From 97be0d6cf1dce0419c1d0364a9520b4b22487fbb Mon Sep 17 00:00:00 2001
From: root <root@mysqldb01-cluster05.safesoftsolutions.com>
Date: Tue, 26 Nov 2013 02:37:51 -0800
Subject: [PATCH 001/261] removed our verison of maria

---
 dev-db/mariadb/mariadb-5.1.67.ebuild | 171 ---------------------------
 1 file changed, 171 deletions(-)
 delete mode 100644 dev-db/mariadb/mariadb-5.1.67.ebuild

diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
deleted file mode 100644
index 24ac7f4..0000000
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}

From c8c8cb3626eb3b12c12faccb00bfd3477ca1dbb0 Mon Sep 17 00:00:00 2001
From: Lisa Simpson <lisa@safesoftsolutions.com>
Date: Fri, 6 Dec 2013 13:42:47 -0800
Subject: [PATCH 002/261] changed the dependency for opensips from mysql to
 mariadb sicne we wont support mysql anymore

---
 net-misc/opensips/opensips-1.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/opensips/opensips-1.8.0.ebuild b/net-misc/opensips/opensips-1.8.0.ebuild
index d14bc86..69c2b65 100644
--- a/net-misc/opensips/opensips-1.8.0.ebuild
+++ b/net-misc/opensips/opensips-1.8.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence"
 
 RDEPEND="
-	mysql? ( >=dev-db/mysql-4.1.20 )
+	mysql? ( >=dev-db/mariadb-4.1.20 )
 	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	postgres? ( >=dev-db/postgresql-8.0.8 )
 	jabber? ( dev-libs/expat )
@@ -126,4 +126,4 @@ pkg_postinst() {
 
 pkg_prerm () {
 	${D}/etc/init.d/opensips stop >/dev/null
-}
\ No newline at end of file
+}

From f75da8632d4e1c23d4c1103aa90c26e9a4a0d9ef Mon Sep 17 00:00:00 2001
From: root <root@opensernode01.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 13:58:34 -0800
Subject: [PATCH 003/261] ported opensips config from old debian box for multi
 instances, use orig for non multi-instance

---
 net-misc/opensips/Manifest                 |   6 +
 net-misc/opensips/files/opensips.init      | 324 ++++++++++++++++++++-
 net-misc/opensips/files/opensips.init.orig |  22 ++
 3 files changed, 340 insertions(+), 12 deletions(-)
 create mode 100644 net-misc/opensips/Manifest
 create mode 100644 net-misc/opensips/files/opensips.init.orig

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
new file mode 100644
index 0000000..6eff61b
--- /dev/null
+++ b/net-misc/opensips/Manifest
@@ -0,0 +1,6 @@
+AUX Makefile-1.8.0.patch 653 SHA256 5f1323751bcbb6f32c665559a6d658b725d278308969127d879ecf2831138f56 SHA512 44fe13addc7f0cb1c241724f8865d2b673b55ed3379ef74976b7dbc6333fd997f130c5ab96e68f35380b380f8593cc712dcc119abeb4f8d644f664acfc6f9e53 WHIRLPOOL 1b3b429ca8bd254334c71f5011579a162a6f51850fd5dfa9167fad931cbb16dc1fed6fa8587fa404abe2b602741fe90030d46a7397c4077fd04521e17114b75b
+AUX opensips.init 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
+DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
+DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
+EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
+EBUILD opensips-1.8.0.ebuild 3145 SHA256 b01f3becac256f630c8481e9eb2d499bf99773e29c9a300df1432f27a7c2705c SHA512 ceb6b6f78e2a65d36ad068bc9ec6239cbf4b3dc7542cea61c4c40a8271cc421f0227ef5cfdf32dd53aa502c2de25b6806531087cc51990634f964a8cbe6a1a12 WHIRLPOOL 131d5264ecf2a2b8d3afeebbaa202df1ab6ee61bbe2b09c1eb0067ad35ff8f442141c26ebde091c7e9539794622949e80c7e90f458b45c7b89a7dfcbd2ed760f
diff --git a/net-misc/opensips/files/opensips.init b/net-misc/opensips/files/opensips.init
index b72251d..dc70a1a 100644
--- a/net-misc/opensips/files/opensips.init
+++ b/net-misc/opensips/files/opensips.init
@@ -1,22 +1,322 @@
 #!/sbin/runscript
-# Copyright 2002 Frauenhofer Gesellschaft FOKUS, Germany.
-# Distributed under the terms of the GNU General Public License, v2 or later
 # $Header$
 
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/opensips
+NAME=opensips
+DESC=opensips
+HOMEDIR=/var/run/opensips
+PIDFILE_LRN=$HOMEDIR/LRN_$NAME.pid
+PIDFILE_FAKERING=$HOMEDIR/FAKERING_$NAME.pid
+PIDFILE_RTP=$HOMEDIR/RTP_$NAME.pid
+PIDFILE_NORTP=$HOMEDIR/NORTP_$NAME.pid
+PIDFILE_INDIALIN=$HOMEDIR/INDIALIN_$NAME.pid
+PIDFILE_INDID=$HOMEDIR/INDID_$NAME.pid
+
+DEFAULTS=/etc/conf.d/opensips
+RUN_OPENSIPS=no
+
+ulimit -c 0
+ulimit -d unlimited
+ulimit -f unlimited
+ulimit -l unlimited
+ulimit -m unlimited
+ulimit -n 100000
+ulimit -s 8192
+ulimit -t unlimited
+ulimit -v unlimited
+
+
 depend() {
-	need net
+        need net
+}
+
+# Do not start opensips if fork=no is set in the config file
+# otherwise the boot process will just stop
+check_fork ()
+{
+    if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" /etc/opensips/opensips.cfg; then
+	echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/opensips debug instead"
+	exit 1
+    fi
 }
 
-start() {
-	ebegin "Starting OpenSIPS"
-	start-stop-daemon --start --quiet --pidfile /var/run/opensips.pid \
-		--exec /usr/sbin/opensips -- -P /var/run/opensips.pid
-	eend $?
+check_opensips_config ()
+{
+	# Check if opensips configuration is valid before starting the server
+	set +e
+	out=$($DAEMON -c 2>&1 > /dev/null)
+	retcode=$?
+	set -e
+	if [ "$retcode" != '0' ]; then
+	    echo "Not starting $DESC: invalid configuration file!"
+	    echo -e "\n$out\n"
+	    exit 1
+	fi
 }
 
-stop() {
-	ebegin "Stopping OpenSIPS"
-	start-stop-daemon --stop --quiet --pidfile /var/run/opensips.pid
-	eend $?
+create_radius_seqfile ()
+{
+    # Create a radius sequence file to be used by the radius client if
+    # radius accounting is enabled. This is needed to avoid any issue
+    # with the file not being writable if opensips first starts as user
+    # root because DUMP_CORE is enabled and creates this file as user
+    # root and then later it switches back to user opensips and cannot
+    # write to the file. If the file exists before opensips starts, it
+    # won't change it's ownership and will be writable for both root
+    # and opensips, no matter what options are chosen at install time
+    RADIUS_SEQ_FILE=/var/run/opensips/opensips_radius.seq
+    if [ -d /var/run/opensips ]; then
+	chown ${USER}:${GROUP} /var/run/opensips
+
+	if [ ! -f $RADIUS_SEQ_FILE ]; then
+	    touch $RADIUS_SEQ_FILE
+	fi
+
+	chown ${USER}:${GROUP} $RADIUS_SEQ_FILE
+	chmod 660 $RADIUS_SEQ_FILE
+    fi
 }
 
+test -f $DAEMON || exit 0
+
+# Load startup options if available
+if [ -f $DEFAULTS ]; then
+   . $DEFAULTS || true
+fi
+
+if [ "$RUN_OPENSIPS" != "yes" ]; then
+    echo "OpenSIPS not yet configured. Edit /etc/conf.d/opensips first."
+    exit 0
+fi
+
+set -e
+
+S_MEMORY=$((`echo $S_MEMORY | sed -e 's/[^0-9]//g'`))
+P_MEMORY=$((`echo $P_MEMORY | sed -e 's/[^0-9]//g'`))
+[ -z "$USER" ]  && USER=opensips
+[ -z "$GROUP" ] && GROUP=opensips
+[ $S_MEMORY -le 0 ] && S_MEMORY=32
+[ $P_MEMORY -le 0 ] && P_MEMORY=32
+
+if test "$DUMP_CORE" = "yes" ; then
+    # set proper ulimit
+    ulimit -c unlimited
+    
+    # directory for the core dump files
+    # COREDIR=/home/corefiles
+    # [ -d $COREDIR ] || mkdir $COREDIR
+    # chmod 777 $COREDIR
+    # echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern
+fi
+
+OPTIONS_LRN="-P $PIDFILE_LRN -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_lrn.cfg"
+OPTIONS_FAKERING="-P $PIDFILE_FAKERING -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_fake_ring.cfg" 
+OPTIONS_RTP="-P $PIDFILE_RTP -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_rtp.cfg"
+OPTIONS_NORTP="-P $PIDFILE_NORTP -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_nortp.cfg"
+OPTIONS_INDIALIN="-P $PIDFILE_INDIALIN -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_inbound_dialin.cfg"
+OPTIONS_INDID="-P $PIDFILE_INDID -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_inbound_did.cfg"
+
+case "$1" in
+  start|debug)
+	#check_opensips_config
+	create_radius_seqfile
+
+	#if [ "$1" != "debug" ]; then
+	#    check_fork
+	#fi
+
+	# dirs under /var/run can go away on reboots.
+	mkdir -p "$HOMEDIR"
+	chmod 775 "$HOMEDIR"
+	chown "$USER:$GROUP" "$HOMEDIR" >/dev/null 2>&1 || true
+
+	echo -n "Starting LRN $DESC: $NAME"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE_LRN \
+		--exec $DAEMON -- $OPTIONS_LRN || echo -n " already running"
+	echo "."
+	
+        echo -n "Starting FAKE RING $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_FAKERING \
+                --exec $DAEMON -- $OPTIONS_FAKERING || echo -n " already running"
+        echo "."
+
+        echo -n "Starting RTP $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_RTP \
+                --exec $DAEMON -- $OPTIONS_RTP || echo -n " already running"
+        echo "."
+
+        echo -n "Starting NORTP $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_NORTP \
+                --exec $DAEMON -- $OPTIONS_NORTP || echo -n " already running"
+        echo "."
+	
+        echo -n "Starting INBOUND DIAL IN $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDIALIN \
+              --exec $DAEMON -- $OPTIONS_INDIALIN || echo -n " already running"
+        echo "."
+
+        echo -n "Starting INBOUND DID $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDID \
+                --exec $DAEMON -- $OPTIONS_INDID || echo -n " already running"
+        echo "."
+	;;
+  stop)
+        echo -n "Stopping LRN $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_LRN \
+                --exec $DAEMON
+        echo "."
+
+        echo -n "Stopping FAKE RING $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_FAKERING \
+                --exec $DAEMON
+        echo "."
+
+        echo -n "Stopping RTP $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_RTP \
+                --exec $DAEMON
+        echo "."
+
+        echo -n "Stopping NORTP $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_NORTP \
+                --exec $DAEMON
+        echo "."
+
+        echo -n "Stopping INBOUND DIAL IN $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDIALIN \
+              --exec $DAEMON
+        echo "."
+
+        echo -n "Stopping INBOUND DID $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDID \
+                --exec $DAEMON
+        echo "."
+
+	;;
+  restart|force-reload)
+	#check_opensips_config
+	create_radius_seqfile
+
+        echo -n "Restarting LRN $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_LRN \
+                --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_LRN \
+                --exec $DAEMON -- $OPTIONS_LRN
+        echo "."
+
+        echo -n "Restarting FAKE RING $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_FAKERING \
+                --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_FAKERING \
+                --exec $DAEMON -- $OPTIONS_FAKERING
+        echo "."
+
+        echo -n "Restarting RTP $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_RTP \
+                --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_RTP \
+                --exec $DAEMON -- $OPTIONS_RTP
+        echo "."
+
+        echo -n "Restarting NORTP $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_NORTP \
+                --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_NORTP \
+                --exec $DAEMON -- $OPTIONS_NORTP
+        echo "."
+
+        echo -n "Restarting INBOUND DIAL IN $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDIALIN \
+              --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDIALIN \
+                --exec $DAEMON -- $OPTIONS_INDIALIN
+        echo "."
+
+        echo -n "Restarting INBOUND DID $DESC: $NAME"
+        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDID \
+                --exec $DAEMON
+        sleep 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDID \
+                --exec $DAEMON -- $OPTIONS_INDID
+        echo "."
+	;;
+  status)
+        echo -n "Status of LRN $DESC: "
+        if [ ! -r "$PIDFILE_LRN" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_LRN" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_LRN exists."
+        fi
+	echo "."
+
+        echo -n "Status of FAKE RING $DESC: "
+        if [ ! -r "$PIDFILE_FAKERING" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_FAKERING" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_FAKERING exists."
+        fi
+	echo "."
+
+        echo -n "Status of RTP $DESC: "
+        if [ ! -r "$PIDFILE_RTP" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_RTP" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_RTP exists."
+        fi
+	echo "."
+
+        echo -n "Status of NORTP $DESC: "
+        if [ ! -r "$PIDFILE_NORTP" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_NORTP" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_NORTP exists."
+        fi
+	echo "."
+
+        echo -n "Status of INBOUND DIAL IN $DESC: "
+        if [ ! -r "$PIDFILE_INDIALIN" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_INDIALIN" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_INDIALIN exists."
+        fi
+	echo "."
+
+        echo -n "Status of INBOUND DID $DESC: "
+        if [ ! -r "$PIDFILE_INDID" ]; then
+                echo "$NAME is not running."
+        fi
+        if read pid < "$PIDFILE_INDID" && ps -p "$pid" > /dev/null 2>&1; then
+                echo "$NAME is running."
+        else
+                echo "$NAME is not running but $PIDFILE_INDID exists."
+        fi
+	echo "."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload|debug|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/net-misc/opensips/files/opensips.init.orig b/net-misc/opensips/files/opensips.init.orig
new file mode 100644
index 0000000..b72251d
--- /dev/null
+++ b/net-misc/opensips/files/opensips.init.orig
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 2002 Frauenhofer Gesellschaft FOKUS, Germany.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header$
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting OpenSIPS"
+	start-stop-daemon --start --quiet --pidfile /var/run/opensips.pid \
+		--exec /usr/sbin/opensips -- -P /var/run/opensips.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping OpenSIPS"
+	start-stop-daemon --stop --quiet --pidfile /var/run/opensips.pid
+	eend $?
+}
+

From ae2c8a3f2419980a1887a2f9df25cd2988a2d8da Mon Sep 17 00:00:00 2001
From: root <root@opensernode01.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 14:03:48 -0800
Subject: [PATCH 004/261] added default

---
 net-misc/opensips/files/opensips.default | 26 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 net-misc/opensips/files/opensips.default

diff --git a/net-misc/opensips/files/opensips.default b/net-misc/opensips/files/opensips.default
new file mode 100644
index 0000000..79ed33b
--- /dev/null
+++ b/net-misc/opensips/files/opensips.default
@@ -0,0 +1,26 @@
+# OpenSIPS startup options
+#
+
+# Set to yes to enable opensips, once configured properly.
+RUN_OPENSIPS=yes
+
+# User to run as
+USER=root
+
+# Group to run as
+GROUP=root
+
+# Amount of shared memory to allocate for the running OpenSIPS server (in Mb)
+S_MEMORY=128
+
+# Amount of pkg memory to allocate for the running OpenSIPS server (in Mb)
+P_MEMORY=4
+
+# Enable the server to leave a core file when it crashes.
+# Set this to 'yes' to enable OpenSIPS to leave a core file when it crashes
+# or 'no' to disable this feature. This option is case sensitive and only
+# accepts 'yes' and 'no' and only in lowercase letters.
+# On some systems (e.g. Ubuntu 6.10, Debian 4.0) it is necessary to specify
+# a directory for the core files to get a dump. Look into the opensips
+# init file for an example configuration.
+DUMP_CORE=no

From 94e816f8cb58cda7dcfc66f6d4a6fbc04077e036 Mon Sep 17 00:00:00 2001
From: root <root@opensernode01.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 15:43:23 -0800
Subject: [PATCH 005/261] updated init script, and added newconfd for ebuild

---
 net-misc/opensips/Manifest              |   6 +-
 net-misc/opensips/files/opensips.init   | 365 ++++++------------------
 net-misc/opensips/opensips-1.8.0.ebuild |   3 +-
 3 files changed, 87 insertions(+), 287 deletions(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 6eff61b..950ad85 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -1,6 +1,8 @@
 AUX Makefile-1.8.0.patch 653 SHA256 5f1323751bcbb6f32c665559a6d658b725d278308969127d879ecf2831138f56 SHA512 44fe13addc7f0cb1c241724f8865d2b673b55ed3379ef74976b7dbc6333fd997f130c5ab96e68f35380b380f8593cc712dcc119abeb4f8d644f664acfc6f9e53 WHIRLPOOL 1b3b429ca8bd254334c71f5011579a162a6f51850fd5dfa9167fad931cbb16dc1fed6fa8587fa404abe2b602741fe90030d46a7397c4077fd04521e17114b75b
-AUX opensips.init 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
+AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bdcb19746df47a038d SHA512 25fc5e61f6ffc2d9aa0ba28b2ff37cb7376c2917d9c3bf60bd1a73c9195b3f9b3b74a7f0cbb3f743db12efe5866c58cae1f3bc83ee0a27d5e4aea6172175412f WHIRLPOOL ddd46bd046751eff342ebd5ef965d684148e5d0a41aaf296764545d05518781065d981169ba9a6d5110efca7012b39b4654eeb33dc1500ce9726d780c51bbdf6
+AUX opensips.init 10538 SHA256 ed5698f0b13994f50de014d2b0f3eedf940d034b58c9819cf0fe24dbeb95425c SHA512 9385c9fde7a71b3b10baa7ad8ea14a03a4914195cf338de821b5f593ef7d83c6a079e226554d5bc3a7bdaeba2eb6bc2794791546e428eaab329bb1c3bff2efa5 WHIRLPOOL 96fd36c2978fbf90923aa806810eb325f5e03028896f11f9cdf1f82aebe2f2b4d4622e374e8a8487f5d1803b8bccbf3fa253092dee00a1a472af0d73a6bac089
+AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
-EBUILD opensips-1.8.0.ebuild 3145 SHA256 b01f3becac256f630c8481e9eb2d499bf99773e29c9a300df1432f27a7c2705c SHA512 ceb6b6f78e2a65d36ad068bc9ec6239cbf4b3dc7542cea61c4c40a8271cc421f0227ef5cfdf32dd53aa502c2de25b6806531087cc51990634f964a8cbe6a1a12 WHIRLPOOL 131d5264ecf2a2b8d3afeebbaa202df1ab6ee61bbe2b09c1eb0067ad35ff8f442141c26ebde091c7e9539794622949e80c7e90f458b45c7b89a7dfcbd2ed760f
+EBUILD opensips-1.8.0.ebuild 3199 SHA256 7f257e5ee439418bd64d5eaeb75518ecee53c532a62ce50f44666e5b3fd6bbcd SHA512 92f616e0e63bde2adaa97068fb6c5df346c238aa928c3f84553eac950cbb4df944cc002466f2582b6faf55e3f8d690c4f79781aa60a9aa3a31e7ed1eeebedbf9 WHIRLPOOL d311ff7e6df83dff68c02c1e30ecb05ad24a19ee29528f9463bd0dec7cf6f6f34692c00425140077e278877b4af5ef81f96b95c4315671e16719949fb5938bfc
diff --git a/net-misc/opensips/files/opensips.init b/net-misc/opensips/files/opensips.init
index dc70a1a..ec321fa 100644
--- a/net-misc/opensips/files/opensips.init
+++ b/net-misc/opensips/files/opensips.init
@@ -1,17 +1,15 @@
 #!/sbin/runscript
 # $Header$
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/opensips
-NAME=opensips
-DESC=opensips
 HOMEDIR=/var/run/opensips
-PIDFILE_LRN=$HOMEDIR/LRN_$NAME.pid
-PIDFILE_FAKERING=$HOMEDIR/FAKERING_$NAME.pid
-PIDFILE_RTP=$HOMEDIR/RTP_$NAME.pid
-PIDFILE_NORTP=$HOMEDIR/NORTP_$NAME.pid
-PIDFILE_INDIALIN=$HOMEDIR/INDIALIN_$NAME.pid
-PIDFILE_INDID=$HOMEDIR/INDID_$NAME.pid
+NAME=opensips
+PIDFILE_LRN=${HOMEDIR}/LRN_${NAME}.pid
+PIDFILE_FAKERING=${HOMEDIR}/FAKERING_${NAME}.pid
+PIDFILE_RTP=${HOMEDIR}/RTP_${NAME}.pid
+PIDFILE_NORTP=${HOMEDIR}/NORTP_${NAME}.pid
+PIDFILE_INDIALIN=${HOMEDIR}/INDIALIN_${NAME}.pid
+PIDFILE_INDID=${HOMEDIR}/INDID_${NAME}.pid
 
 DEFAULTS=/etc/conf.d/opensips
 RUN_OPENSIPS=no
@@ -31,58 +29,9 @@ depend() {
         need net
 }
 
-# Do not start opensips if fork=no is set in the config file
-# otherwise the boot process will just stop
-check_fork ()
-{
-    if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" /etc/opensips/opensips.cfg; then
-	echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/opensips debug instead"
-	exit 1
-    fi
-}
-
-check_opensips_config ()
-{
-	# Check if opensips configuration is valid before starting the server
-	set +e
-	out=$($DAEMON -c 2>&1 > /dev/null)
-	retcode=$?
-	set -e
-	if [ "$retcode" != '0' ]; then
-	    echo "Not starting $DESC: invalid configuration file!"
-	    echo -e "\n$out\n"
-	    exit 1
-	fi
-}
-
-create_radius_seqfile ()
-{
-    # Create a radius sequence file to be used by the radius client if
-    # radius accounting is enabled. This is needed to avoid any issue
-    # with the file not being writable if opensips first starts as user
-    # root because DUMP_CORE is enabled and creates this file as user
-    # root and then later it switches back to user opensips and cannot
-    # write to the file. If the file exists before opensips starts, it
-    # won't change it's ownership and will be writable for both root
-    # and opensips, no matter what options are chosen at install time
-    RADIUS_SEQ_FILE=/var/run/opensips/opensips_radius.seq
-    if [ -d /var/run/opensips ]; then
-	chown ${USER}:${GROUP} /var/run/opensips
-
-	if [ ! -f $RADIUS_SEQ_FILE ]; then
-	    touch $RADIUS_SEQ_FILE
-	fi
-
-	chown ${USER}:${GROUP} $RADIUS_SEQ_FILE
-	chmod 660 $RADIUS_SEQ_FILE
-    fi
-}
-
-test -f $DAEMON || exit 0
-
 # Load startup options if available
-if [ -f $DEFAULTS ]; then
-   . $DEFAULTS || true
+if [ -f /etc/conf.d/opensips ]; then
+   . /etc/conf.d/opensips || true
 fi
 
 if [ "$RUN_OPENSIPS" != "yes" ]; then
@@ -92,231 +41,79 @@ fi
 
 set -e
 
-S_MEMORY=$((`echo $S_MEMORY | sed -e 's/[^0-9]//g'`))
-P_MEMORY=$((`echo $P_MEMORY | sed -e 's/[^0-9]//g'`))
-[ -z "$USER" ]  && USER=opensips
-[ -z "$GROUP" ] && GROUP=opensips
-[ $S_MEMORY -le 0 ] && S_MEMORY=32
-[ $P_MEMORY -le 0 ] && P_MEMORY=32
-
-if test "$DUMP_CORE" = "yes" ; then
-    # set proper ulimit
-    ulimit -c unlimited
-    
-    # directory for the core dump files
-    # COREDIR=/home/corefiles
-    # [ -d $COREDIR ] || mkdir $COREDIR
-    # chmod 777 $COREDIR
-    # echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern
-fi
-
-OPTIONS_LRN="-P $PIDFILE_LRN -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_lrn.cfg"
-OPTIONS_FAKERING="-P $PIDFILE_FAKERING -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_fake_ring.cfg" 
-OPTIONS_RTP="-P $PIDFILE_RTP -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_rtp.cfg"
-OPTIONS_NORTP="-P $PIDFILE_NORTP -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_nortp.cfg"
-OPTIONS_INDIALIN="-P $PIDFILE_INDIALIN -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_inbound_dialin.cfg"
-OPTIONS_INDID="-P $PIDFILE_INDID -m $S_MEMORY -M $P_MEMORY -u $USER -g $GROUP -f /etc/opensips/opensips_inbound_did.cfg"
-
-case "$1" in
-  start|debug)
-	#check_opensips_config
-	create_radius_seqfile
-
-	#if [ "$1" != "debug" ]; then
-	#    check_fork
-	#fi
-
+S_MEMORY=$((`echo ${S_MEMORY} | sed -e 's/[^0-9]//g'`))
+P_MEMORY=$((`echo ${P_MEMORY} | sed -e 's/[^0-9]//g'`))
+[ -z "${USER}" ]  && USER=opensips
+[ -z "${GROUP}" ] && GROUP=opensips
+[ ${S_MEMORY} -le 0 ] && S_MEMORY=32
+[ ${P_MEMORY} -le 0 ] && P_MEMORY=32
+
+OPTIONS_LRN="-P ${PIDFILE_LRN} -m ${S_MEMORY} -M ${P_MEMORY} -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_lrn.cfg"
+OPTIONS_FAKERING="-P ${PIDFILE_FAKERING} -m ${S_MEMORY} -M $P_MEMORY -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_fake_ring.cfg"
+OPTIONS_RTP="-P ${PIDFILE_RTP} -m ${S_MEMORY} -M $P_MEMORY -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_rtp.cfg"
+OPTIONS_NORTP="-P ${PIDFILE_NORTP} -m ${S_MEMORY} -M ${P_MEMORY} -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_nortp.cfg"
+OPTIONS_INDIALIN="-P ${PIDFILE_INDIALIN} -m ${S_MEMORY} -M ${P_MEMORY} -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_inbound_dialin.cfg"
+OPTIONS_INDID="-P ${PIDFILE_INDID} -m ${S_MEMORY} -M ${P_MEMORY} -u ${USER} -g ${GROUP} -f /etc/opensips/opensips_inbound_did.cfg"
+
+start() {
 	# dirs under /var/run can go away on reboots.
-	mkdir -p "$HOMEDIR"
-	chmod 775 "$HOMEDIR"
-	chown "$USER:$GROUP" "$HOMEDIR" >/dev/null 2>&1 || true
-
-	echo -n "Starting LRN $DESC: $NAME"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE_LRN \
-		--exec $DAEMON -- $OPTIONS_LRN || echo -n " already running"
-	echo "."
+	mkdir -p "${HOMEDIR}"
+	chmod 775 "${HOMEDIR}"
+	chown "${USER}:${GROUP}" "${HOMEDIR}" >/dev/null 2>&1 || true
 	
-        echo -n "Starting FAKE RING $DESC: $NAME"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_FAKERING \
-                --exec $DAEMON -- $OPTIONS_FAKERING || echo -n " already running"
-        echo "."
-
-        echo -n "Starting RTP $DESC: $NAME"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_RTP \
-                --exec $DAEMON -- $OPTIONS_RTP || echo -n " already running"
-        echo "."
-
-        echo -n "Starting NORTP $DESC: $NAME"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_NORTP \
-                --exec $DAEMON -- $OPTIONS_NORTP || echo -n " already running"
-        echo "."
+	ebegin "Starting LRN - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_LRN} \
+	--exec ${DAEMON} -- ${OPTIONS_LRN}
+	eend $?
 	
-        echo -n "Starting INBOUND DIAL IN $DESC: $NAME"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDIALIN \
-              --exec $DAEMON -- $OPTIONS_INDIALIN || echo -n " already running"
-        echo "."
-
-        echo -n "Starting INBOUND DID $DESC: $NAME"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDID \
-                --exec $DAEMON -- $OPTIONS_INDID || echo -n " already running"
-        echo "."
-	;;
-  stop)
-        echo -n "Stopping LRN $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_LRN \
-                --exec $DAEMON
-        echo "."
-
-        echo -n "Stopping FAKE RING $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_FAKERING \
-                --exec $DAEMON
-        echo "."
-
-        echo -n "Stopping RTP $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_RTP \
-                --exec $DAEMON
-        echo "."
-
-        echo -n "Stopping NORTP $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_NORTP \
-                --exec $DAEMON
-        echo "."
-
-        echo -n "Stopping INBOUND DIAL IN $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDIALIN \
-              --exec $DAEMON
-        echo "."
-
-        echo -n "Stopping INBOUND DID $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDID \
-                --exec $DAEMON
-        echo "."
-
-	;;
-  restart|force-reload)
-	#check_opensips_config
-	create_radius_seqfile
-
-        echo -n "Restarting LRN $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_LRN \
-                --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_LRN \
-                --exec $DAEMON -- $OPTIONS_LRN
-        echo "."
-
-        echo -n "Restarting FAKE RING $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_FAKERING \
-                --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_FAKERING \
-                --exec $DAEMON -- $OPTIONS_FAKERING
-        echo "."
-
-        echo -n "Restarting RTP $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_RTP \
-                --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_RTP \
-                --exec $DAEMON -- $OPTIONS_RTP
-        echo "."
-
-        echo -n "Restarting NORTP $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_NORTP \
-                --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_NORTP \
-                --exec $DAEMON -- $OPTIONS_NORTP
-        echo "."
-
-        echo -n "Restarting INBOUND DIAL IN $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDIALIN \
-              --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDIALIN \
-                --exec $DAEMON -- $OPTIONS_INDIALIN
-        echo "."
-
-        echo -n "Restarting INBOUND DID $DESC: $NAME"
-        start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE_INDID \
-                --exec $DAEMON
-        sleep 1
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_INDID \
-                --exec $DAEMON -- $OPTIONS_INDID
-        echo "."
-	;;
-  status)
-        echo -n "Status of LRN $DESC: "
-        if [ ! -r "$PIDFILE_LRN" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_LRN" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_LRN exists."
-        fi
-	echo "."
-
-        echo -n "Status of FAKE RING $DESC: "
-        if [ ! -r "$PIDFILE_FAKERING" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_FAKERING" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_FAKERING exists."
-        fi
-	echo "."
-
-        echo -n "Status of RTP $DESC: "
-        if [ ! -r "$PIDFILE_RTP" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_RTP" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_RTP exists."
-        fi
-	echo "."
-
-        echo -n "Status of NORTP $DESC: "
-        if [ ! -r "$PIDFILE_NORTP" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_NORTP" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_NORTP exists."
-        fi
-	echo "."
-
-        echo -n "Status of INBOUND DIAL IN $DESC: "
-        if [ ! -r "$PIDFILE_INDIALIN" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_INDIALIN" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_INDIALIN exists."
-        fi
-	echo "."
-
-        echo -n "Status of INBOUND DID $DESC: "
-        if [ ! -r "$PIDFILE_INDID" ]; then
-                echo "$NAME is not running."
-        fi
-        if read pid < "$PIDFILE_INDID" && ps -p "$pid" > /dev/null 2>&1; then
-                echo "$NAME is running."
-        else
-                echo "$NAME is not running but $PIDFILE_INDID exists."
-        fi
-	echo "."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload|debug|status}" >&2
-	exit 1
-	;;
-esac
+	ebegin "Starting FAKE RING - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_FAKERING} \
+	--exec ${DAEMON} -- ${OPTIONS_FAKERING}
+	eend $?
+	
+	ebegin "Starting RTP - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_RTP} \
+	        --exec ${DAEMON} -- ${OPTIONS_RTP}
+	eend $?
+	
+	ebegin "Starting NORTP - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_NORTP} \
+	        --exec ${DAEMON} -- ${OPTIONS_NORTP}
+	eend $?
+	
+	ebegin "Starting INBOUND DIAL IN - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_INDIALIN} \
+	      --exec ${DAEMON} -- ${OPTIONS_INDIALIN}
+	eend $?
+	
+	ebegin "Starting INBOUND DID - ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE_INDID} \
+	        --exec ${DAEMON} -- ${OPTIONS_INDID}
+	eend $?
+}
 
-exit 0
+stop() {
+	ebegin "Stopping LRN - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_LRN}
+	eend $?
+	
+	ebegin "Stopping FAKE RING - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_FAKERING}
+	eend $?
+	
+	ebegin "Stopping RTP - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_RTP}
+	eend $?
+	
+	ebegin "Stopping NORTP - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_NORTP}
+	eend $?
+	
+	ebegin "Stopping INBOUND DIAL IN - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_INDIALIN}
+	eend $?
+	
+	ebegin "Stopping INBOUND DID - ${NAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE_INDID}
+	eend $?
+}
diff --git a/net-misc/opensips/opensips-1.8.0.ebuild b/net-misc/opensips/opensips-1.8.0.ebuild
index 69c2b65..da39005 100644
--- a/net-misc/opensips/opensips-1.8.0.ebuild
+++ b/net-misc/opensips/opensips-1.8.0.ebuild
@@ -101,7 +101,7 @@ src_install () {
 		cfg-target=${D}/etc/opensips \
 		modules-prefix=${D}/usr/lib/opensips \
 		modules-dir=modules \
-		modules-target=${D}/usr/lib/opensips/modules/ \
+		modules-target=${D}/usr/lib/opensips/modules \
 		man-prefix=${D}/usr/share/man \
 		man-dir="" \
 		doc-prefix=${D}/usr/share/doc \
@@ -109,6 +109,7 @@ src_install () {
 		data-prefix=${D}/usr || die
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/opensips.init opensips
+	newconfd ${FILESDIR}/opensips.defaults opensips
 	mv menuconfig/configure menuconfig/osipsconfig
 	dosbin menuconfig/osipsconfig 
 	# fix what the Makefile don't do

From a0109ac3065f73b373fc84b94d5ed5bfe18da13f Mon Sep 17 00:00:00 2001
From: root <root@opensipsnode01.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 16:56:13 -0800
Subject: [PATCH 006/261] added manifest

---
 net-misc/opensips/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 950ad85..05afb82 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -1,8 +1,8 @@
 AUX Makefile-1.8.0.patch 653 SHA256 5f1323751bcbb6f32c665559a6d658b725d278308969127d879ecf2831138f56 SHA512 44fe13addc7f0cb1c241724f8865d2b673b55ed3379ef74976b7dbc6333fd997f130c5ab96e68f35380b380f8593cc712dcc119abeb4f8d644f664acfc6f9e53 WHIRLPOOL 1b3b429ca8bd254334c71f5011579a162a6f51850fd5dfa9167fad931cbb16dc1fed6fa8587fa404abe2b602741fe90030d46a7397c4077fd04521e17114b75b
 AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bdcb19746df47a038d SHA512 25fc5e61f6ffc2d9aa0ba28b2ff37cb7376c2917d9c3bf60bd1a73c9195b3f9b3b74a7f0cbb3f743db12efe5866c58cae1f3bc83ee0a27d5e4aea6172175412f WHIRLPOOL ddd46bd046751eff342ebd5ef965d684148e5d0a41aaf296764545d05518781065d981169ba9a6d5110efca7012b39b4654eeb33dc1500ce9726d780c51bbdf6
-AUX opensips.init 10538 SHA256 ed5698f0b13994f50de014d2b0f3eedf940d034b58c9819cf0fe24dbeb95425c SHA512 9385c9fde7a71b3b10baa7ad8ea14a03a4914195cf338de821b5f593ef7d83c6a079e226554d5bc3a7bdaeba2eb6bc2794791546e428eaab329bb1c3bff2efa5 WHIRLPOOL 96fd36c2978fbf90923aa806810eb325f5e03028896f11f9cdf1f82aebe2f2b4d4622e374e8a8487f5d1803b8bccbf3fa253092dee00a1a472af0d73a6bac089
+AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d540466be30bc63 SHA512 a6bc407d96bfaca17e893ff8200e09703d4592e610dd5df66d2cccc635b134dac4b57a32ea5d9efd91a8f24d932616613115328bd561f34aabce84dff0c287e8 WHIRLPOOL aa67bce3127926b35e4c9bca24ec0f17490c41637645b58f37a24fa7f4a27ca5e99e115f1417e26d82a7a7b6c223074341e9bb24c5304d90a5f89e6305678cf6
 AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
-EBUILD opensips-1.8.0.ebuild 3199 SHA256 7f257e5ee439418bd64d5eaeb75518ecee53c532a62ce50f44666e5b3fd6bbcd SHA512 92f616e0e63bde2adaa97068fb6c5df346c238aa928c3f84553eac950cbb4df944cc002466f2582b6faf55e3f8d690c4f79781aa60a9aa3a31e7ed1eeebedbf9 WHIRLPOOL d311ff7e6df83dff68c02c1e30ecb05ad24a19ee29528f9463bd0dec7cf6f6f34692c00425140077e278877b4af5ef81f96b95c4315671e16719949fb5938bfc
+EBUILD opensips-1.8.0.ebuild 3193 SHA256 64f8bb9358e5f4151408e3512b8a408f8a2fb370e026654c1d31a614e42399e1 SHA512 b21b1d548940733b7f2323451c53932787a34bd0f89366264cc00283012f619b607f1698d5e80cd9eba20a520d268d5c7f8a2c070bcfaeb593a0dbd902a337c4 WHIRLPOOL 8286f03cea4c6af00586c12d85d2dffd680b2c4308a316a5584c903d700a2545b393f5393c0ab896be9c0b4a0476e485c15a1802b0a48475a5607249a85a67ea

From 903519866426320cdcbb4349f7ab2b0e30cee200 Mon Sep 17 00:00:00 2001
From: root <root@opensipsnode02.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 17:13:33 -0800
Subject: [PATCH 007/261] ebuild had a type for the conf.d filename

---
 net-misc/opensips/opensips-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/opensips/opensips-1.8.0.ebuild b/net-misc/opensips/opensips-1.8.0.ebuild
index da39005..a3702e7 100644
--- a/net-misc/opensips/opensips-1.8.0.ebuild
+++ b/net-misc/opensips/opensips-1.8.0.ebuild
@@ -109,7 +109,7 @@ src_install () {
 		data-prefix=${D}/usr || die
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/opensips.init opensips
-	newconfd ${FILESDIR}/opensips.defaults opensips
+	newconfd ${FILESDIR}/opensips.default opensips
 	mv menuconfig/configure menuconfig/osipsconfig
 	dosbin menuconfig/osipsconfig 
 	# fix what the Makefile don't do

From 91c69b8abc113711da72113c8541cda80acc53b1 Mon Sep 17 00:00:00 2001
From: root <root@opensipsnode02.safesoftsolutions.com>
Date: Fri, 6 Dec 2013 17:15:08 -0800
Subject: [PATCH 008/261] added manifest again

---
 net-misc/opensips/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 05afb82..a6b9dc4 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -5,4 +5,4 @@ AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e94
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
-EBUILD opensips-1.8.0.ebuild 3193 SHA256 64f8bb9358e5f4151408e3512b8a408f8a2fb370e026654c1d31a614e42399e1 SHA512 b21b1d548940733b7f2323451c53932787a34bd0f89366264cc00283012f619b607f1698d5e80cd9eba20a520d268d5c7f8a2c070bcfaeb593a0dbd902a337c4 WHIRLPOOL 8286f03cea4c6af00586c12d85d2dffd680b2c4308a316a5584c903d700a2545b393f5393c0ab896be9c0b4a0476e485c15a1802b0a48475a5607249a85a67ea
+EBUILD opensips-1.8.0.ebuild 3192 SHA256 2da7c96cc162ddad235db82a210635a5ce05de6dc36bbe4c58b61b6144004ddf SHA512 5f28ef1fe37efd544e1f87148aa10cf8e3f6e680956fb6f3be3e21d0a88222daa85f19cd6a874b30a1a7860447696f638f5b2ed7b9fd850f30717ebe4a535cb4 WHIRLPOOL eb66199909f7a474da1803df9c109f53835c6d8c7e20d2374bea2a15b0c44fe299e25934ea70ac971cce278191ed649562d5442df371a117ff3bba3febb40e6b

From f32fce19b2a4cde8382a5f2786e609439c542942 Mon Sep 17 00:00:00 2001
From: root <root@hyp04>
Date: Wed, 8 Jan 2014 10:24:25 -0800
Subject: [PATCH 009/261] removed old mysql, and mariadb

---
 dev-db/mariadb/ChangeLog                      | 213 --------------
 dev-db/mariadb/Manifest                       |  27 --
 dev-db/mariadb/files/my.cnf-4.1               | 147 ----------
 dev-db/mariadb/files/my.cnf-5.1               | 146 ----------
 dev-db/mariadb/files/my.cnf-5.5               | 153 ----------
 dev-db/mariadb/mariadb-10.0.1.ebuild          | 124 --------
 dev-db/mariadb/mariadb-10.0.2.ebuild          | 124 --------
 dev-db/mariadb/mariadb-10.0.3.ebuild          | 124 --------
 dev-db/mariadb/mariadb-10.0.4.ebuild          | 124 --------
 dev-db/mariadb/mariadb-5.2.14.ebuild          | 171 -----------
 dev-db/mariadb/mariadb-5.3.12.ebuild          | 171 -----------
 dev-db/mariadb/mariadb-5.5.31.ebuild          | 128 ---------
 dev-db/mariadb/mariadb-5.5.32.ebuild          | 128 ---------
 dev-db/mariadb/mariadb-5.5.33a-r1.ebuild      | 128 ---------
 dev-db/mariadb/metadata.xml                   |  29 --
 dev-db/mysql-cluster/ChangeLog                |  17 --
 dev-db/mysql-cluster/Manifest                 |   3 -
 dev-db/mysql-cluster/metadata.xml             |  19 --
 .../mysql-cluster/mysql-cluster-7.0.9.ebuild  | 228 ---------------
 dev-db/mysql-init-scripts/ChangeLog           |  19 --
 dev-db/mysql-init-scripts/metadata.xml        |   5 -
 .../mysql-init-scripts-2.0_pre1.ebuild        |  25 --
 dev-db/mysql/Manifest                         |  26 --
 dev-db/mysql/files/my.cnf                     |  48 ----
 dev-db/mysql/files/my.cnf-4.0                 | 113 --------
 dev-db/mysql/files/my.cnf-4.1                 | 147 ----------
 dev-db/mysql/files/my.cnf-5.1                 | 146 ----------
 dev-db/mysql/files/my.cnf-5.5                 | 153 ----------
 dev-db/mysql/files/mysql.init                 |  37 ---
 dev-db/mysql/mysql-5.0.96.ebuild              | 213 --------------
 dev-db/mysql/mysql-5.1.66-r1.ebuild           | 265 ------------------
 dev-db/mysql/mysql-5.1.66.ebuild              | 265 ------------------
 dev-db/mysql/mysql-5.1.67-r1.ebuild           | 265 ------------------
 dev-db/mysql/mysql-5.1.67.ebuild              | 265 ------------------
 dev-db/mysql/mysql-5.5.29-r1.ebuild           | 129 ---------
 dev-db/mysql/mysql-5.5.29.ebuild              | 129 ---------
 dev-db/mysql/mysql-5.6.10.ebuild              | 119 --------
 virtual/mysql/ChangeLog                       |  24 --
 virtual/mysql/Manifest                        |  11 -
 virtual/mysql/metadata.xml                    |   8 -
 virtual/mysql/mysql-10.0.ebuild               |  20 --
 virtual/mysql/mysql-4.0.ebuild                |  17 --
 virtual/mysql/mysql-4.1.ebuild                |  15 -
 virtual/mysql/mysql-5.0.ebuild                |  17 --
 virtual/mysql/mysql-5.1.ebuild                |  22 --
 virtual/mysql/mysql-5.2.ebuild                |  19 --
 virtual/mysql/mysql-5.3.ebuild                |  19 --
 virtual/mysql/mysql-5.5.ebuild                |  21 --
 virtual/mysql/mysql-5.6.ebuild                |  20 --
 49 files changed, 4786 deletions(-)
 delete mode 100644 dev-db/mariadb/ChangeLog
 delete mode 100644 dev-db/mariadb/Manifest
 delete mode 100644 dev-db/mariadb/files/my.cnf-4.1
 delete mode 100644 dev-db/mariadb/files/my.cnf-5.1
 delete mode 100644 dev-db/mariadb/files/my.cnf-5.5
 delete mode 100644 dev-db/mariadb/mariadb-10.0.1.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-10.0.2.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-10.0.3.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-10.0.4.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.2.14.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.3.12.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.5.31.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.5.32.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
 delete mode 100644 dev-db/mariadb/metadata.xml
 delete mode 100644 dev-db/mysql-cluster/ChangeLog
 delete mode 100644 dev-db/mysql-cluster/Manifest
 delete mode 100644 dev-db/mysql-cluster/metadata.xml
 delete mode 100644 dev-db/mysql-cluster/mysql-cluster-7.0.9.ebuild
 delete mode 100644 dev-db/mysql-init-scripts/ChangeLog
 delete mode 100644 dev-db/mysql-init-scripts/metadata.xml
 delete mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
 delete mode 100644 dev-db/mysql/Manifest
 delete mode 100644 dev-db/mysql/files/my.cnf
 delete mode 100644 dev-db/mysql/files/my.cnf-4.0
 delete mode 100644 dev-db/mysql/files/my.cnf-4.1
 delete mode 100644 dev-db/mysql/files/my.cnf-5.1
 delete mode 100644 dev-db/mysql/files/my.cnf-5.5
 delete mode 100644 dev-db/mysql/files/mysql.init
 delete mode 100644 dev-db/mysql/mysql-5.0.96.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.66-r1.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.66.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.67-r1.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.67.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.5.29-r1.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.5.29.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.6.10.ebuild
 delete mode 100644 virtual/mysql/ChangeLog
 delete mode 100644 virtual/mysql/Manifest
 delete mode 100644 virtual/mysql/metadata.xml
 delete mode 100644 virtual/mysql/mysql-10.0.ebuild
 delete mode 100644 virtual/mysql/mysql-4.0.ebuild
 delete mode 100644 virtual/mysql/mysql-4.1.ebuild
 delete mode 100644 virtual/mysql/mysql-5.0.ebuild
 delete mode 100644 virtual/mysql/mysql-5.1.ebuild
 delete mode 100644 virtual/mysql/mysql-5.2.ebuild
 delete mode 100644 virtual/mysql/mysql-5.3.ebuild
 delete mode 100644 virtual/mysql/mysql-5.5.ebuild
 delete mode 100644 virtual/mysql/mysql-5.6.ebuild

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
deleted file mode 100644
index 12e2ac1..0000000
--- a/dev-db/mariadb/ChangeLog
+++ /dev/null
@@ -1,213 +0,0 @@
-# ChangeLog for dev-db/mariadb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*mariadb-10.0.4 (09 Oct 2013)
-
-  09 Oct 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.4.ebuild:
-  [mariadb] Version bump for 10.0.4 All tests pass
-
-*mariadb-5.5.33a (20 Sep 2013)
-
-  20 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33a.ebuild,
-  -mariadb-5.5.33.ebuild:
-  [mariadb] Version Bump to 5.5.33a All tests pass Fix crashes upstream Remove
-  hacks for jemalloc and tokudb per upstream
-
-*mariadb-5.5.33 (18 Sep 2013)
-
-  18 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33.ebuild,
-  metadata.xml:
-  [mariadb] Bump to version 5.5.33 PBXT was removed upstream TokuDB was added.
-  TokuDB only builds on amd64 according to author. jemalloc was added by
-  upstream. Small hack in cmake to use system lib.
-
-  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mariadb-5.1.66.ebuild,
-  -mariadb-5.2.13.ebuild, -mariadb-5.3.11.ebuild, -mariadb-5.5.28a.ebuild,
-  -mariadb-5.5.29.ebuild, -mariadb-5.5.30.ebuild:
-  [dev-db/mariadb] Trim old
-
-*mariadb-5.5.32 (19 Jul 2013)
-
-  19 Jul 2013; Brian Evans <grknight@lavabit.com> +mariadb-5.5.32.ebuild:
-  Version bump
-
-*mariadb-10.0.3 (12 Jun 2013)
-
-  12 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.3.ebuild:
-  Bump, tests still running for now.
-
-*mariadb-5.5.31 (28 May 2013)
-
-  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.31.ebuild:
-  Bump.
-
-*mariadb-10.0.1 (21 Mar 2013)
-
-  21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.1.ebuild:
-  Very untested MariaDB 10 series.
-
-*mariadb-5.5.30 (13 Mar 2013)
-
-  13 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.30.ebuild:
-  Bump.
-
-  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.67.ebuild,
-  mariadb-5.2.14.ebuild, mariadb-5.3.12.ebuild, mariadb-5.5.29.ebuild:
-  Update headers and keywords.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.1,
-  files/my.cnf-5.1, files/my.cnf-5.5:
-  Sync with gentoo-x86 for prefix changes.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.62-r1.ebuild,
-  mariadb-5.1.62.ebuild, mariadb-5.1.66.ebuild, mariadb-5.2.12-r1.ebuild,
-  mariadb-5.2.12.ebuild, mariadb-5.2.13.ebuild, mariadb-5.3.11.ebuild,
-  mariadb-5.3.6.ebuild, mariadb-5.3.7.ebuild, mariadb-5.3.9.ebuild,
-  mariadb-5.5.24.ebuild, mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild,
-  mariadb-5.5.28.ebuild, mariadb-5.5.28a.ebuild:
-  HPPA has decided not to support mariadb for the present time.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mariadb-5.1.55.ebuild:
-  Trim old versions.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.5.24.ebuild,
-  mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild, mariadb-5.5.28.ebuild,
-  mariadb-5.5.28a.ebuild:
-  Fix {tests} typo.
-
-  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.1.62.ebuild, mariadb-5.2.7.ebuild,
-  mariadb-5.2.8.ebuild, mariadb-5.2.9.ebuild, mariadb-5.2.10.ebuild,
-  mariadb-5.2.12.ebuild, mariadb-5.3.0_beta.ebuild, mariadb-5.3.1_beta.ebuild,
-  mariadb-5.3.3_rc.ebuild, mariadb-5.3.5.ebuild, mariadb-5.3.6.ebuild,
-  mariadb-5.5.22.ebuild, mariadb-5.5.23.ebuild:
-  Move EAPI assignment to the top.
-  Whitespace.
-
-*mariadb-5.3.3_rc (12 Jan 2012)
-
-  12 Jan 2012; <atlantis@gentoo.org> +mariadb-5.3.3_rc.ebuild:
-  [dev-db/mariadb] 5.3.3_rc version bump.
-
-*mariadb-5.2.10 (12 Jan 2012)
-
-  12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.10.ebuild:
-  [dev-db/mariadb] Bump to 5.2.10 revision.
-
-  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.2.7.ebuild, mariadb-5.2.8.ebuild, mariadb-5.3.0_beta.ebuild:
-  [dev-db/mariadb] Bump EAPI to 4 on old mariadb versions.
-
-  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.9.ebuild, mariadb-5.3.1_beta.ebuild:
-  [dev-db/mariadb] Use EAPI-4 to support the new Prefix support of the
-  eclasses.
-
-*mariadb-5.2.9 (27 Sep 2011)
-
-  27 Sep 2011; <atlantis@gentoo.org> +mariadb-5.2.9.ebuild:
-  Bumped mariadb to 5.2.9 release.
-
-*mariadb-5.3.1_beta (22 Sep 2011)
-
-  22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.3.1_beta.ebuild:
-  Bumped mariadb to the 5.3.1_beta release. This needs more work as even unit
-  tests are failing.
-
-*mariadb-5.2.8 (19 Aug 2011)
-
-  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.8.ebuild:
-  [dev-db/maria] Bumped to release 5.2.8.
-
-  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild:
-  Added patch by Diego to fix the multiple install of files.
-
-*mariadb-5.3.0_beta (29 Jul 2011)
-
-  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.3.0_beta.ebuild:
-  [dev-db/mariadb] Bump to the first 5.3.0 beta release.
-
-  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mariadb-5.1.42-r1.ebuild, -mariadb-5.1.50.ebuild, -mariadb-5.1.50-r1.ebuild,
-  -mariadb-5.1.53.ebuild, -mariadb-5.2.4.ebuild, -mariadb-5.2.5.ebuild,
-  -mariadb-5.2.6.ebuild:
-  Dropped old versions of mariadb from the overlay.
-
-  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild:
-  [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
-  Drop irrelevant code and use mysql-v2 and not mysql-autotools.
-
-*mariadb-5.2.6 (13 May 2011)
-
-  13 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.5.ebuild, +mariadb-5.2.6.ebuild:
-  Bumped mariadb to the 5.2.6 release.
-  Fixed the calls to the mysql-autotools functions in the ebuilds using the
-  mysql-v2 eclass.
-
-  28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.4.ebuild, mariadb-5.2.5.ebuild:
-  Review the build type support in the eclass / ebuilds.
-
-*mariadb-5.2.5 (27 Mar 2011)
-
-  27 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mariadb-5.2.3.ebuild, +mariadb-5.2.5.ebuild:
-  Bumped mariadb to the 5.2.5 release.
-
-*mariadb-5.1.55 (05 Mar 2011)
-
-  05 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.42-r1.ebuild, mariadb-5.1.50.ebuild, mariadb-5.1.50-r1.ebuild,
-  mariadb-5.1.53.ebuild, +mariadb-5.1.55.ebuild, mariadb-5.2.3.ebuild,
-  mariadb-5.2.4.ebuild:
-  Bumped mariadb to the 5.1.55 release.
-  Updated testing instructions for mariadb ebuilds.
-
-*mariadb-5.2.3 (29 Nov 2010)
-
-  29 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.3.ebuild:
-  Added initial ebuild to test 5.2.3 release. Updated eclass as the maria
-  plugin was renamed to aria in the maria-5.2 tree.
-  This ebuild is currently dying on the configure run - it seems autoconf is
-  eating a case in the plugins.m4 file.
-
-*mariadb-5.1.50-r1 (06 Oct 2010)
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild,
-  +mariadb-5.1.50-r1.ebuild:
-  Release ready for tree now.
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild:
-  Ready for release.
-
-  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.50.ebuild:
-  Dropped the block on amarok[embedded].
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.50.ebuild:
-  Drop the EGIT_REPO_URI used to test locally.
-
-*mariadb-5.1.50 (24 Sep 2010)
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.1.50.ebuild:
-  Updated mariadb to the 5.1.50 release and added embedded support based on
-  Kristian Nielsen's <knielsen AT knielsen-hq DOT org> updated patch - bug
-  306315.
-
-*mariadb-5.1.42 (15 Mar 2010)
-
-  15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-4.1,
-  +mariadb-5.1.42.ebuild, +metadata.xml:
-  Add MariaDB. Bug #303130, based on the submission by Brian Evans
-  <grknight@scent-team.com>.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
deleted file mode 100644
index a3a2f37..0000000
--- a/dev-db/mariadb/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-AUX my.cnf-4.1 4237 SHA256 08524ededab93a9f1678c2febf0b837bf0b46cbaf0e649a04f90746ff23e47fe SHA512 3edc4fd8214f880c4e0de51b22a28c4f984910f84abe67624282e83db11bd21469f8d3dbc022bab8daed23e09c4f4a48b26aa5b3b993edb2d699c2bcf1f5603a WHIRLPOOL a8ed9409496d96e160fb249afa56dd1ab068ee749c8621ddb056b1ac58f442192725faafbe08dae37739bfb504dcba2b1f8b8433eab665121689389c21fdb5af
-AUX my.cnf-5.1 4829 SHA256 109d4db271860f646df0a1317a2812ffe4b51785aca423bf539e93de2640b65f SHA512 7b0838ac416dffc184a92720991ec78daf2bdb1056cf9b24d918002458ae8693a8b9d91280bb754ce9fb12b0f861f111a134909a545260304401161a53827747 WHIRLPOOL b628a658ad842353b63975081548761a0f41c357e5f1089147286edee57ea6e274b25af5a3aa339b058aaf6da5d306153e465ca42b9e14d2a2399f4cd2280750
-AUX my.cnf-5.5 5002 SHA256 191a6a92923d338e71d6b0dd9bb5f915cbee75693db582e45268ae67826c15b1 SHA512 a665cd1894a081cc53522664300628e575e763962b7471a9a61bd539da3de0d85f4dc21d892946249293bea4f9ecf9968ee220533986cf3b82a9e775215894e0 WHIRLPOOL 9cd2062a9c8e5c01e8667095d6ffbfd9a8a8fce7df7427553574df453c2c4be2b407a2fa34409c1b16a49d1f591234c6648d26c132fb4d9cb4440db75529397d
-DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
-DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
-DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
-DIST mariadb-10.0.4.tar.gz 31104543 SHA256 f04fa28452cf27ea5ce9fb443a407a233402831559c258dd81caa4908be72af9 SHA512 337b1801a12aa29b65025436b41fb1857f1deca85825dde72cc8f30e5e24ce62ad702125bb41d95316d2b096f88a32e18649bfa57b077acba7b57d93a5b0b398 WHIRLPOOL f6c8c7d23853b1b41d53b5a1dd4381d6d4c30aabf7699fe4a5dd0530cb8782ab7f82960ae049ee52dfe16946c42b0019570ba39a9ef83b764a3b1052afa8f6f8
-DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
-DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
-DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
-DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
-DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
-DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
-DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
-EBUILD mariadb-10.0.1.ebuild 4303 SHA256 5ef074eb879dcf9bb71952af946f721fcbdc540a44cdb886ad66d039b0ef1c68 SHA512 77be69c7261c656646c80443930effe2f05f1fe3a92cd80fd15257b06176ba94f4768513ff05190f0f3e21d0debd437fb092fd0d3099c7cf5a20ad1527a676ed WHIRLPOOL ff36d59e5daae9fe3bbdd017e69f0ef1327671077822af76dd7144a0522ddfdee0afc3653d13452b11c203e1e39c860f95e7fb0bb30c07323f00cdd859eec310
-EBUILD mariadb-10.0.2.ebuild 4303 SHA256 5ef074eb879dcf9bb71952af946f721fcbdc540a44cdb886ad66d039b0ef1c68 SHA512 77be69c7261c656646c80443930effe2f05f1fe3a92cd80fd15257b06176ba94f4768513ff05190f0f3e21d0debd437fb092fd0d3099c7cf5a20ad1527a676ed WHIRLPOOL ff36d59e5daae9fe3bbdd017e69f0ef1327671077822af76dd7144a0522ddfdee0afc3653d13452b11c203e1e39c860f95e7fb0bb30c07323f00cdd859eec310
-EBUILD mariadb-10.0.3.ebuild 4303 SHA256 5ef074eb879dcf9bb71952af946f721fcbdc540a44cdb886ad66d039b0ef1c68 SHA512 77be69c7261c656646c80443930effe2f05f1fe3a92cd80fd15257b06176ba94f4768513ff05190f0f3e21d0debd437fb092fd0d3099c7cf5a20ad1527a676ed WHIRLPOOL ff36d59e5daae9fe3bbdd017e69f0ef1327671077822af76dd7144a0522ddfdee0afc3653d13452b11c203e1e39c860f95e7fb0bb30c07323f00cdd859eec310
-EBUILD mariadb-10.0.4.ebuild 4303 SHA256 5ef074eb879dcf9bb71952af946f721fcbdc540a44cdb886ad66d039b0ef1c68 SHA512 77be69c7261c656646c80443930effe2f05f1fe3a92cd80fd15257b06176ba94f4768513ff05190f0f3e21d0debd437fb092fd0d3099c7cf5a20ad1527a676ed WHIRLPOOL ff36d59e5daae9fe3bbdd017e69f0ef1327671077822af76dd7144a0522ddfdee0afc3653d13452b11c203e1e39c860f95e7fb0bb30c07323f00cdd859eec310
-EBUILD mariadb-5.1.67.ebuild 6139 SHA256 b078c8b775af3de788b876f1d0d2034bc869cbb50abd2e66f32fa97827cfc0dd SHA512 004acbbab9e6521e5636a664c690078ef439728caafb565628fbb51830fc346961b2a6a9859eefd9d413d31b843e86666277dc124e6ae56c12ecf91c8f193630 WHIRLPOOL 4e0b95f855efa3e848d950062cb6bb408a1349406961dd400a232ac70d5fe7dac7a2b60dd27366abc6d01ddc03ce8ba1dfc0c7a08b4cd7ef14233dd70a43a4c8
-EBUILD mariadb-5.2.14.ebuild 6139 SHA256 cda45549305440ebad53070326cc97145670e529e0a2442bf32313b3ae7bb87c SHA512 35461342dae9fc536c9fab694145e91e596b63e63a2530fb5e8565a81c996794ce777e21c6140d5c08e64ca1aedf4ced6b5a8be6a5d35ad94c36d307f812f799 WHIRLPOOL 813df13a7503aca2421e35152801d028c02ac541958046edfb9bec275d722e9125cd26195f6cb5de104edcd75015fce40a36a835f3d0dc84d27a294adba6f96f
-EBUILD mariadb-5.3.12.ebuild 6139 SHA256 3a100af180cf6996925b097486c68258befde65867b148701909263aabfd583b SHA512 004b15eeb91a184c75d3d48b179c5918ac56285e42364a831f265383be6be452c63830af9ceecc80c33f17c256338e4a9d16d3f272c3ff583e048390e21a7bc4 WHIRLPOOL 5fc916908aee833fc6bae68a1ca41c01d9ccec1a1401eef63cbbbca4afc334c8023c85fb7840d83ae5143084dd2fde444f4ea632314c794210d1992aa46f963e
-EBUILD mariadb-5.5.31.ebuild 4494 SHA256 2285b83afb654c64dde9e34115d4c17f1019b31db2aa1c2f916bed3a865822b2 SHA512 60cba144ca4256f184e35550a39b0e66139c3df539a0e9d930550af69b8b54491d5df780f1328ddc04f39b462462f70a4b5267195a0ee1316b7198b88e56ccb8 WHIRLPOOL 8e4157436ca8a10699204ef8314d0999dae232e9b9169f5b07db5751cc5bbe3d253cd65be77799670224d08bf813bc978df6e653a7f97b6f398cdbd360e03f62
-EBUILD mariadb-5.5.32.ebuild 4494 SHA256 2285b83afb654c64dde9e34115d4c17f1019b31db2aa1c2f916bed3a865822b2 SHA512 60cba144ca4256f184e35550a39b0e66139c3df539a0e9d930550af69b8b54491d5df780f1328ddc04f39b462462f70a4b5267195a0ee1316b7198b88e56ccb8 WHIRLPOOL 8e4157436ca8a10699204ef8314d0999dae232e9b9169f5b07db5751cc5bbe3d253cd65be77799670224d08bf813bc978df6e653a7f97b6f398cdbd360e03f62
-EBUILD mariadb-5.5.33a-r1.ebuild 4385 SHA256 69accaa1860be76ad74f01d7b3d77126d41dd885776c5b47c5864b0a4de30bc5 SHA512 5091c85ed33c6c7fce03815defecb19b13eba5ce5626baaf340989122f062d4a65551f12514a7fa3cefbbc7680bafcd0d40e694a71f2cb08d28d14bfcbebc4c1 WHIRLPOOL 989ed67a4d34d717b70486e1c66ce896d9240c13d6bc73b5a3913bd2fb490d0b8ab45f74723782d8be83d3321095d050b53502a5146820dfe326af29b6d03ef1
-MISC ChangeLog 7926 SHA256 7e4aa5894174e297c25b8a292d39ff16fb0cba216f026e83e4feb705fea62df6 SHA512 42e8993b426b6d7bf5ae7c7143ebb4d529550f9bed5b8ecf219aa5cfdcb2d1a20f64a6ae8808f41eb9d1fbbf7d4987fa8b04f75c19e3c6fe816e71d287459a05 WHIRLPOOL 86d22cc2079830c9ed92c0565785022b66dfd86c803baf7fd21745f3678d0d82a25afb3c8debe0998481207f448a0701b1efdb0ba285d5e0c55b9d9f883808be
-MISC metadata.xml 1633 SHA256 f33ed7090c3e8917886b3efefbb24e03541e968a5833725dc066825bd0d7b6fa SHA512 c2fbbe518ac7a1f679b16cf5cb4add19369dedba343405079c044885132eae2a6e74126c4adb1d3befcef1050b8159f00f7576d259daac0c4bf81072f5647662 WHIRLPOOL 8673a8d013f14f8f965ddd50fdbfa0e89ea254b4afbd742d11fabcc500384369848801b55eba80d69e179661f41cf9b86e44eabc1e0923c5105257f0f2aee815
diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1
deleted file mode 100644
index 211deaa..0000000
--- a/dev-db/mariadb/files/my.cnf-4.1
+++ /dev/null
@@ -1,147 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-default-character-set		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= /var/run/mysqld/mysqld.sock
-pid-file 					= /var/run/mysqld/mysqld.pid
-log-error 					= /var/log/mysql/mysqld.err
-basedir 					= /usr
-datadir 					= @DATADIR@
-skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= /tmp/
-#log-update 				= /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= /tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= /var/lib/mysql/
-#innodb_log_arch_dir		= /var/lib/mysql/
-#innodb_log_group_home_dir	= /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
deleted file mode 100644
index baf41c5..0000000
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ /dev/null
@@ -1,146 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.3 2013/01/20 02:39:55 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
deleted file mode 100644
index 1f42561..0000000
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ /dev/null
@@ -1,153 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
diff --git a/dev-db/mariadb/mariadb-10.0.1.ebuild b/dev-db/mariadb/mariadb-10.0.1.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.0.2.ebuild b/dev-db/mariadb/mariadb-10.0.2.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.0.3.ebuild b/dev-db/mariadb/mariadb-10.0.3.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.0.4.ebuild b/dev-db/mariadb/mariadb-10.0.4.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
deleted file mode 100644
index 0c99bfd..0000000
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.14.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
deleted file mode 100644
index d58f658..0000000
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.12.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.31.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.32.ebuild b/dev-db/mariadb/mariadb-5.5.32.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.32.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
deleted file mode 100644
index 57edaca..0000000
--- a/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
deleted file mode 100644
index df3c16c..0000000
--- a/dev-db/mariadb/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
-<use>
-  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libevent'>Use libevent for connection handling</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
deleted file mode 100644
index 67c7aca..0000000
--- a/dev-db/mysql-cluster/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for dev-db/mysql-cluster
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-cluster-7.0.9.ebuild:
-  Move EAPI assignment to the top.
-  Whitespace.
-
-*mysql-cluster-7.0.9 (09 Aug 2010)
-
-  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
-  +mysql-cluster-7.0.9.ebuild:
-  Bug #331691: mysql-cluster support from Nathan Sullivan
-  <nathan@nightsys.net> for Gentoo telco users. Needs more polish still and
-  init.d scripts.
-
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
deleted file mode 100644
index 9a5d0f3..0000000
--- a/dev-db/mysql-cluster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mysql-cluster-gpl-7.0.9.tar.gz 22778151 SHA256 c4d5ff949c7aa8b4173492406b7b202cc9c3755bafe4670bc9e615a688d64d32 SHA512 43875f38d4cef3c58a067893c857df31d09b27909b61be07ccea365e194debea7549687c0941e4d90197b0eb3b21ed24df846b86435225f8ed91168544ee0ba2 WHIRLPOOL 24baee9c07d1a15e503fb43b3bf0ebf1b0349d5572110d7b3caf6850ff96ec071804c5b19c1132640f20ef2dd42e2d4455d9d08058ecf42c7fce06c66128035e
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
deleted file mode 100644
index f9c087a..0000000
--- a/dev-db/mysql-cluster/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<use>
-  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.9.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.0.9.ebuild
deleted file mode 100644
index bc14555..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.0.9.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-MY_EXTRAS_VER="live"
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
deleted file mode 100644
index 8363a18..0000000
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for dev-db/mysql-init-scripts
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-conf.d,
-  files/mysql-5.1.53-init.d:
-  Add stop timeout.
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-init.d:
-  Fix typo.
-
-*mysql-init-scripts-2.0_pre1 (06 Dec 2010)
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org>
-  +mysql-init-scripts-2.0_pre1.ebuild, +files/mysql-5.1.53-conf.d,
-  +files/mysql-5.1.53-init.d, +files/logrotate.mysql, +metadata.xml:
-  Finally revamp init scripts, based on bug #175783 submission from Davide
-  Pesavento <davidepesa@gmail.com>.
-
diff --git a/dev-db/mysql-init-scripts/metadata.xml b/dev-db/mysql-init-scripts/metadata.xml
deleted file mode 100644
index abf3529..0000000
--- a/dev-db/mysql-init-scripts/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>mysql</herd>
-</pkgmetadata>
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
deleted file mode 100644
index 2a33efa..0000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild,v 1.4 2010/10/19 05:53:42 leio Exp $
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc.
-RDEPEND="!<dev-db/mysql-5.1 sys-apps/openrc"
-
-src_install() {
-	newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
-	newinitd "${FILESDIR}/mysql-5.1.53-init.d" "mysql"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
deleted file mode 100644
index c3609e2..0000000
--- a/dev-db/mysql/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec SHA512 f3864d5ff209dce0a0ab0ae5d0c20d4564ff491d21681c052a7a9d75f986b22d9c637f7d606ab1d7f923539a9137abaf547ceab4c2334140b76f952ef45d26dc WHIRLPOOL ec41a690119cff9b0f2b6adab148dee82a77e9a56fbabe7619d3aa1a9996261c9ad8a4c33d40294a12d701ef7db9fe40e81ad167566070a61d759ac134f087f7
-AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
-AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
-AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
-AUX my.cnf-5.5 5000 SHA256 ea119fee667ed963ad20b807a5102ad776035df4009f3bfc819b26a47bb0a3db SHA512 1265cf6d1fd3dfa9d0607eef0065409e4d6a8187e8e6882a45e69da7fc0a337a336c1fd3ef3bd66a8707f82818def70d30e66f487b57cd75f094acc4f467ef94 WHIRLPOOL 52abef494668f35d29241d5cb89b5f197671d1224465c25b05f59a265dc940b9a4797f13fa499279a649a84f1a7090db180ae7bec889d49914981773aa6f6198
-AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
-DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
-DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
-DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
-DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
-DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
-DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c
-DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
-EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd5434abcc9b8caca84adcf275a0 SHA512 e7d71bb91dd953ec013d5b10379f97fe649c0a4c678ddead7120660349b8dfb8b7f2ebedb45ca17ec6b522ca5c8ece34cd8e0ec6a66fdb8faf076e5074e1e3cd WHIRLPOOL c9a06e4d0d52af5cbdc2cc56e1003564de4281ada0b951f7c9d2f93b64cecba1a6c48405308ef4b0a646099f0bc3ad3e10ba86a38e7d84519ef223a8927352c1
-EBUILD mysql-5.1.66-r1.ebuild 8891 SHA256 9ad43d379f02e5b9f0e99594409eb58dc86116f81df87ef368824ee08e661941 SHA512 117f6b3efc810e32cea6fa7d7c18eba09dd90176d91543a83402567173bea6d926ac54533ed0da41d451ea007271d93359479337190ca2a4b308c8ccaec3ee7d WHIRLPOOL 58d406277a7327594b346fe39ead1564ba3b3d16832a0bbf480eab19a5bfff083125efbc522a518a582b26f3ffb5faba81ca139e467692b53cca262a1be882c3
-EBUILD mysql-5.1.66.ebuild 8878 SHA256 2d82220b8dbeb5b0a6a3f760c53e31f988a57ea9cc7f37e5a3fead1f29524155 SHA512 cdb006885dd908a2f3105a6ee58b36759d7702db3fc6cfb7a23684055496bb6556150f989bb008c5fc5813ec64eef50d29102ad9daccda161b69443f9e5b8366 WHIRLPOOL 89d6519ed90618b67c7b22d38c7ee6f41d7c5b3bca4d9c959a2476e38ad89b0985496ce155cb16c3fa2b0216d10d97f5dc4d0cb2b745763f3ba78db1155a9168
-EBUILD mysql-5.1.67-r1.ebuild 8891 SHA256 12ba6efd6f0991a9c365cb6a52eb1b2fa93e0504c6818106e60389ab7da183b3 SHA512 de573eb6f1a66228594bab6dad31b1e9e3862d6637e0dae9d1e5b1a209c57aa8c607a331271f962f397e8ece7df2cab2a007568c3090e77b0fd6051d52ff0443 WHIRLPOOL fd3d485dca11bb536d5ef70f628fef3bfe9047873b82549d0465a67eae9590c44000886feed594e0463d5058fa47c23f4d8d139d38a7ed659d2250758f9a589c
-EBUILD mysql-5.1.67.ebuild 8874 SHA256 d1a8b6f09de5974eb24694591efe4e46a25fd1062ce1a2d4b2fbc829cf560e8a SHA512 eaace8c366b1bf119bd956a5a5612c65dbd2e5b48fb3c91b55a3294b19ef6fab7d051175e75899f618df53fa23936b5df27f511701252c0f5d975e660c88eb47 WHIRLPOOL c6ec84b11b5943119aa914bedb341fe52cbd093702348e08d863c7db23a857bb6647959f7689ccd38115b190c07f5087976ee716d72f7989e94237f043da8ff0
-EBUILD mysql-5.5.29-r1.ebuild 4242 SHA256 3050cce87771178e6b0e1be0486542068ca58266477882a017a9d900be284251 SHA512 c6f8ef37f7aa200fcd2a93d13b4617500a5b128b33d3fc3a319c60442968090e61b0d89cb3f0854aacdc203f8a4118650421cd87a5f741cf9236d8848d58b8f1 WHIRLPOOL 7a204932d5b42ba51296de982878f47f45c83afd174b8f67094fc8dbb2405b7296cc50005fbdc8e270a3ae45378fa67fccfba56332a634ad04742acc9786dd71
-EBUILD mysql-5.5.29.ebuild 4239 SHA256 e0698d4254ffb43527ebc76d12b032cf2bb44bb98cc84c8d35c6506e92df425e SHA512 07b378685d411bfcc9ea623f9889496ac918117db255520c772fa771af5004b834e7f2aa8d906cfbc622462c5d624fcec7150e742a1e0655fbbc90252a881d08 WHIRLPOOL ccfd8507c5e08e8151b59ad594090807c39b0eef147069fa7e9874cc5010cee796ccd1a10ccba978cfdafc5236d94c467c5ad08be42f482e6cdd74a10511eff2
-EBUILD mysql-5.6.10.ebuild 3860 SHA256 e17dedc8bd7c4e11bf89c460d80feb5469e709937c2e5baa6a3d9880b73406fa SHA512 b7be1c308c89a54ad1bc38babfb689372214422a827573c66eba683a4d13045f713313747addb9894bc7991e6658ccbbb0f06620580b3a67da88cbcb211f4fbf WHIRLPOOL ca1b5d61302870cfd69c227283abe4a37673588cea8c0b6df2df7af26d324e1193843d2817fce6a0e63905a211cfed471a731d9ab248183446b5ba762f14761f
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf
deleted file mode 100644
index 4e7d0f6..0000000
--- a/dev-db/mysql/files/my.cnf
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.5 2008/11/14 01:49:37 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 32M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-#skip-networking
-skip-innodb
-innodb_file_per_table
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-log		= /var/log/mysql/mysql.log
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=1M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
deleted file mode 100644
index abc8690..0000000
--- a/dev-db/mysql/files/my.cnf-4.0
+++ /dev/null
@@ -1,113 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 64M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-log-error	= /var/log/mysql/mysqld.err
-# If set, mysql logs all queries (general query log). This will be deprecated in
-# MySQL 5.0. This logs all queries, even error queries and is slow.
-# log          = /var/log/mysql/mysql.log
-#
-# If you really need logging, you'd rather use binary logging. Especially when doing
-# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info.
-# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
-# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
-# running.
-# Before doing that, check which logfile slave curently uses by running
-# mysql> SHOW SLAVE STATUS
-# To list logfiles on master do:
-# mysql> SHOW MASTER LOGS
-# Then use PURGE for those not needed anymore only! Never remove the files
-# manually!
-#
-# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
-# mysql> RESET MASTER - Deletes all binary logs listed in the index
-#                       file, resetting the binlog index file to be empty.
-# mysql> RESET SLAVE - Makes the slave forget its replication position in
-#                      the master logs.
-# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
-# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
-#
-# log-bin
-# set-variable  = binlog-do-db=non_existant
-# set-variable  = binlog-ignore-db=database_name
-#
-# server-id has to unique for each master or slave in your network,
-# lets use the last number from IP address
-# server-id	= 207
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-# be secure by default!
-bind-address    = 127.0.0.1
-port			= 3306
-# this can make it even more secure:
-#skip-networking
-#
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-set-variable = innodb_buffer_pool_size=32M
-# this is the default, increase it if you have lots of tables
-set-variable = innodb_additional_mem_pool_size=1M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-innodb_data_home_dir = /var/lib/mysql/
-innodb_log_arch_dir = /var/lib/mysql/
-innodb_log_group_home_dir = /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-set-variable = innodb_log_file_size=8M
-# this is the default, increase it if you have very large transactions going on
-set-variable = innodb_log_buffer_size=1M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-loose-innodb_file_per_table=1
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completion
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
deleted file mode 100644
index 458a58a..0000000
--- a/dev-db/mysql/files/my.cnf-4.1
+++ /dev/null
@@ -1,147 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-default-character-set		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= /var/run/mysqld/mysqld.sock
-pid-file 					= /var/run/mysqld/mysqld.pid
-log-error 					= /var/log/mysql/mysqld.err
-basedir 					= /usr
-datadir 					= @DATADIR@
-skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= /tmp/
-#log-update 				= /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= /tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= /var/lib/mysql/
-#innodb_log_arch_dir		= /var/lib/mysql/
-#innodb_log_group_home_dir	= /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
deleted file mode 100644
index f1ee4f2..0000000
--- a/dev-db/mysql/files/my.cnf-5.1
+++ /dev/null
@@ -1,146 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
deleted file mode 100644
index f43d535..0000000
--- a/dev-db/mysql/files/my.cnf-5.5
+++ /dev/null
@@ -1,153 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
deleted file mode 100644
index 16ea7bc..0000000
--- a/dev-db/mysql/files/mysql.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.7 2004/07/14 21:41:15 agriffis Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
-		eerror "No /etc/mysql/my.cnf file exists!"
-	fi
-
-    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
-
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting mysqld"
-	/usr/bin/safe_mysqld >/dev/null 2>&1 &
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping mysqld"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/mysqld/mysqld.pid --retry 20
-	eend $?
-}
diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
deleted file mode 100644
index f22bc53..0000000
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.96.ebuild,v 1.4 2013/01/20 01:49:23 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20120401-2131Z"
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND=""
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.0 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-			5.0.96)
-				for t in \
-					client_xml compress connect ctype_recoding drop \
-					federated grant information_schema \
-					information_schema_db innodb lowercase_table \
-					lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \
-					mysqlcheck mysqldump-max mysqldump mysqldump_restore \
-					mysqlshow ps ps_1general rename rpl000009 rpl_ddl \
-					rpl_delete_all rpl_drop_db rpl_dual_pos_advance \
-					rpl_error_ignored_table rpl_filter_tables_not_exist \
-					rpl_replicate_do rpl_trigger_not_windows select \
-					show_check sp system_mysql_db system_mysql_db_fix30020 \
-					system_mysql_db_fix40123 view \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-		esac
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.66-r1.ebuild b/dev-db/mysql/mysql-5.1.66-r1.ebuild
deleted file mode 100644
index e4a31ea..0000000
--- a/dev-db/mysql/mysql-5.1.66-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130128-0054Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
deleted file mode 100644
index e01f201..0000000
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66.ebuild,v 1.8 2012/12/01 00:52:42 blueness Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20121101-2319Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.67-r1.ebuild b/dev-db/mysql/mysql-5.1.67-r1.ebuild
deleted file mode 100644
index 1917077..0000000
--- a/dev-db/mysql/mysql-5.1.67-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130128-0054Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
deleted file mode 100644
index 2c57149..0000000
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67.ebuild,v 1.11 2013/02/08 16:44:59 ago Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20121101-2319Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.29-r1.ebuild b/dev-db/mysql/mysql-5.5.29-r1.ebuild
deleted file mode 100644
index 42bc387..0000000
--- a/dev-db/mysql/mysql-5.5.29-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130120-2303Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
deleted file mode 100644
index 485881c..0000000
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29.ebuild,v 1.1 2013/01/20 02:18:30 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130120-0100Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.6.10.ebuild
deleted file mode 100644
index 496dc33..0000000
--- a/dev-db/mysql/mysql-5.6.10.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
deleted file mode 100644
index b8991f2..0000000
--- a/virtual/mysql/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for virtual/mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> -Manifest,
-  mysql-5.2.ebuild, mysql-5.3.ebuild:
-  Update headers and keywords.
-
-  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.2.ebuild:
-  [virtual/mysql-5.2] Adjust keywords for the virtual.
-
-  08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.ebuild,
-  mysql-5.1.ebuild:
-  mysql-community is long gone, removal time.
-
-*mysql-5.5 (04 Sep 2010)
-*mysql-5.4 (04 Sep 2010)
-*mysql-5.1 (04 Sep 2010)
-*mysql-5.0 (04 Sep 2010)
-
-  04 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.ebuild,
-  +mysql-5.1.ebuild, +mysql-5.4.ebuild, +mysql-5.5.ebuild, +metadata.xml:
-  Add in virtual in overlay for cluster.
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
deleted file mode 100644
index baa70c9..0000000
--- a/virtual/mysql/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-EBUILD mysql-10.0.ebuild 656 SHA256 1d0ab66329ad9f5c0293e3723323d3aa53ad5e608b17bf0401a192acdbb44a1f SHA512 2f9e910580c558df11a82fc12c551a11ce6f71ad3f99bb57ccf64edfeb2864d339a079a4600f848d38e79e001364ba4f1bccd3fe1c8ab8d4e68e8dcd84e039fc WHIRLPOOL 36caa65cf74e6ba319312075445cefd1ee50acf83cc55d53c849d764e841144f5a1f8ef442a7755ed355535ee758a858ac9a79ebea2a5b99a963c24258976542
-EBUILD mysql-4.0.ebuild 542 SHA256 ba282fc3990574245c1d5fb9f8f2c35854d6cdec309a10c0a9f47baa175a9c1d SHA512 0b4446880993eacef984619ba469af9381dfb011898adb542d188bac0579e088b0c2556a34a938acd65d27042c31394d05fe0fd06430400eebebe8fad10bf84f WHIRLPOOL ffaa3430d9dc01a66483380e60885b95ecc4f2db1f184bdf0824de47951f5f93bc2f23c675eca9e5241684376da6e6bd1e092eccfb44c3aa74ab9668f0ca1555
-EBUILD mysql-4.1.ebuild 544 SHA256 8a954f2516153767d6c225d31b4a99fac4e234e9addd6c09d54a26fa10315993 SHA512 21cbc9b7b33922188339a8c0e2c007c08ba33c836a376a6e6a0afcafaee078afdf3ea3ce7720656ca8be5297a4554bb9e715339f9208f08cabe1a0d57e3a11ae WHIRLPOOL 25c49f9a7f05fdf462ab2bbf4ae1e906343de860da4a0285cfeca58da87756444c1ec6cff145fd2f2de1a5c3686e59a47e76a3b169390e38158bda148a6580af
-EBUILD mysql-5.0.ebuild 567 SHA256 fbcd098a2291900fc3c1d681aa42e116d9a69cb8cc24ddd99b456d8d9a3d18b3 SHA512 9ed1c714a6f2a2cd3038abd161dc4f6002973ecf1aeb3e0239db68585ffe0c0e638e3ffa79c8c185a1ad2268ff8dd8ca02c8fea0c73a06b4940398dbb8bb11df WHIRLPOOL 915b70aecefe447847173f50cddbc6218a27957bc6e713f760898dc8e4535aa1f61db183450b45eec569f5f62f7fbc427b957293dcd0efb0aa10029b5668e083
-EBUILD mysql-5.1.ebuild 770 SHA256 58aa298cc49457c7b6474b3eb5f90754e121ad87583a6baf33cb94fcaf4041ef SHA512 adebd8dcaa42ba5cc3ee5c4b65dc130cf6caaf658f7e01368dbd3f5408c804e19c2a42fd48b7ec6d744519c0becaac917abce493af67ea277dfa3cfe39ea0cc9 WHIRLPOOL 07a09bc7f81ba99764945d76f02a071e7adab2e58650bf3a7dc82c09e7366fd29ab7fdf07f1c67a39e33ffebc39930d35a02f2a184186f23037a649b425ede1d
-EBUILD mysql-5.2.ebuild 628 SHA256 cad035a8d626c37e1eae251c57b5375978de7bf86de11c5c5b6979c97b92a3d2 SHA512 4d2538a09c0602bcf1ceeddbc1f748ccd629f9ba917e1dbd8fa52b157ed16fb8cf661d8a871a710c257e1f0b59a004b671c7026d794f5b823bbc7b1d3e7042aa WHIRLPOOL b31dfe44567da76496e82638acbe47049f69a355c22d736db22c13650324ae48b84c817fffdd70ad7e31857157d57df04b95edf47985ad581330018f9a91751f
-EBUILD mysql-5.3.ebuild 628 SHA256 d5a723d0bb33caa3abb979ce3524084cc8d8a806d78e93e89496276b06478f5d SHA512 59cb150e907b23aca21bfe2a5ea83f1c69717a6db3281e83fa936ba78bd8ef62cf0a0dd40ad0e19ac66ace2bd72cf41170f0d4f452e347ff1f8e10183d67c88d WHIRLPOOL 8edae30b3f481f83ff26dffd9831e4232a6be67bafc91d07f7a0263d0a3756957fa07ac4361e6376acabe0214795c1f833cd8aec6715e6375400bb9fd0045c2a
-EBUILD mysql-5.5.ebuild 717 SHA256 1c481319ecdf58aff554d6340f47d4673210f5663ac383328117a4bab2049fa3 SHA512 ac00d6c5a208e6db00a3da2f1642ba945d400d4dd045c4f6cc8ef5bcd8e399341c0b0934632f3f2c137a0def7c5ba6d958e9f5a1a355d7aa458780964414f431 WHIRLPOOL e90427a593cbd0ad30c5c8fce60ff3f1bff609ba550385621ee415536489c2bb55223d1e82386694d8899e6705a5c405e7dfc2934033834705f4e9cebb25381d
-EBUILD mysql-5.6.ebuild 666 SHA256 d2bdfaa8f8bba69a40b9009d485873bb88828a5f87c9d7671572edec21918f6e SHA512 5ab28854a24968cbec8666ad5f8e3d27b4eb4e113599693ed2801fa4ee3bac1e11ae04e43f686f38ce6a98ab14e352c4444a0e409ea1d9d4ce1ef52e1ad8e0b0 WHIRLPOOL c3b7c284d882c0449c138f6e670820fa87889eba0e67fca9685258654857ea96dd1d179eba2ebd55e4ddaed6f202111fbcc4fa5b5fceeb10ac5c113c6fbf693d
-MISC ChangeLog 817 SHA256 98face67ec0a1d924ef30d1789256710da8b9c7a7050b4c5f1044a67d39eeb9d SHA512 87bb298237a7948826393121996c482a046f38a664b61de7eb3fc171337e4a380111d0ef0bacc50082b12a04fc7ee8d4494a56a83081a790fdac53598c148dc2 WHIRLPOOL 536a88d2070797f7becc5e47dad9a9e4cd294d5796b1ceba17e544ff1c53baf3eb4f28d8fe8b992ebfbcc6ffb77d3cba830b53d6a951d0277bce443aad9fc931
-MISC metadata.xml 244 SHA256 4d47eee187cd72bea30c9ab80aa89d7cf128e8643b8b986e3781fa123f9144aa SHA512 c9cb9d6bc4e44e18eb54801af8b9cbb698bcb905524e02bfa72a03111955377c4e9b507db52b929a47e740bf1be0d025910f310f334a1c1c6531313231d39289 WHIRLPOOL 369f2a18e230171ecef8d67e7c5d419943e8e026111e2736b4d858760705bfc24e85e16ab8800a1681fae625ce74342b4b01e961c418b242cc2d1229ff67ba0a
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
deleted file mode 100644
index 0ea2af6..0000000
--- a/virtual/mysql/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>mysql</herd>
-  <use>
-    <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  </use>
-</pkgmetadata>
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
deleted file mode 100644
index d3137a4..0000000
--- a/virtual/mysql/mysql-10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
deleted file mode 100644
index 9ecbe43..0000000
--- a/virtual/mysql/mysql-4.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.5 2010/11/06 19:21:13 leio Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*
-)"
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
deleted file mode 100644
index d3f2f2c..0000000
--- a/virtual/mysql/mysql-4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.7 2010/11/06 19:21:13 leio Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="=dev-db/mysql-${PV}*"
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
deleted file mode 100644
index ec5667c..0000000
--- a/virtual/mysql/mysql-5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.9 2011/01/07 23:57:45 robbat2 Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*
-)"
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
deleted file mode 100644
index a41eabc..0000000
--- a/virtual/mysql/mysql-5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-# TODO: add mysql-cluster here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mysql/mysql-5.2.ebuild
deleted file mode 100644
index ae0e162..0000000
--- a/virtual/mysql/mysql-5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mysql/mysql-5.3.ebuild
deleted file mode 100644
index 45e3e68..0000000
--- a/virtual/mysql/mysql-5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
deleted file mode 100644
index 5a30961..0000000
--- a/virtual/mysql/mysql-5.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.5 2012/04/18 06:12:08 robbat2 Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-# TODO: add Drizzle and MariaDB here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
deleted file mode 100644
index d167bed..0000000
--- a/virtual/mysql/mysql-5.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-# TODO: add Drizzle and MariaDB here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-)"

From 497b57d516290758412efb926fc4eb0f8b99d5c1 Mon Sep 17 00:00:00 2001
From: root <root@fs02.safesoftsolutions.com>
Date: Thu, 16 Jan 2014 17:32:44 -0800
Subject: [PATCH 010/261] added ceph-deploy, and push

---
 dev-python/pushy/Manifest                     |  2 ++
 dev-python/pushy/pushy-0.5.3.ebuild           | 20 +++++++++++
 sys-cluster/ceph-deploy/Manifest              |  1 +
 .../ceph-deploy/ceph-deploy-9999.ebuild       | 35 +++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 dev-python/pushy/Manifest
 create mode 100644 dev-python/pushy/pushy-0.5.3.ebuild
 create mode 100644 sys-cluster/ceph-deploy/Manifest
 create mode 100644 sys-cluster/ceph-deploy/ceph-deploy-9999.ebuild

diff --git a/dev-python/pushy/Manifest b/dev-python/pushy/Manifest
new file mode 100644
index 0000000..d719959
--- /dev/null
+++ b/dev-python/pushy/Manifest
@@ -0,0 +1,2 @@
+DIST pushy-0.5.3.zip 48474 SHA256 792a1c27515eff312587ac15b6f515be146a30f9c89d2b327761be221df9b52b SHA512 c9aec617adc8370ae285332e7106fa53fcbfb156bd2ac4ff3c748c7a26ad8684a10e74c63f101677e58fe5cdbbc92ad267b01d3b2ee1ef676c2126567400fe5e WHIRLPOOL 37b05d2db0ab1b1f6c0203d70ce10edbdfdff40a961dc3d3bab19942477545622269ce248e7001017797c466a67899d79986708dda2043e6c1f81b307ca85f00
+EBUILD pushy-0.5.3.ebuild 494 SHA256 d468c3d473906e13a92ea25eb8f412c3de0c5395ae6e82f9665425ccbaadbb96 SHA512 b8072f9f1c1cc74bdaf48a2070de65484091e7f6050bf43880d0eda26d87823003b2935ff33a40bc89c0cc33f1f1eab1c35d4dbed04d1e1feb5716ba51b6d338 WHIRLPOOL c8830f44f94b1532d205e21560e4e51554a6b9aca9d5faa62b011725c92c6534f46167cf7cda67a199a108d695510ddfbd09f446394fad82bc842141b3fdc501
diff --git a/dev-python/pushy/pushy-0.5.3.ebuild b/dev-python/pushy/pushy-0.5.3.ebuild
new file mode 100644
index 0000000..aec744f
--- /dev/null
+++ b/dev-python/pushy/pushy-0.5.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2013 Hacking Networked Solutions
+# Distributed under the terms of the GNU General Public License v3
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1
+
+DESCRIPTION="A library for transparently accessing objects in a remote Python interpreter"
+HOMEPAGE="https://pypi.python.org/pypi/pushy/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/sys-cluster/ceph-deploy/Manifest b/sys-cluster/ceph-deploy/Manifest
new file mode 100644
index 0000000..04b92a9
--- /dev/null
+++ b/sys-cluster/ceph-deploy/Manifest
@@ -0,0 +1 @@
+EBUILD ceph-deploy-9999.ebuild 809 SHA256 5995d6d69b79bad0577d5f7efa5cd759c1bb1687c98fcd469f750a1e0d1f264c SHA512 845d1326b6fcfbee7e1e681485b4fdb8029967222ad63e5d494db1bb01ce1447c06acbc3048d2064609fbf2d858fefe9c0b957613e1d2128671e165424c379a7 WHIRLPOOL ff8d5079ed130f3690bda7c491693a4a1956ef7042bbddd4727a365ea3023a2125887e2b1546bae8ff1d3c42bc3e9fb13580f5f1829e29968cfe197ab5ec3c18
diff --git a/sys-cluster/ceph-deploy/ceph-deploy-9999.ebuild b/sys-cluster/ceph-deploy/ceph-deploy-9999.ebuild
new file mode 100644
index 0000000..323fd88
--- /dev/null
+++ b/sys-cluster/ceph-deploy/ceph-deploy-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="
+		git://github.com/ceph/ceph-deploy.git
+		https://github.com/ceph/ceph-deploy.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1 ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem, deploy tools"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+        dev-python/pushy[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${DEPEND}"

From d0bec01672bdf6b2da2391567729768c0f851117 Mon Sep 17 00:00:00 2001
From: root <root@backup.safesoftsolutions.com>
Date: Wed, 12 Feb 2014 21:07:55 -0800
Subject: [PATCH 011/261] added 3dm2

---
 sys-block/3dm2/3dm2-10.2.1-r1.ebuild | 112 +++++++++++++++++++++++++++
 sys-block/3dm2/Manifest              |   3 +
 sys-block/3dm2/files/3dm2.init       |  20 +++++
 3 files changed, 135 insertions(+)
 create mode 100644 sys-block/3dm2/3dm2-10.2.1-r1.ebuild
 create mode 100644 sys-block/3dm2/Manifest
 create mode 100644 sys-block/3dm2/files/3dm2.init

diff --git a/sys-block/3dm2/3dm2-10.2.1-r1.ebuild b/sys-block/3dm2/3dm2-10.2.1-r1.ebuild
new file mode 100644
index 0000000..fdc8f5a
--- /dev/null
+++ b/sys-block/3dm2/3dm2-10.2.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit eutils
+
+MY_ARCH="${ARCH/amd64/x86_64}"
+
+DESCRIPTION="3ware/LSI Disk Managment web utility"
+HOMEPAGE="http://www.lsi.com/"
+
+LICENSE="LSI"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+MY_PN="3DM2_CLI-Linux_${PV}_9.5.4.zip"
+SRC_URI_BASE="http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files"
+SRC_URI=${SRC_URI_BASE}/${MY_PN}
+
+# The fetch restriction maybe removed as soon as 3ware/LSI provides a working non-interactive
+# mirror for download.
+# - Marc "Judge" Richter <mailYYYY@marc-richter.info> @ 20111214 
+RESTRICT="fetch"
+
+RDEPEND="~sys-block/tw_cli-10.2
+	virtual/libc
+	virtual/logger
+	virtual/mta"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+    einfo "3ware/LSI have great support, but a horrific hosting-strategy."
+    einfo "Packages are renamed, compatibility isn't documented very well,"
+    einfo "download locations move, the license permits direct download but"
+    einfo "their server forces the acceptance of an EULA even for direct"
+    einfo "link URIs, ..."
+    einfo "Therefore it is impossible for portage to download the needed"
+    einfo "package itself. Please download the file"
+    einfo ""
+    einfo "${MY_PN}"
+    einfo ""
+    einfo "from ${SRC_URI}"
+    einfo "manually and place it in ${DISTDIR} before emerging this atom."
+    echo
+}
+
+src_unpack() {
+	unpack ${A}
+	tar zxf tdmCliLnx.tgz
+	mkdir help msg
+	tar zxf tdm2Help.tgz -C help
+	tar zxf tdm2Msg.tgz -C msg
+}
+
+src_prepare() {
+	# update conf paths for Gentoo standards
+	sed -i -e 's;MsgPath /opt/3ware/3DM2/msg;MsgPath /usr/share/3dm2/msg;' \
+		-e 's;Help /opt/3ware/3DM2/help;Help /usr/share/3dm2/help;' \
+		-e 's;imgPath /etc/3dm2;imgPath /usr/share/3dm2;' \
+		3dm2.conf || die "sed update 3dm2.conf"
+}
+
+src_install() {
+	newsbin "3dm2.${MY_ARCH}" ${PN} || die "dosbin 3dm2.${MY_ARCH}"
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins 3dm2.conf || die "doins 3dm2.conf"
+
+	insinto /usr/share/${PN}
+	doins logo.gif || die "doins logo.gif"
+	doins -r help || die "doins help"
+	doins -r msg || die "doins msg"
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN} || die "newinitd 3dm2.init"
+
+	dodoc LGPL_License.txt OpenSSL.txt
+}
+
+pkg_preinst() {
+	RESTART=0
+	if [ $(pgrep 3dm2 >/dev/null; echo $?) -eq 0 ]; then
+		/etc/init.d/${PN} stop
+		RESTART=1
+	fi
+}
+
+pkg_postinst() {
+	if [ ${RESTART} -eq 0 ]; then
+		ewarn "Default password for both user and administrator is: 3ware"
+		ewarn "Since remote access is *enabled* by default, you should change"
+		ewarn "these passwords right after you have started 3dm2 by init.d ."
+		ewarn ""
+		elog "Start 3dm2, then connect to the server at https://localhost:888/"
+		elog "or at any DNS name your server is available as."
+		elog
+		elog "To change the ssl cert, place a file called 3dm2.pem in /etc/3dm2"
+		elog "It must contain the certificate and the key."
+		elog "Under normal circumstances you don't need to change it. You just"
+		elog "will have to manually accept the "unsecure" certificate if you skip"
+		elog "this step."
+	else
+		ewarn "Note: 3dm2 was automatically stopped to complete this upgrade."
+		ewarn "You should restart it now with: /etc/init.d/${PN} start"
+	fi
+	echo
+}
diff --git a/sys-block/3dm2/Manifest b/sys-block/3dm2/Manifest
new file mode 100644
index 0000000..bdae6cc
--- /dev/null
+++ b/sys-block/3dm2/Manifest
@@ -0,0 +1,3 @@
+AUX 3dm2.init 417 SHA256 568438bdffd0c8f9b5ed219529c81004f4fedf51d8d3c234aba363357c2bbfc1 SHA512 046425686462763307791040d12f761013a8587ab396f57b89ded07fe617a1d46fb8c7e349bf0751ad58245cdf56597f79c1864b1ee8e880b37a78646a52a649 WHIRLPOOL 65415bcb074442859414055a61e55668e08898ae38e116c4339cf5904088ca04196bbf95228af1b6c76ed406ce3ac3f9500dda70fb1d294be03528b8170f4885
+DIST 3DM2_CLI-Linux_10.2.1_9.5.4.zip 10393953 SHA256 bf6ba7f083f806011b6fc73522f527893bdee87dad746553f2f071507ead7734 SHA512 20d479017eafe0294ab55d754e40c848896bdac08f868c1619c0662f80a8068032480ec3a7dcad610846e54f2ddaa10c429c7b3e5e3eec7cffc20edd48fdcff3 WHIRLPOOL 8497aa9189130b254db8838c13f1d1cf8d80b7acd6c14f3aeb9deb646a6c43112433bb02ca4dc1d00f17364e8a4d74416c07c5a500e61db047cfdca3b52b02df
+EBUILD 3dm2-10.2.1-r1.ebuild 3197 SHA256 4673764f2ca57a348a94a6daa8dfad23b73c5ee8cee66a427b5dc101614cb27b SHA512 bf0fce3a49f044a64eb96b07018d9f01f4afcc98e4182bbf72b9640ede0d1fd2e0173a70c145b5dbecf4d7d7efcbc242bd369b0f8b3fbce2b7d041895cbd5883 WHIRLPOOL d17248d66f852c3900b117d1c37a62e3e808d5e132f84f460e853e20a5fc157eff20c1db3e2bdbfea544fbf2e44bf2d278db326a630828562b3fd606f6a8a9df
diff --git a/sys-block/3dm2/files/3dm2.init b/sys-block/3dm2/files/3dm2.init
new file mode 100644
index 0000000..9f7ce53
--- /dev/null
+++ b/sys-block/3dm2/files/3dm2.init
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header$
+
+depend() {
+        need net
+}
+
+start() {
+        ebegin "Starting 3dm2"
+        start-stop-daemon --start --quiet --exec /usr/sbin/3dm2
+        eend ${?}
+}
+
+stop() {
+        ebegin "Stopping 3dm2"
+        start-stop-daemon --stop --quiet --name 3dm2
+        eend ${?}
+}

From 8bb6336c2243ff28059690d66445c23d86d58303 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 21 Feb 2014 14:27:13 -0800
Subject: [PATCH 012/261] updated couchbase stuff

---
 dev-db/couchbase-server-enterprise/Manifest | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-db/couchbase-server-enterprise/Manifest b/dev-db/couchbase-server-enterprise/Manifest
index 15e9d95..4c2e08b 100644
--- a/dev-db/couchbase-server-enterprise/Manifest
+++ b/dev-db/couchbase-server-enterprise/Manifest
@@ -1,12 +1,16 @@
 AUX 2.0.0/couchbase-server 3956 SHA256 df2d03152bc183591a57f78ce3b50590fe0d91f8e6e36f66a45e9fc67faab0cc SHA512 01b2f1a0ca3e4c2f93ff37271979f434e7010b272bcfca1fa8b8e40c1115ae5750a3ec0d5efc13edb93e21b09a35cde71bfb6fb48465329c83528ead975d3f8c WHIRLPOOL 1f5293c7e5f64eaa3ee618d07b1911963f7187d00eec78c205e93341625f2917e466b074f85bd582584e6144cd42f57caa6d4852f115c1288a2c1e51ab132f07
 AUX 2.0.1/couchbase-server 3956 SHA256 df2d03152bc183591a57f78ce3b50590fe0d91f8e6e36f66a45e9fc67faab0cc SHA512 01b2f1a0ca3e4c2f93ff37271979f434e7010b272bcfca1fa8b8e40c1115ae5750a3ec0d5efc13edb93e21b09a35cde71bfb6fb48465329c83528ead975d3f8c WHIRLPOOL 1f5293c7e5f64eaa3ee618d07b1911963f7187d00eec78c205e93341625f2917e466b074f85bd582584e6144cd42f57caa6d4852f115c1288a2c1e51ab132f07
 AUX 2.1.0/couchbase-server 3956 SHA256 df2d03152bc183591a57f78ce3b50590fe0d91f8e6e36f66a45e9fc67faab0cc SHA512 01b2f1a0ca3e4c2f93ff37271979f434e7010b272bcfca1fa8b8e40c1115ae5750a3ec0d5efc13edb93e21b09a35cde71bfb6fb48465329c83528ead975d3f8c WHIRLPOOL 1f5293c7e5f64eaa3ee618d07b1911963f7187d00eec78c205e93341625f2917e466b074f85bd582584e6144cd42f57caa6d4852f115c1288a2c1e51ab132f07
+AUX 2.1.1/couchbase-server 3130 SHA256 321309ac85c288108b13282bf3d7ecc5819c78f63854a44b70277f569f217c1d SHA512 72059e25e044bd3f7a1d12a8681cd6064f2edcd3585d3511f38fac2d8a3c126f8772366bf0f849ca234dd77cddd0192f7129013a0d6e7e96bfd342e166e3a907 WHIRLPOOL 4626adf19f22fe0b4e4880a8cdf099efa95ea0a77c710bb9b0aa527e4322eec41c71ba0abba48514ec6f1af224f1162578b63163b329175615ae7d48db48b391
 DIST couchbase-server-enterprise_x86_2.0.0.deb 119091618 SHA256 08638e3ac899dfaa19ba897a787584db2f7374e71084127fe31f3f6d2f5e45ad SHA512 274f4b321f9d8c8a84d1d5b3f1a13d8d939159f3b4a27c1af47cafc3ba035298dbf7e740e29326165cc49ed26b3b811420ed504d736002102878192e9ba5c8f1 WHIRLPOOL d5764f5e2026187e5508b73f096a9343d88edbf24c681da083619942fe5b48c2bf8ecccccda0aa89d945b8b96bfe3daafb9abefa6c331e9d66456fd25377ba52
 DIST couchbase-server-enterprise_x86_2.0.1.deb 119201232 SHA256 ee3e2d575a12e72eae16b81f44945775f41ef40a16d778e41bb193f00fb50588 SHA512 8b8416345ca97935897973de72920a7e1638bbbcd9009a67c026d70d980f89cee57e8eb7f3872f75fec661f95eca57654e4a84963b9ef1ea4dc7bdde90d9bbbc WHIRLPOOL 08957cd98bc91e756074cc36a388cc97231f862c80d52f050ca84129bbe220e037bbb50576deee55e9fc9b88c6e2fb11b3b0ea6ad52fdfd7e4d6fc1f4d6af052
 DIST couchbase-server-enterprise_x86_2.1.0.deb 122594130 SHA256 d38c76cfcdec8d96b0fd2870a6f48f44b7dbb71d95eeb855e87d06d637e6a1bd SHA512 f2c200485ccd2f5c09c19af8bcd46cb15caf43c34b85e7085070649513686823e172b70ab9c4f48f62fb4e42995fec085f5f62b95bd57a091e328b579f2c76a0 WHIRLPOOL d79af40c984ffc7d38aa8fe813fe4283db1813da820619e24aac1fb84609f4ec0809b6586fb8d01b1cbea427bce3484dea07377a0af28b5b4850e4fa2ec29dcd
+DIST couchbase-server-enterprise_x86_2.1.1.deb 122593866 SHA256 ab38e3db05aab74ab48999b5e6c9949bdca2e1a093b6f1241d7ccbbb7a2817f9 SHA512 c3837e87e3be8327e132686c8d437d40c64a1020154d110ee898e5b80af968584dd56019ab07a204f0055d1cd3d7d87a16157e2349193370890aebc8c701d5c5 WHIRLPOOL abb7762f5d1fcb8f9b4c947f495f02e2ad1be30a6851afd9ee8f2bdb3772a7420b1bd4f941cf474212ee620d504e159e3f82bac4e6435bb5f4d9768d51ad77f7
 DIST couchbase-server-enterprise_x86_64_2.0.0.deb 120528316 SHA256 5b88bd0b059dba3759725c870cede5763f24c955f0a73a544a624dc39a0ba7df SHA512 1a217e37b9b1cd2b65bb2b6295d3ca5248d943897e3064334806f7011fae70c0f320b94218b21a926dbaa2bd4717bdeaa514fbbeb9d3926cd4e589cd0fd2b99e WHIRLPOOL 0a9195ba415aca6d6e0d2b58c2a48908538da324d6b96260362a51973494e8155ee02c5e7552f4d23f937796fb80ba26fbcf240dc26db120586b1a9d7534139d
 DIST couchbase-server-enterprise_x86_64_2.0.1.deb 120661276 SHA256 8550436da4e408c01e232021a8d015d02dab328dd47c105ff2c829582f7059b1 SHA512 b9016b90f9483360a2019d63a103423cf13662b3eb0373ecc82c55f5c660c9f9f1041acb18f55b38b593e27e5a1db14ead9c4c7289e8d7fae061aef286b22f77 WHIRLPOOL eb0194f9fd3ac3629879bec5f00e5808e7741646373836eb78bc2aed6dc28ac1731566392e9c4e352f1d433446354e3cd01c463a507057038dad5b49a71187b6
 DIST couchbase-server-enterprise_x86_64_2.1.0.deb 124043818 SHA256 17b754ce149829d809c2caa80d996ed1c305b90c7d94d0748186836293f0f0e6 SHA512 bcc6adb715a31c112ddb138cac6ed646c27a1b4c39b9223afc0a239d7be6edbe56718d9fd904a7c50419a0c18ea9e621f824ca99ef6b274a3fad895f56e91c22 WHIRLPOOL 0cd0d353483474ca69334c7a3548e8754cf68148b1f2aa30187263423e030d219ec194c267ac4f487387dc4c77034d0606b2a3abfb9fa4a23faeb4fb010a34ee
+DIST couchbase-server-enterprise_x86_64_2.1.1.deb 124060426 SHA256 5a83a212ce292ef436678e99ac2bb0f44e050e3711b0af2619d84cd4e2013d92 SHA512 0943c8534dc651487055a4d8febee13908f10c9a11536137df945faad499f94b66f00373cc0637180952a98f771828c43c0f5a468fb8848dd65613399e84c639 WHIRLPOOL a01b3aeae1ce5b042c15f3da8bdafccba7aefbb77499041d7035006d3ca140b19145be1e18763c703e90b92487a7557eea7bb4adf11f593ea16b363e211ed2d9
 EBUILD couchbase-server-enterprise-2.0.0.ebuild 1511 SHA256 e9ed24b6d5042d0cf0e14c2c60cfa54457d1f39e83133001768d63e952dddfee SHA512 be933e307fdaa0a7858329c788ddbae90c4621840c42e5a2da817ffc76905193e5b50aa60a4efb61c67ca3e62f090c1ea9bb107e000951f4cdc68c88502cb149 WHIRLPOOL 8dc95af59fc5fa00512c2a631bf37abc7f0bd7d9885a3355453657b488ae321b454c996db329317e80fdd5d675e95862b0cd6eaa05fb7d3f7f961e13671192db
 EBUILD couchbase-server-enterprise-2.0.1.ebuild 1511 SHA256 e9ed24b6d5042d0cf0e14c2c60cfa54457d1f39e83133001768d63e952dddfee SHA512 be933e307fdaa0a7858329c788ddbae90c4621840c42e5a2da817ffc76905193e5b50aa60a4efb61c67ca3e62f090c1ea9bb107e000951f4cdc68c88502cb149 WHIRLPOOL 8dc95af59fc5fa00512c2a631bf37abc7f0bd7d9885a3355453657b488ae321b454c996db329317e80fdd5d675e95862b0cd6eaa05fb7d3f7f961e13671192db
 EBUILD couchbase-server-enterprise-2.1.0.ebuild 1511 SHA256 e9ed24b6d5042d0cf0e14c2c60cfa54457d1f39e83133001768d63e952dddfee SHA512 be933e307fdaa0a7858329c788ddbae90c4621840c42e5a2da817ffc76905193e5b50aa60a4efb61c67ca3e62f090c1ea9bb107e000951f4cdc68c88502cb149 WHIRLPOOL 8dc95af59fc5fa00512c2a631bf37abc7f0bd7d9885a3355453657b488ae321b454c996db329317e80fdd5d675e95862b0cd6eaa05fb7d3f7f961e13671192db
+EBUILD couchbase-server-enterprise-2.1.1.ebuild 4538 SHA256 603ac33f0b5de8b6c5a1666148f2fc33116fbd60a8b56bf1a696e67ebe41b473 SHA512 2290eeadf90e47ddd2b6648e2ddc2f1c210705163fbdaff03db49ef66bfa892a3f1414e0fe28ae6fad71371f0613255771e8191b834dc8c2b4933825a11a421d WHIRLPOOL ec1ee0a3b6de9791ff6b0da6c9c2c013f3d5b3e30055f1d8ffb91c251b829e604ee10f1949a3703f9a9edf4e7ab833822ce41665d1ba50e62f024c32594a81f4

From a405dcf9bf4822768a736ca99ec23c5f903f4916 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Thu, 6 Mar 2014 17:35:54 -0800
Subject: [PATCH 013/261] added safesoft mytop package

---
 dev-db/mytop/Manifest          |  2 ++
 dev-db/mytop/mytop-1.91.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 dev-db/mytop/Manifest
 create mode 100644 dev-db/mytop/mytop-1.91.ebuild

diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
new file mode 100644
index 0000000..f88e117
--- /dev/null
+++ b/dev-db/mytop/Manifest
@@ -0,0 +1,2 @@
+DIST mytop-1.91.tar.gz 20829 SHA256 ea2673b15232c1a7773db56b2aa9a355f902eac6b941a6d13689bb2ccbb520bb SHA512 4ef5cd1fa2ad40e307f3ad8e47ea883a59cadc87aeff6e343ee8abc46ec8b26986209cca6b8132bb5416ff3de7cb889c1f85fd340fd35af2d41748c497ae4dd3 WHIRLPOOL e98119494b9948120843e7bbbe8487e99c1073c710c2698e68e25b6dcf21bc3028878595dea760f587ce35bdb86d9e7f6d3e28a110357693b420664c7e609bd6
+EBUILD mytop-1.91.ebuild 831 SHA256 377735314f5aa1ba56490de5aec6de75b4b17a15cdc1238a7d6a3456e5a3fa4e SHA512 1794a0cb8c4c2623f545004136b0ddba1507abe960f4c8986d65301d0de0453cc6db55ac06bad0325a7b70f96d07d69ce1642a0e0eebc9452d2d11969893697d WHIRLPOOL 7b0031721352b6c94284a8a31434557e0dc06319a6887bd02e03c8f5181291b04278b61a8775dd28c0a8fddec50501da9f9d22ab0c0d035bea124254d9deb62b
diff --git a/dev-db/mytop/mytop-1.91.ebuild b/dev-db/mytop/mytop-1.91.ebuild
new file mode 100644
index 0000000..7153bd0
--- /dev/null
+++ b/dev-db/mytop/mytop-1.91.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.91.ebuild,v 1.2 2014/02/24 02:29:20 phajdan.jr Exp $
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="mytop - a top clone for mysql"
+HOMEPAGE="http://mirrors.safesoft.us/gentoo/mytop/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/mytop/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-perl/DBD-mysql
+	virtual/perl-Getopt-Long
+	dev-perl/TermReadKey
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-HiRes"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	sed -i -r\
+		-e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \
+		"${D}"/usr/bin/mytop
+}

From d75e934353acce41d4838f7aa09311e495d3a6a9 Mon Sep 17 00:00:00 2001
From: Lisa Simpson <lisa@safesoftsolutions.com>
Date: Thu, 6 Mar 2014 17:50:11 -0800
Subject: [PATCH 014/261] updated ebuild to be stable

---
 dev-db/mytop/Manifest          | 2 +-
 dev-db/mytop/mytop-1.91.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index f88e117..0f47b30 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,2 +1,2 @@
 DIST mytop-1.91.tar.gz 20829 SHA256 ea2673b15232c1a7773db56b2aa9a355f902eac6b941a6d13689bb2ccbb520bb SHA512 4ef5cd1fa2ad40e307f3ad8e47ea883a59cadc87aeff6e343ee8abc46ec8b26986209cca6b8132bb5416ff3de7cb889c1f85fd340fd35af2d41748c497ae4dd3 WHIRLPOOL e98119494b9948120843e7bbbe8487e99c1073c710c2698e68e25b6dcf21bc3028878595dea760f587ce35bdb86d9e7f6d3e28a110357693b420664c7e609bd6
-EBUILD mytop-1.91.ebuild 831 SHA256 377735314f5aa1ba56490de5aec6de75b4b17a15cdc1238a7d6a3456e5a3fa4e SHA512 1794a0cb8c4c2623f545004136b0ddba1507abe960f4c8986d65301d0de0453cc6db55ac06bad0325a7b70f96d07d69ce1642a0e0eebc9452d2d11969893697d WHIRLPOOL 7b0031721352b6c94284a8a31434557e0dc06319a6887bd02e03c8f5181291b04278b61a8775dd28c0a8fddec50501da9f9d22ab0c0d035bea124254d9deb62b
+EBUILD mytop-1.91.ebuild 827 SHA256 e70ccdcd1011f024fb68d20dfd505eddfe49afa6121e58a0ff1b7c94bc1ca097 SHA512 7d9ab1acd1c7399d7a290640c708a139d2598797e29f85546b7cc5aa36b76a74b59064c29d1f359c6f06d4ae119b3653c65a05c16cbd7ad9bdbd2653b3f355b6 WHIRLPOOL cb3b9b5c1a62579010b47142fc3f5ee4f882cb294cedde3bf0d69baa53eb0b11dad6caf33d241cf0819b28aef1267b620b996141e0e2dbad8d1244b7e5bbbe14
diff --git a/dev-db/mytop/mytop-1.91.ebuild b/dev-db/mytop/mytop-1.91.ebuild
index 7153bd0..179d216 100644
--- a/dev-db/mytop/mytop-1.91.ebuild
+++ b/dev-db/mytop/mytop-1.91.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mirrors.safesoft.us/gentoo/mytop/"
 SRC_URI="http://mirrors.safesoft.us/gentoo/mytop/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 SLOT="0"
 IUSE=""
 

From 0bccffb6b1917e5b851826194336331b1027074b Mon Sep 17 00:00:00 2001
From: root <lisa@safesoft.us>
Date: Tue, 8 Apr 2014 18:46:11 -0700
Subject: [PATCH 015/261] fixed ioncube

---
 dev-php/ioncube-loaders/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/ioncube-loaders/Manifest b/dev-php/ioncube-loaders/Manifest
index 2277efc..41084dc 100644
--- a/dev-php/ioncube-loaders/Manifest
+++ b/dev-php/ioncube-loaders/Manifest
@@ -1,2 +1,2 @@
-DIST ioncube_loaders_lin_x86-64.tar.bz2 3670569 SHA256 bc6f2e5989d163361e1ee6608a231f9df12c6364e7d2bb19712abe4f754f8175 SHA512 771ea9bd287ca00a8d2da51caa70c6ea42e47eb5d76297c99388f6f409a50946b8c362a3bb7c48872d261082dd8bdfe9350ed46ac6c2dccc1cd2c0cda6f83d80 WHIRLPOOL 0ffe9ab293b46a4697a87ccdd0092597910f4f559cfb879690112697f3aeefa2f7de047f888d18be84384a0817fd0a9474ad237f8005b0d90d196db837bcc0be
+DIST ioncube_loaders_lin_x86-64.tar.bz2 4467406 SHA256 288af173c64174e0c717a61fb9356c6b73b127d24ccdada53cfe2b16471a41c7 SHA512 f62f29ec435b3f0fb7d2af9d093d231f8cce298c0fdd7629081872c45c1d675087376334318bb6dc8c22296035e4a8dd2f08962cc1b7014cbd0abf4409979d1b WHIRLPOOL 230d879a61ef3aeaf00a4a6c7e1aca5df9c23b5a474cfbc0c2a0d25a1df87c1c5ec8551c15ecaeed294fbed4513f3bdbd4f9e0760233a89dd4bed34a8278414e
 EBUILD ioncube-loaders-4.4.0.ebuild 2321 SHA256 be317fcbf0fab8370766f9072c60bd528aab2ad842b064df181148348f542922 SHA512 0f74461a82736e4762ecde066293b5717821e3306e6055865301f22a2015236c01ada2be896211e64dc497fb6851669368fd064cff8a765202b11e19a04ae8e8 WHIRLPOOL a849bcb18f4bf2cb2e1a638742ed95432a7fb0e734613388721d18f8aa8b2452cb402388ec8e3b4b3e3cb27231b387c0845a564ab72a98e5e27afff9810dc8c8

From 8fd1537b756fcc09f0c46bd13f044ead66ef6465 Mon Sep 17 00:00:00 2001
From: Drew Matthews <drew@scurvynet.com>
Date: Thu, 17 Apr 2014 22:44:58 -0700
Subject: [PATCH 016/261] merged in the offical gentoo overlay

---
 dev-db/mariadb-galera/ChangeLog               |   18 +
 dev-db/mariadb-galera/Manifest                |    2 +
 dev-db/mariadb-galera/files/my.cnf-5.5        |  159 ++
 .../mariadb-galera-5.5.34.ebuild              |  136 ++
 .../mariadb-galera-5.5.36.ebuild              |  110 ++
 dev-db/mariadb-galera/metadata.xml            |   26 +
 dev-db/mariadb-native-client/ChangeLog        |   13 +
 dev-db/mariadb-native-client/Manifest         |    1 +
 .../files/multilib-install.patch              |   16 +
 .../mariadb-native-client-1.0.ebuild          |   58 +
 .../mariadb-native-client-9999.ebuild         |   76 +
 dev-db/mariadb-native-client/metadata.xml     |    8 +
 dev-db/mariadb/ChangeLog                      |  233 +++
 dev-db/mariadb/Manifest                       |    7 +
 dev-db/mariadb/files/my.cnf-4.1               |  147 ++
 dev-db/mariadb/files/my.cnf-5.1               |  146 ++
 dev-db/mariadb/files/my.cnf-5.5               |  150 ++
 dev-db/mariadb/mariadb-10.0.10.ebuild         |  110 ++
 dev-db/mariadb/mariadb-10.0.9_rc.ebuild       |  110 ++
 dev-db/mariadb/mariadb-5.1.67.ebuild          |  171 ++
 dev-db/mariadb/mariadb-5.2.14.ebuild          |  171 ++
 dev-db/mariadb/mariadb-5.3.12.ebuild          |  171 ++
 dev-db/mariadb/mariadb-5.5.37.ebuild          |  113 ++
 dev-db/mariadb/metadata.xml                   |   29 +
 dev-db/myodbc/ChangeLog                       |  136 ++
 dev-db/myodbc/Manifest                        |    1 +
 dev-db/myodbc/files/cmake-doc-path.patch      |   43 +
 dev-db/myodbc/files/odbc.ini.m4               |   18 +
 dev-db/myodbc/files/odbcinst.ini.m4           |    6 +
 dev-db/myodbc/metadata.xml                    |    5 +
 dev-db/myodbc/myodbc-5.2.5.ebuild             |  108 ++
 dev-db/mysql-cluster/ChangeLog                |   29 +
 dev-db/mysql-cluster/Manifest                 |    5 +
 dev-db/mysql-cluster/metadata.xml             |   21 +
 .../mysql-cluster/mysql-cluster-7.0.37.ebuild |  229 +++
 .../mysql-cluster/mysql-cluster-7.2.13.ebuild |  128 ++
 .../mysql-cluster/mysql-cluster-7.3.0.ebuild  |  128 ++
 dev-db/mysql-init-scripts/ChangeLog           |   19 +
 .../mysql-init-scripts/files/logrotate.mysql  |   15 +
 .../files/mysql-5.1.53-conf.d                 |   78 +
 .../files/mysql-5.1.53-init.d                 |  110 ++
 dev-db/mysql-init-scripts/metadata.xml        |    5 +
 .../mysql-init-scripts-2.0_pre1.ebuild        |   25 +
 dev-db/mysql/ChangeLog                        |  388 +++++
 dev-db/mysql/Manifest                         |   16 +
 dev-db/mysql/files/my.cnf                     |   48 +
 dev-db/mysql/files/my.cnf-4.0                 |  113 ++
 dev-db/mysql/files/my.cnf-4.1                 |  147 ++
 dev-db/mysql/files/my.cnf-5.1                 |  146 ++
 dev-db/mysql/files/my.cnf-5.5                 |  149 ++
 dev-db/mysql/files/mysql.init                 |   37 +
 dev-db/mysql/metadata.xml                     |   27 +
 dev-db/mysql/mysql-4.0.27-r1.ebuild           |   35 +
 dev-db/mysql/mysql-4.1.22-r1.ebuild           |   44 +
 dev-db/mysql/mysql-5.0.96.ebuild              |  213 +++
 dev-db/mysql/mysql-5.1.70.ebuild              |  265 +++
 dev-db/mysql/mysql-5.1.73.ebuild              |  265 +++
 dev-db/mysql/mysql-5.5.35.ebuild              |  129 ++
 dev-db/mysql/mysql-5.5.37.ebuild              |  136 ++
 dev-db/mysql/mysql-5.6.17.ebuild              |  129 ++
 dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild   |  129 ++
 dev-db/percona-server/Manifest                |    2 +
 dev-db/percona-server/files/my.cnf-5.5        |  149 ++
 dev-db/percona-server/files/my.cnf-5.6        |  153 ++
 dev-db/percona-server/metadata.xml            |   18 +
 .../percona-server-5.5.36.34.2.ebuild         |  138 ++
 .../percona-server-5.6.16.64.2.ebuild         |  142 ++
 dev-java/mariadb-java-client/ChangeLog        |   13 +
 dev-java/mariadb-java-client/Manifest         |    2 +
 .../files/maven-build-1.1.4.xml               |  253 +++
 .../mariadb-java-client/files/maven-build.xml |  250 +++
 .../mariadb-java-client-1.1.3.ebuild          |   46 +
 .../mariadb-java-client-1.1.4.ebuild          |   47 +
 .../mariadb-java-client-9999.ebuild           |   46 +
 dev-java/mariadb-java-client/metadata.xml     |    7 +
 eclass/mysql-autotools.eclass                 |  676 ++++++++
 eclass/mysql-cmake.eclass                     |  485 ++++++
 eclass/mysql-multilib.eclass                  |  859 +++++++++
 eclass/mysql-v2.eclass                        |  878 ++++++++++
 eclass/mysql.eclass                           | 1528 +++++++++++++++++
 eclass/mysql_fx.eclass                        |  306 ++++
 metadata/layout.conf                          |   15 +-
 .../2010-12-31-mysql-init-revamp.en.txt       |   28 +
 metadata/news/ChangeLog                       |    8 +
 profiles/package.mask                         |    9 +
 profiles/package.use.mask                     |    9 +
 profiles/repo_name                            |    2 +-
 sys-cluster/galera/ChangeLog                  |   22 +
 sys-cluster/galera/Manifest                   |    3 +
 .../galera/files/disable-tests-23.2.7.patch   |   76 +
 sys-cluster/galera/files/disable-tests.patch  |   80 +
 sys-cluster/galera/files/garb.cnf             |   17 +
 sys-cluster/galera/files/garb.sh              |   63 +
 sys-cluster/galera/files/respect-flags.patch  |   35 +
 sys-cluster/galera/galera-23.2.4-r1.ebuild    |   85 +
 sys-cluster/galera/galera-23.2.7.ebuild       |   86 +
 sys-cluster/galera/galera-25.3.2.ebuild       |   87 +
 sys-cluster/galera/metadata.xml               |    8 +
 virtual/mysql/ChangeLog                       |   34 +
 virtual/mysql/metadata.xml                    |    8 +
 virtual/mysql/mysql-10.0.ebuild               |   20 +
 virtual/mysql/mysql-4.0.ebuild                |   17 +
 virtual/mysql/mysql-4.1.ebuild                |   15 +
 virtual/mysql/mysql-5.0.ebuild                |   17 +
 virtual/mysql/mysql-5.1.ebuild                |   22 +
 virtual/mysql/mysql-5.2.ebuild                |   19 +
 virtual/mysql/mysql-5.3.ebuild                |   19 +
 virtual/mysql/mysql-5.5.ebuild                |   23 +
 virtual/mysql/mysql-5.6.ebuild                |   21 +
 virtual/mysql/mysql-5.7.ebuild                |   19 +
 110 files changed, 12558 insertions(+), 13 deletions(-)
 create mode 100644 dev-db/mariadb-galera/ChangeLog
 create mode 100644 dev-db/mariadb-galera/Manifest
 create mode 100644 dev-db/mariadb-galera/files/my.cnf-5.5
 create mode 100644 dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
 create mode 100644 dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
 create mode 100644 dev-db/mariadb-galera/metadata.xml
 create mode 100644 dev-db/mariadb-native-client/ChangeLog
 create mode 100644 dev-db/mariadb-native-client/Manifest
 create mode 100644 dev-db/mariadb-native-client/files/multilib-install.patch
 create mode 100644 dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
 create mode 100644 dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
 create mode 100644 dev-db/mariadb-native-client/metadata.xml
 create mode 100644 dev-db/mariadb/ChangeLog
 create mode 100644 dev-db/mariadb/Manifest
 create mode 100644 dev-db/mariadb/files/my.cnf-4.1
 create mode 100644 dev-db/mariadb/files/my.cnf-5.1
 create mode 100644 dev-db/mariadb/files/my.cnf-5.5
 create mode 100644 dev-db/mariadb/mariadb-10.0.10.ebuild
 create mode 100644 dev-db/mariadb/mariadb-10.0.9_rc.ebuild
 create mode 100644 dev-db/mariadb/mariadb-5.1.67.ebuild
 create mode 100644 dev-db/mariadb/mariadb-5.2.14.ebuild
 create mode 100644 dev-db/mariadb/mariadb-5.3.12.ebuild
 create mode 100644 dev-db/mariadb/mariadb-5.5.37.ebuild
 create mode 100644 dev-db/mariadb/metadata.xml
 create mode 100644 dev-db/myodbc/ChangeLog
 create mode 100644 dev-db/myodbc/Manifest
 create mode 100644 dev-db/myodbc/files/cmake-doc-path.patch
 create mode 100644 dev-db/myodbc/files/odbc.ini.m4
 create mode 100644 dev-db/myodbc/files/odbcinst.ini.m4
 create mode 100644 dev-db/myodbc/metadata.xml
 create mode 100644 dev-db/myodbc/myodbc-5.2.5.ebuild
 create mode 100644 dev-db/mysql-cluster/ChangeLog
 create mode 100644 dev-db/mysql-cluster/Manifest
 create mode 100644 dev-db/mysql-cluster/metadata.xml
 create mode 100644 dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
 create mode 100644 dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
 create mode 100644 dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
 create mode 100644 dev-db/mysql-init-scripts/ChangeLog
 create mode 100644 dev-db/mysql-init-scripts/files/logrotate.mysql
 create mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
 create mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
 create mode 100644 dev-db/mysql-init-scripts/metadata.xml
 create mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
 create mode 100644 dev-db/mysql/ChangeLog
 create mode 100644 dev-db/mysql/Manifest
 create mode 100644 dev-db/mysql/files/my.cnf
 create mode 100644 dev-db/mysql/files/my.cnf-4.0
 create mode 100644 dev-db/mysql/files/my.cnf-4.1
 create mode 100644 dev-db/mysql/files/my.cnf-5.1
 create mode 100644 dev-db/mysql/files/my.cnf-5.5
 create mode 100644 dev-db/mysql/files/mysql.init
 create mode 100644 dev-db/mysql/metadata.xml
 create mode 100644 dev-db/mysql/mysql-4.0.27-r1.ebuild
 create mode 100644 dev-db/mysql/mysql-4.1.22-r1.ebuild
 create mode 100644 dev-db/mysql/mysql-5.0.96.ebuild
 create mode 100644 dev-db/mysql/mysql-5.1.70.ebuild
 create mode 100644 dev-db/mysql/mysql-5.1.73.ebuild
 create mode 100644 dev-db/mysql/mysql-5.5.35.ebuild
 create mode 100644 dev-db/mysql/mysql-5.5.37.ebuild
 create mode 100644 dev-db/mysql/mysql-5.6.17.ebuild
 create mode 100644 dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
 create mode 100644 dev-db/percona-server/Manifest
 create mode 100644 dev-db/percona-server/files/my.cnf-5.5
 create mode 100644 dev-db/percona-server/files/my.cnf-5.6
 create mode 100644 dev-db/percona-server/metadata.xml
 create mode 100644 dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
 create mode 100644 dev-db/percona-server/percona-server-5.6.16.64.2.ebuild
 create mode 100644 dev-java/mariadb-java-client/ChangeLog
 create mode 100644 dev-java/mariadb-java-client/Manifest
 create mode 100644 dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
 create mode 100644 dev-java/mariadb-java-client/files/maven-build.xml
 create mode 100644 dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
 create mode 100644 dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
 create mode 100644 dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
 create mode 100644 dev-java/mariadb-java-client/metadata.xml
 create mode 100644 eclass/mysql-autotools.eclass
 create mode 100644 eclass/mysql-cmake.eclass
 create mode 100644 eclass/mysql-multilib.eclass
 create mode 100644 eclass/mysql-v2.eclass
 create mode 100644 eclass/mysql.eclass
 create mode 100644 eclass/mysql_fx.eclass
 create mode 100644 metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
 create mode 100644 metadata/news/ChangeLog
 create mode 100644 profiles/package.mask
 create mode 100644 profiles/package.use.mask
 create mode 100644 sys-cluster/galera/ChangeLog
 create mode 100644 sys-cluster/galera/Manifest
 create mode 100644 sys-cluster/galera/files/disable-tests-23.2.7.patch
 create mode 100644 sys-cluster/galera/files/disable-tests.patch
 create mode 100644 sys-cluster/galera/files/garb.cnf
 create mode 100644 sys-cluster/galera/files/garb.sh
 create mode 100644 sys-cluster/galera/files/respect-flags.patch
 create mode 100644 sys-cluster/galera/galera-23.2.4-r1.ebuild
 create mode 100644 sys-cluster/galera/galera-23.2.7.ebuild
 create mode 100644 sys-cluster/galera/galera-25.3.2.ebuild
 create mode 100644 sys-cluster/galera/metadata.xml
 create mode 100644 virtual/mysql/ChangeLog
 create mode 100644 virtual/mysql/metadata.xml
 create mode 100644 virtual/mysql/mysql-10.0.ebuild
 create mode 100644 virtual/mysql/mysql-4.0.ebuild
 create mode 100644 virtual/mysql/mysql-4.1.ebuild
 create mode 100644 virtual/mysql/mysql-5.0.ebuild
 create mode 100644 virtual/mysql/mysql-5.1.ebuild
 create mode 100644 virtual/mysql/mysql-5.2.ebuild
 create mode 100644 virtual/mysql/mysql-5.3.ebuild
 create mode 100644 virtual/mysql/mysql-5.5.ebuild
 create mode 100644 virtual/mysql/mysql-5.6.ebuild
 create mode 100644 virtual/mysql/mysql-5.7.ebuild

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
new file mode 100644
index 0000000..03a68b4
--- /dev/null
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -0,0 +1,18 @@
+*mariadb-galera-5.5.35 (14 Feb 2014)
+
+  14 Feb 2014;  <grknight@gentoo.org> +mariadb-galera-5.5.35.ebuild,
+  -mariadb-galera-5.5.33a.ebuild:
+  [mariadb-galera] Version bump to 5.5.35
+
+*mariadb-galera-5.5.33a (09 Oct 2013)
+
+  09 Oct 2013; Brian Evans <grknight@tuffmail.com>
+  +mariadb-galera-5.5.33a.ebuild:
+  [mariadb-galera] Version bump to 5.5.33a
+
+*mariadb-galera-5.5.32 (17 Sep 2013)
+
+  17 Sep 2013; Brian Evans <grknight@tuffmail.com>
+  +mariadb-galera-5.5.32.ebuild:
+  [mariadb-galera] Version bump to 5.5.32 sys_vars.all_vars test fails but known
+  upstream per IRC as a variable name was missed and not added in test
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
new file mode 100644
index 0000000..3012b7e
--- /dev/null
+++ b/dev-db/mariadb-galera/Manifest
@@ -0,0 +1,2 @@
+DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
+DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256 3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512 49eeeed9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4 WHIRLPOOL c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
diff --git a/dev-db/mariadb-galera/files/my.cnf-5.5 b/dev-db/mariadb-galera/files/my.cnf-5.5
new file mode 100644
index 0000000..237c97c
--- /dev/null
+++ b/dev-db/mariadb-galera/files/my.cnf-5.5
@@ -0,0 +1,159 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+# These settings are required for Galera clustering
+#mysql settings
+binlog_format=ROW
+default-storage-engine=innodb
+innodb_autoinc_lock_mode=2
+query_cache_size=0
+query_cache_type=0
+bind-address=0.0.0.0
+# Uncomment this section to activate Galera clustering
+#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
+# You should change this name to something meaningful
+#wsrep_cluster_name="my_wsrep_cluster"
+# List all nodes of the cluster including this one
+#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
+#wsrep_sst_method=rsync
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
new file mode 100644
index 0000000..e1bf28b
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+WSREP_REVISION="23"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+		# plugins.unix_socket
+		# fails because portage strips out the USER enviornment variable
+		#
+		# sys_vars.all_vars
+		# Fails in 5.5.32 only due to known issue upstream, forgotten variable from test.
+		# Should be fixed in next release.
+		#
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql \
+			sys_vars.all_vars ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
new file mode 100644
index 0000000..801fd97
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+WSREP_REVISION="25"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
new file mode 100644
index 0000000..59e6784
--- /dev/null
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<!-- 
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
+<use>
+  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
+  <flag name='community'>Enables the community features from upstream.</flag>
+  <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
+  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
+  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
+  <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/mariadb-native-client/ChangeLog b/dev-db/mariadb-native-client/ChangeLog
new file mode 100644
index 0000000..bb6ae82
--- /dev/null
+++ b/dev-db/mariadb-native-client/ChangeLog
@@ -0,0 +1,13 @@
+*mariadb-native-client-9999 (26 Jun 2013)
+
+  26 Jun 2013; Brian Evans <grknight@lavabit.com>
+  +mariadb-native-client-9999.ebuild, mariadb-native-client-1.0.ebuild,
+  metadata.xml:
+  Add live ebuild with mysqlcompat feature, optional ssl support and external
+  zlib
+
+*mariadb-native-client-1.0 (22 May 2013)
+
+  22 May 2013;  <grknight@lavabit.com> +files/multilib-install.patch,
+  +mariadb-native-client-1.0.ebuild, +metadata.xml:
+  Add new C library for MySQL
diff --git a/dev-db/mariadb-native-client/Manifest b/dev-db/mariadb-native-client/Manifest
new file mode 100644
index 0000000..a3cdbfd
--- /dev/null
+++ b/dev-db/mariadb-native-client/Manifest
@@ -0,0 +1 @@
+DIST mariadb-native-client.tar.gz 548121 SHA256 848c45ec1e685412abe020d934eee45d17cf81e7cbfa79ef6317343eb8557354 SHA512 ece36c3333cf6dbd4fc4f2be54542d05d7fe44a9387586afc0367356fdadae5d24c41d977b1d5f829156d6a54c9e89afc3d18d3f4b1510fcea2527ac701fa6af WHIRLPOOL 48a92dd2dc0655455a68aab91860a218463d95feec21b00fb43b406efc185838fb97d40880cba39d44bfff2f8c0ae4af85a4459a57cb050550b0d8809a0bb3bc
diff --git a/dev-db/mariadb-native-client/files/multilib-install.patch b/dev-db/mariadb-native-client/files/multilib-install.patch
new file mode 100644
index 0000000..6dfa270
--- /dev/null
+++ b/dev-db/mariadb-native-client/files/multilib-install.patch
@@ -0,0 +1,16 @@
+diff -aruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/libmysql/CMakeLists.txt	2013-05-17 14:16:47.621519747 -0400
++++ b/libmysql/CMakeLists.txt	2013-05-17 14:18:04.570428917 -0400
+@@ -166,9 +166,9 @@
+ 
+ INSTALL(TARGETS
+           libmariadb mariadbclient
+-          RUNTIME DESTINATION "lib"
+-          LIBRARY DESTINATION "lib"
+-          ARCHIVE DESTINATION "lib")
++          RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ 
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include
+         DESTINATION mariadbclient)
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
new file mode 100644
index 0000000..fb43970
--- /dev/null
+++ b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+	S="${WORKDIR}/${PN}"
+fi
+
+inherit cmake-multilib eutils "${VCS_INHERIT}"
+
+DESCRIPTION="Client Library for C is used to connect applications developed in C/C++ to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz
+	"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/openssl:=
+	amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  ) )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch "${FILESDIR}/multilib-install.patch"
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		$(cmake-utils_use_build doc DOCS)
+	)
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	strip_static_libraries() {
+		einfo "IN ${T}/usr/$(get_libdir)"
+		rm "${T}/usr/$(get_libdir)/mariadb/libmariadbclient.a"
+	}
+
+	cmake-multilib_src_install
+	if ! use static-libs ; then
+		multilib_foreach_abi strip_static_libraries
+	fi
+}
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
new file mode 100644
index 0000000..a0a135c
--- /dev/null
+++ b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+	S="${WORKDIR}/${PN}"
+fi
+
+inherit cmake-multilib eutils "${VCS_INHERIT}"
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="Client Library for C is used to connect applications developed in C/C++ to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz
+	"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="doc +mysqlcompat +ssl static-libs"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=
+		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  )  )
+	 )
+	mysqlcompat? (
+		!dev-db/mysql
+		!dev-db/mysql-cluster
+		!dev-db/mariadb
+		!dev-db/mariadb-galera
+		!dev-db/percona-server
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	sed -i 	-e "s~DESTINATION \"lib/mariadb~DESTINATION \"\$\{CMAKE_INSTALL_LIBDIR\}~" \
+		-e "s~DESTINATION lib/mariadb~DESTINATION \$\{CMAKE_INSTALL_LIBDIR\}~" \
+		"${S}/libmariadb/CMakeLists.txt"
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_EXTERNAL_ZLIB=ON
+		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+		$(cmake-utils_use_build doc DOCS)
+	)
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	strip_static_libraries() {
+		rm "${ED}/usr/$(get_libdir)/libmariadbclient.a"
+		use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a"
+	}
+
+	cmake-multilib_src_install
+	if ! use static-libs ; then
+		multilib_foreach_abi strip_static_libraries
+	fi
+	dodoc README
+}
diff --git a/dev-db/mariadb-native-client/metadata.xml b/dev-db/mariadb-native-client/metadata.xml
new file mode 100644
index 0000000..069fbde
--- /dev/null
+++ b/dev-db/mariadb-native-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+<flag name='mysqlcompat'>Enable mysqlclient library symbolic links</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
new file mode 100644
index 0000000..6a9d494
--- /dev/null
+++ b/dev-db/mariadb/ChangeLog
@@ -0,0 +1,233 @@
+# ChangeLog for dev-db/mariadb
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mariadb-10.0.7 (30 Dec 2013)
+
+  30 Dec 2013; Brian Evans <grknight@tuffmail.com> files/my.cnf-5.5,
+  -mariadb-10.0.4.ebuild, +mariadb-10.0.7.ebuild:
+  [mariadb] Version bump for 10 series
+
+*mariadb-5.5.34 (22 Nov 2013)
+
+  22 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.34.ebuild:
+  [mariadb] Version bump
+
+  19 Nov 2013; Brian Evans <grknight@tuffmail.com> -mariadb-10.0.1.ebuild,
+  -mariadb-10.0.2.ebuild, -mariadb-10.0.3.ebuild, -mariadb-5.5.31.ebuild:
+  [mariadb] Drop old
+
+*mariadb-10.0.6 (19 Nov 2013)
+
+  19 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.6.ebuild:
+  [mariadb] Version bump to 10.0.6
+
+*mariadb-10.0.4 (09 Oct 2013)
+
+  09 Oct 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.4.ebuild:
+  [mariadb] Version bump for 10.0.4 All tests pass
+
+*mariadb-5.5.33a (20 Sep 2013)
+
+  20 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33a.ebuild,
+  -mariadb-5.5.33.ebuild:
+  [mariadb] Version Bump to 5.5.33a All tests pass Fix crashes upstream Remove
+  hacks for jemalloc and tokudb per upstream
+
+*mariadb-5.5.33 (18 Sep 2013)
+
+  18 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33.ebuild,
+  metadata.xml:
+  [mariadb] Bump to version 5.5.33 PBXT was removed upstream TokuDB was added.
+  TokuDB only builds on amd64 according to author. jemalloc was added by
+  upstream. Small hack in cmake to use system lib.
+
+  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mariadb-5.1.66.ebuild,
+  -mariadb-5.2.13.ebuild, -mariadb-5.3.11.ebuild, -mariadb-5.5.28a.ebuild,
+  -mariadb-5.5.29.ebuild, -mariadb-5.5.30.ebuild:
+  [dev-db/mariadb] Trim old
+
+*mariadb-5.5.32 (19 Jul 2013)
+
+  19 Jul 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.32.ebuild:
+  Version bump
+
+*mariadb-10.0.3 (12 Jun 2013)
+
+  12 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.3.ebuild:
+  Bump, tests still running for now.
+
+*mariadb-5.5.31 (28 May 2013)
+
+  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.31.ebuild:
+  Bump.
+
+*mariadb-10.0.1 (21 Mar 2013)
+
+  21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.1.ebuild:
+  Very untested MariaDB 10 series.
+
+*mariadb-5.5.30 (13 Mar 2013)
+
+  13 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.30.ebuild:
+  Bump.
+
+  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.67.ebuild,
+  mariadb-5.2.14.ebuild, mariadb-5.3.12.ebuild, mariadb-5.5.29.ebuild:
+  Update headers and keywords.
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.1,
+  files/my.cnf-5.1, files/my.cnf-5.5:
+  Sync with gentoo-x86 for prefix changes.
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.62-r1.ebuild,
+  mariadb-5.1.62.ebuild, mariadb-5.1.66.ebuild, mariadb-5.2.12-r1.ebuild,
+  mariadb-5.2.12.ebuild, mariadb-5.2.13.ebuild, mariadb-5.3.11.ebuild,
+  mariadb-5.3.6.ebuild, mariadb-5.3.7.ebuild, mariadb-5.3.9.ebuild,
+  mariadb-5.5.24.ebuild, mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild,
+  mariadb-5.5.28.ebuild, mariadb-5.5.28a.ebuild:
+  HPPA has decided not to support mariadb for the present time.
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mariadb-5.1.55.ebuild:
+  Trim old versions.
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.5.24.ebuild,
+  mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild, mariadb-5.5.28.ebuild,
+  mariadb-5.5.28a.ebuild:
+  Fix {tests} typo.
+
+  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.55.ebuild, mariadb-5.1.62.ebuild, mariadb-5.2.7.ebuild,
+  mariadb-5.2.8.ebuild, mariadb-5.2.9.ebuild, mariadb-5.2.10.ebuild,
+  mariadb-5.2.12.ebuild, mariadb-5.3.0_beta.ebuild, mariadb-5.3.1_beta.ebuild,
+  mariadb-5.3.3_rc.ebuild, mariadb-5.3.5.ebuild, mariadb-5.3.6.ebuild,
+  mariadb-5.5.22.ebuild, mariadb-5.5.23.ebuild:
+  Move EAPI assignment to the top.
+  Whitespace.
+
+*mariadb-5.3.3_rc (12 Jan 2012)
+
+  12 Jan 2012; <atlantis@gentoo.org> +mariadb-5.3.3_rc.ebuild:
+  [dev-db/mariadb] 5.3.3_rc version bump.
+
+*mariadb-5.2.10 (12 Jan 2012)
+
+  12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.2.10.ebuild:
+  [dev-db/mariadb] Bump to 5.2.10 revision.
+
+  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.2.7.ebuild, mariadb-5.2.8.ebuild, mariadb-5.3.0_beta.ebuild:
+  [dev-db/mariadb] Bump EAPI to 4 on old mariadb versions.
+
+  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.55.ebuild, mariadb-5.2.9.ebuild, mariadb-5.3.1_beta.ebuild:
+  [dev-db/mariadb] Use EAPI-4 to support the new Prefix support of the
+  eclasses.
+
+*mariadb-5.2.9 (27 Sep 2011)
+
+  27 Sep 2011; <atlantis@gentoo.org> +mariadb-5.2.9.ebuild:
+  Bumped mariadb to 5.2.9 release.
+
+*mariadb-5.3.1_beta (22 Sep 2011)
+
+  22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.3.1_beta.ebuild:
+  Bumped mariadb to the 5.3.1_beta release. This needs more work as even unit
+  tests are failing.
+
+*mariadb-5.2.8 (19 Aug 2011)
+
+  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.2.8.ebuild:
+  [dev-db/maria] Bumped to release 5.2.8.
+
+  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild:
+  Added patch by Diego to fix the multiple install of files.
+
+*mariadb-5.3.0_beta (29 Jul 2011)
+
+  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.3.0_beta.ebuild:
+  [dev-db/mariadb] Bump to the first 5.3.0 beta release.
+
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mariadb-5.1.42-r1.ebuild, -mariadb-5.1.50.ebuild, -mariadb-5.1.50-r1.ebuild,
+  -mariadb-5.1.53.ebuild, -mariadb-5.2.4.ebuild, -mariadb-5.2.5.ebuild,
+  -mariadb-5.2.6.ebuild:
+  Dropped old versions of mariadb from the overlay.
+
+  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.55.ebuild:
+  [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
+  Drop irrelevant code and use mysql-v2 and not mysql-autotools.
+
+*mariadb-5.2.6 (13 May 2011)
+
+  13 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.55.ebuild, mariadb-5.2.5.ebuild, +mariadb-5.2.6.ebuild:
+  Bumped mariadb to the 5.2.6 release.
+  Fixed the calls to the mysql-autotools functions in the ebuilds using the
+  mysql-v2 eclass.
+
+  28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.55.ebuild, mariadb-5.2.4.ebuild, mariadb-5.2.5.ebuild:
+  Review the build type support in the eclass / ebuilds.
+
+*mariadb-5.2.5 (27 Mar 2011)
+
+  27 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mariadb-5.2.3.ebuild, +mariadb-5.2.5.ebuild:
+  Bumped mariadb to the 5.2.5 release.
+
+*mariadb-5.1.55 (05 Mar 2011)
+
+  05 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.42-r1.ebuild, mariadb-5.1.50.ebuild, mariadb-5.1.50-r1.ebuild,
+  mariadb-5.1.53.ebuild, +mariadb-5.1.55.ebuild, mariadb-5.2.3.ebuild,
+  mariadb-5.2.4.ebuild:
+  Bumped mariadb to the 5.1.55 release.
+  Updated testing instructions for mariadb ebuilds.
+
+*mariadb-5.2.3 (29 Nov 2010)
+
+  29 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.2.3.ebuild:
+  Added initial ebuild to test 5.2.3 release. Updated eclass as the maria
+  plugin was renamed to aria in the maria-5.2 tree.
+  This ebuild is currently dying on the configure run - it seems autoconf is
+  eating a case in the plugins.m4 file.
+
+*mariadb-5.1.50-r1 (06 Oct 2010)
+
+  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild,
+  +mariadb-5.1.50-r1.ebuild:
+  Release ready for tree now.
+
+  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild:
+  Ready for release.
+
+  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.50.ebuild:
+  Dropped the block on amarok[embedded].
+
+  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.1.50.ebuild:
+  Drop the EGIT_REPO_URI used to test locally.
+
+*mariadb-5.1.50 (24 Sep 2010)
+
+  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.1.50.ebuild:
+  Updated mariadb to the 5.1.50 release and added embedded support based on
+  Kristian Nielsen's <knielsen AT knielsen-hq DOT org> updated patch - bug
+  306315.
+
+*mariadb-5.1.42 (15 Mar 2010)
+
+  15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-4.1,
+  +mariadb-5.1.42.ebuild, +metadata.xml:
+  Add MariaDB. Bug #303130, based on the submission by Brian Evans
+  <grknight@tuffmail.com>.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
new file mode 100644
index 0000000..8c16e7c
--- /dev/null
+++ b/dev-db/mariadb/Manifest
@@ -0,0 +1,7 @@
+DIST mariadb-10.0.10.tar.gz 51946792 SHA256 66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512 806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948 WHIRLPOOL 79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
+DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512 2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064 WHIRLPOOL 0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
+DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
+DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
+DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
+DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
+DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1
new file mode 100644
index 0000000..211deaa
--- /dev/null
+++ b/dev-db/mariadb/files/my.cnf-4.1
@@ -0,0 +1,147 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= /var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+default-character-set		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= /var/run/mysqld/mysqld.sock
+pid-file 					= /var/run/mysqld/mysqld.pid
+log-error 					= /var/log/mysql/mysqld.err
+basedir 					= /usr
+datadir 					= @DATADIR@
+skip-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_cache 				= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= /usr/share/mysql/english
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= /tmp/
+#log-update 				= /path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= /tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= /var/lib/mysql/
+#innodb_log_arch_dir		= /var/lib/mysql/
+#innodb_log_group_home_dir	= /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+set-variable = innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
new file mode 100644
index 0000000..baf41c5
--- /dev/null
+++ b/dev-db/mariadb/files/my.cnf-5.1
@@ -0,0 +1,146 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.3 2013/01/20 02:39:55 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
new file mode 100644
index 0000000..42ebd39
--- /dev/null
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -0,0 +1,150 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+[mariadb]
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild b/dev-db/mariadb/mariadb-10.0.10.ebuild
new file mode 100644
index 0000000..d4a66b7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# plugins.unix_socket
+		# fails because portage strips out the USER enviornment variable
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help plugins.unix_socket \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
new file mode 100644
index 0000000..d4a66b7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# plugins.unix_socket
+		# fails because portage strips out the USER enviornment variable
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help plugins.unix_socket \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
new file mode 100644
index 0000000..24ac7f4
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
new file mode 100644
index 0000000..0c99bfd
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.14.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
new file mode 100644
index 0000000..d58f658
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.12.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-5.5.37.ebuild b/dev-db/mariadb/mariadb-5.5.37.ebuild
new file mode 100644
index 0000000..8cdf607
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.37.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
new file mode 100644
index 0000000..df3c16c
--- /dev/null
+++ b/dev-db/mariadb/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<!-- 
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
+<use>
+  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
+  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
+  <flag name='community'>Enables the community features from upstream.</flag>
+  <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='libevent'>Use libevent for connection handling</flag>
+  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
+  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
+  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
+  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
+  <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
new file mode 100644
index 0000000..0bc92e4
--- /dev/null
+++ b/dev-db/myodbc/ChangeLog
@@ -0,0 +1,136 @@
+# ChangeLog for dev-db/myodbc
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.33 2013/05/10 08:17:39 patrick Exp $
+
+  24 Jul 2013; Brian Evans <grknight@lavabit.com> myodbc-5.2.5.ebuild:
+  [myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt
+
+  10 May 2013; Patrick Lauer <patrick@gentoo.org> myodbc-5.1.6.ebuild:
+  Fix src_prepare
+
+  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> myodbc-5.1.6.ebuild:
+  Move Qt dependencies to the new category
+
+  31 Jul 2012; Michael Palimaka <kensington@gentoo.org> myodbc-5.1.6.ebuild:
+  Add missing slot dependencies on Qt.
+
+  10 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> -myodbc-3.51.06.ebuild,
+  -myodbc-3.51.11.ebuild, -myodbc-3.51.12.ebuild,
+  -myodbc-3.51.26_p1127.ebuild, -myodbc-3.51.26_p1127-r1.ebuild,
+  -myodbc-3.51.27_p695.ebuild, -myodbc-5.1.5_p1144.ebuild:
+  Old versions don't work on newer unixODBC, so clean them up. Latest is
+  stable anyway.
+
+  26 Jun 2010; <nixnut@gentoo.org> myodbc-5.1.6.ebuild:
+  ppc stable #322277
+
+  24 Jun 2010; Pacho Ramos <pacho@gentoo.org> myodbc-5.1.6.ebuild:
+  stable amd64, bug 322277
+
+  14 Jun 2010; Christian Faulhammer <fauli@gentoo.org> myodbc-5.1.6.ebuild:
+  stable x86, bug 322277
+
+  11 Apr 2010; <nixnut@gentoo.org> myodbc-3.51.26_p1127-r1.ebuild,
+  myodbc-5.1.5_p1144.ebuild:
+  ppc stable #302944
+
+  07 Feb 2010; Markos Chandras <hwoarang@gentoo.org>
+  myodbc-3.51.26_p1127-r1.ebuild, myodbc-5.1.5_p1144.ebuild:
+  Stable on amd64 wrt bug #302944
+
+  03 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
+  myodbc-3.51.26_p1127-r1.ebuild:
+  stable x86, bug 302944
+
+  03 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
+  myodbc-5.1.5_p1144.ebuild:
+  stable x86, bug 302944
+
+*myodbc-5.1.6 (31 Jan 2010)
+
+  31 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +myodbc-5.1.6.ebuild,
+  +files/myodbc-5.1.6-qt4-includedir.patch:
+  Version bump for 5.1 slot, now includes support for Qt Gui.
+
+*myodbc-3.51.27_p695 (31 Jan 2010)
+
+  31 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +myodbc-3.51.27_p695.ebuild:
+  Add 3.51.27 as the final release in the 3.51 series.
+
+  26 Feb 2009; Joseph Jezak <josejx@gentoo.org> myodbc-3.51.12.ebuild:
+  Marked ppc stable.
+
+*myodbc-5.1.5_p1144 (01 Nov 2008)
+
+  01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +myodbc-5.1.5_p1144.ebuild:
+  Include 5.1 version now, in a new SLOT.
+
+*myodbc-3.51.26_p1127-r1 (01 Nov 2008)
+
+  01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +myodbc-3.51.26_p1127-r1.ebuild:
+  Bring in slotted myodbc in preparation for 5.1. Also fix bug #159026 with
+  $FILESDIR usage during pkg_config. Use sed instead of m4. Driver name for
+  DSN also includes SLOT value.
+
+*myodbc-3.51.26_p1127 (01 Nov 2008)
+
+  01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +myodbc-3.51.26_p1127.ebuild:
+  Version bump per bug #240088, also handles new upstream source location
+  and versioning.
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> myodbc-3.51.12.ebuild:
+  (QA) RESTRICT clean up.
+
+  31 Jan 2007; Marius Mauch <genone@gentoo.org> myodbc-3.51.06.ebuild,
+  myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild:
+  Replacing einfo with elog
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> myodbc-3.51.06.ebuild,
+  myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  28 Oct 2006; Sven Wegener <swegener@gentoo.org> myodbc-3.51.06.ebuild,
+  myodbc-3.51.11.ebuild, myodbc-3.51.12.ebuild:
+  Use emerge --config instead of ebuild config.
+
+*myodbc-3.51.12 (24 Jun 2006)
+
+  24 Jun 2006; Francesco Riosa <vivo@gentoo.org> +myodbc-3.51.12.ebuild:
+  version bump
+
+  21 Jan 2006; <nixnut@gentoo.org> myodbc-3.51.11.ebuild:
+  Added ~ppc keyword.
+
+  16 Aug 2005; Francesco Riosa <vivo@gentoo.org> myodbc-3.51.11.ebuild:
+  Workaround for bug #102026, now configuring without samples and test
+
+  27 Jul 2005; Francesco Riosa <vivo@gentoo.org> myodbc-3.51.11.ebuild:
+  "unstable" to "stable" after testing on amd64 and x86.
+
+  28 Jun 2005; Simon Stelling <blubb@gentoo.org> myodbc-3.51.11.ebuild:
+  added ~amd64 keyword
+
+*myodbc-3.51.11 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
+  +myodbc-3.51.11.ebuild:
+  Add metadata. New version for mysql-4.1 support.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> myodbc-3.51.06.ebuild:
+  sync IUSE (+debug, +doc, +static)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> myodbc-3.51.06.ebuild:
+  adding RESTRICT="nomirror"
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> myodbc-3.51.06.ebuild,
+  files/odbc.ini.m4, files/odbcinst.ini.m4:
+  major changes made for auto-configuration of driver and DSN.
+
+*myodbc-3.51.06 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> myodbc-3.51.06.ebuild:
+  initial commit, bug #15546, submitted by Zhen Lin <lowzl@hotmail.com>
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
new file mode 100644
index 0000000..ed3dbfb
--- /dev/null
+++ b/dev-db/myodbc/Manifest
@@ -0,0 +1 @@
+DIST mysql-connector-odbc-5.2.5-src.tar.gz 581313 SHA256 54e35c646bb4d972bc18fba40d486059aac336d838269bef8049d1d78ebfb96a SHA512 a503df647690073e5b6b02ea49b3db380e6524388addd37b9993dcc0d0fb325c0d1e0954bbbc5a01e5d59c1ee20aab021dce731f89debfe07e61f9caad31e5cc WHIRLPOOL f3c0e42760142436c84756f2c75c2351185be7ade9101d0ff6ecdd762d6421f01d8ce333673edef4a84c6b2c832a52e5ac47ec8403df376ba15df8e60480bed1
diff --git a/dev-db/myodbc/files/cmake-doc-path.patch b/dev-db/myodbc/files/cmake-doc-path.patch
new file mode 100644
index 0000000..c7f7d9d
--- /dev/null
+++ b/dev-db/myodbc/files/cmake-doc-path.patch
@@ -0,0 +1,43 @@
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt	2013-03-09 09:51:06 +0000
++++ CMakeLists.txt	2013-03-09 11:05:27 +0000
+@@ -33,6 +33,12 @@
+ SET(CONNECTOR_MAJOR "5")
+ SET(CONNECTOR_MINOR "2")
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ IF(CONNECTOR_MINOR LESS 10)
+ 	SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
+ ELSE(CONNECTOR_MINOR LESS 10)
+@@ -329,19 +335,17 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
+-  INSTALL(FILES README       DESTINATION .)
+-  INSTALL(FILES README.debug DESTINATION .)
+-  INSTALL(FILES INSTALL      DESTINATION .)
++    INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README       DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES INSTALL      DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-    INSTALL(FILES COPYING       DESTINATION .)
+   ELSE()
+-    INSTALL(FILES LICENSE.mysql DESTINATION .)
+   ENDIF()
+ 
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ 
+ INCLUDE(CPack)
+ 
+
+
diff --git a/dev-db/myodbc/files/odbc.ini.m4 b/dev-db/myodbc/files/odbc.ini.m4
new file mode 100644
index 0000000..d80dddb
--- /dev/null
+++ b/dev-db/myodbc/files/odbc.ini.m4
@@ -0,0 +1,18 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbc.ini.m4,v 1.2 2004/07/18 02:46:19 dragonheart Exp $
+# vim:ts=4 noexpandtab ft=dosini:
+#
+[ODBC Data Sources]
+__PN__-test = MySQL ODBC __PF__ Driver Testing DSN
+
+# see http://www.mysql.com/products/myodbc/faq_toc.html
+# for details about the following entry
+[__PN__-test]
+Description	= MySQL ODBC __PF__ Driver Testing DSN
+Driver		= __PN__
+Socket		= /var/run/mysqld/mysqld.sock
+Server		= localhost
+User		= root
+Database	= test
+Option		= 3
+#Port		=
+#Password	=
diff --git a/dev-db/myodbc/files/odbcinst.ini.m4 b/dev-db/myodbc/files/odbcinst.ini.m4
new file mode 100644
index 0000000..981b6f9
--- /dev/null
+++ b/dev-db/myodbc/files/odbcinst.ini.m4
@@ -0,0 +1,6 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbcinst.ini.m4,v 1.2 2004/07/18 02:46:19 dragonheart Exp $
+# vim:ts=4 noexpandtab ft=dosini:
+#
+[__PN__]
+Description	= MySQL ODBC __PF__ Driver 
+Driver		= /usr/lib/libmyodbc3.so
diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml
new file mode 100644
index 0000000..716e7d4
--- /dev/null
+++ b/dev-db/myodbc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+</pkgmetadata>
diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.5.ebuild
new file mode 100644
index 0000000..0dfdd64
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.2.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/unixODBC
+	>=virtual/mysql-4.1
+"
+DEPEND="${DEPEND} ${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	# Fix as-needed on the installer binary
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+
+	# Patch document path so it doesn't install files to /usr
+	epatch "${FILESDIR}/cmake-doc-path.patch"
+}
+
+src_configure() {
+	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+	mycmakeargs+=(
+		-DWITH_UNIXODBC=1
+		-DRPM_BUILD=1
+		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${PF},g" \
+			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+}
diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
new file mode 100644
index 0000000..ea31e05
--- /dev/null
+++ b/dev-db/mysql-cluster/ChangeLog
@@ -0,0 +1,29 @@
+# ChangeLog for dev-db/mysql-cluster
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mysql-cluster-7.0.37 (03 Jul 2013)
+
+  03 Jul 2013; Brian Evans <grknight@lavabit.com> +mysql-cluster-7.0.37.ebuild,
+  -mysql-cluster-7.0.9.ebuild:
+  [mysql-cluster] Bump 7.0 series to 7.0.37
+
+*mysql-cluster-7.2.13 (01 Jul 2013)
+*mysql-cluster-7.3.0 (01 Jul 2013)
+
+  01 Jul 2013; Brian Evans <grknight@lavabit.com> 
+  +mysql-cluster-7.2.13.ebuild, +mysql-cluster-7.3.0.ebuild:
+  Bump to version 7.2.13 and 7.3.0
+
+  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-cluster-7.0.9.ebuild:
+  Move EAPI assignment to the top.
+  Whitespace.
+
+*mysql-cluster-7.0.9 (09 Aug 2010)
+
+  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-cluster-7.0.9.ebuild:
+  Bug #331691: mysql-cluster support from Nathan Sullivan
+  <nathan@nightsys.net> for Gentoo telco users. Needs more polish still and
+  init.d scripts.
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
new file mode 100644
index 0000000..2dd4ef9
--- /dev/null
+++ b/dev-db/mysql-cluster/Manifest
@@ -0,0 +1,5 @@
+DIST mysql-cluster-gpl-7.0.37.tar.gz 26875310 SHA256 4711275321aa4b1e5565327323320b95d89f07fd7f076d10a5a7f51653a50754 SHA512 d84cb77bce86a6438697a0d0caed517a8e1537c56d1af23575338c789dd5e9305b3684f37fd237d6a39cc64f6d1df7fe1180e3906eecff04581d3a2962d0d870 WHIRLPOOL f7a6de3046090236dc8c28d418b3bb00f32c326c388a8a3fdcf088ee3eea8fe06366a2732f210ff1904d05fd28edd825f23adf0c87e60c7be5bc16000fba110e
+DIST mysql-cluster-gpl-7.2.13.tar.gz 28571637 SHA256 3ea1061617bf2421fc7020c48e39b7539d04580171a663c778f98aa9c0176e85 SHA512 3dbc2ae8c9827b86bc88e89e07d26f1dd72cf3de88929dc9ae520f749a435b06202cdeb026689e8ced696d7440e23b86cf89e24cb0dd9084a8fb2c307ac02cee WHIRLPOOL c5f7b7b0951acc005b0f8b08ddbdb979b94fbe17353203a83b364a6d8c41de0d95caf621eb28c96627e6318240ba1ef604517993645a5878a78734d5f5ab137d
+DIST mysql-cluster-gpl-7.3.0.tar.gz 28623955 SHA256 ef0a8474e7debd7d4e2e900e60a08651d0c47d6d395d402061e100dc0fabcc03 SHA512 8c4eeb0d4d422bcffec0ab32286967d5fac8c54b4965f688f79794acfb90b7f477d86a8e980b62d47c68a468ff254c97569db34d2306eb6403a43a0afca64eee WHIRLPOOL 605ad60b6fa1f5948613f86568a94e21031ed7f611f3a621ae67a0ab3a387e0331c48cf2490ab4308a9ebac49e3bf0e25a7b084a4366f756a28dba3d59bcfcb3
+DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
+DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
new file mode 100644
index 0000000..22c35e3
--- /dev/null
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
+  <flag name='cluster'>Add support for NDB clustering</flag>
+  <flag name='community'>Enables the community features from upstream.</flag>
+  <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
+  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
+  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
new file mode 100644
index 0000000..b944856
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER="live"
+BUILD="autotools"
+
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 \
+				; do
+					mysql_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
new file mode 100644
index 0000000..afe0df0
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER="live"
+BUILD="cmake"
+
+# PBXT
+#PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 \
+			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
new file mode 100644
index 0000000..afe0df0
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER="live"
+BUILD="cmake"
+
+# PBXT
+#PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 \
+			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
new file mode 100644
index 0000000..8363a18
--- /dev/null
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for dev-db/mysql-init-scripts
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-conf.d,
+  files/mysql-5.1.53-init.d:
+  Add stop timeout.
+
+  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-init.d:
+  Fix typo.
+
+*mysql-init-scripts-2.0_pre1 (06 Dec 2010)
+
+  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-init-scripts-2.0_pre1.ebuild, +files/mysql-5.1.53-conf.d,
+  +files/mysql-5.1.53-init.d, +files/logrotate.mysql, +metadata.xml:
+  Finally revamp init scripts, based on bug #175783 submission from Davide
+  Pesavento <davidepesa@gmail.com>.
+
diff --git a/dev-db/mysql-init-scripts/files/logrotate.mysql b/dev-db/mysql-init-scripts/files/logrotate.mysql
new file mode 100644
index 0000000..b3d50de
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/logrotate.mysql
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
+monthly
+create 660 mysql mysql
+notifempty
+size 5M
+sharedscripts
+missingok
+postrotate
+/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+endscript
+}
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
new file mode 100644
index 0000000..3c79b13
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+# If you want a non-stock location for the config file, uncomment or update
+# either of these as needed. If you do use it, you must make sure that none of
+# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
+# files collide with each other.
+MY_CNF="/etc/mysql/my.cnf"
+#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
+
+# Place any additional arguments here that you might need
+# Common/useful options:
+# --skip-slave-start=1 - For bringing up replication initially
+# --server-id=NNN - Server ID for replication
+# --skip-networking - lock it down to UNIX sockets only
+MY_ARGS=""
+
+# This setting (in seconds) should be high enough to allow InnoDB to do a full
+# checkpoint recovery. 900 is the default used in the upstream RPM startup
+# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
+# database. After the core startup is done, we wait this long for the UNIX
+# socket to appear.
+STARTUP_TIMEOUT="900"
+
+# This is how long, in milliseconds, we wait for pidfile to be created, early
+# in the startup.
+STARTUP_EARLY_TIMEOUT="1000"
+
+# How long (in seconds) should we wait for shutdown?
+STOP_TIMEOUT=120
+
+# integer [-20 .. 19 ] default 0
+# change the priority of the server -20 (high) to 19 (low)
+# see "man nice 1" for description
+#NICE=0
+
+# See start-stop-daemon(8) for possible settings
+#IONICE=2
+
+# If defined, --verbose gets passed to S-S-D
+#DEBUG=1
+
+# Depending on your usage of MySQL, you may also wish to start it after some
+# other services are up. Uncomment the lines below as needed. If these aren't
+# enough for you, we encourage you to file a bug, and help us understand how
+# you are using MySQL.
+
+# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
+# If so, you need DNS before you can accept connections.
+# Avoid dependency circular loops if you use MySQL to power a local DNS server.
+#rc_use="dns"
+#rc_after="dns"
+
+# Does your MySQL bind to an IP on an interface other than net.lo?
+# Alternatively you might wish to specify the exact interface here.
+#rc_use="net"
+#rc_after="net"
+
+# Do you store your MySQL files on a SAN or other network filesystem, that is
+# provided by the netmount init script?
+#rc_need="netmount"
+
+# Or from NFS? P.S. This is not a good idea in most cases, but does have some
+# valid usage cases, so we provide the option.
+#rc_need="nfsmount"
+
+# Should any one of the instances satisfy the requirement for MySQL coming up?
+# By default, we say no.
+[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
+# But uncomment this next instead if you think it should.
+#rc_provide="mysql"
+
+# Tell OpenRC about our config file
+[ -n "${MY_CNF}" ] && rc_config="${MY_CNF}"
+
+# vim: ft=gentoo-conf-d et ts=4 sw=4:
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
new file mode 100644
index 0000000..308e314
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
@@ -0,0 +1,110 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount
+}
+
+get_config() {
+	my_print_defaults --config-file="$1" mysqld |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${SVCNAME}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${SVCNAME}${ebextra}"
+}
+
+start() {
+	# Check for old conf.d variables that mean migration was not yet done.
+	local varlist="${!mysql_slot_*} ${!MYSQL_BLOG_PID_FILE*} ${!STOPTIMEOUT*}"
+	varlist="${varlist// /}"
+	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+	# It does have a use in testing, as it is possible to build a config file
+	# that works with both the old and new init scripts simulateously.
+	if [ -n "${varlist}" -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+		eerror "Not proceeding because it may be dangerous."
+		return 1
+	fi
+
+	# Now we can startup
+	ebegin "Starting $(mysql_svcname)"
+
+	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+
+	if [ ! -d "${datadir}" ] ; then
+		eerror "MySQL datadir \`${datadir}' is empty or invalid"
+		eerror "Please check your config file \`${MY_CNF}'"
+		return 1
+	fi
+
+	if [ ! -d "${datadir}"/mysql ] ; then
+		eerror "You don't appear to have the mysql database installed yet."
+		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		return 1
+	fi
+
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+	start-stop-daemon \
+		${DEBUG/*/"--verbose"} \
+		--start \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--background \
+		--wait ${startup_early_timeout} \
+		${tmpnice} \
+		${tmpionice} \
+		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eend ${ret}
+		return ${ret}
+	fi
+
+	ewaitfile ${startup_timeout} "${socket}"
+	eend $? || return 1
+
+	save_options pidfile "${pidfile}"
+	save_options basedir "${basedir}"
+}
+
+stop() {
+	ebegin "Stopping $(mysql_svcname)"
+
+	local pidfile="$(get_options pidfile)"
+	local basedir="$(get_options basedir)"
+	local stop_timeout=${STOP_TIMEOUT:-120}
+
+	start-stop-daemon \
+		${DEBUG/*/"--verbose"} \
+		--stop \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--retry ${stop_timeout}
+	eend $?
+}
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/metadata.xml b/dev-db/mysql-init-scripts/metadata.xml
new file mode 100644
index 0000000..abf3529
--- /dev/null
+++ b/dev-db/mysql-init-scripts/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>mysql</herd>
+</pkgmetadata>
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
new file mode 100644
index 0000000..2a33efa
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild,v 1.4 2010/10/19 05:53:42 leio Exp $
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc.
+RDEPEND="!<dev-db/mysql-5.1 sys-apps/openrc"
+
+src_install() {
+	newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
+	newinitd "${FILESDIR}/mysql-5.1.53-init.d" "mysql"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
new file mode 100644
index 0000000..202fea8
--- /dev/null
+++ b/dev-db/mysql/ChangeLog
@@ -0,0 +1,388 @@
+# ChangeLog for dev-db/mysql
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mysql-5.1.73 (12 Dec 2013)
+
+  12 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.1.73.ebuild:
+  [mysql] Bump 5.1 series
+
+*mysql-5.5.35 (10 Dec 2013)
+*mysql-5.6.15 (10 Dec 2013)
+
+  10 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.35.ebuild,
+  +mysql-5.6.15.ebuild, -mysql-5.6.10.ebuild:
+  [mysql] Version bumps for 5.5 and 5.6 series
+
+  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mysql-5.1.66-r1.ebuild,
+  -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild,
+  -mysql-5.1.68.ebuild, -mysql-5.1.69.ebuild, -mysql-5.5.29-r1.ebuild,
+  -mysql-5.5.29.ebuild, -mysql-5.5.30.ebuild, -mysql-5.5.31.ebuild,
+  -mysql-5.6.7_rc.ebuild, -mysql-5.6.9_rc.ebuild:
+  [dev-db/mysql] Trim old
+
+*mysql-5.6.13 (26 Aug 2013)
+
+  26 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.6.13.ebuild:
+  [dev-db/mysql] Version bump to 5.6.13.  Failing test(s):
+  rpl.rpl_spec_variables similar to bug 473002
+
+*mysql-5.5.33 (16 Aug 2013)
+
+  16 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.33.ebuild:
+  Version bump w/ failing tests Failing test(s): rpl.rpl_deadlock_innodb
+  main.plugin_auth main.mysqladmin main.mysqlhotcopy_archive
+  main.mysqlhotcopy_myisam
+
+*mysql-5.6.12 (06 Jun 2013)
+
+  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.12.ebuild,
+  mysql-5.6.10.ebuild, mysql-5.6.7_rc.ebuild, mysql-5.6.9_rc.ebuild,
+  mysql-5.7.1_alpha_pre11.ebuild:
+  Bump. Fails tests: rpl.rpl_spec_variables (mix,stmt),
+  binlog.binlog_mysqlbinlog_filter (stmt), perfschema.binlog_edge_mix,
+  perfschema.binlog_edge_stmt, funcs_1.is_columns_mysql,
+  funcs_1.is_tables_mysql, funcs_1.is_triggers,
+  sys_vars.table_definition_cache_basic, sys_vars.table_open_cache_basic.
+
+*mysql-4.0.27-r1 (06 Jun 2013)
+*mysql-4.1.22-r1 (06 Jun 2013)
+*mysql-5.1.68 (06 Jun 2013)
+*mysql-5.5.32 (06 Jun 2013)
+
+  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.27-r1.ebuild,
+  +mysql-4.1.22-r1.ebuild, +mysql-5.1.68.ebuild, +mysql-5.5.32.ebuild,
+  mysql-5.1.66.ebuild, mysql-5.1.69.ebuild, mysql-5.5.30.ebuild,
+  mysql-5.5.31.ebuild:
+  Bump.
+
+*mysql-5.5.31 (03 Jun 2013)
+
+  03 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.31.ebuild,
+  mysql-5.1.69.ebuild:
+  Bump.
+
+*mysql-5.1.69 (28 May 2013)
+
+  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.69.ebuild:
+  Bump, please see bug #471632 for test failures.
+
+*mysql-5.5.30 (08 Mar 2013)
+
+  08 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.30.ebuild:
+  Bump.
+
+  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
+  mysql-5.1.67.ebuild:
+  Update headers and keywords.
+
+*mysql-5.6.9_rc (28 Jan 2013)
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.9_rc.ebuild:
+  Add still-broken 5.6 for development. As a problem with as-needed link order
+  still.
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.0,
+  files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild,
+  mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild:
+  Sync with gentoo-x86 for prefix changes & headers.
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.19.ebuild,
+  -mysql-5.5.20.ebuild, -mysql-5.5.21.ebuild, -mysql-5.5.22.ebuild,
+  -mysql-5.5.25a.ebuild, -mysql-5.5.27.ebuild, -mysql-5.5.28.ebuild,
+  -mysql-5.6.2_alpha_pre5.ebuild:
+  Trim.
+
+*mysql-5.1.66-r1 (28 Jan 2013)
+*mysql-5.1.67-r1 (28 Jan 2013)
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.66-r1.ebuild,
+  +mysql-5.1.67-r1.ebuild, mysql-5.1.66.ebuild, mysql-5.1.67.ebuild:
+  Actually move PBXT fix to revbump.
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
+  mysql-5.1.67.ebuild:
+  Include PBXT nice fix per bug #374349.
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  mysql-5.1.66.ebuild, mysql-5.1.67.ebuild, mysql-5.5.19.ebuild,
+  mysql-5.5.20.ebuild, mysql-5.5.21.ebuild, mysql-5.5.22.ebuild,
+  mysql-5.5.28.ebuild, mysql-5.5.29.ebuild:
+  Sync from gentoo-x86.
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.96.ebuild:
+  Copy keywords from gentoo-x86.
+
+*mysql-5.1.65 (14 Aug 2012)
+
+  14 Aug 2012; <atlantis@gentoo.org> +mysql-5.1.65.ebuild:
+  [dev-db/mysql] Bump to the 5.1.65 release.
+
+*mysql-5.5.25a (07 Jul 2012)
+
+  07 Jul 2012; <atlantis@gentoo.org> +mysql-5.5.25a.ebuild:
+  [dev-db/mysql-5.5.25a] Version bump.
+
+  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
+  Move EAPI assignment to the top.
+  Whitespace.
+
+  15 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/my.cnf-5.1:
+  Update table_cache to table_open_cache variable for mysql-5.1 my.cnf file.
+  Fixes bug 403425 - thanks to Alex Efros <powerman-asdf@yandex.ru> for the
+  report.
+
+*mysql-5.1.61 (31 Jan 2012)
+*mysql-5.5.20 (31 Jan 2012)
+
+  31 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.61.ebuild,
+  +mysql-5.5.20.ebuild:
+  Version bump, passes all tests.
+
+  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.58-r1.ebuild, mysql-5.5.10.ebuild, mysql-5.5.12.ebuild,
+  mysql-5.5.14.ebuild, mysql-5.5.15.ebuild:
+  [dev-db/mysql] Bump EAPI to 4 on old mysql versions.
+
+*mysql-5.5.18 (20 Nov 2011)
+
+  20 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.18.ebuild:
+  Version bump.
+
+*mysql-5.1.60 (19 Nov 2011)
+
+  19 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.60.ebuild:
+  Version bump.
+
+*mysql-5.5.17 (26 Oct 2011)
+
+  26 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.17.ebuild:
+  [dev-db/mysql] Bumped to the 5.5.17 version.
+
+  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.59.ebuild, mysql-5.5.16.ebuild, mysql-5.6.2_alpha_pre5.ebuild:
+  [dev-db/mysql] Use EAPI-4 to support the new Prefix support of the eclasses.
+
+*mysql-5.5.16 (22 Sep 2011)
+
+  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.5.16.ebuild:
+  Bumped mysql to the 5.5.16 release.
+
+*mysql-5.1.59 (22 Sep 2011)
+
+  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.1.59.ebuild:
+  Bumped mysql to the 5.1.59 release.
+
+*mysql-5.5.15 (30 Jul 2011)
+
+  30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.15.ebuild:
+  [dev-db/mysql] 5.5.15 release version bump.
+
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mysql-5.1.58.ebuild:
+  Dropped broken mysql-5.1.58 ebuild.
+
+*mysql-5.1.58-r1 (21 Jul 2011)
+
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.58-r1.ebuild:
+  [dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to
+  the ebuild and the mysql-v2 eclass. Fixes bug 375063.
+
+  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.58.ebuild:
+  [dev-db/mysql-5.5.14] Don't use live version of mysql_extras.
+  [dev-db/mysql-5.1.58] Don't use live version of mysql_extras.
+  Synced from the tree.
+
+  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.13.ebuild:
+  5.5.13 removed from uptream mirrors, unable to verify digest.
+
+  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.56.ebuild,
+  -mysql-5.1.56-r1.ebuild, -mysql-5.1.57.ebuild:
+  Old versions moved to tree.
+
+  13 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.57.ebuild, mysql-5.1.58.ebuild, mysql-5.5.13.ebuild,
+  mysql-5.5.14.ebuild:
+  Replace mysql_disable_test calls with mysql-v2_disable_test.
+  Should finally disable the remaining failing tests.
+
+  18 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.57.ebuild:
+  Update mysql-v2 eclass to use the git-2 eclass.
+  Update the mysql-5.1.57 ebuild to use the mysql-v2 eclass.
+
+  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
+  Really disable binlog.binlog_statement_insert_delayed test. 
+
+  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
+  Disable tests that fail for mysql-5.5.*:
+  3 tests fail for latin/utf-8 charsets and 1 causes segmentation faults.
+
+  15 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mysql-5.0.91.ebuild, -mysql-5.1.50-r2.ebuild, -mysql-5.1.50-r3.ebuild,
+  -mysql-5.1.51.ebuild, -mysql-5.1.51-r1.ebuild, -mysql-5.1.52-r2.ebuild,
+  -mysql-5.1.53-r1.ebuild, -mysql-5.5.4_alpha_pre3.ebuild:
+  Dropping old versions.
+
+*mysql-5.5.12 (11 May 2011)
+*mysql-5.1.57 (11 May 2011)
+
+  11 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.57.ebuild, +mysql-5.5.12.ebuild:
+  Bumped mysql to the 5.1.57 and 5.5.12 releases.
+
+*mysql-5.1.56-r1 (18 Apr 2011)
+
+  18 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.56.ebuild,
+  +mysql-5.1.56-r1.ebuild:
+  Make a release of 5.1.56 using the old eclass.
+
+*mysql-5.1.56 (28 Mar 2011)
+
+  28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.56.ebuild, mysql-5.5.10.ebuild, metadata.xml:
+  Bumped mysql to the 5.1.56 release.
+  More updates to the 5.5.10 ebuild.
+
+  26 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild:
+  Applied a few more fixes to mysql-5.5.10.
+
+  21 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild:
+  A few more updates for mysql-5.5.10 including a reworked patch from upstream
+  ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.
+
+*mysql-5.5.10 (17 Mar 2011)
+
+  17 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.10.ebuild:
+  Introduce new eclasses and update mysql_fx.eclass to support the cmake based
+  mysql-5.5 ebuilds.
+  Add initial support for mysql-5.5.10 - this is still a work in progress.
+
+*mysql-5.0.92 (17 Feb 2011)
+
+  17 Feb 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.0.92.ebuild:
+  Bumped mysql to the 5.0.92 release.
+  This version is still breaking on a missing #endif at sql/sql_parse.cc.
+
+  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.53-r1.ebuild:
+  Add ~mips per main tree.
+
+  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.51-r1.ebuild,
+  mysql-5.1.52-r2.ebuild, mysql-5.1.53-r1.ebuild:
+  Update libtool changes from main tree.
+
+*mysql-5.1.53-r1 (28 Nov 2010)
+*mysql-5.1.52-r2 (28 Nov 2010)
+
+  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.52.ebuild,
+  +mysql-5.1.52-r2.ebuild, +mysql-5.1.53-r1.ebuild:
+  Add 5.1.53 ebuild and bump 5.1.52 to be ahead of main tree versions.
+
+*mysql-5.1.52 (03 Nov 2010)
+
+  03 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.52.ebuild:
+  Add 5.1.52 release, just need to integrate MIPS and federated fixes
+
+*mysql-5.1.51-r1 (06 Oct 2010)
+
+  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.51.ebuild,
+  +mysql-5.1.51-r1.ebuild:
+  Release ready for tree now.
+
+  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild,
+  mysql-5.1.50-r3.ebuild, mysql-5.1.51.ebuild:
+  Ready for release.
+
+*mysql-5.1.51 (04 Oct 2010)
+
+  04 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.51.ebuild:
+  Bumped to mysql-5.1.51.
+
+  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.50-r3.ebuild:
+  Dropped the block on amarok[embedded].
+
+  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.50-r3.ebuild:
+  Drop the EGIT_REPO_URI used to test locally.
+
+*mysql-5.1.50-r3 (24 Sep 2010)
+
+  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.50-r3.ebuild:
+  Bumped mysql to 5.1.50-r3 to add the embedded patch.
+
+  07 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.49.ebuild,
+  -mysql-5.5.1_alpha_pre2-r1.ebuild:
+  cleanup.
+
+  07 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
+  Hello again bug #332565.
+
+  05 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
+  Refix bug #332565.
+
+  01 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
+  Block the new sharedlib patch since it doesn't work fully yet.
+
+*mysql-5.1.50-r2 (01 Sep 2010)
+
+  01 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.50.ebuild,
+  +mysql-5.1.50-r2.ebuild:
+  Rename to avoid conflict.
+
+  21 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50.ebuild:
+  Some tests false-positive with XtraDB.
+
+*mysql-5.1.50 (20 Aug 2010)
+
+  20 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.50.ebuild:
+  Verbump.
+
+  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql-5.0.90-r3.ebuild, -mysql-5.1.44-r4.ebuild, -mysql-5.1.45-r2.ebuild,
+  -mysql-5.1.46.ebuild:
+  Cleanup.
+
+  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.90-r3.ebuild,
+  mysql-5.0.91.ebuild:
+  Add prefix keywords.
+
+  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.91.ebuild:
+  Clean up 5.0.91 for release.
+
+*mysql-5.1.49 (27 Jul 2010)
+
+  27 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.49.ebuild:
+  Added mysql-5.1.49 release.
+
+*mysql-5.0.91 (22 May 2010)
+
+  22 May 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.91.ebuild:
+  Bug #319489: new version for GLSA, but critically broken.
+
+*mysql-5.1.42 (02 Jan 2010)
+
+  02 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.42.ebuild:
+  Bumped mysql to 5.1.42.
+
+*mysql-5.1.41 (29 Nov 2009)
+
+  29 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.41.ebuild:
+  Initial bump to mysql-5.1.41.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
new file mode 100644
index 0000000..a9d6217
--- /dev/null
+++ b/dev-db/mysql/Manifest
@@ -0,0 +1,16 @@
+DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
+DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
+DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
+DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
+DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
+DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
+DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
+DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
+DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
+DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
+DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
+DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
+DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
+DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
+DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
+DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf
new file mode 100644
index 0000000..4e7d0f6
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf
@@ -0,0 +1,48 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.5 2008/11/14 01:49:37 robbat2 Exp $
+#
+# This file can be simultaneously placed in three places:
+# 1. /etc/mysql/my.cnf to set global options.
+# 2. /var/lib/mysql/my.cnf to set server-specific options.
+# 3. ~/.my.cnf to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run the program with --help to get a list of them.
+#
+# The following values assume you have at least 32M RAM!
+
+[client]
+#password	= my_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[safe_mysqld]
+err-log		= /var/log/mysql/mysql.err
+
+[mysqld]
+#skip-networking
+skip-innodb
+innodb_file_per_table
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+log		= /var/log/mysql/mysql.log
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+language	= /usr/share/mysql/english
+skip-locking
+set-variable	= key_buffer=16M
+set-variable	= max_allowed_packet=1M
+set-variable	= thread_stack=128K
+
+[mysqldump]
+quick
+set-variable	= max_allowed_packet=1M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completition
+
+[isamchk]
+set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
new file mode 100644
index 0000000..abc8690
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-4.0
@@ -0,0 +1,113 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
+#
+# This file can be simultaneously placed in three places:
+# 1. /etc/mysql/my.cnf to set global options.
+# 2. /var/lib/mysql/my.cnf to set server-specific options.
+# 3. ~/.my.cnf to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run the program with --help to get a list of them.
+#
+# The following values assume you have at least 64M RAM!
+
+[client]
+#password	= my_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[safe_mysqld]
+err-log		= /var/log/mysql/mysql.err
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+log-error	= /var/log/mysql/mysqld.err
+# If set, mysql logs all queries (general query log). This will be deprecated in
+# MySQL 5.0. This logs all queries, even error queries and is slow.
+# log          = /var/log/mysql/mysql.log
+#
+# If you really need logging, you'd rather use binary logging. Especially when doing
+# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info.
+# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
+# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
+# running.
+# Before doing that, check which logfile slave curently uses by running
+# mysql> SHOW SLAVE STATUS
+# To list logfiles on master do:
+# mysql> SHOW MASTER LOGS
+# Then use PURGE for those not needed anymore only! Never remove the files
+# manually!
+#
+# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
+# mysql> RESET MASTER - Deletes all binary logs listed in the index
+#                       file, resetting the binlog index file to be empty.
+# mysql> RESET SLAVE - Makes the slave forget its replication position in
+#                      the master logs.
+# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
+# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
+#
+# log-bin
+# set-variable  = binlog-do-db=non_existant
+# set-variable  = binlog-ignore-db=database_name
+#
+# server-id has to unique for each master or slave in your network,
+# lets use the last number from IP address
+# server-id	= 207
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+language	= /usr/share/mysql/english
+skip-locking
+set-variable	= key_buffer=16M
+set-variable	= max_allowed_packet=1M
+set-variable	= thread_stack=128K
+# be secure by default!
+bind-address    = 127.0.0.1
+port			= 3306
+# this can make it even more secure:
+#skip-networking
+#
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+set-variable = innodb_buffer_pool_size=32M
+# this is the default, increase it if you have lots of tables
+set-variable = innodb_additional_mem_pool_size=1M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+innodb_data_home_dir = /var/lib/mysql/
+innodb_log_arch_dir = /var/lib/mysql/
+innodb_log_group_home_dir = /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+set-variable = innodb_log_file_size=8M
+# this is the default, increase it if you have very large transactions going on
+set-variable = innodb_log_buffer_size=1M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+set-variable = innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+loose-innodb_file_per_table=1
+
+[mysqldump]
+quick
+set-variable	= max_allowed_packet=16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completion
+
+[isamchk]
+set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
new file mode 100644
index 0000000..458a58a
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-4.1
@@ -0,0 +1,147 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= /var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+default-character-set		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= /var/run/mysqld/mysqld.sock
+pid-file 					= /var/run/mysqld/mysqld.pid
+log-error 					= /var/log/mysql/mysqld.err
+basedir 					= /usr
+datadir 					= @DATADIR@
+skip-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_cache 				= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= /usr/share/mysql/english
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= /tmp/
+#log-update 				= /path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= /tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= /var/lib/mysql/
+#innodb_log_arch_dir		= /var/lib/mysql/
+#innodb_log_group_home_dir	= /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+set-variable = innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
new file mode 100644
index 0000000..f1ee4f2
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-5.1
@@ -0,0 +1,146 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
new file mode 100644
index 0000000..eb4f859
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -0,0 +1,149 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size					= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
new file mode 100644
index 0000000..16ea7bc
--- /dev/null
+++ b/dev-db/mysql/files/mysql.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.7 2004/07/14 21:41:15 agriffis Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f /etc/mysql/my.cnf ] ; then
+		eerror "No /etc/mysql/my.cnf file exists!"
+	fi
+
+    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
+
+	if [ ! -d $dir/mysql ] ; then
+		eerror "You dont appear to have the mysql database installed yet."
+		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting mysqld"
+	/usr/bin/safe_mysqld >/dev/null 2>&1 &
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping mysqld"
+	start-stop-daemon --stop --quiet \
+		--pidfile=/var/run/mysqld/mysqld.pid --retry 20
+	eend $?
+}
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
new file mode 100644
index 0000000..9ecd928
--- /dev/null
+++ b/dev-db/mysql/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<!-- 
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
+<use>
+  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
+  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
+  <flag name='community'>Enables the community features from upstream.</flag>
+  <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
+  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
+  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name='raid'>Deprecated option, removed in the 5.0 series</flag>
+  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
new file mode 100644
index 0000000..dc82246
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.27-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.27-r1.ebuild,v 1.6 2008/12/14 20:17:13 klausman Exp $
+
+MY_EXTRAS_VER="20070105"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+
+inherit mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
new file mode 100644
index 0000000..d5fa1b6
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.22-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.22-r1.ebuild,v 1.8 2011/07/08 10:05:34 ssuominen Exp $
+
+MY_EXTRAS_VER="20090228-2228Z"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+
+inherit mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		local testopts="--force"
+
+		# sandbox makes ndbd zombie
+		has "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
+
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|3306|3307|g" mysql-test-run.pl
+
+		# from Makefile.am:
+		retstatus=1
+		./mysql-test-run.pl ${testopts} \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
+		&& retstatus=0
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
new file mode 100644
index 0000000..f22bc53
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.96.ebuild,v 1.4 2013/01/20 01:49:23 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20120401-2131Z"
+
+inherit toolchain-funcs mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND=""
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.0 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		case ${PV} in
+			5.0.*)
+			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		case $PV in
+			5.0.91)
+			for t in archive archive_gis archive-big \
+				federated_archive mysqldump-max \
+				; do
+					mysql_disable_test $t "Broken in $PV"
+				done
+			;;
+			5.0.96)
+				for t in \
+					client_xml compress connect ctype_recoding drop \
+					federated grant information_schema \
+					information_schema_db innodb lowercase_table \
+					lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \
+					mysqlcheck mysqldump-max mysqldump mysqldump_restore \
+					mysqlshow ps ps_1general rename rpl000009 rpl_ddl \
+					rpl_delete_all rpl_drop_db rpl_dual_pos_advance \
+					rpl_error_ignored_table rpl_filter_tables_not_exist \
+					rpl_replicate_do rpl_trigger_not_windows select \
+					show_check sp system_mysql_db system_mysql_db_fix30020 \
+					system_mysql_db_fix40123 view \
+				; do
+					mysql_disable_test $t "Broken in $PV"
+				done
+			;;
+		esac
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
new file mode 100644
index 0000000..06c804b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.70.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130626-0127Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73.ebuild
new file mode 100644
index 0000000..721099e
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.73.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.5.35.ebuild b/dev-db/mysql/mysql-5.5.35.ebuild
new file mode 100644
index 0000000..2df1496
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.35.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20140121-1138Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.5.37.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
new file mode 100644
index 0000000..ebb6824
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+                # main.mysql_tzinfo_to_sql_symlink
+                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+                #
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.6.17.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
new file mode 100644
index 0000000..3de9afc
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.17.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+		#
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
+			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
+			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
new file mode 100644
index 0000000..9026213
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_columns_mysql, 
+		# funcs_1.is_tables_mysql, funcs_1.is_triggers,
+		# binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
+		# perfschema.binlog_edge_stmt
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+                # main.mysql_tzinfo_to_sql_symlink
+                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+                #
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql funcs_1.is_triggers \
+			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000 --testcase-timeout=30
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
new file mode 100644
index 0000000..f2be9e8
--- /dev/null
+++ b/dev-db/percona-server/Manifest
@@ -0,0 +1,2 @@
+DIST percona-server-5.5.36-34.2.tar.gz 24206105 SHA256 62a0c4a45412e4c2eadf53d3a60977d33e27e650be32bf46bb13dff2b3e84fee SHA512 f6a072df53c85d170774e12d39e1b8d83db8d47daae370a915d9513e7c0224cd3afa64c84242aefbea98dd2e9f363bbe6bc454a3cfc1fbecdba274f550b724ae WHIRLPOOL d0bc8775a0618daa823f939339c875019b5c71400edf6401d4414d352e91d7a1963bc05bd4a81992cb915ae8ec6220df14dce066e11552575a496dfbe0721e88
+DIST percona-server-5.6.16-64.2.tar.gz 34455024 SHA256 841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d SHA512 c114d4267f4c917bd886d76d4d6dca3c71bfc33efc57a8cbac623ec52b87b8cf1aaa6bdef3df6db91a074206d3c2206997c39d316abc33e927584307b791fb5c WHIRLPOOL ed60be8ec2008f9893df408b4e883ecf7c459d4e81a6e302207595980ac88ad5879f32d842ae9de66e5470b00db5b5b7a3fc5cb200468019f574d0e00df539de
diff --git a/dev-db/percona-server/files/my.cnf-5.5 b/dev-db/percona-server/files/my.cnf-5.5
new file mode 100644
index 0000000..85a26ec
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf-5.5
@@ -0,0 +1,149 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
diff --git a/dev-db/percona-server/files/my.cnf-5.6 b/dev-db/percona-server/files/my.cnf-5.6
new file mode 100644
index 0000000..f43d535
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf-5.6
@@ -0,0 +1,153 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_open_cache 			= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
new file mode 100644
index 0000000..6c8301d
--- /dev/null
+++ b/dev-db/percona-server/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
+  <flag name='community'>Enables the community features from upstream.</flag>
+  <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
+  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+  <flag name='test'>Install upstream testsuites for end use.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild b/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
new file mode 100644
index 0000000..7c1debc
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+		# main.file_contents
+		# Fails finding a BZR revision number from a text file.
+		# This is an information only test and not needed in Gentoo
+		#
+		# main.percona_bug1289599
+		# Appears to be a syntax error in the test file itself
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 main.file_contents \
+			main.percona_bug1289599 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/percona-server/percona-server-5.6.16.64.2.ebuild b/dev-db/percona-server/percona-server-5.6.16.64.2.ebuild
new file mode 100644
index 0000000..1d7b70d
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.6.16.64.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+		# main.file_contents
+		# Fails finding a BZR revision number from a text file.
+		# This is an information only test and not needed in Gentoo
+		#
+		# main.percona_bug1289599
+		# Looks to be a syntax error in the test file itself
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 binlog.binlog_mysqlbinlog_filter \
+			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
+			main.file_contents main.percona_bug1289599; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-java/mariadb-java-client/ChangeLog b/dev-java/mariadb-java-client/ChangeLog
new file mode 100644
index 0000000..1d1c502
--- /dev/null
+++ b/dev-java/mariadb-java-client/ChangeLog
@@ -0,0 +1,13 @@
+*mariadb-java-client-1.1.4 (10 Sep 2013)
+
+  10 Sep 2013; Brian Evans <grknight@tuffmail.com> +files/maven-build-1.1.4.xml,
+  +mariadb-java-client-1.1.4.ebuild:
+  [mariadb-java-client] Version bump
+
+*mariadb-java-client-1.1.3 (01 Jul 2013)
+*mariadb-java-client-9999 (01 Jul 2013)
+
+  01 Jul 2013; Brian Evans <grknight@lavabit.com> +files/maven-build.xml,
+  +mariadb-java-client-1.1.3.ebuild, +mariadb-java-client-9999.ebuild,
+  +metadata.xml:
+  New ebuilds for MariaDB's LGPL JDBC Client
diff --git a/dev-java/mariadb-java-client/Manifest b/dev-java/mariadb-java-client/Manifest
new file mode 100644
index 0000000..e1bc387
--- /dev/null
+++ b/dev-java/mariadb-java-client/Manifest
@@ -0,0 +1,2 @@
+DIST mariadb-java-client-1.1.3.tar.gz 179751 SHA256 bb9927e3bacaa501e8a0a04ac1a93cccf43c64d4a4742d17b115b54869964076 SHA512 22ed23483b5ab741bfbd82825ce21cb55533c78fa8ea839effda2eca185f283b92a3b551a12761c3e00de6a0722e95c4ebd670462d553b33dbe9925541ae5b97 WHIRLPOOL 0896218d64c5e488322a745a7819c2f9c39d5b5ed677d013abae7270455caea0b4394d013d8ee17b8fb166679f1a3f89af6ff06e2a9d026f525df5088e813ffa
+DIST mariadb-java-client-1.1.4.tar.gz 184565 SHA256 6feec7634572577fed376a19927d05d5abea01aa81615451b259f4fec52d72cd SHA512 4be86df3949845f48741e98a5f1ef17d30229af15966f86e502890f01b05b518bbf0aad8814e50512554cbb318b1048dfa9ff3f5540c41111a60c0059e526236 WHIRLPOOL 4966ae823933d2aefbcb2e86a1302b11b635def426500033e256277fd91a6ade0bfffe995b023a84b4c8fd448c3a78df7c2ea64f8c8e298dfc7f12a16662a42c
diff --git a/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml b/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
new file mode 100644
index 0000000..0a62494
--- /dev/null
+++ b/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 7/1/13 1:49 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="mariadb-java-client-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="mariadb-java-client"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"/>
+    <pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         manifest="src/main/resources/META-INF/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.6"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.6/junit-4.6.jar" 
+         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.6/junit-4.6.jar" 
+         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/mariadb-java-client/files/maven-build.xml b/dev-java/mariadb-java-client/files/maven-build.xml
new file mode 100644
index 0000000..3251eb1
--- /dev/null
+++ b/dev-java/mariadb-java-client/files/maven-build.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 7/1/13 1:49 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="mariadb-java-client-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="mariadb-java-client"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         manifest="src/main/resources/META-INF/MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.6"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.6/junit-4.6.jar" 
+         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.6/junit-4.6.jar" 
+         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
new file mode 100644
index 0000000..7ce3bfc
--- /dev/null
+++ b/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+MY_PN="client-java"
+
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	"
+fi
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils "${VCS_INHERIT}"
+
+DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${IUSE}"
+
+# Tests require a server running on localhost port 3306
+RESTRICT="test"
+
+RDEPEND="${RDEPEND} >=virtual/jre-1.6"
+DEPEND="${DEPEND} >=virtual/jdk-1.6"
+
+src_prepare() {
+	cp "${FILESDIR}/maven-build.xml" build.xml
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+}
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
new file mode 100644
index 0000000..f6b371f
--- /dev/null
+++ b/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+MY_PN="client-java"
+
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	"
+fi
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 "${VCS_INHERIT}"
+
+DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${IUSE}"
+
+# Tests require a server running on localhost port 3306
+RESTRICT="test"
+
+COMMON_DEPEND="dev-java/jna"
+RDEPEND="${RDEPEND} >=virtual/jre-1.6 ${COMMON_DEPEND}"
+DEPEND="${DEPEND} >=virtual/jdk-1.6 ${COMMON_DEPEND}"
+
+src_prepare() {
+	cp "${FILESDIR}/maven-build-1.1.4.xml" build.xml || die
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+}
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
new file mode 100644
index 0000000..46173b3
--- /dev/null
+++ b/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+MY_PN="client-java"
+
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
+	"
+fi
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils "${VCS_INHERIT}"
+
+DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="${IUSE}"
+
+# Tests require a server running on localhost port 3306
+RESTRICT="test"
+
+RDEPEND="${RDEPEND} >=virtual/jre-1.6"
+DEPEND="${DEPEND} >=virtual/jdk-1.6"
+
+src_prepare() {
+	cp "${FILESDIR}/maven-build.xml" build.xml
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+}
diff --git a/dev-java/mariadb-java-client/metadata.xml b/dev-java/mariadb-java-client/metadata.xml
new file mode 100644
index 0000000..eada174
--- /dev/null
+++ b/dev-java/mariadb-java-client/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+</use>
+</pkgmetadata>
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
new file mode 100644
index 0000000..2cfa3f2
--- /dev/null
+++ b/eclass/mysql-autotools.eclass
@@ -0,0 +1,676 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.17 2013/03/16 19:20:34 robbat2 Exp $
+
+# @ECLASS: mysql-autotools.eclass
+# @MAINTAINER:
+# MySQL Team <mysql-bugs@gentoo.org>
+# Robin H. Johnson <robbat2@gentoo.org>
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# Luca Longinotti <chtekk@gentoo.org>
+# @AUTHOR:
+# Francesco Riosa <vivo@gentoo.org> (retired)
+# @BLURB: This eclass provides support for autotools based mysql releases
+# @DESCRIPTION:
+# The mysql-autotools.eclass provides the support to build the mysql
+# ebuilds using the autotools build system. This eclass provides
+# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
+# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
+
+inherit autotools flag-o-matic multilib prefix
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql-autotools_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-autotools_disable_test() {
+
+	local rawtestname testname testsuite reason mysql_disable_file
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	mysql_disable_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+
+	# ${S}/mysql-tests/t/disabled.def
+	#
+	# ${S}/mysql-tests/suite/federated/disabled.def
+	#
+	# ${S}/mysql-tests/suite/jp/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl/t/disabled.def
+	# ${S}/mysql-tests/suite/parts/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+	# ${S}/mysql-tests/suite/binlog/t/disabled.def
+	# ${S}/mysql-tests/suite/innodb/t/disabled.def
+	if [[ -n ${testsuite} ]]; then
+		for mysql_disable_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[[ -f ${mysql_disable_file} ]] && break
+		done
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+		else
+			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-autotools_configure_minimal
+# @DESCRIPTION:
+# Helper function to configure a minimal build
+mysql-autotools_configure_minimal() {
+
+	# These are things we exclude from a minimal build, please
+	# note that the server actually does get built and installed,
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
+
+	for i in ${minimal_exclude_list} ; do
+		myconf="${myconf} --without-${i}"
+	done
+	myconf="${myconf} --with-extra-charsets=none"
+	myconf="${myconf} --enable-local-infile"
+
+	if use static ; then
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared --with-pic"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	if ! use latin1 ; then
+		myconf="${myconf} --with-charset=utf8"
+		myconf="${myconf} --with-collation=utf8_general_ci"
+	else
+		myconf="${myconf} --with-charset=latin1"
+		myconf="${myconf} --with-collation=latin1_swedish_ci"
+	fi
+
+	# MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
+	# A note is added to the configure output
+	if [[ ${PN} == "mariadb" ]]  && mysql_version_is_at_least "5.1.61" ; then
+		myconf="${myconf} --disable-distribution"
+	fi
+}
+
+# @FUNCTION: mysql-autotools_configure_common
+# @DESCRIPTION:
+# Helper function to configure the common builds
+mysql-autotools_configure_common() {
+
+	myconf="${myconf} $(use_with big-tables)"
+	myconf="${myconf} --enable-local-infile"
+	myconf="${myconf} --with-extra-charsets=all"
+	myconf="${myconf} --with-mysqld-user=mysql"
+	myconf="${myconf} --with-server"
+	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
+	myconf="${myconf} --without-libwrap"
+
+	if use static ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared --with-pic"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --with-debug=full"
+	else
+		myconf="${myconf} --without-debug"
+		if ( use cluster ); then
+			myconf="${myconf} --without-ndb-debug"
+		fi
+	fi
+
+	if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
+		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
+	elif ! use latin1 ; then
+		myconf="${myconf} --with-charset=utf8"
+		myconf="${myconf} --with-collation=utf8_general_ci"
+	else
+		myconf="${myconf} --with-charset=latin1"
+		myconf="${myconf} --with-collation=latin1_swedish_ci"
+	fi
+
+	if use embedded ; then
+		myconf="${myconf} --with-embedded-privilege-control"
+		myconf="${myconf} --with-embedded-server"
+	else
+		myconf="${myconf} --without-embedded-privilege-control"
+		myconf="${myconf} --without-embedded-server"
+	fi
+
+}
+
+# @FUNCTION: mysql-autotools_configure_51
+# @DESCRIPTION:
+# Helper function to configure 5.1 and later builds
+mysql-autotools_configure_51() {
+
+	# TODO: !!!! readd --without-readline
+	# the failure depend upon config/ac-macros/readline.m4 checking into
+	# readline.h instead of history.h
+	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
+	myconf="${myconf} --enable-assembler"
+	myconf="${myconf} --with-geometry"
+	myconf="${myconf} --with-readline"
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
+	myconf="${myconf} --without-pstack"
+	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
+
+	# This is an explict die here, because if we just forcibly disable it, then the
+	# user's data is not accessible.
+	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
+	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
+	myconf="${myconf} $(use_enable community community-features)"
+	if use community; then
+		myconf="${myconf} $(use_enable profiling)"
+	else
+		myconf="${myconf} --disable-profiling"
+	fi
+
+	# Scan for all available plugins
+	local plugins_avail="$(
+	LANG=C \
+	find "${S}" \
+		\( \
+		-name 'plug.in' \
+		-o -iname 'configure.in' \
+		-o -iname 'configure.ac' \
+		\) \
+		-print0 \
+	| xargs -0 sed -r -n \
+		-e '/^MYSQL_STORAGE_ENGINE/{
+			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
+			s~^([^ ]+).*~\1~gp;
+		}' \
+	| tr -s '\n' ' '
+	)"
+
+	# 5.1 introduces a new way to manage storage engines (plugins)
+	# like configuration=none
+	# This base set are required, and will always be statically built.
+	local plugins_sta="csv myisam myisammrg heap"
+	local plugins_dyn=""
+	local plugins_dis="example ibmdb2i"
+
+	# These aren't actually required by the base set, but are really useful:
+	plugins_sta="${plugins_sta} archive blackhole"
+
+	# Now the extras
+	if use extraengine ; then
+		# like configuration=max-no-ndb, archive and example removed in 5.1.11
+		# not added yet: ibmdb2i
+		# Not supporting as examples: example,daemon_example,ftexample
+		plugins_sta="${plugins_sta} partition"
+
+		if [[ ${PN} != "mariadb" ]] ; then
+			elog "Before using the Federated storage engine, please be sure to read"
+			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
+			plugins_dyn="${plugins_dyn} federated"
+		else
+			elog "MariaDB includes the FederatedX engine. Be sure to read"
+			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
+			plugins_dyn="${plugins_dyn} federatedx"
+		fi
+	else
+		plugins_dis="${plugins_dis} partition federated"
+	fi
+
+	# Upstream specifically requests that InnoDB always be built:
+	# - innobase, innodb_plugin
+	# Build falcon if available for 6.x series.
+	for i in innobase falcon ; do
+		[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
+	done
+	for i in innodb_plugin ; do
+		[[ -e ${S}/storage/${i} ]] && plugins_dyn="${plugins_dyn} ${i}"
+	done
+
+	# like configuration=max-no-ndb
+	if ( use cluster ) ; then
+		plugins_sta="${plugins_sta} ndbcluster partition"
+		plugins_dis="${plugins_dis//partition}"
+		myconf="${myconf} --with-ndb-binlog"
+	else
+		plugins_dis="${plugins_dis} ndbcluster"
+	fi
+
+	if [[ ${PN} == "mariadb" ]] ; then
+		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
+		# caught above.
+		# This is not optional, without it several upstream testcases fail.
+		# Also strongly recommended by upstream.
+		if [[ ${PV} < "5.2.0" ]] ; then
+			myconf="${myconf} --with-maria-tmp-tables"
+			plugins_sta="${plugins_sta} maria"
+		else
+			myconf="${myconf} --with-aria-tmp-tables"
+			plugins_sta="${plugins_sta} aria"
+		fi
+
+		[[ ( -e ${S}/storage/innobase ) || ( -e ${S}/storage/xtradb ) ]] ||
+			die "The ${P} package doesn't provide innobase nor xtradb"
+
+		for i in innobase xtradb ; do
+			[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
+		done
+
+		myconf="${myconf} $(use_with libevent)"
+
+		if mysql_version_is_at_least "5.2" ; then
+			for i in oqgraph ; do
+				use ${i} \
+				&& plugins_dyn="${plugins_dyn} ${i}" \
+				|| plugins_dis="${plugins_dis} ${i}"
+			done
+		fi
+
+		if mysql_version_is_at_least "5.2.5" ; then
+			for i in sphinx ; do
+				use ${i} \
+				&& plugins_dyn="${plugins_dyn} ${i}" \
+				|| plugins_dis="${plugins_dis} ${i}"
+			done
+		fi
+
+		#Authentication plugins
+		if mysql_version_is_at_least "5.2.11" ; then
+			for i in pam ; do
+				use ${i} \
+				&& plugins_dyn="${plugins_dyn} auth_${i}" \
+				|| plugins_dis="${plugins_dis} auth_${i}"
+			done
+		fi
+	fi
+
+	if pbxt_available && [[ ${PBXT_NEWSTYLE} == "1" ]]; then
+		use pbxt \
+		&& plugins_sta="${plugins_sta} pbxt" \
+		|| plugins_dis="${plugins_dis} pbxt"
+	fi
+
+	use static && \
+	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
+	plugins_dyn=""
+
+	# Google MySQL, bundle what upstream supports
+	if [[ ${PN} == "google-mysql" ]]; then
+		for x in innobase innodb_plugin innodb ; do
+			plugins_sta="${plugins_sta//$x}"
+			plugins_dyn="${plugins_dyn//$x}"
+		done
+		plugins_sta="${plugins_sta} innodb_plugin googlestats"
+		myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc"
+		# use system lzo for google-mysql
+		myconf="${myconf} --with-lzo2-dir=/usr"
+	fi
+
+	einfo "Available plugins: ${plugins_avail}"
+	einfo "Dynamic plugins: ${plugins_dyn}"
+	einfo "Static plugins: ${plugins_sta}"
+	einfo "Disabled plugins: ${plugins_dis}"
+
+	# These are the static plugins
+	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
+	# And the disabled ones
+	for i in ${plugins_dis} ; do
+		myconf="${myconf} --without-plugin-${i}"
+	done
+}
+
+pbxt_src_configure() {
+
+	mysql_init_vars
+
+	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+
+	einfo "Reconfiguring dir '${PWD}'"
+	eautoreconf
+
+	local myconf=""
+	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	use debug && myconf="${myconf} --with-debug=full"
+	econf ${myconf} || die "Problem configuring PBXT storage engine"
+}
+
+pbxt_src_compile() {
+
+	# TODO: is it safe/needed to use emake here ?
+	make || die "Problem making PBXT storage engine (${myconf})"
+
+	popd
+	# TODO: modify test suite for PBXT
+}
+
+pbxt_src_install() {
+
+	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+		emake install DESTDIR="${D}" || die "Failed to install PBXT"
+	popd
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-autotools_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-autotools_src_prepare() {
+
+	cd "${S}"
+
+	if [[ ${MY_EXTRAS_VER} != none ]]; then
+
+		# Apply the patches for this MySQL version
+		EPATCH_SUFFIX="patch"
+		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+		# Clean out old items
+		rm -f "${EPATCH_SOURCE}"/*
+		# Now link in right patches
+		mysql_mv_patches
+		# And apply
+		epatch
+	fi
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
+	# Additional checks, remove bundled zlib (Cluster needs this, for static
+	# memory management in zlib, leave available for Cluster)
+	if [[ "${PN}" != "mysql-cluster" ]] ; then
+		rm -f "${S}/zlib/"*.[ch]
+		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+	fi
+	rm -f "scripts/mysqlbug"
+
+	# Make charsets install in the right place
+	find . -name 'Makefile.am' \
+		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+	# Remove what needs to be recreated, so we're sure it's actually done
+	einfo "Cleaning up old buildscript files"
+	find . -name Makefile \
+		-o -name Makefile.in \
+		-o -name configure \
+		-exec rm -f {} \;
+	rm -f "ltmain.sh"
+	rm -f "scripts/mysqlbug"
+
+	local rebuilddirlist d
+
+	if xtradb_patch_available && use xtradb ; then
+		einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
+		pushd "${S}"/storage >/dev/null
+		i="innobase"
+		o="${WORKDIR}/storage-${i}.mysql-upstream"
+		# Have we been here already?
+		[[ -d ${o} ]] && rm -f "${i}"
+		# Or maybe we haven't
+		[[ ( -d ${i} ) && ! ( -d ${o} ) ]] && mv "${i}" "${o}"
+		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
+		popd >/dev/null
+	fi
+
+	if pbxt_patch_available && [[ ${PBXT_NEWSTYLE} == "1" ]] && use pbxt ; then
+		einfo "Adding storage engine: PBXT"
+		pushd "${S}"/storage >/dev/null
+		i='pbxt'
+		[[ -d ${i} ]] && rm -rf "${i}"
+		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+		f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
+		[[ -f $f ]] && epatch "$f"
+		popd >/dev/null
+	fi
+
+	rebuilddirlist="."
+	# This does not seem to be needed presently. robbat2 2010/02/23
+	#einfo "Updating innobase cmake"
+	## TODO: check this with a cmake expert
+	#cmake \
+	#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
+	#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
+	#	"storage/innobase"
+
+	for d in ${rebuilddirlist} ; do
+		einfo "Reconfiguring dir '${d}'"
+		pushd "${d}" &>/dev/null
+		eautoreconf
+		popd &>/dev/null
+	done
+}
+
+# @FUNCTION: mysql-autotools_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-autotools_src_configure() {
+	# bug 401733
+	export QA_CONFIGURE_OPTIONS=".*"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# $myconf is modified by the configure_* functions
+	local myconf=""
+
+	if use minimal ; then
+		mysql-autotools_configure_minimal
+	else
+		mysql-autotools_configure_common
+		mysql-autotools_configure_51
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# glib-2.3.2_pre fix, bug #16496
+	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
+	# fail badly during cluster startup.
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector-all"
+	fi
+
+	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# storage/googlestats, sql/ in google-mysql are using C++ templates
+	# implicitly. Upstream might be interested in this, exclude
+	# -fno-implicit-templates for google-mysql for now.
+	mysql_version_is_at_least "5.0" \
+	&& [[ ${PN} != "google-mysql" ]] \
+	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
+	# causes a mis-compile.
+	# Upstream bugs:
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
+	# http://bugs.mysql.com/bug.php?id=45205
+	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
+		append-flags -fno-omit-frame-pointer && \
+		filter-flags -fomit-frame-pointer
+
+	econf \
+		--libexecdir="${EPREFIX}/usr/sbin" \
+		--sysconfdir="${MY_SYSCONFDIR}" \
+		--localstatedir="${MY_LOCALSTATEDIR}" \
+		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
+		--libdir="${MY_LIBDIR}" \
+		--includedir="${MY_INCLUDEDIR}" \
+		--with-low-memory \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--without-docs \
+		--with-LIBDIR="$(get_libdir)" \
+		${myconf} || die "econf failed"
+
+	# TODO: Move this before autoreconf !!!
+	find . -type f -name Makefile -print0 \
+	| xargs -0 -n100 sed -i \
+	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
+
+	if [[ $EAPI == 2 ]] && [[ ${PBXT_NEWSTYLE} != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_configure
+	fi
+}
+
+# @FUNCTION: mysql-autotools_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-autotools_src_compile() {
+
+	emake || die "emake failed"
+
+	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_compile
+	fi
+}
+
+# @FUNCTION: mysql-autotools_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-autotools_src_install() {
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	emake install \
+		DESTDIR="${D}" \
+		benchdir_root="${MY_SHAREDSTATEDIR}" \
+		testroot="${MY_SHAREDSTATEDIR}" \
+		|| die "emake install failed"
+
+	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_install
+	fi
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# Various junk (my-*.cnf moved elsewhere)
+	einfo "Removing duplicate /usr/share/mysql files"
+	rm -Rf "${ED}/usr/share/info"
+	for removeme in  "mysql-log-rotate" mysql.server* \
+		binary-configure* my-*.cnf mi_test_all*
+	do
+		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
+	done
+
+	# Clean up stuff for a minimal build
+	if use minimal ; then
+		einfo "Remove all extra content for minimal build"
+		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+		rm -f "${ED}/usr/sbin/mysqld"
+		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if use !test ; then
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+	fi
+
+	# Configuration stuff
+	case ${MYSQL_PV_MAJOR} in
+		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
+	esac
+	einfo "Building default my.cnf (${mysql_mycnf_version})"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	doins scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-${mysql_mycnf_version}"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		-e "s!/tmp!${EPREFIX}/tmp!" \
+		-e "s!/usr!${EPREFIX}/usr!" \
+		-e "s!= /var!= ${EPREFIX}/var!" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR}/my.cnf.ok"
+	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Creating initial directories"
+		# Empty directories ...
+		diropts "-m0750"
+		keepdir "${MY_DATADIR#${EPREFIX}}"
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
+		done
+	fi
+
+	# Docs
+	einfo "Installing docs"
+	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
+		[[ -f $i ]] && dodoc "$i"
+	done
+	doinfo "${S}"/Docs/mysql.info
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini
+		do
+			[[ -f $script ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+		done
+
+	fi
+
+	mysql_lib_symlinks "${ED}"
+
+	#Remove mytop if perl is not selected
+	[[ ${PN} == "mariadb" ]] && ! use perl \
+	&& mysql_version_is_at_least "5.3" \
+	&& rm -f "${ED}/usr/bin/mytop"
+
+	#Bug 455462 remove unnecessary libtool files
+	prune_libtool_files --modules
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
new file mode 100644
index 0000000..81159ac
--- /dev/null
+++ b/eclass/mysql-cmake.eclass
@@ -0,0 +1,485 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $
+
+# @ECLASS: mysql-cmake.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides the support for cmake based mysql releases
+# @DESCRIPTION:
+# The mysql-cmake.eclass provides the support to build the mysql
+# ebuilds using the cmake build system. This eclass provides
+# the src_prepare, src_configure, src_compile, and src_install
+# phase hooks.
+
+inherit cmake-utils flag-o-matic multilib prefix eutils
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_cmake_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-cmake_disable_test() {
+
+	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	for mysql_disabled_file in \
+		${S}/mysql-test/disabled.def  \
+		${S}/mysql-test/t/disabled.def ; do
+		[[ -f ${mysql_disabled_file} ]] && break
+	done
+	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
+
+	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
+		for mysql_disabled_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[[ -f ${mysql_disabled_file} ]] && break
+		done
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
+		else
+			for mysql_disabled_dir in \
+				${S}/mysql-test/suite/${testsuite} \
+				${S}/mysql-test/suite/${testsuite}/t  \
+				FAILED ; do
+				[[ -d ${mysql_disabled_dir} ]] && break
+			done
+			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
+				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
+			else
+				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+			fi
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-cmake_use_plugin
+# @DESCRIPTION:
+# Helper function to enable/disable plugins by use flags
+# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
+# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
+mysql-cmake_use_plugin() {
+	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
+	if use_if_iuse $1 ; then
+		echo "-DWITH_$2=1"
+	else
+		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
+	fi
+}
+
+# @FUNCTION: configure_cmake_locale
+# @DESCRIPTION:
+# Helper function to configure locale cmake options
+configure_cmake_locale() {
+
+	if ! use minimal && [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+
+	elif ! use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8
+			-DDEFAULT_COLLATION=utf8_general_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	fi
+}
+
+# @FUNCTION: configure_cmake_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal build
+configure_cmake_minimal() {
+
+	mycmakeargs+=(
+		-DWITHOUT_SERVER=1
+		-DWITHOUT_EMBEDDED_SERVER=1
+		-DEXTRA_CHARSETS=none
+		-DINSTALL_SQLBENCHDIR=
+		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
+		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITHOUT_CSV_STORAGE_ENGINE=1
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+		-DWITHOUT_HEAP_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+	)
+}
+
+# @FUNCTION: configure_cmake_standard
+# @DESCRIPTION:
+# Helper function to configure standard build
+configure_cmake_standard() {
+
+	mycmakeargs+=(
+		-DEXTRA_CHARSETS=all
+		-DMYSQL_USER=mysql
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		$(cmake-utils_use_disable !static SHARED)
+		$(cmake-utils_use_with debug)
+		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
+		$(cmake-utils_use_with profiling)
+		$(cmake-utils_use_enable systemtap DTRACE)
+		$(cmake-utils_use_enable static-libs STATIC_LIBS)
+	)
+
+	if use static; then
+		mycmakeargs+=( -DWITH_PIC=1 )
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	if use tcmalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	# Storage engines
+	mycmakeargs+=(
+		-DWITH_ARCHIVE_STORAGE_ENGINE=1
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITH_CSV_STORAGE_ENGINE=1
+		-DWITH_HEAP_STORAGE_ENGINE=1
+		-DWITH_INNOBASE_STORAGE_ENGINE=1
+		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITH_MYISAM_STORAGE_ENGINE=1
+		-DWITH_PARTITION_STORAGE_ENGINE=1
+		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
+	)
+
+	if in_iuse pbxt ; then
+		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
+	fi
+
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+		mycmakeargs+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin extraengine FEDERATEDX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+		)
+
+		if mysql_version_is_at_least 10.0.5 ; then
+			# CassandraSE needs Apache Thrift which is not in portage
+			# TODO: Add use and deps for Connect SE external deps
+			mycmakeargs+=(
+				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
+				$(mysql-cmake_use_plugin extraengine SEQUENCE)
+				$(mysql-cmake_use_plugin extraengine SPIDER)
+				$(mysql-cmake_use_plugin extraengine CONNECT)
+				-DCONNECT_WITH_MYSQL=1
+				$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
+				$(cmake-utils_use odbc CONNECT_WITH_ODBC)
+			)
+		fi
+	fi
+
+	if [[ ${PN} == "percona-server" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with pam)
+		)
+	fi
+
+	if [[ ${PN} == "mysql-cluster" ]]; then
+		# TODO: This really should include the following options,
+		# but the memcached package doesn't install the files it seeks.
+		# -DWITH_BUNDLED_MEMCACHED=OFF
+		# -DMEMCACHED_HOME=${EPREFIX}/usr
+		mycmakeargs+=(
+			-DWITH_BUNDLED_LIBEVENT=OFF
+			$(cmake-utils_use_with java NDB_JAVA)
+		)
+	fi
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-cmake_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-cmake_src_prepare() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	cd "${S}"
+
+	if [[ ${MY_EXTRAS_VER} != none ]]; then
+
+		# Apply the patches for this MySQL version
+		EPATCH_SUFFIX="patch"
+		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+		# Clean out old items
+		rm -f "${EPATCH_SOURCE}"/*
+		# Now link in right patches
+		mysql_mv_patches
+		# And apply
+		epatch
+	fi
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
+	rm -f "scripts/mysqlbug"
+	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if in_iuse tokudb ; then
+		# Don't build bundled xz-utils
+		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
+	fi
+
+	epatch_user
+}
+
+# @FUNCTION: mysql-cmake_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-cmake_src_configure() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
+		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
+		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
+		-DSYSCONFDIR=${EPREFIX}/etc/mysql
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${P}
+		-DINSTALL_DOCREADMEDIR=share/doc/${P}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_ELIBDIR=$(get_libdir)/mysql
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_SQLBENCHDIR=share/mysql
+		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		$(cmake-utils_use_with test UNIT_TESTS)
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+	)
+
+	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+		mycmakeargs+=( -DWITH_EDITLINE=system )
+	fi
+
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# Bug 412851
+	# MariaDB requires this flag to compile with GPLv3 readline linked
+	# Adds a warning about redistribution to configure
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
+	fi
+
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+		if use jemalloc ; then
+			mycmakeargs+=( -DWITH_JEMALLOC="system" )
+		else
+			mycmakeargs+=( -DWITH_JEMALLOC=no )
+		fi
+		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
+	fi
+
+	configure_cmake_locale
+
+	if use minimal ; then
+		configure_cmake_minimal
+	else
+		configure_cmake_standard
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors"
+	# Causes linkage failures.  Upstream bug #59607 removes it
+	if ! mysql_version_is_at_least "5.6" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	fi
+	# As of 5.7, exceptions and rtti are used!
+	if ! mysql_version_is_at_least "5.7" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	cmake-utils_src_configure
+}
+
+# @FUNCTION: mysql-cmake_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-cmake_src_compile() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	cmake-utils_src_compile
+}
+
+# @FUNCTION: mysql-cmake_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-cmake_src_install() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	cmake-utils_src_install
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# Create a mariadb_config symlink
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	rm -Rf "${ED}/usr/data"
+
+	# Various junk (my-*.cnf moved elsewhere)
+	einfo "Removing duplicate /usr/share/mysql files"
+
+	# Clean up stuff for a minimal build
+#	if use minimal ; then
+#		einfo "Remove all extra content for minimal build"
+#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+#		rm -f "${ED}/usr/sbin/mysqld"
+#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+#	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+	fi
+
+	# Configuration stuff
+	case ${MYSQL_PV_MAJOR} in
+		5.[1-4]*) mysql_mycnf_version="5.1" ;;
+		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
+	esac
+	einfo "Building default my.cnf (${mysql_mycnf_version})"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	doins scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-${mysql_mycnf_version}"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR}/my.cnf.ok"
+	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Creating initial directories"
+		# Empty directories ...
+		diropts "-m0750"
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
+		done
+	fi
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f $script ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+		done
+	fi
+
+#	cat <<-EOF > "${T}"/80mysql-libdir
+#	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+#	EOF
+#	doenvd "${T}"/80mysql-libdir
+
+	#Remove mytop if perl is not selected
+	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
+	&& rm -f "${ED}/usr/bin/mytop"
+}
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
new file mode 100644
index 0000000..e2dd614
--- /dev/null
+++ b/eclass/mysql-multilib.eclass
@@ -0,0 +1,859 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: mysql-multilib.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql-multilib.eclass is the base eclass to build the mysql and
+# alternative projects (mariadb and percona) ebuilds.
+# This eclass uses the mysql-cmake eclass for the
+# specific bits related to the build system.
+# It provides the src_unpack, src_prepare, src_configure, src_compile,
+# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+MYSQL_EXTRAS=""
+
+# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
+# @DESCRIPTION:
+# The version of the MYSQL_EXTRAS repo to use to build mysql
+# Use "none" to disable it's use
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
+
+inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+	toolchain-funcs user cmake-utils multilib-build
+
+#
+# Supported EAPI versions and export functions
+#
+
+case "${EAPI:-0}" in
+	5) ;;
+	*) die "Unsupported EAPI: ${EAPI}" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
+
+#
+# VARIABLES:
+#
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
+if [[ ${MY_EXTRAS_VER} == "live" ]]; then
+	EGIT_PROJECT=mysql-extras
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+	RESTRICT="userpriv"
+fi
+
+# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# mysql_upgrade.
+MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+
+# Cluster is a special case...
+if [[ "${PN}" == "mysql-cluster" ]]; then
+	case $PV in
+		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+	esac
+fi
+
+# @ECLASS-VARIABLE: MYSQL_VERSION_ID
+# @DESCRIPTION:
+# MYSQL_VERSION_ID will be:
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
+# This is an important part, because many of the choices the MySQL ebuild will do
+# depend on this variable.
+# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
+MYSQL_VERSION_ID=""
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3 ; do
+	# pad to length 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number by BASH)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# This eclass should only be used with at least mysql-5.5.35
+mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35"
+
+# @ECLASS-VARIABLE: XTRADB_VER
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Version of the XTRADB storage engine
+
+# @ECLASS-VARIABLE: PERCONA_VER
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Designation by PERCONA for a MySQL version to apply an XTRADB release
+
+# Work out the default SERVER_URI correctly
+if [[ -z ${SERVER_URI} ]]; then
+	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
+		mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
+			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
+		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
+		SERVER_URI="
+		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		"
+		if [[ ${PN} == "mariadb-galera" ]]; then
+			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
+		fi
+	elif [[ ${PN} == "percona-server" ]]; then
+		PERCONA_PN="Percona-Server"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		MY_PV=$(get_version_component_range 1-3 ${PV})
+		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
+		PERCONA_RC=$(get_version_component_range 6 ${PV})
+		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
+#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz
+#		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
+	else
+		if [[ "${PN}" == "mysql-cluster" ]] ; then
+			URI_DIR="MySQL-Cluster"
+			URI_FILE="mysql-cluster-gpl"
+		else
+			URI_DIR="MySQL"
+			URI_FILE="mysql"
+		fi
+		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		# Recently upstream switched to an archive site, and not on mirrors
+		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
+					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
+	fi
+fi
+
+# Define correct SRC_URIs
+SRC_URI="${SERVER_URI}"
+
+# Gentoo patches to MySQL
+if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
+HOMEPAGE="http://www.mysql.com/"
+if [[ ${PN} == "mariadb" ]]; then
+	HOMEPAGE="http://mariadb.org/"
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+fi
+if [[ ${PN} == "mariadb-galera" ]]; then
+	HOMEPAGE="http://mariadb.org/"
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
+fi
+if [[ ${PN} == "percona-server" ]]; then
+	HOMEPAGE="http://www.percona.com/software/percona-server"
+	DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal 
+	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+	IUSE="${IUSE} oqgraph pam sphinx tokudb"
+	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \
+		REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )"
+	REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
+fi
+
+if [[ ${PN} == "percona-server" ]]; then
+	IUSE="${IUSE} pam"
+fi
+
+REQUIRED_USE="
+	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
+	 minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+
+#
+# DEPENDENCIES:
+#
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+DEPEND="
+	ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?]
+	)
+	kernel_linux? ( 
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	amd64? ( abi_x86_32? (
+		app-emulation/emul-linux-x86-baselibs[abi_x86_32]
+	) )
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+	!dev-db/mariadb-native-client[mysqlcompat]
+	jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+"
+
+# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
+else
+	DEPEND="${DEPEND} >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]"
+fi
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	# Bug 441700 MariaDB >=5.3 include custom mytop
+	DEPEND="${DEPEND} 
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= )
+		sphinx? ( app-misc/sphinx:0= )
+		!minimal? ( pam? ( virtual/pam:0= ) )
+		perl? ( !dev-db/mytop )"
+	if mysql_version_is_at_least "10.0.5" ; then
+		DEPEND="${DEPEND}
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			"
+	fi
+	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
+	if mysql_version_is_at_least "10.0.9" ; then
+		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \
+		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
+	fi
+fi
+
+# Having different flavours at the same time is not a good idea
+for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
+	[[ ${i} == ${PN} ]] ||
+	DEPEND="${DEPEND} !dev-db/${i}"
+done
+
+if [[ ${PN} == "mysql-cluster" ]] ; then
+	# TODO: This really should include net-misc/memcached
+	# but the package does not install the files it seeks.
+	mysql_version_is_at_least "7.2.3" && \
+		DEPEND="${DEPEND} dev-libs/libevent:0="
+fi
+
+# prefix: first need to implement something for #196294
+RDEPEND="${DEPEND}
+	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	selinux? ( sec-policy/selinux-mysql )
+"
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	# Bug 455016 Add dependencies of mytop
+	RDEPEND="${RDEPEND} perl? (
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes ) "
+fi
+
+if [[ ${PN} == "mariadb-galera" ]] ; then
+	# The wsrep API version must match between the ebuild and sys-cluster/galera.
+	# This will be indicated by WSREP_REVISION in the ebuild and the first number
+	# in the version of sys-cluster/galera
+	RDEPEND="${RDEPEND} 
+		=sys-cluster/galera-${WSREP_REVISION}*
+	"
+fi
+
+if [[ ${PN} == "mysql-cluster" ]] ; then
+       mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
+               DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
+fi
+
+# compile-time-only
+DEPEND="${DEPEND}
+	virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	>=dev-util/cmake-2.8.9
+"
+
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	 ~virtual/mysql-${MYSQL_PV_MAJOR}"
+
+# my_config.h includes ABI specific data
+MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h )
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql-multilib_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-multilib_disable_test() {
+	mysql-cmake_disable_test "$@"
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-multilib_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+#   create new user and group for mysql
+#   warn about deprecated features
+mysql-multilib_pkg_setup() {
+
+	if has test ${FEATURES} ; then
+		if ! use minimal ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+
+	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
+		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
+		ewarn "5.1 series should NOT be put into production. In the near"
+		ewarn "future, it will be disabled from building."
+	fi
+
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
+	fi
+
+	if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+		die
+	fi
+
+}
+
+# @FUNCTION: mysql-multilib_src_unpack
+# @DESCRIPTION:
+# Unpack the source code
+mysql-multilib_src_unpack() {
+
+	# Initialize the proper variables first
+	mysql_init_vars
+
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
+
+	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+}
+
+# @FUNCTION: mysql-multilib_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-multilib_src_prepare() {
+	mysql-cmake_src_prepare "$@"
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
+	fi
+}
+
+
+# @FUNCTION: mysql-multilib_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_mysql-multilib_src_configure() {
+
+		debug-print-function ${FUNCNAME} "$@"
+
+		CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+		# debug hack wrt #497532
+		mycmakeargs=(
+			-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
+			-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
+			-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
+			-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
+			-DSYSCONFDIR=${EPREFIX}/etc/mysql
+			-DINSTALL_BINDIR=bin
+			-DINSTALL_DOCDIR=share/doc/${P}
+			-DINSTALL_DOCREADMEDIR=share/doc/${P}
+			-DINSTALL_INCLUDEDIR=include/mysql
+			-DINSTALL_INFODIR=share/info
+			-DINSTALL_LIBDIR=$(get_libdir)
+			-DINSTALL_ELIBDIR=$(get_libdir)/mysql
+			-DINSTALL_MANDIR=share/man
+			-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
+			-DINSTALL_MYSQLSHAREDIR=share/mysql
+			-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
+			-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+			-DINSTALL_SBINDIR=sbin
+			-DINSTALL_SCRIPTDIR=share/mysql/scripts
+			-DINSTALL_SQLBENCHDIR=share/mysql
+			-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
+			-DWITH_COMMENT="Gentoo Linux ${PF}"
+			$(cmake-utils_use_with test UNIT_TESTS)
+			-DWITH_READLINE=0
+			-DWITH_LIBEDIT=0
+			-DWITH_ZLIB=system
+			-DWITHOUT_LIBWRAP=1
+			-DENABLED_LOCAL_INFILE=1
+			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		)
+
+		if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+			mycmakeargs+=( -DWITH_EDITLINE=system )
+		fi
+
+		if use ssl; then
+			mycmakeargs+=( -DWITH_SSL=system )
+		else
+			mycmakeargs+=( -DWITH_SSL=bundled )
+		fi
+
+		# Bug 412851
+		# MariaDB requires this flag to compile with GPLv3 readline linked
+		# Adds a warning about redistribution to configure
+		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+			mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
+
+                	if use jemalloc ; then
+                        	mycmakeargs+=( -DWITH_JEMALLOC="system" )
+	                else
+        	                mycmakeargs+=( -DWITH_JEMALLOC=no )
+                	fi
+			# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
+#			mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
+	        fi
+
+		configure_cmake_locale
+
+		if multilib_build_binaries ; then
+			if use minimal ; then
+				configure_cmake_minimal
+			else
+				configure_cmake_standard
+			fi
+		else
+			configure_cmake_minimal
+		fi
+
+		# Bug #114895, bug #110149
+		filter-flags "-O" "-O[01]"
+
+		CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+		# Causes linkage failures.  Upstream bug #59607 removes it
+		if ! mysql_version_is_at_least "5.6" ; then
+			CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+		fi
+		# As of 5.7, exceptions are used!
+		if ! mysql_version_is_at_least "5.7" ; then
+			CXXFLAGS="${CXXFLAGS} -fno-exceptions"
+		fi
+		export CXXFLAGS
+
+		# bug #283926, with GCC4.4, this is required to get correct behavior.
+		append-flags -fno-strict-aliasing
+
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
+}
+
+# @FUNCTION: mysql-multilib_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-multilib_src_compile() {
+	#_mysql-multilib_src_compile() {
+	#
+	#	if ! multilib_build_binaries ; then
+	#		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
+	#	else
+	#		cmake-utils_src_compile
+	#	fi
+	#}
+
+	debug-print-function ${FUNCNAME} "$@"
+
+#	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
+	multilib_foreach_abi cmake-utils_src_compile "${@}"
+}
+
+# @FUNCTION: mysql-multilib_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-multilib_src_install() {
+	_mysql-multilib_src_install() {
+		debug-print-function ${FUNCNAME} "$@"
+
+		if multilib_build_binaries; then
+			mysql-cmake_src_install
+		else
+		#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
+			cmake-utils_src_install
+			if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
+				insinto /usr/include/mysql/private
+				doins sql/*.h
+			fi
+			
+		fi
+		# Do multilib magic only when >1 ABI is used.
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			# Make sure all headers are the same for each ABI.
+			multilib_check_headers
+		fi
+	}
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	multilib_foreach_abi _mysql-multilib_src_install "${@}"
+	multilib_install_wrappers
+}
+
+# @FUNCTION: mysql-multilib_pkg_preinst
+# @DESCRIPTION:
+# Call java-pkg-opt-2 eclass when mysql-cluster is installed
+mysql-multilib_pkg_preinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
+	fi
+}
+
+# @FUNCTION: mysql-multilib_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+#   create the dir for logfiles if non-existant
+#   touch the logfiles and secure them
+#   install scripts
+#   issue required steps for optional features
+#   issue deprecation warnings
+mysql-multilib_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Check FEATURES="collision-protect" before removing this
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	# Secure the logfiles
+	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		docinto "support-files"
+		for script in \
+			support-files/my-*.cnf \
+			support-files/magic \
+			support-files/ndb-config-2-node.ini
+		do
+			[[ -f "${script}" ]] \
+			&& dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in scripts/mysql* ; do
+			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
+				dodoc "${script}"
+			fi
+		done
+
+		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+			if use_if_iuse pam ; then
+				einfo
+				elog "This install includes the PAM authentication plugin."
+				elog "To activate and configure the PAM plugin, please read:"
+				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
+				einfo
+			fi
+		fi
+
+		einfo
+		elog "You might want to run:"
+		elog "\"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+
+		einfo
+		elog "If you are upgrading major versions, you should run the"
+		elog "mysql_upgrade tool."
+		einfo
+	fi
+}
+
+# @FUNCTION: mysql-multilib_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-multilib_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql-multilib_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-multilib_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
+# @FUNCTION: mysql-multilib_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
+mysql-multilib_pkg_config() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+
+	if built_with_use ${CATEGORY}/${PN} minimal ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)"
+	fi
+	MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql-multilib_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql-multilib_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now, in the"
+		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options="--log-warnings=0"
+	local sqltmp="$(emktemp)"
+
+	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	[[ -r "${help_tables}" ]] \
+	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+	|| touch "${TMPDIR}/fill_help_tables.sql"
+	help_tables="${TMPDIR}/fill_help_tables.sql"
+
+	# Figure out which options we need to disable to do the setup
+	helpfile="${TMPDIR}/mysqld-help"
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated innodb ssl log-bin relay-log slow-query-log external-locking \
+		ndbcluster log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+	# But some options changed names
+	egrep -sq external-locking "${helpfile}" && \
+	options="${options/skip-locking/skip-external-locking}"
+
+	use prefix || options="${options} --user=mysql"
+
+	# Fix bug 446200.  Don't reference host my.cnf
+	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
+		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	pushd "${TMPDIR}" &>/dev/null
+	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
+	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
+	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	einfo "Command: $cmd"
+	eval $cmd \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir "${PID_DIR}"
+		chown mysql:mysql "${PID_DIR}"
+		chmod 755 "${PID_DIR}"
+	fi
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--user=mysql \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--default-storage-engine=MyISAM \
+		--socket=${socket} \
+		--pid-file=${pidfile}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-uroot \
+		--password="${MYSQL_ROOT_PASSWORD}" \
+		mysql < "${sqltmp}"
+	rc=$?
+	eend $?
+	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
new file mode 100644
index 0000000..67f9499
--- /dev/null
+++ b/eclass/mysql-v2.eclass
@@ -0,0 +1,878 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $
+
+# @ECLASS: mysql-v2.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql-v2.eclass is the base eclass to build the mysql and
+# alternative projects (mariadb and percona) ebuilds.
+# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
+# specific bits related to the build system.
+# It provides the src_unpack, src_prepare, src_configure, src_compile,
+# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+# @ECLASS-VARIABLE: BUILD
+# @DESCRIPTION:
+# Build type of the mysql version
+: ${BUILD:=autotools}
+
+case ${BUILD} in
+	"cmake")
+		BUILD_INHERIT="mysql-cmake"
+		;;
+	"autotools")
+		BUILD_INHERIT="mysql-autotools"
+
+		WANT_AUTOCONF="latest"
+		WANT_AUTOMAKE="latest"
+		;;
+	*)
+		die "${BUILD} is not a valid build system for mysql"
+		;;
+esac
+
+MYSQL_EXTRAS=""
+
+# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
+# @DESCRIPTION:
+# The version of the MYSQL_EXTRAS repo to use to build mysql
+# Use "none" to disable it's use
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
+
+inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
+
+#
+# Supported EAPI versions and export functions
+#
+
+case "${EAPI:-0}" in
+	4|5) ;;
+	*) die "Unsupported EAPI: ${EAPI}" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
+
+#
+# VARIABLES:
+#
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
+if [[ ${MY_EXTRAS_VER} == "live" ]]; then
+	EGIT_PROJECT=mysql-extras
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+	RESTRICT="userpriv"
+fi
+
+# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# mysql_upgrade.
+MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+
+# Cluster is a special case...
+if [[ "${PN}" == "mysql-cluster" ]]; then
+	case $PV in
+		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
+		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+	esac
+fi
+
+# @ECLASS-VARIABLE: MYSQL_VERSION_ID
+# @DESCRIPTION:
+# MYSQL_VERSION_ID will be:
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
+# This is an important part, because many of the choices the MySQL ebuild will do
+# depend on this variable.
+# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
+MYSQL_VERSION_ID=""
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3 ; do
+	# pad to length 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number by BASH)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# This eclass should only be used with at least mysql-5.1.50
+mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
+
+# @ECLASS-VARIABLE: XTRADB_VER
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Version of the XTRADB storage engine
+
+# @ECLASS-VARIABLE: PERCONA_VER
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Designation by PERCONA for a MySQL version to apply an XTRADB release
+
+# Work out the default SERVER_URI correctly
+if [[ -z ${SERVER_URI} ]]; then
+	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
+		mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
+			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
+		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
+		SERVER_URI="
+		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		"
+		if [[ ${PN} == "mariadb-galera" ]]; then
+			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
+		fi
+	elif [[ ${PN} == "percona-server" ]]; then
+		PERCONA_PN="Percona-Server"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		MY_PV=$(get_version_component_range 1-3 ${PV})
+		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
+		PERCONA_RC=$(get_version_component_range 6 ${PV})
+		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
+#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz
+#		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
+	else
+		if [[ "${PN}" == "mysql-cluster" ]] ; then
+			URI_DIR="MySQL-Cluster"
+			URI_FILE="mysql-cluster-gpl"
+		else
+			URI_DIR="MySQL"
+			URI_FILE="mysql"
+		fi
+		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		# Recently upstream switched to an archive site, and not on mirrors
+		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
+					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
+	fi
+fi
+
+# Define correct SRC_URIs
+SRC_URI="${SERVER_URI}"
+
+# Gentoo patches to MySQL
+if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
+HOMEPAGE="http://www.mysql.com/"
+if [[ ${PN} == "mariadb" ]]; then
+	HOMEPAGE="http://mariadb.org/"
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+fi
+if [[ ${PN} == "mariadb-galera" ]]; then
+	HOMEPAGE="http://mariadb.org/"
+	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
+fi
+if [[ ${PN} == "percona-server" ]]; then
+	HOMEPAGE="http://www.percona.com/software/percona-server"
+	DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+case "${BUILD}" in
+	"autotools")
+		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
+		;;
+	"cmake")
+		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
+		;;
+esac
+
+# Common IUSE
+IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
+	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
+		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
+	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
+		REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
+	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
+	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \
+		REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
+	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
+		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )"
+fi
+
+if mysql_version_is_at_least "5.5"; then
+	REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
+	IUSE="${IUSE} jemalloc tcmalloc"
+fi
+
+if mysql_version_is_at_least "5.5.7"; then
+	IUSE="${IUSE} systemtap"
+fi
+
+if [[ ${PN} == "percona-server" ]]; then
+	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
+fi
+
+REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+
+#
+# DEPENDENCIES:
+#
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	kernel_linux? ( sys-process/procps )
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-libs/zlib-1.2.3
+"
+# TODO: add this as a dep if it is moved from the overlay
+#	!dev-db/mariadb-native-client[mysqlcompat]
+
+# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
+	DEPEND="${DEPEND} dev-libs/libedit"
+else
+	DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+fi
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
+	mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
+	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
+	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
+	# Bug 441700 MariaDB >=5.3 include custom mytop
+	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
+	if mysql_version_is_at_least "10.0.5" ; then
+		DEPEND="${DEPEND}
+			odbc? ( dev-db/unixODBC )
+			xml? ( dev-libs/libxml2 )
+			"
+	fi
+	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
+	if mysql_version_is_at_least "10.0.9" ; then
+		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \
+			DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
+	fi
+fi
+
+# Having different flavours at the same time is not a good idea
+for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
+	[[ ${i} == ${PN} ]] ||
+	DEPEND="${DEPEND} !dev-db/${i}"
+done
+
+if mysql_version_is_at_least "5.5.7" ; then
+	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] ) 
+	tcmalloc? ( dev-util/google-perftools )
+	>=sys-libs/zlib-1.2.3[static-libs?]
+        ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	kernel_linux? ( dev-libs/libaio )"
+fi
+
+if [[ ${PN} == "mysql-cluster" ]] ; then
+	# TODO: This really should include net-misc/memcached
+	# but the package does not install the files it seeks.
+	mysql_version_is_at_least "7.2.3" && \
+		DEPEND="${DEPEND} dev-libs/libevent"
+fi
+
+# prefix: first need to implement something for #196294
+RDEPEND="${DEPEND}
+	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	selinux? ( sec-policy/selinux-mysql )
+"
+
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	# Bug 455016 Add dependencies of mytop
+	if mysql_version_is_at_least "5.3" ; then
+		RDEPEND="${RDEPEND} perl? (
+			virtual/perl-Getopt-Long
+			dev-perl/TermReadKey
+			virtual/perl-Term-ANSIColor
+			virtual/perl-Time-HiRes ) "
+	fi
+fi
+
+if [[ ${PN} == "mariadb-galera" ]] ; then
+	# The wsrep API version must match between the ebuild and sys-cluster/galera.
+	# This will be indicated by WSREP_REVISION in the ebuild and the first number
+	# in the version of sys-cluster/galera
+	RDEPEND="${RDEPEND} 
+		=sys-cluster/galera-${WSREP_REVISION}*
+	"
+fi
+
+if [[ ${PN} == "mysql-cluster" ]] ; then
+       mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
+               DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
+fi
+
+DEPEND="${DEPEND}
+	virtual/yacc
+"
+
+DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
+
+# compile-time-only
+DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
+
+# compile-time-only
+if mysql_version_is_at_least "5.5.8" ; then
+	DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
+fi
+
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+# For other stuff to bring us in
+PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
+
+#
+# External patches
+#
+
+# MariaDB has integrated PBXT until it was dropped in version 5.5.33
+# PBXT_VERSION means that we have a PBXT patch for this PV
+# PBXT was only introduced after 5.1.12
+pbxt_patch_available() {
+	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
+	return $?
+}
+
+pbxt_available() {
+	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
+	return $?
+}
+
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
+# MariaDB has integrated XtraDB
+# XTRADB_VERS means that we have a XTRADB patch for this PV
+# XTRADB was only introduced after 5.1.26
+xtradb_patch_available() {
+	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
+		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
+	return $?
+}
+
+if pbxt_patch_available; then
+
+	PBXT_P="pbxt-${PBXT_VERSION}"
+	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
+	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
+fi
+
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
+if pbxt_available; then
+
+	IUSE="${IUSE} pbxt"
+	PBXT_NEWSTYLE=1
+	REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
+fi
+
+if xtradb_patch_available; then
+	XTRADB_P="percona-xtradb-${XTRADB_VER}"
+	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
+	XTRADB_SRC_B1="http://www.percona.com/"
+	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
+	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
+	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
+	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
+	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
+	IUSE="${IUSE} xtradb"
+	REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
+fi
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql-v2_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-v2_disable_test() {
+	${BUILD_INHERIT}_disable_test "$@"
+}
+
+# @FUNCTION: mysql-v2_configure_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal build
+configure_minimal() {
+	${BUILD_INHERIT}_configure_minimal "$@"
+}
+
+# @FUNCTION: mysql-v2_configure_common
+# @DESCRIPTION:
+# Helper function to configure common builds
+configure_common() {
+	${BUILD_INHERIT}_configure_common "$@"
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-v2_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+#   check for conflicting use flags
+#   create new user and group for mysql
+#   warn about deprecated features
+mysql-v2_pkg_setup() {
+
+	if has test ${FEATURES} ; then
+		if ! use minimal ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	# Check for USE flag problems in pkg_setup
+	if ! mysql_version_is_at_least "5.2" && use debug ; then
+		# Also in package.use.mask
+		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+
+	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
+		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
+		ewarn "5.1 series should NOT be put into production. In the near"
+		ewarn "future, it will be disabled from building."
+	fi
+
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
+	fi
+
+	if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+		die
+	fi
+
+}
+
+# @FUNCTION: mysql-v2_src_unpack
+# @DESCRIPTION:
+# Unpack the source code
+mysql-v2_src_unpack() {
+
+	# Initialize the proper variables first
+	mysql_init_vars
+
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
+
+	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+}
+
+# @FUNCTION: mysql-v2_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-v2_src_prepare() {
+	${BUILD_INHERIT}_src_prepare "$@"
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
+	fi
+}
+
+# @FUNCTION: mysql-v2_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-v2_src_configure() {
+	${BUILD_INHERIT}_src_configure "$@"
+}
+
+# @FUNCTION: mysql-v2_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-v2_src_compile() {
+	${BUILD_INHERIT}_src_compile "$@"
+}
+
+# @FUNCTION: mysql-v2_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-v2_src_install() {
+	${BUILD_INHERIT}_src_install "$@"
+}
+
+# @FUNCTION: mysql-v2_pkg_preinst
+# @DESCRIPTION:
+# Create the user and groups for mysql - die if that fails.
+mysql-v2_pkg_preinst() {
+	if [[ ${PN} == "mysql-cluster" ]] ; then
+		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
+	fi
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+# @FUNCTION: mysql-v2_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+#   create the dir for logfiles if non-existant
+#   touch the logfiles and secure them
+#   install scripts
+#   issue required steps for optional features
+#   issue deprecation warnings
+mysql-v2_pkg_postinst() {
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Check FEATURES="collision-protect" before removing this
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	# Secure the logfiles
+	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		docinto "support-files"
+		for script in \
+			support-files/my-*.cnf \
+			support-files/magic \
+			support-files/ndb-config-2-node.ini
+		do
+			[[ -f "${script}" ]] \
+			&& dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in scripts/mysql* ; do
+			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
+				dodoc "${script}"
+			fi
+		done
+
+		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+			if use_if_iuse pam ; then
+				einfo
+				elog "This install includes the PAM authentication plugin."
+				elog "To activate and configure the PAM plugin, please read:"
+				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
+				einfo
+			fi
+		fi
+
+		einfo
+		elog "You might want to run:"
+		elog "\"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+
+		einfo
+		elog "If you are upgrading major versions, you should run the"
+		elog "mysql_upgrade tool."
+		einfo
+
+		if [[ ${PN} == "mariadb-galera" ]] ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
+	fi
+
+	if use_if_iuse pbxt ; then
+		elog "Note: PBXT is now statically built when enabled."
+		elog ""
+		elog "If, you previously installed as a plugin and "
+		elog "you cannot start the MySQL server,"
+		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
+		elog "use the MySQL upgrade script to restore the table"
+		elog "or execute the following SQL command:"
+		elog "    CREATE TABLE IF NOT EXISTS plugin ("
+		elog "      name char(64) binary DEFAULT '' NOT NULL,"
+		elog "      dl char(128) DEFAULT '' NOT NULL,"
+		elog "      PRIMARY KEY (name)"
+		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
+	fi
+}
+
+# @FUNCTION: mysql-v2_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-v2_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql-v2_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-v2_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
+# @FUNCTION: mysql-v2_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
+mysql-v2_pkg_config() {
+
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+
+	if built_with_use ${CATEGORY}/${PN} minimal ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)"
+	fi
+	MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now, in the"
+		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options="--log-warnings=0"
+	local sqltmp="$(emktemp)"
+
+	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	[[ -r "${help_tables}" ]] \
+	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+	|| touch "${TMPDIR}/fill_help_tables.sql"
+	help_tables="${TMPDIR}/fill_help_tables.sql"
+
+	# Figure out which options we need to disable to do the setup
+	helpfile="${TMPDIR}/mysqld-help"
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated innodb ssl log-bin relay-log slow-query-log external-locking \
+		ndbcluster log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+	# But some options changed names
+	egrep -sq external-locking "${helpfile}" && \
+	options="${options/skip-locking/skip-external-locking}"
+
+	use prefix || options="${options} --user=mysql"
+
+	# Fix bug 446200.  Don't reference host my.cnf
+	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
+		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	pushd "${TMPDIR}" &>/dev/null
+	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
+	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
+	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	einfo "Command: $cmd"
+	eval $cmd \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir "${PID_DIR}"
+		chown mysql:mysql "${PID_DIR}"
+		chmod 755 "${PID_DIR}"
+	fi
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--user=mysql \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--default-storage-engine=MyISAM \
+		--socket=${socket} \
+		--pid-file=${pidfile}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-uroot \
+		--password="${MYSQL_ROOT_PASSWORD}" \
+		mysql < "${sqltmp}"
+	rc=$?
+	eend $?
+	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
+
+# @FUNCTION: mysql-v2_pkg_postrm
+# @DESCRIPTION:
+# Remove mysql symlinks.
+mysql-v2_pkg_postrm() {
+
+	: # mysql_lib_symlinks "${ED}"
+}
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
new file mode 100644
index 0000000..01f1c6d
--- /dev/null
+++ b/eclass/mysql.eclass
@@ -0,0 +1,1528 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.177 2013/03/16 19:20:34 robbat2 Exp $
+
+# @ECLASS: mysql.eclass
+# @MAINTAINER:
+# MySQL Team <mysql-bugs@gentoo.org>
+# Luca Longinotti <chtekk@gentoo.org>
+# Robin H. Johnson <robbat2@gentoo.org>
+# @AUTHOR:
+# Francesco Riosa (Retired) <vivo@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql.eclass provides almost all the code to build the mysql ebuilds
+# including the src_unpack, src_prepare, src_configure, src_compile,
+# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
+if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
+	EGIT_PROJECT=mysql-extras
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+	inherit git-2
+fi
+
+case "${EAPI:-0}" in
+	2|3|4|5)
+		EXPORT_FUNCTIONS pkg_setup \
+					src_unpack src_prepare \
+					src_configure src_compile \
+					src_install \
+					pkg_preinst pkg_postinst \
+					pkg_config pkg_postrm
+		IUSE_DEFAULT_ON='+'
+		;;
+	0 | 1)
+		EXPORT_FUNCTIONS pkg_setup \
+					src_unpack \
+					src_compile \
+					src_install \
+					pkg_preinst pkg_postinst \
+					pkg_config pkg_postrm
+		;;
+	*)
+		die "Unsupported EAPI: ${EAPI}" ;;
+esac
+
+
+# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# mysql_upgrade.
+MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+
+# Cluster is a special case...
+if [[ "${PN}" == "mysql-cluster" ]]; then
+	case $PV in
+		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
+	esac
+fi
+
+
+# @ECLASS-VARIABLE: MYSQL_VERSION_ID
+# @DESCRIPTION:
+# MYSQL_VERSION_ID will be:
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
+# This is an important part, because many of the choices the MySQL ebuild will do
+# depend on this variable.
+# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
+
+MYSQL_VERSION_ID=""
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3 ; do
+	# pad to length 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number by BASH)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
+# @DESCRIPTION:
+# Specifiy if community features are available. Possible values are 1 (yes)
+# and 0 (no).
+# Community features are available in mysql-community
+# AND in the re-merged mysql-5.0.82 and newer
+if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.4}" != "${PV}" ] ; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.5}" != "${PV}" ] ; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#6}" != "${PV}" ] ; then
+	MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#7}" != "${PV}" ] ; then
+	MYSQL_COMMUNITY_FEATURES=1
+else
+	MYSQL_COMMUNITY_FEATURES=0
+fi
+
+# @ECLASS-VARIABLE: XTRADB_VER
+# @DESCRIPTION:
+# Version of the XTRADB storage engine
+XTRADB_VER="${XTRADB_VER}"
+
+# @ECLASS-VARIABLE: PERCONA_VER
+# @DESCRIPTION:
+# Designation by PERCONA for a MySQL version to apply an XTRADB release
+PERCONA_VER="${PERCONA_VER}"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
+		kernel_linux? ( sys-process/procps )
+		>=sys-apps/sed-4
+		>=sys-apps/texinfo-4.7-r1
+		>=sys-libs/readline-4.1
+		>=sys-libs/zlib-1.2.3"
+
+[[ "${PN}" == "mariadb" ]] \
+&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
+
+# Having different flavours at the same time is not a good idea
+for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
+	[[ "${i}" == ${PN} ]] ||
+	DEPEND="${DEPEND} !dev-db/${i}"
+done
+
+# prefix: first need to implement something for #196294
+RDEPEND="${DEPEND}
+		!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
+		selinux? ( sec-policy/selinux-mysql )"
+
+DEPEND="${DEPEND}
+		virtual/yacc"
+
+if [ "${EAPI:-0}" = "2" ]; then
+	DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
+fi
+
+# compile-time-only
+mysql_version_is_at_least "5.1" \
+|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
+
+# compile-time-only
+mysql_version_is_at_least "5.1.12" \
+&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
+#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
+#	sphinx? ( app-misc/sphinx )"
+
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+# For other stuff to bring us in
+PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
+
+# Work out the default SERVER_URI correctly
+if [ -z "${SERVER_URI}" ]; then
+	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
+	if [ "${PN}" == "mariadb" ]; then
+		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
+		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
+		SERVER_URI="
+		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
+		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+		"
+	# The community and cluster builds are on the mirrors
+	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
+		if [[ "${PN}" == "mysql-cluster" ]] ; then
+			URI_DIR="MySQL-Cluster"
+			URI_FILE="mysql-cluster-gpl"
+		else
+			URI_DIR="MySQL"
+			URI_FILE="mysql"
+		fi
+		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		# Recently upstream switched to an archive site, and not on mirrors
+		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
+					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
+	# The (old) enterprise source is on the primary site only
+	elif [ "${PN}" == "mysql" ]; then
+		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
+	fi
+fi
+
+# Define correct SRC_URIs
+SRC_URI="${SERVER_URI}"
+
+# Gentoo patches to MySQL
+[[ ${MY_EXTRAS_VER} != live ]] \
+&& SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
+HOMEPAGE="http://www.mysql.com/"
+if [[ "${PN}" == "mariadb" ]]; then
+	HOMEPAGE="http://askmonty.org/"
+	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
+fi
+if [[ "${PN}" == "mysql-community" ]]; then
+	DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+
+mysql_version_is_at_least "4.1" \
+&& IUSE="${IUSE} latin1"
+
+if mysql_version_is_at_least "4.1.3" ; then
+	IUSE="${IUSE} extraengine"
+	if [[ "${PN}" != "mysql-cluster" ]] ; then
+		IUSE="${IUSE} cluster"
+	fi
+fi
+
+mysql_version_is_at_least "5.0" \
+|| IUSE="${IUSE} raid"
+
+mysql_version_is_at_least "5.0.18" \
+&& IUSE="${IUSE} max-idx-128"
+
+mysql_version_is_at_least "5.1" \
+|| IUSE="${IUSE} berkdb"
+
+[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
+&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
+
+[[ "${PN}" == "mariadb" ]] \
+&& IUSE="${IUSE} libevent"
+
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& IUSE="${IUSE} oqgraph"
+#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
+#&& IUSE="${IUSE} oqgraph sphinx"
+
+# MariaDB has integrated PBXT
+# PBXT_VERSION means that we have a PBXT patch for this PV
+# PBXT was only introduced after 5.1.12
+pbxt_patch_available() {
+	[[ "${PN}" != "mariadb" ]] \
+	&& mysql_version_is_at_least "5.1.12" \
+	&& [[ -n "${PBXT_VERSION}" ]]
+	return $?
+}
+
+pbxt_available() {
+	pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
+	return $?
+}
+
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
+# MariaDB has integrated XtraDB
+# XTRADB_VERS means that we have a XTRADB patch for this PV
+# XTRADB was only introduced after 5.1.26
+xtradb_patch_available() {
+	[[ "${PN}" != "mariadb" ]] \
+	&& mysql_version_is_at_least "5.1.26" \
+	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
+	return $?
+}
+
+
+pbxt_patch_available \
+&& PBXT_P="pbxt-${PBXT_VERSION}" \
+&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
+&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
+
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
+pbxt_available \
+&& IUSE="${IUSE} pbxt" \
+&& mysql_version_is_at_least "5.1.40" \
+&& PBXT_NEWSTYLE=1
+
+xtradb_patch_available \
+&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
+&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
+&& XTRADB_SRC_B1="http://www.percona.com/" \
+&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
+&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
+&& IUSE="${IUSE} xtradb"
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql_disable_test() {
+	local rawtestname testname testsuite reason mysql_disable_file
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	mysql_disable_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo ${testname} : ${reason} >> "${mysql_disable_file}"
+
+	# ${S}/mysql-tests/t/disabled.def
+	#
+	# ${S}/mysql-tests/suite/federated/disabled.def
+	#
+	# ${S}/mysql-tests/suite/jp/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl/t/disabled.def
+	# ${S}/mysql-tests/suite/parts/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+	# ${S}/mysql-tests/suite/binlog/t/disabled.def
+	# ${S}/mysql-tests/suite/innodb/t/disabled.def
+	if [ -n "${testsuite}" ]; then
+		for mysql_disable_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[ -f "${mysql_disable_file}" ] && break
+		done
+		if [ "${mysql_disabled_file}" != "FAILED" ]; then
+			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+		else
+			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+		fi
+	fi
+}
+
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
+# void mysql_init_vars()
+# Initialize global variables
+# 2005-11-19 <vivo@gentoo.org>
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
+		MY_SOURCEDIR=${SERVER_URI##*/}
+		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
+}
+
+configure_minimal() {
+	# These are things we exclude from a minimal build, please
+	# note that the server actually does get built and installed,
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
+
+	for i in ${minimal_exclude_list} ; do
+		myconf="${myconf} --without-${i}"
+	done
+	myconf="${myconf} --with-extra-charsets=none"
+	myconf="${myconf} --enable-local-infile"
+
+	if use static ; then
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared --with-pic"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	if mysql_version_is_at_least "4.1" && ! use latin1 ; then
+		myconf="${myconf} --with-charset=utf8"
+		myconf="${myconf} --with-collation=utf8_general_ci"
+	else
+		myconf="${myconf} --with-charset=latin1"
+		myconf="${myconf} --with-collation=latin1_swedish_ci"
+	fi
+}
+
+configure_common() {
+	myconf="${myconf} $(use_with big-tables)"
+	myconf="${myconf} --enable-local-infile"
+	myconf="${myconf} --with-extra-charsets=all"
+	myconf="${myconf} --with-mysqld-user=mysql"
+	myconf="${myconf} --with-server"
+	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
+	myconf="${myconf} --without-libwrap"
+
+	if use static ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared --with-pic"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --with-debug=full"
+	else
+		myconf="${myconf} --without-debug"
+		mysql_version_is_at_least "4.1.3" \
+		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
+		&& myconf="${myconf} --without-ndb-debug"
+	fi
+
+	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
+		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
+	elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
+		myconf="${myconf} --with-charset=utf8"
+		myconf="${myconf} --with-collation=utf8_general_ci"
+	else
+		myconf="${myconf} --with-charset=latin1"
+		myconf="${myconf} --with-collation=latin1_swedish_ci"
+	fi
+
+	if use embedded ; then
+		myconf="${myconf} --with-embedded-privilege-control"
+		myconf="${myconf} --with-embedded-server"
+	else
+		myconf="${myconf} --without-embedded-privilege-control"
+		myconf="${myconf} --without-embedded-server"
+	fi
+
+}
+
+configure_40_41_50() {
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
+	myconf="${myconf} $(use_with perl bench)"
+	myconf="${myconf} --enable-assembler"
+	myconf="${myconf} --with-extra-tools"
+	myconf="${myconf} --with-innodb"
+	myconf="${myconf} --without-readline"
+	myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
+	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
+
+	# --with-vio is not needed anymore, it's on by default and
+	# has been removed from configure
+	#  Apply to 4.x and 5.0.[0-3]
+	if use ssl ; then
+		 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
+	fi
+
+	if mysql_version_is_at_least "5.0.60" ; then
+			if use berkdb ; then
+				elog "Berkeley DB support was disabled due to build failures"
+				elog "on multiple arches, go to a version earlier than 5.0.60"
+				elog "if you want it again. Gentoo bug #224067."
+			fi
+			myconf="${myconf} --without-berkeley-db"
+	elif use berkdb ; then
+		# The following fix is due to a bug with bdb on SPARC's. See:
+		# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+		# It comes down to non-64-bit safety problems.
+		if use alpha || use amd64 || use hppa || use mips || use sparc ; then
+			elog "Berkeley DB support was disabled due to compatibility issues on this arch"
+			myconf="${myconf} --without-berkeley-db"
+		else
+			myconf="${myconf} --with-berkeley-db=./bdb"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	if mysql_version_is_at_least "4.1.3" ; then
+		myconf="${myconf} --with-geometry"
+		if [[ "${PN}" != "mysql-cluster" ]] ; then
+			myconf="${myconf} $(use_with cluster ndbcluster)"
+		fi
+	fi
+
+	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
+		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+		myconf="${myconf} --with-archive-storage-engine"
+
+		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+		myconf="${myconf} --with-csv-storage-engine"
+
+		# http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
+		myconf="${myconf} --with-blackhole-storage-engine"
+
+		# http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
+		# http://dev.mysql.com/doc/mysql/en/federated-description.html
+		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+		if mysql_version_is_at_least "5.0.3" ; then
+			elog "Before using the Federated storage engine, please be sure to read"
+			elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			myconf="${myconf} --with-federated-storage-engine"
+		fi
+	fi
+
+	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+		myconf="${myconf} `use_enable community community-features`"
+		if use community; then
+			myconf="${myconf} `use_enable profiling`"
+		else
+			myconf="${myconf} --disable-profiling"
+		fi
+	fi
+
+	mysql_version_is_at_least "5.0.18" \
+	&& use max-idx-128 \
+	&& myconf="${myconf} --with-max-indexes=128"
+}
+
+configure_51() {
+	# TODO: !!!! readd --without-readline
+	# the failure depend upon config/ac-macros/readline.m4 checking into
+	# readline.h instead of history.h
+	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
+	myconf="${myconf} --enable-assembler"
+	myconf="${myconf} --with-geometry"
+	myconf="${myconf} --with-readline"
+	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
+	myconf="${myconf} --without-pstack"
+	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
+
+	# This is an explict die here, because if we just forcibly disable it, then the
+	# user's data is not accessible.
+	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
+	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
+	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+		myconf="${myconf} $(use_enable community community-features)"
+		if use community; then
+			myconf="${myconf} $(use_enable profiling)"
+		else
+			myconf="${myconf} --disable-profiling"
+		fi
+	fi
+
+	# Scan for all available plugins
+	local plugins_avail="$(
+	LANG=C \
+	find "${S}" \
+		\( \
+		-name 'plug.in' \
+		-o -iname 'configure.in' \
+		-o -iname 'configure.ac' \
+		\) \
+		-print0 \
+	| xargs -0 sed -r -n \
+		-e '/^MYSQL_STORAGE_ENGINE/{
+			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
+			s~^([^ ]+).*~\1~gp;
+		}' \
+	| tr -s '\n' ' '
+	)"
+
+	# 5.1 introduces a new way to manage storage engines (plugins)
+	# like configuration=none
+	# This base set are required, and will always be statically built.
+	local plugins_sta="csv myisam myisammrg heap"
+	local plugins_dyn=""
+	local plugins_dis="example ibmdb2i"
+
+	# These aren't actually required by the base set, but are really useful:
+	plugins_sta="${plugins_sta} archive blackhole"
+
+	# default in 5.5.4
+	if mysql_version_is_at_least "5.5.4" ; then
+		plugins_sta="${plugins_sta} partition"
+	fi
+	# Now the extras
+	if use extraengine ; then
+		# like configuration=max-no-ndb, archive and example removed in 5.1.11
+		# not added yet: ibmdb2i
+		# Not supporting as examples: example,daemon_example,ftexample
+		plugins_sta="${plugins_sta} partition"
+
+		if [[ "${PN}" != "mariadb" ]] ; then
+			elog "Before using the Federated storage engine, please be sure to read"
+			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
+			plugins_dyn="${plugins_sta} federated"
+		else
+			elog "MariaDB includes the FederatedX engine. Be sure to read"
+			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
+			plugins_dyn="${plugins_sta} federatedx"
+		fi
+	else
+		plugins_dis="${plugins_dis} partition federated"
+	fi
+
+	# Upstream specifically requests that InnoDB always be built:
+	# - innobase, innodb_plugin
+	# Build falcon if available for 6.x series.
+	for i in innobase falcon ; do
+		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+	done
+	for i in innodb_plugin ; do
+		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
+	done
+
+	# like configuration=max-no-ndb
+	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+		plugins_sta="${plugins_sta} ndbcluster partition"
+		plugins_dis="${plugins_dis//partition}"
+		myconf="${myconf} --with-ndb-binlog"
+	else
+		plugins_dis="${plugins_dis} ndbcluster"
+	fi
+
+	if [[ "${PN}" == "mariadb" ]] ; then
+		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
+		# caught above.
+		# This is not optional, without it several upstream testcases fail.
+		# Also strongly recommended by upstream.
+		if [[ "${PV}" < "5.2.0" ]] ; then
+			myconf="${myconf} --with-maria-tmp-tables"
+			plugins_sta="${plugins_sta} maria"
+		else
+			myconf="${myconf} --with-aria-tmp-tables"
+			plugins_sta="${plugins_sta} aria"
+		fi
+
+		[ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
+			die "The ${P} package doesn't provide innobase nor xtradb"
+
+		for i in innobase xtradb ; do
+			[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+		done
+
+		myconf="${myconf} $(use_with libevent)"
+
+		if mysql_version_is_at_least "5.2" ; then
+			#This should include sphinx, but the 5.2.4 archive forgot the plug.in file
+			#for i in oqgraph sphinx ; do
+			for i in oqgraph ; do
+				use ${i} \
+				&& plugins_dyn="${plugins_dyn} ${i}" \
+				|| plugins_dis="${plugins_dis} ${i}"
+			done
+		fi
+	fi
+
+	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
+		use pbxt \
+		&& plugins_sta="${plugins_sta} pbxt" \
+		|| plugins_dis="${plugins_dis} pbxt"
+	fi
+
+	use static && \
+	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
+	plugins_dyn=""
+
+	einfo "Available plugins: ${plugins_avail}"
+	einfo "Dynamic plugins: ${plugins_dyn}"
+	einfo "Static plugins: ${plugins_sta}"
+	einfo "Disabled plugins: ${plugins_dis}"
+
+	# These are the static plugins
+	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
+	# And the disabled ones
+	for i in ${plugins_dis} ; do
+		myconf="${myconf} --without-plugin-${i}"
+	done
+}
+
+pbxt_src_configure() {
+	mysql_init_vars
+
+	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+
+	einfo "Reconfiguring dir '${PWD}'"
+	eautoreconf
+
+	local myconf=""
+	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	use debug && myconf="${myconf} --with-debug=full"
+	econf ${myconf} || die "Problem configuring PBXT storage engine"
+}
+
+pbxt_src_compile() {
+
+	# Be backwards compatible for now
+	if [[ $EAPI != 2 ]]; then
+		pbxt_src_configure
+	fi
+	# TODO: is it safe/needed to use emake here ?
+	make || die "Problem making PBXT storage engine (${myconf})"
+
+	popd
+	# TODO: modify test suite for PBXT
+}
+
+pbxt_src_install() {
+	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
+		emake install DESTDIR="${D}" || die "Failed to install PBXT"
+	popd
+}
+
+#
+# EBUILD FUNCTIONS
+#
+# @FUNCTION: mysql_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+#   check for conflicting use flags
+#   create new user and group for mysql
+#   warn about deprecated features
+mysql_pkg_setup() {
+	if has test ${FEATURES} ; then
+		if ! use minimal ; then
+			if [[ $UID -eq 0 ]]; then
+				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	# bug 350844
+	case "${EAPI:-0}" in
+		0 | 1)
+			if use static && ! built_with_use sys-libs/ncurses static-libs; then
+				die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
+			fi
+			;;
+	esac
+
+	# Check for USE flag problems in pkg_setup
+	if use static && use ssl ; then
+		M="MySQL does not support being built statically with SSL support enabled!"
+		eerror "${M}"
+		die "${M}"
+	fi
+
+	if mysql_version_is_at_least "5.1.51" \
+	   && ! mysql_version_is_at_least "5.2" \
+	   && use debug ; then
+	   # Also in package.use.mask
+	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
+	fi
+
+	if ! mysql_version_is_at_least "5.0" \
+	&& use raid \
+	&& use static ; then
+		eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
+		eerror "with RAID support enabled."
+		die "USE flags 'raid' and 'static' conflict!"
+	fi
+
+	if mysql_version_is_at_least "4.1.3" \
+	&& ( use cluster || use extraengine || use embedded ) \
+	&& use minimal ; then
+		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
+		eerror "${M}"
+		die "${M}"
+	fi
+
+	if mysql_version_is_at_least "5.1" \
+	&& xtradb_patch_available \
+	&& use xtradb \
+	&& use embedded ; then
+		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
+		eerror "${M}"
+		die "${M}"
+	fi
+
+	# Bug #290570, 284946, 307251
+	# Upstream changes made us need a fairly new GCC4.
+	# But only for 5.0.8[3-6]!
+	if mysql_version_is_at_least "5.0.83"  && ! mysql_version_is_at_least 5.0.87 ; then
+		GCC_VER=$(gcc-version)
+		case ${CHOST}:${GCC_VER} in
+			*-darwin*:4.*) : ;; # bug #310615
+			*:2*|*:3*|*:4.0|*:4.1|*:4.2)
+			eerror "Some releases of MySQL required a very new GCC, and then"
+			eerror "later release relaxed that requirement again. Either pick a"
+			eerror "MySQL >=5.0.87, or use a newer GCC."
+			die "Active GCC too old!" ;;
+		esac
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+
+	mysql_check_version_range "4.0 to 5.0.99.99" \
+	&& use berkdb \
+	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
+
+	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
+		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
+		ewarn "5.1 series should NOT be put into production. In the near"
+		ewarn "future, it will be disabled from building."
+		ewarn ""
+		ewarn "If you need NDB support, you should instead move to the new"
+		ewarn "mysql-cluster package that represents that upstream NDB"
+		ewarn "development."
+	fi
+}
+
+# @FUNCTION: mysql_src_unpack
+# @DESCRIPTION:
+# Unpack the source code and call mysql_src_prepare for EAPI < 2.
+mysql_src_unpack() {
+	# Initialize the proper variables first
+	mysql_init_vars
+
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
+
+	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+
+	# Be backwards compatible for now
+	case ${EAPI:-0} in
+        	2) : ;;
+        	0 | 1) mysql_src_prepare ;;
+	esac
+}
+
+# @FUNCTION: mysql_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql_src_prepare() {
+	cd "${S}"
+
+	# Apply the patches for this MySQL version
+	EPATCH_SUFFIX="patch"
+	mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+	# Clean out old items
+	rm -f "${EPATCH_SOURCE}"/*
+	# Now link in right patches
+	mysql_mv_patches
+	# And apply
+	epatch
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
+	# Additional checks, remove bundled zlib (Cluster needs this, for static
+	# memory management in zlib, leave available for Cluster)
+	if [[ "${PN}" != "mysql-cluster" ]] ; then
+		rm -f "${S}/zlib/"*.[ch]
+		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+	fi
+	rm -f "scripts/mysqlbug"
+
+	# Make charsets install in the right place
+	find . -name 'Makefile.am' \
+		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+	if mysql_version_is_at_least "4.1" ; then
+		# Remove what needs to be recreated, so we're sure it's actually done
+		einfo "Cleaning up old buildscript files"
+		find . -name Makefile \
+			-o -name Makefile.in \
+			-o -name configure \
+			-exec rm -f {} \;
+		rm -f "ltmain.sh"
+		rm -f "scripts/mysqlbug"
+	fi
+
+	local rebuilddirlist d
+
+	if xtradb_patch_available && use xtradb ; then
+		einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
+		pushd "${S}"/storage >/dev/null
+		i="innobase"
+		o="${WORKDIR}/storage-${i}.mysql-upstream"
+		# Have we been here already?
+		[ -d "${o}" ] && rm -f "${i}"
+		# Or maybe we haven't
+		[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
+		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
+		popd >/dev/null
+	fi
+
+	if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+		einfo "Adding storage engine: PBXT"
+		pushd "${S}"/storage >/dev/null
+		i='pbxt'
+		[ -d "${i}" ] && rm -rf "${i}"
+		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+		popd >/dev/null
+	fi
+
+	if mysql_version_is_at_least "5.1.12" ; then
+		rebuilddirlist="."
+		# This does not seem to be needed presently. robbat2 2010/02/23
+		#einfo "Updating innobase cmake"
+		## TODO: check this with a cmake expert
+		#cmake \
+		#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
+		#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
+		#	"storage/innobase"
+	else
+		rebuilddirlist=". innobase"
+	fi
+
+	for d in ${rebuilddirlist} ; do
+		einfo "Reconfiguring dir '${d}'"
+		pushd "${d}" &>/dev/null
+		eautoreconf
+		popd &>/dev/null
+	done
+
+	if mysql_check_version_range "4.1 to 5.0.99.99" \
+	&& use berkdb ; then
+		einfo "Fixing up berkdb buildsystem"
+		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
+		cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
+		|| die "Could not copy libtool.m4 to bdb/dist/"
+		#These files exist only with libtool-2*, and need to be included.
+		if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
+			cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
+		fi
+		pushd "bdb/dist" &>/dev/null
+		sh s_all \
+		|| die "Failed bdb reconfigure"
+		popd &>/dev/null
+	fi
+}
+
+# @FUNCTION: mysql_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql_src_configure() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# $myconf is modified by the configure_* functions
+	local myconf=""
+
+	if use minimal ; then
+		configure_minimal
+	else
+		configure_common
+		if mysql_version_is_at_least "5.1.10" ; then
+			configure_51
+		else
+			configure_40_41_50
+		fi
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# glib-2.3.2_pre fix, bug #16496
+	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
+	# fail badly during cluster startup.
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector-all"
+	fi
+
+	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	mysql_version_is_at_least "5.0" \
+	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
+	# causes a mis-compile.
+	# Upstream bugs:
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
+	# http://bugs.mysql.com/bug.php?id=45205
+	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
+		append-flags -fno-omit-frame-pointer && \
+		filter-flags -fomit-frame-pointer
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		--sysconfdir=${MY_SYSCONFDIR} \
+		--localstatedir=${MY_LOCALSTATEDIR} \
+		--sharedstatedir=${MY_SHAREDSTATEDIR} \
+		--libdir=${MY_LIBDIR} \
+		--includedir=${MY_INCLUDEDIR} \
+		--with-low-memory \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--without-docs \
+		--with-LIBDIR="$(get_libdir)" \
+		${myconf} || die "econf failed"
+
+	# TODO: Move this before autoreconf !!!
+	find . -type f -name Makefile -print0 \
+	| xargs -0 -n100 sed -i \
+	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
+
+	if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_configure
+	fi
+}
+
+# @FUNCTION: mysql_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql_src_compile() {
+	# Be backwards compatible for now
+	case ${EAPI:-0} in
+		2) : ;;
+		0 | 1) mysql_src_configure ;;
+	esac
+
+	emake || die "emake failed"
+
+	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_compile
+	fi
+}
+
+# @FUNCTION: mysql_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql_src_install() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	emake install \
+		DESTDIR="${D}" \
+		benchdir_root=${MY_SHAREDSTATEDIR} \
+		testroot="${MY_SHAREDSTATEDIR}" \
+		|| die "emake install failed"
+
+	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
+		pbxt_patch_available && use pbxt && pbxt_src_install
+	fi
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# Various junk (my-*.cnf moved elsewhere)
+	einfo "Removing duplicate /usr/share/mysql files"
+	rm -Rf "${ED}/usr/share/info"
+	for removeme in  "mysql-log-rotate" mysql.server* \
+		binary-configure* my-*.cnf mi_test_all*
+	do
+		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
+	done
+
+	# Clean up stuff for a minimal build
+	if use minimal ; then
+		einfo "Remove all extra content for minimal build"
+		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+		rm -f "${ED}/usr/sbin/mysqld"
+		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if use !test ; then
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+	fi
+
+	# Configuration stuff
+	case ${MYSQL_PV_MAJOR} in
+		3*|4.0) mysql_mycnf_version="4.0" ;;
+		4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
+		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
+	esac
+	einfo "Building default my.cnf (${mysql_mycnf_version})"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	doins scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-${mysql_mycnf_version}"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		-e "s!/tmp!${EPREFIX}/tmp!" \
+		-e "s!/usr!${EPREFIX}/usr!" \
+		-e "s!= /var!= ${EPREFIX}/var!" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok"
+	use prefix && sed -i -e '/^user[ 	]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR}/my.cnf.ok"
+	fi
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Creating initial directories"
+		# Empty directories ...
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
+		done
+	fi
+
+	# Docs
+	einfo "Installing docs"
+	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
+		[[ -f "$i" ]] && dodoc "$i"
+	done
+	doinfo "${S}"/Docs/mysql.info
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+		done
+
+	fi
+
+	mysql_lib_symlinks "${ED}"
+}
+
+# @FUNCTION: mysql_pkg_preinst
+# @DESCRIPTION:
+# Create the user and groups for mysql - die if that fails.
+mysql_pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+# @FUNCTION: mysql_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+#   create the dir for logfiles if non-existant
+#   touch the logfiles and secure them
+#   install scripts
+#   issue required steps for optional features
+#   issue deprecation warnings
+mysql_pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Check FEATURES="collision-protect" before removing this
+	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	# Secure the logfiles
+	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		docinto "support-files"
+		for script in \
+			support-files/my-*.cnf \
+			support-files/magic \
+			support-files/ndb-config-2-node.ini
+		do
+			[[ -f "${script}" ]] \
+			&& dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in scripts/mysql* ; do
+			[[ -f "${script}" ]] \
+			&& [[ "${script%.sh}" == "${script}" ]] \
+			&& dodoc "${script}"
+		done
+
+		einfo
+		elog "You might want to run:"
+		elog "\"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+
+		einfo
+		elog "If you are upgrading major versions, you should run the"
+		elog "mysql_upgrade tool."
+		einfo
+	fi
+
+	if pbxt_available && use pbxt ; then
+                elog "Note: PBXT is now statically built when enabled."
+                elog ""
+                elog "If, you previously installed as a plugin and "
+                elog "you cannot start the MySQL server,"
+		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
+		elog "use the MySQL upgrade script to restore the table"
+		elog "or execute the following SQL command:"
+		elog "    CREATE TABLE IF NOT EXISTS plugin ("
+		elog "      name char(64) binary DEFAULT '' NOT NULL,"
+		elog "      dl char(128) DEFAULT '' NOT NULL,"
+		elog "      PRIMARY KEY (name)"
+		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
+	fi
+
+	mysql_check_version_range "4.0 to 5.0.99.99" \
+	&& use berkdb \
+	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
+}
+
+# @FUNCTION: mysql_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
+# @FUNCTION: mysql_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
+mysql_pkg_config() {
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+
+	if built_with_use ${CATEGORY}/${PN} minimal ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ -d "${old_MY_DATADIR_s}" ]]  && [[ "${old_MY_DATADIR_s}" != / ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
+	fi
+	MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now, in the"
+		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options="--log-warnings=0"
+	local sqltmp="$(emktemp)"
+
+	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	[[ -r "${help_tables}" ]] \
+	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+	|| touch "${TMPDIR}/fill_help_tables.sql"
+	help_tables="${TMPDIR}/fill_help_tables.sql"
+
+	# Figure out which options we need to disable to do the setup
+	helpfile="${TMPDIR}/mysqld-help"
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
+		federated innodb ssl log-bin relay-log slow-query-log external-locking \
+		ndbcluster log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+	# But some options changed names
+	egrep -sq external-locking "${helpfile}" && \
+	options="${options/skip-locking/skip-external-locking}"
+
+	use prefix || options="${options} --user=mysql"
+
+	pushd "${TMPDIR}" &>/dev/null
+	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
+	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
+	[ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+	einfo "Command: $cmd"
+	eval $cmd \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+	if mysql_version_is_at_least "4.1.3" ; then
+		# Filling timezones, see
+		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+		"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+		if [[ -r "${help_tables}" ]] ; then
+			cat "${help_tables}" >> "${sqltmp}"
+		fi
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it ..."
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--user=mysql \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--default-storage-engine=MyISAM \
+		--socket=${socket} \
+		--pid-file=${pidfile}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-uroot \
+		--password="${MYSQL_ROOT_PASSWORD}" \
+		mysql < "${sqltmp}"
+	rc=$?
+	eend $?
+	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
+
+# @FUNCTION: mysql_pkg_postrm
+# @DESCRIPTION:
+# Remove mysql symlinks.
+mysql_pkg_postrm() {
+	: # mysql_lib_symlinks "${ED}"
+}
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
new file mode 100644
index 0000000..c62bd8c
--- /dev/null
+++ b/eclass/mysql_fx.eclass
@@ -0,0 +1,306 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.30 2012/01/09 10:42:19 grobian Exp $
+
+# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
+# Maintainer:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Luca Longinotti <chtekk@gentoo.org>
+
+inherit multilib
+
+#
+# Helper function, version (integer) may have sections separated by dots
+# for readability.
+#
+stripdots() {
+	local dotver=${1:-"0"}
+	local v=""
+	local ret=0
+	if [[ "${dotver/./}" != "${dotver}" ]] ; then
+		# dotted version number
+		for i in 1000000 10000 100 1 ; do
+			v=${dotver%%\.*}
+			# remove leading zeroes
+			while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
+			# increment integer version number
+			ret=$(( ${v} * ${i} + ${ret} ))
+			if [[ "${dotver}" == "${dotver/\.}" ]] ; then
+				dotver=0
+			else
+				dotver=${dotver#*\.}
+			fi
+		done
+		echo "${ret}"
+	else
+		# already an integer
+		v=${dotver}
+		while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
+		echo "${v}"
+	fi
+}
+
+#
+# Check if a version number falls inside a given range.
+# The range includes the extremes and must be specified as
+# "low_version to high_version" i.e. "4.1.2 to 5.1.99.99".
+# Returns true if inside the range.
+#
+mysql_check_version_range() {
+	local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
+	local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
+	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+	[[ ${lbound} -le ${my_ver} ]] && [[ ${my_ver} -le ${rbound} ]] && return 0
+	return 1
+}
+
+#
+# True if at least one applicable range is found for the patch.
+#
+_mysql_test_patch_ver_pn() {
+	local allelements=", version, package name"
+	# So that it fails the directory test if none of them exist
+	local filesdir="/dev/null"
+	for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
+		"${WORKDIR}/mysql-extras" ; do
+		if [ -d "${d}" ]; then
+			filesdir="${d}"
+			break
+		fi
+	done
+
+	[[ -d "${filesdir}" ]] || die "Source dir must be a directory"
+	local flags=$1 pname=$2
+	if [[ $(( $flags & $(( 1 + 4 + 16 )) )) -eq 21 ]] ; then
+		einfo "using '${pname}'"
+		ln -sf "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "Couldn't move ${pname}"
+		return 0
+	fi
+
+	[[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \
+	&& allelements="${allelements//", version"}"
+
+	[[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \
+	&& allelements="${allelements//", package name"}"
+
+	[[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \
+	&& ewarn "QA notice: ${allelements} missing in ${pname} patch"
+
+	return 1
+}
+
+#
+# Parse a "index_file" looking for patches to apply to the
+# current MySQL version.
+# If the patch applies, print its description.
+#
+mysql_mv_patches() {
+	# So that it fails the directory test if none of them exist
+	local filesdir="/dev/null"
+	if [[ -z "${1}" ]]; then
+		for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
+			"${WORKDIR}/mysql-extras" ; do
+			if [ -d "${d}" ]; then
+				filesdir="${d}"
+				break
+			fi
+		done
+		[[ -d "${filesdir}" ]] || die "No patches directory found!"
+	fi
+
+	for i in "$1" "${filesdir}/0000_index.txt" "${filesdir}/000_index.txt" ; do
+		if [ -n "$i" -a -f "$i" ]; then
+			local index_file="$i"
+			break
+		fi
+	done
+
+	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+	local my_test_fx=${3:-"_mysql_test_patch_ver_pn"}
+	_mysql_mv_patches "${index_file}" "${my_ver}" "${my_test_fx}"
+}
+
+_mysql_mv_patches() {
+	local index_file="${1}"
+	local my_ver="${2}"
+	local my_test_fx="${3}"
+	local dsc ndsc=0 i
+	dsc=( )
+
+	# Values for flags are (2^x):
+	#  1 - one patch found
+	#  2 - at least one version range is wrong
+	#  4 - at least one version range is ok
+	#  8 - at least one ${PN} did not match
+	#  16 - at least one ${PN} has been matched
+	local flags=0 pname=""
+	while read row ; do
+		case "${row}" in
+			@patch\ *)
+				[[ -n "${pname}" ]] \
+				&& ${my_test_fx} ${flags} "${pname}" \
+				&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+				flags=1 ; ndsc=0 ; dsc=( )
+				pname=${row#"@patch "}
+				;;
+			@ver\ *)
+				if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
+					flags=$(( ${flags} | 4 ))
+				else
+					flags=$(( ${flags} | 2 ))
+				fi
+				;;
+			@pn\ *)
+				if [[ ${row#"@pn "} == "${PN}" ]] ; then
+					flags=$(( ${flags} | 16 ))
+				else
+					flags=$(( ${flags} | 8 ))
+				fi
+				;;
+			# @use\ *) ;;
+			@@\ *)
+				dsc[$ndsc]="${row#"@@ "}"
+				(( ++ndsc ))
+				;;
+		esac
+	done < "${index_file}"
+
+	${my_test_fx} ${flags} "${pname}" \
+	&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+}
+
+#
+# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
+# (nice) idea from versionator.eclass
+#
+mysql_version_is_at_least() {
+	local want_s=$(stripdots "$1") have_s=$(stripdots "${2:-${MYSQL_VERSION_ID}}")
+	[[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value to check"
+	[[ ${want_s} -le ${have_s} ]] && return 0 || return 1
+}
+
+#
+# To be called on the live filesystem, reassigning symlinks of each MySQL
+# library to the best version available.
+#
+mysql_lib_symlinks() {
+
+	local d dirlist maxdots libname libnameln libsuffix reldir
+	libsuffix=$(get_libname)
+
+	einfo "libsuffix = ${libsuffix}"
+	einfo "Updating MySQL libraries symlinks"
+
+	reldir="${1}"
+	pushd "${reldir}/usr/$(get_libdir)" &> /dev/null
+
+	# dirlist must contain the less significative directory left
+	dirlist="mysql"
+
+	# waste some time in removing and recreating symlinks
+	for d in $dirlist ; do
+		for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
+			# maxdot is a limit versus infinite loop
+			maxdots=0
+			libnameln=${libname##*/}
+			# loop in version of the library to link it, similar to how
+			# libtool works
+			if [[ ${CHOST} == *-darwin* ]] ; then
+				# macho: libname.x.y.z.dylib
+				local libbasename=${libnameln%%.*}       # libname
+				local libver=${libnameln#${libbasename}} # .x.y.z.dylib
+				libver=${libver%${libsuffix}}            # .x.y.z
+				while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 ]] ; do
+					libnameln="${libbasename}${libver}${libsuffix}"
+					rm -f "${libnameln}"
+					ln -s "${libname}" "${libnameln}"
+					(( ++maxdots ))
+					libver=${libver%.*}
+				done
+				libnameln="${libbasename}${libsuffix}"
+				rm -f "${libnameln}"
+				ln -s "${libname}" "${libnameln}"
+			else
+				# elf: libname.so.x.y.z
+				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
+					rm -f "${libnameln}"
+					ln -s "${libname}" "${libnameln}"
+					(( ++maxdots ))
+					libnameln="${libnameln%.*}"
+				done
+				rm -f "${libnameln}"
+				ln -s "${libname}" "${libnameln}"
+			fi
+		done
+	done
+
+	popd &> /dev/null
+}
+
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
+# void mysql_init_vars()
+# Initialize global variables
+# 2005-11-19 <vivo@gentoo.org>
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
+	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
+		MY_SOURCEDIR=${SERVER_URI##*/}
+		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
+}
diff --git a/metadata/layout.conf b/metadata/layout.conf
index b68fe00..5491859 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,12 +1,11 @@
+masters = gentoo
+thin-manifests = true
+
 # This went live Wednesday, July 4, 2012 at 10:00 UTC
 # For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
 # and/or GLEP 59.
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
-# Bug #470670 - gentoo's council says to deprecate
-# EAPIs 1 and 2.
-eapis-deprecated = 1 2
-
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo
 update-changelog = true
@@ -17,11 +16,3 @@ update-changelog = true
 # INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
 # 2012 was the removal date)
 cache-formats = md5-dict
-
-# Support for implicit masters is deprecated, so we need to explicitly
-# specify that this repo does not dependent on any masters, in order
-# to distinguish it from repos that rely on the deprecated behavior.
-masters = gentoo
-
-#eclass-overrides = gentoo
-
diff --git a/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt b/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
new file mode 100644
index 0000000..6a45d49
--- /dev/null
+++ b/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
@@ -0,0 +1,28 @@
+Title: MySQL 5.1 init script revamp
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Content-Type: text/plain
+Posted: 2010-12-31
+Revision: 1
+News-Item-Format: 1.0
+Display-If-Installed: <dev-db/mysql-init-init-scripts-1.99
+
+The MySQL init scripts are being revamped to handle more corner cases in MySQL
+usage, and migrate from the old mixed multi-instance to symlinked init
+instances instead.
+
+This does mean that you MUST review and merge the changes in the conf.d script
+to the new style. For each instance of the mysql_slot_* variable in your old
+/etc/conf.d/mysql, you should have a seperate /etc/conf.d/$FOO file, as well
+as making /etc/init.d/$FOO a symlink back to /etc/init.d/mysql.
+
+The following variables have moved:
+- MY_CNF (was 'mycnf' in mysql_slot_*)
+- STARTUP_TIMEOUT (was 'startup_timeout' in mysql_slot_*)
+- NICE (was 'nice' in the mysql_slot_* array)
+
+All other items from the mysql_slot_* variable array should be merged to form
+the new MY_ARGS variable.
+
+Lastly, the new init scripts allow more flexibility in init dependency
+ordering. Please see the rc_* variables in the new conf.d file for more
+details.
diff --git a/metadata/news/ChangeLog b/metadata/news/ChangeLog
new file mode 100644
index 0000000..c693dad
--- /dev/null
+++ b/metadata/news/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for news
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt:
+  Add news file about MySQL init migration work.
+
diff --git a/profiles/package.mask b/profiles/package.mask
new file mode 100644
index 0000000..9f43e7b
--- /dev/null
+++ b/profiles/package.mask
@@ -0,0 +1,9 @@
+# Brian Evans <grknight@tuffmail.com> (16 Dec 2013)
+# Add percona-server to the mask until the virtual is unmasked
+>=dev-db/percona-server-5.6
+
+# Robin H. Johnson <robbat2@gentoo.org> (04 Mar 2013)
+# Only 5.6 remains masked.
+>=dev-db/mariadb-5.6
+>=dev-db/mysql-5.6
+>=virtual/mysql-5.6
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
new file mode 100644
index 0000000..151a9b4
--- /dev/null
+++ b/profiles/package.use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+# Brian Evans <grknight@tuffmail.com> (8 Oct 2013)
+# Mask embedded for percona server.
+# Upstream unsupported https://bugs.launchpad.net/bugs/1236873
+dev-db/percona-server embedded
+
diff --git a/profiles/repo_name b/profiles/repo_name
index 975a719..0eaebf1 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-ScurvyNet
+mysql
diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
new file mode 100644
index 0000000..4e6a705
--- /dev/null
+++ b/sys-cluster/galera/ChangeLog
@@ -0,0 +1,22 @@
+*galera-25.3.2 (13 Feb 2014)
+
+  13 Feb 2014;  <grknight@gentoo.org> +galera-25.3.2.ebuild:
+  [galera] Version bump for new 25.x series
+
+*galera-23.2.7 (18 Nov 2013)
+
+  18 Nov 2013; Brian Evans <grknight@tuffmail.com>
+  +files/disable-tests-23.2.7.patch, +galera-23.2.7.ebuild:
+  [galera] Version bump
+
+*galera-23.2.4-r1 (21 Aug 2013)
+
+  21 Aug 2013; Brian Evans <grknight@tuffmail.com> +galera-23.2.4-r1.ebuild,
+  -galera-23.2.4.ebuild, files/garb.sh:
+  [sys-cluster/galera] Revbump to fix issues report in Bug 466706 Comment 14
+
+*galera-23.2.4 (14 May 2013)
+
+  14 May 2013;  <grknight@lavabit.com> +files/disable-tests.patch,
+  +files/garb.cnf, +files/garb.sh, +galera-23.2.4.ebuild, +metadata.xml:
+  Add required runtime-only library for mariadb-galera
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
new file mode 100644
index 0000000..cad5a56
--- /dev/null
+++ b/sys-cluster/galera/Manifest
@@ -0,0 +1,3 @@
+DIST galera-23.2.4-src.tar.gz 3061934 SHA256 83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512 b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711 WHIRLPOOL 3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2
+DIST galera-23.2.7-src.tar.gz 3140705 SHA256 b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512 15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc WHIRLPOOL 011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482
+DIST galera-25.3.2-src.tar.gz 3808803 SHA256 5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d SHA512 784476938d8d57e865685f3a43ed95d1aeed151dd145476bc094d5a132c87bdaab2cd9c8aac610adc4c847dfbf814b0d59cddaa68b73c741fd6918738f52f545 WHIRLPOOL 01c51a6ba5f069890e9c529bde7d7ce7bb7e16997779ab074be592257792f5c5d3d146e228548a2db31acf5fab0d7e410506118f03c2fdb44004fb364a3cc6fa
diff --git a/sys-cluster/galera/files/disable-tests-23.2.7.patch b/sys-cluster/galera/files/disable-tests-23.2.7.patch
new file mode 100644
index 0000000..fd6c0a0
--- /dev/null
+++ b/sys-cluster/galera/files/disable-tests-23.2.7.patch
@@ -0,0 +1,76 @@
+diff -aurN a/galera/SConstruct b/galera/SConstruct
+--- a/galera/SConstruct	2013-10-16 10:08:43.057673018 -0400
++++ b/galera/SConstruct	2013-10-16 10:10:04.687494314 -0400
+@@ -407,19 +407,20 @@
+ # Clone base from default environment
+ check_env = env.Clone()
+ 
+-conf = Configure(check_env)
++if tests == 1:
++    conf = Configure(check_env)
+ 
+ # Check header and library
+ 
+-if not conf.CheckHeader('check.h'):
+-    print 'Error: check header file not found or not usable'
+-    Exit(1)
+-
+-if not conf.CheckLib('check'):
+-    print 'Error: check library not found or not usable'
+-    Exit(1)
++    if not conf.CheckHeader('check.h'):
++        print 'Error: check header file not found or not usable'
++        Exit(1)
++
++    if not conf.CheckLib('check'):
++        print 'Error: check library not found or not usable'
++        Exit(1)
+ 
+-conf.Finish()
++    conf.Finish()
+ 
+ # Note: Don't do this, glibc does not like static linking
+ # Link unit tests statically
+diff -aurN a/galera/SConscript b/galera/SConscript
+--- a/galera/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galera/SConscript	2013-05-13 13:13:20.851827437 -0400
+@@ -1,2 +1,2 @@
+ 
+-SConscript(['src/SConscript', 'tests/SConscript'])
++SConscript(['src/SConscript'])
+diff -aurN a/galerautils/SConscript b/galerautils/SConscript
+--- a/galerautils/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galerautils/SConscript	2013-05-13 13:15:37.010071765 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcache/SConscript b/gcache/SConscript
+--- a/gcache/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcache/SConscript	2013-05-13 13:15:55.179837389 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcomm/SConscript b/gcomm/SConscript
+--- a/gcomm/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcomm/SConscript	2013-05-13 13:16:08.979659369 -0400
+@@ -1,3 +1,3 @@
+ # SCons build script for building gcomm
+ 
+-SConscript(Split('''src/SConscript test/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
+--- a/gcs/src/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcs/src/SConscript	2013-05-13 13:12:53.122184848 -0400
+@@ -46,8 +46,6 @@
+                      source = 'gcs_test.c',
+                      LINK = libgcs_env['CXX'])
+ 
+-SConscript('unit_tests/SConscript')
+-
+ #
+ env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
+ 
diff --git a/sys-cluster/galera/files/disable-tests.patch b/sys-cluster/galera/files/disable-tests.patch
new file mode 100644
index 0000000..b82294b
--- /dev/null
+++ b/sys-cluster/galera/files/disable-tests.patch
@@ -0,0 +1,80 @@
+diff -aurN a/galera/SConscript b/galera/SConscript
+--- a/galera/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galera/SConscript	2013-05-13 13:13:20.851827437 -0400
+@@ -1,2 +1,2 @@
+ 
+-SConscript(['src/SConscript', 'tests/SConscript'])
++SConscript(['src/SConscript'])
+diff -aurN a/galerautils/SConscript b/galerautils/SConscript
+--- a/galerautils/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galerautils/SConscript	2013-05-13 13:15:37.010071765 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcache/SConscript b/gcache/SConscript
+--- a/gcache/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcache/SConscript	2013-05-13 13:15:55.179837389 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcomm/SConscript b/gcomm/SConscript
+--- a/gcomm/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcomm/SConscript	2013-05-13 13:16:08.979659369 -0400
+@@ -1,3 +1,3 @@
+ # SCons build script for building gcomm
+ 
+-SConscript(Split('''src/SConscript test/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
+--- a/gcs/src/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcs/src/SConscript	2013-05-13 13:12:53.122184848 -0400
+@@ -46,8 +46,6 @@
+                      source = 'gcs_test.c',
+                      LINK = libgcs_env['CXX'])
+ 
+-SConscript('unit_tests/SConscript')
+-
+ #
+ env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2013-03-11 02:44:50.000000000 -0400
++++ b/SConstruct	2013-05-13 13:11:03.493597370 -0400
+@@ -305,20 +305,6 @@
+ # Clone base from default environment
+ check_env = env.Clone()
+ 
+-conf = Configure(check_env)
+-
+-# Check header and library
+-
+-if not conf.CheckHeader('check.h'):
+-    print 'Error: check header file not found or not usable'
+-    Exit(1)
+-
+-if not conf.CheckLib('check'):
+-    print 'Error: check library not found or not usable'
+-    Exit(1)
+-
+-conf.Finish()
+-
+ # Note: Don't do this, glibc does not like static linking
+ # Link unit tests statically
+ # check_env.Append(LINKFLAGS = ' -static')
+@@ -328,11 +314,7 @@
+ #
+ 
+ def builder_unit_test(target, source, env):
+-    app = str(source[0].abspath)
+-    if os.spawnl(os.P_WAIT, app, app)==0:
+-        open(str(target[0]),'w').write("PASSED\n")
+-    else:
+-        return 1
++	print("Disabled\n")
+ # Create a builder for tests
+ bld = Builder(action = builder_unit_test)
+ check_env.Append(BUILDERS = {'Test' :  bld})
diff --git a/sys-cluster/galera/files/garb.cnf b/sys-cluster/galera/files/garb.cnf
new file mode 100644
index 0000000..4f0047a
--- /dev/null
+++ b/sys-cluster/galera/files/garb.cnf
@@ -0,0 +1,17 @@
+# Copyright (C) 2012 Coedership Oy
+# This config file is to be sourced by garbd service script.
+
+# A space-separated list of node addresses (address[:port]) in the cluster
+# GALERA_NODES=""
+
+# Galera cluster name, should be the same as on the rest of the nodes.
+# GALERA_GROUP=""
+
+# Optional Galera internal options string (e.g. SSL settings)
+# see http://www.codership.com/wiki/doku.php?id=galera_parameters
+# GALERA_OPTIONS=""
+
+# Log file for garbd. Optional, by default logs to syslog
+# LOG_FILE=""
+
+PIDFILE=/var/run/garbd
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
new file mode 100644
index 0000000..6f0cc93
--- /dev/null
+++ b/sys-cluster/galera/files/garb.sh
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+	after mysql
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -z "${GALERA_NODES}" ]; then
+		eerror "List of GALERA_NODES is not configured"
+		return 1
+	fi
+
+	if [ -z "${GALERA_GROUP}" ]; then
+		eerror "GALERA_GROUP name is not configured"
+		return 1
+	fi
+
+	GALERA_PORT="${GALERA_PORT:-4567}"
+
+	for ADDRESS in ${GALERA_NODES} 0; do
+		HOST=$(echo $ADDRESS | cut -d \: -f 1 )
+		PORT=$(echo $ADDRESS | cut -d \: -f 2 )
+		if [[ "${HOST}" == "${PORT}" ]]; then
+			PORT=${GALERA_PORT}
+		fi
+		PORT=${PORT:-$GALERA_PORT}
+		nc -z ${HOST} ${PORT} > /dev/null &&  break
+	done
+	if [ ${ADDRESS} == "0" ]; then
+		eerror "None of the nodes in GALERA_NODES is accessible"
+		return 1
+	fi
+
+	OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}"
+	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
+        [ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+
+	start-stop-daemon \
+		--start \
+		--exec /usr/bin/garbd \
+		--pidfile "${PIDFILE}" \
+		--make-pidfile \
+		--user garbd \
+		--group garbd \
+		--background \
+		-- ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon \
+		--stop \
+		--exec /usr/bin/garbd \
+		--pidfile "${PIDFILE}"
+	eend $?
+}
+
diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
new file mode 100644
index 0000000..d7e5f37
--- /dev/null
+++ b/sys-cluster/galera/files/respect-flags.patch
@@ -0,0 +1,35 @@
+--- a/SConstruct	2014-03-07 14:27:26.797904671 -0500
++++ b/SConstruct	2014-03-07 14:31:18.672478115 -0500
+@@ -49,7 +49,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -214,12 +214,12 @@
+                       ' -Wall -Wextra -Wno-unused-parameter')
+ 
+ # C-specific flags
+-env.Replace(CFLAGS = ' -std=c99 -fno-strict-aliasing -pipe')
++env.Replace(CFLAGS = os.getenv('CFLAGS','') + ' -std=c99 -fno-strict-aliasing -pipe')
+ 
+ # CXX-specific flags
+ # Note: not all 3rd-party libs like '-Wold-style-cast -Weffc++'
+ #       adding those after checks
+-env.Replace(CXXFLAGS = ' -Wno-long-long -Wno-deprecated -ansi')
++env.Replace(CXXFLAGS = os.getenv('CXXFLAGS','') + ' -Wno-long-long -Wno-deprecated -ansi')
+ if sysname != 'sunos':
+     env.Append(CXXFLAGS = ' -pipe')
+ 
+@@ -228,7 +228,7 @@
+ # TODO: enable '-Wl,--warn-common -Wl,--fatal-warnings' after warnings from
+ # static linking have beed addressed
+ #
+-env.Append(LINKFLAGS = link_arch)
++env.Append(LINKFLAGS = link_arch + ' ' + os.getenv('LDFLAGS',''))
+ 
+ #
+ # Check required headers and libraries (autoconf functionality)
diff --git a/sys-cluster/galera/galera-23.2.4-r1.ebuild b/sys-cluster/galera/galera-23.2.4-r1.ebuild
new file mode 100644
index 0000000..a4d2bc5
--- /dev/null
+++ b/sys-cluster/galera/galera-23.2.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="${PN}-${PV}-src"
+
+inherit scons-utils multilib toolchain-funcs base versionator
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.codership.org/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="garbd ssl test"
+
+RDEPEND="
+	 ssl? ( dev-libs/openssl )
+	>=dev-libs/boost-1.41
+	"
+DEPEND="${DEPEND}
+	${RDEPEND}
+	test? ( dev-libs/check )
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${RDEPEND}
+	garbd? ( || (
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		net-analyzer/gnu-netcat
+		net-analyzer/openbsd-netcat
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd
+	fi
+}
+
+src_prepare() {
+	#Remove bundled dev-cpp/asio
+	rm -fr "${S}/asio"
+	#Remove Werror from build file, no way to disable. Also, respect LDFLAGS.
+	sed -i	-e "s/-Werror //" \
+		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
+		"${S}/SConstruct"
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -fr "${S}/garb"
+	fi
+	if ! use test ; then
+		epatch "${FILESDIR}/disable-tests.patch"
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	tc-export CXX
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/galera/galera-23.2.7.ebuild b/sys-cluster/galera/galera-23.2.7.ebuild
new file mode 100644
index 0000000..dea040f
--- /dev/null
+++ b/sys-cluster/galera/galera-23.2.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="${PN}-${PV}-src"
+
+inherit scons-utils multilib toolchain-funcs base versionator
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.codership.org/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="garbd ssl test"
+
+RDEPEND="
+	 ssl? ( dev-libs/openssl )
+	>=dev-libs/boost-1.41
+	"
+DEPEND="${DEPEND}
+	${RDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${RDEPEND}
+	garbd? ( || (
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		net-analyzer/gnu-netcat
+		net-analyzer/openbsd-netcat
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd
+	fi
+}
+
+src_prepare() {
+	#Remove bundled dev-cpp/asio
+	rm -fr "${S}/asio"
+	#Remove Werror from build file, no way to disable. Also, respect LDFLAGS.
+	sed -i	-e "s/-Werror //" \
+		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
+		"${S}/SConstruct"
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -fr "${S}/garb"
+	fi
+#	if ! use test ; then
+#		epatch "${FILESDIR}/disable-tests-${PV}.patch"
+#	fi
+}
+
+src_configure() {
+	tc-export CC
+	tc-export CXX
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+		$(use_scons test tests 1 0)
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/galera/galera-25.3.2.ebuild b/sys-cluster/galera/galera-25.3.2.ebuild
new file mode 100644
index 0000000..4b96af4
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="${PN}-${PV}-src"
+
+inherit scons-utils multilib toolchain-funcs base versionator eutils
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.codership.org/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="garbd ssl test"
+
+CDEPEND="
+	 ssl? ( dev-libs/openssl )
+	>=dev-libs/boost-1.41
+	"
+DEPEND="${DEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${CDEPEND}
+	garbd? ( || (
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		net-analyzer/gnu-netcat
+		net-analyzer/openbsd-netcat
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd
+	fi
+}
+
+src_prepare() {
+	# Remove bundled dev-cpp/asio
+	rm -fr "${S}/asio"
+	
+	# Respect {C,LD}FLAGS.
+	epatch "${FILESDIR}/respect-flags.patch"
+	
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -fr "${S}/garb"
+	fi
+	
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC CXX
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+		$(use_scons test tests 1 0)
+		strict_build_flags=0
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/galera/metadata.xml b/sys-cluster/galera/metadata.xml
new file mode 100644
index 0000000..6c8e585
--- /dev/null
+++ b/sys-cluster/galera/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+  <flag name='garbd'>Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
+</use>
+</pkgmetadata>
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
new file mode 100644
index 0000000..2c619f9
--- /dev/null
+++ b/virtual/mysql/ChangeLog
@@ -0,0 +1,34 @@
+# ChangeLog for virtual/mysql
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mysql-5.7 (10 Dec 2013)
+
+  10 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.7.ebuild:
+  [virtual] Add missing 5.7 virtual
+
+*mysql-10.0 (21 Mar 2013)
+
+  21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-10.0.ebuild:
+  Update virtual for MariaDB, but perhaps it should be in virtual/mysql-5.6.
+
+  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> -Manifest,
+  mysql-5.2.ebuild, mysql-5.3.ebuild:
+  Update headers and keywords.
+
+  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.2.ebuild:
+  [virtual/mysql-5.2] Adjust keywords for the virtual.
+
+  08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.ebuild,
+  mysql-5.1.ebuild:
+  mysql-community is long gone, removal time.
+
+*mysql-5.5 (04 Sep 2010)
+*mysql-5.4 (04 Sep 2010)
+*mysql-5.1 (04 Sep 2010)
+*mysql-5.0 (04 Sep 2010)
+
+  04 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.ebuild,
+  +mysql-5.1.ebuild, +mysql-5.4.ebuild, +mysql-5.5.ebuild, +metadata.xml:
+  Add in virtual in overlay for cluster.
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
new file mode 100644
index 0000000..0ea2af6
--- /dev/null
+++ b/virtual/mysql/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
new file mode 100644
index 0000000..8e28056
--- /dev/null
+++ b/virtual/mysql/mysql-10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+# TODO: add Drizzle here
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
+)"
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
new file mode 100644
index 0000000..9ecbe43
--- /dev/null
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.5 2010/11/06 19:21:13 leio Exp $
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*
+)"
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
new file mode 100644
index 0000000..d3f2f2c
--- /dev/null
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.7 2010/11/06 19:21:13 leio Exp $
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="=dev-db/mysql-${PV}*"
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
new file mode 100644
index 0000000..ec5667c
--- /dev/null
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.9 2011/01/07 23:57:45 robbat2 Exp $
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*
+)"
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
new file mode 100644
index 0000000..a41eabc
--- /dev/null
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static"
+
+DEPEND=""
+# TODO: add mysql-cluster here
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
+	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
+)"
diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mysql/mysql-5.2.ebuild
new file mode 100644
index 0000000..ae0e162
--- /dev/null
+++ b/virtual/mysql/mysql-5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static"
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
+)"
diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mysql/mysql-5.3.ebuild
new file mode 100644
index 0000000..45e3e68
--- /dev/null
+++ b/virtual/mysql/mysql-5.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static"
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
+)"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
new file mode 100644
index 0000000..c2ade9a
--- /dev/null
+++ b/virtual/mysql/mysql-5.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.5 2012/04/18 06:12:08 robbat2 Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+# TODO: add Drizzle here
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
+	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
+	=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]
+)"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
new file mode 100644
index 0000000..36f49c1
--- /dev/null
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+# TODO: add Drizzle and MariaDB here
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
+	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
+)"
diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
new file mode 100644
index 0000000..eeec7d1
--- /dev/null
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
+)"

From 247c535baab2b7c1714a24601d2418daa77715a5 Mon Sep 17 00:00:00 2001
From: Lisa Simpson <lisa@safesoftsolutions.com>
Date: Thu, 17 Apr 2014 23:02:41 -0700
Subject: [PATCH 017/261] removed our duplicates

---
 dev-db/mariadb-galera/ChangeLog               |   18 -
 dev-db/mariadb-galera/Manifest                |    2 -
 dev-db/mariadb-galera/files/my.cnf-5.5        |  159 --
 .../mariadb-galera-5.5.34.ebuild              |  136 --
 .../mariadb-galera-5.5.36.ebuild              |  110 --
 dev-db/mariadb-galera/metadata.xml            |   26 -
 dev-db/mariadb-native-client/ChangeLog        |   13 -
 dev-db/mariadb-native-client/Manifest         |    1 -
 .../files/multilib-install.patch              |   16 -
 .../mariadb-native-client-1.0.ebuild          |   58 -
 .../mariadb-native-client-9999.ebuild         |   76 -
 dev-db/mariadb-native-client/metadata.xml     |    8 -
 dev-db/mariadb/ChangeLog                      |  233 ---
 dev-db/mariadb/Manifest                       |    7 -
 dev-db/mariadb/files/my.cnf-4.1               |  147 --
 dev-db/mariadb/files/my.cnf-5.1               |  146 --
 dev-db/mariadb/files/my.cnf-5.5               |  150 --
 dev-db/mariadb/mariadb-10.0.10.ebuild         |  110 --
 dev-db/mariadb/mariadb-10.0.9_rc.ebuild       |  110 --
 dev-db/mariadb/mariadb-5.1.67.ebuild          |  171 --
 dev-db/mariadb/mariadb-5.2.14.ebuild          |  171 --
 dev-db/mariadb/mariadb-5.3.12.ebuild          |  171 --
 dev-db/mariadb/mariadb-5.5.37.ebuild          |  113 --
 dev-db/mariadb/metadata.xml                   |   29 -
 dev-db/mysql-cluster/ChangeLog                |   29 -
 dev-db/mysql-cluster/Manifest                 |    5 -
 dev-db/mysql-cluster/metadata.xml             |   21 -
 .../mysql-cluster/mysql-cluster-7.0.37.ebuild |  229 ---
 .../mysql-cluster/mysql-cluster-7.2.13.ebuild |  128 --
 .../mysql-cluster/mysql-cluster-7.3.0.ebuild  |  128 --
 dev-db/mysql-init-scripts/ChangeLog           |   19 -
 .../mysql-init-scripts/files/logrotate.mysql  |   15 -
 .../files/mysql-5.1.53-conf.d                 |   78 -
 .../files/mysql-5.1.53-init.d                 |  110 --
 dev-db/mysql-init-scripts/metadata.xml        |    5 -
 .../mysql-init-scripts-2.0_pre1.ebuild        |   25 -
 dev-db/mysql/ChangeLog                        |  388 -----
 dev-db/mysql/Manifest                         |   16 -
 dev-db/mysql/files/my.cnf                     |   48 -
 dev-db/mysql/files/my.cnf-4.0                 |  113 --
 dev-db/mysql/files/my.cnf-4.1                 |  147 --
 dev-db/mysql/files/my.cnf-5.1                 |  146 --
 dev-db/mysql/files/my.cnf-5.5                 |  149 --
 dev-db/mysql/files/mysql.init                 |   37 -
 dev-db/mysql/metadata.xml                     |   27 -
 dev-db/mysql/mysql-4.0.27-r1.ebuild           |   35 -
 dev-db/mysql/mysql-4.1.22-r1.ebuild           |   44 -
 dev-db/mysql/mysql-5.0.96.ebuild              |  213 ---
 dev-db/mysql/mysql-5.1.70.ebuild              |  265 ---
 dev-db/mysql/mysql-5.1.73.ebuild              |  265 ---
 dev-db/mysql/mysql-5.5.35.ebuild              |  129 --
 dev-db/mysql/mysql-5.5.37.ebuild              |  136 --
 dev-db/mysql/mysql-5.6.17.ebuild              |  129 --
 dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild   |  129 --
 dev-java/mariadb-java-client/ChangeLog        |   13 -
 dev-java/mariadb-java-client/Manifest         |    2 -
 .../files/maven-build-1.1.4.xml               |  253 ---
 .../mariadb-java-client/files/maven-build.xml |  250 ---
 .../mariadb-java-client-1.1.3.ebuild          |   46 -
 .../mariadb-java-client-1.1.4.ebuild          |   47 -
 .../mariadb-java-client-9999.ebuild           |   46 -
 dev-java/mariadb-java-client/metadata.xml     |    7 -
 eclass/mysql-autotools.eclass                 |  676 --------
 eclass/mysql-cmake.eclass                     |  485 ------
 eclass/mysql-multilib.eclass                  |  859 ---------
 eclass/mysql-v2.eclass                        |  878 ----------
 eclass/mysql.eclass                           | 1528 -----------------
 eclass/mysql_fx.eclass                        |  306 ----
 .../2010-12-31-mysql-init-revamp.en.txt       |   28 -
 virtual/mysql/ChangeLog                       |   34 -
 virtual/mysql/metadata.xml                    |    8 -
 virtual/mysql/mysql-10.0.ebuild               |   20 -
 virtual/mysql/mysql-4.0.ebuild                |   17 -
 virtual/mysql/mysql-4.1.ebuild                |   15 -
 virtual/mysql/mysql-5.0.ebuild                |   17 -
 virtual/mysql/mysql-5.1.ebuild                |   22 -
 virtual/mysql/mysql-5.2.ebuild                |   19 -
 virtual/mysql/mysql-5.3.ebuild                |   19 -
 virtual/mysql/mysql-5.5.ebuild                |   23 -
 virtual/mysql/mysql-5.6.ebuild                |   21 -
 virtual/mysql/mysql-5.7.ebuild                |   19 -
 81 files changed, 11047 deletions(-)
 delete mode 100644 dev-db/mariadb-galera/ChangeLog
 delete mode 100644 dev-db/mariadb-galera/Manifest
 delete mode 100644 dev-db/mariadb-galera/files/my.cnf-5.5
 delete mode 100644 dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
 delete mode 100644 dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
 delete mode 100644 dev-db/mariadb-galera/metadata.xml
 delete mode 100644 dev-db/mariadb-native-client/ChangeLog
 delete mode 100644 dev-db/mariadb-native-client/Manifest
 delete mode 100644 dev-db/mariadb-native-client/files/multilib-install.patch
 delete mode 100644 dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
 delete mode 100644 dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
 delete mode 100644 dev-db/mariadb-native-client/metadata.xml
 delete mode 100644 dev-db/mariadb/ChangeLog
 delete mode 100644 dev-db/mariadb/Manifest
 delete mode 100644 dev-db/mariadb/files/my.cnf-4.1
 delete mode 100644 dev-db/mariadb/files/my.cnf-5.1
 delete mode 100644 dev-db/mariadb/files/my.cnf-5.5
 delete mode 100644 dev-db/mariadb/mariadb-10.0.10.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-10.0.9_rc.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.1.67.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.2.14.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.3.12.ebuild
 delete mode 100644 dev-db/mariadb/mariadb-5.5.37.ebuild
 delete mode 100644 dev-db/mariadb/metadata.xml
 delete mode 100644 dev-db/mysql-cluster/ChangeLog
 delete mode 100644 dev-db/mysql-cluster/Manifest
 delete mode 100644 dev-db/mysql-cluster/metadata.xml
 delete mode 100644 dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
 delete mode 100644 dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
 delete mode 100644 dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
 delete mode 100644 dev-db/mysql-init-scripts/ChangeLog
 delete mode 100644 dev-db/mysql-init-scripts/files/logrotate.mysql
 delete mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
 delete mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
 delete mode 100644 dev-db/mysql-init-scripts/metadata.xml
 delete mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
 delete mode 100644 dev-db/mysql/ChangeLog
 delete mode 100644 dev-db/mysql/Manifest
 delete mode 100644 dev-db/mysql/files/my.cnf
 delete mode 100644 dev-db/mysql/files/my.cnf-4.0
 delete mode 100644 dev-db/mysql/files/my.cnf-4.1
 delete mode 100644 dev-db/mysql/files/my.cnf-5.1
 delete mode 100644 dev-db/mysql/files/my.cnf-5.5
 delete mode 100644 dev-db/mysql/files/mysql.init
 delete mode 100644 dev-db/mysql/metadata.xml
 delete mode 100644 dev-db/mysql/mysql-4.0.27-r1.ebuild
 delete mode 100644 dev-db/mysql/mysql-4.1.22-r1.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.0.96.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.70.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.1.73.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.5.35.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.5.37.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.6.17.ebuild
 delete mode 100644 dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
 delete mode 100644 dev-java/mariadb-java-client/ChangeLog
 delete mode 100644 dev-java/mariadb-java-client/Manifest
 delete mode 100644 dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
 delete mode 100644 dev-java/mariadb-java-client/files/maven-build.xml
 delete mode 100644 dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
 delete mode 100644 dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
 delete mode 100644 dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
 delete mode 100644 dev-java/mariadb-java-client/metadata.xml
 delete mode 100644 eclass/mysql-autotools.eclass
 delete mode 100644 eclass/mysql-cmake.eclass
 delete mode 100644 eclass/mysql-multilib.eclass
 delete mode 100644 eclass/mysql-v2.eclass
 delete mode 100644 eclass/mysql.eclass
 delete mode 100644 eclass/mysql_fx.eclass
 delete mode 100644 metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
 delete mode 100644 virtual/mysql/ChangeLog
 delete mode 100644 virtual/mysql/metadata.xml
 delete mode 100644 virtual/mysql/mysql-10.0.ebuild
 delete mode 100644 virtual/mysql/mysql-4.0.ebuild
 delete mode 100644 virtual/mysql/mysql-4.1.ebuild
 delete mode 100644 virtual/mysql/mysql-5.0.ebuild
 delete mode 100644 virtual/mysql/mysql-5.1.ebuild
 delete mode 100644 virtual/mysql/mysql-5.2.ebuild
 delete mode 100644 virtual/mysql/mysql-5.3.ebuild
 delete mode 100644 virtual/mysql/mysql-5.5.ebuild
 delete mode 100644 virtual/mysql/mysql-5.6.ebuild
 delete mode 100644 virtual/mysql/mysql-5.7.ebuild

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
deleted file mode 100644
index 03a68b4..0000000
--- a/dev-db/mariadb-galera/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-*mariadb-galera-5.5.35 (14 Feb 2014)
-
-  14 Feb 2014;  <grknight@gentoo.org> +mariadb-galera-5.5.35.ebuild,
-  -mariadb-galera-5.5.33a.ebuild:
-  [mariadb-galera] Version bump to 5.5.35
-
-*mariadb-galera-5.5.33a (09 Oct 2013)
-
-  09 Oct 2013; Brian Evans <grknight@tuffmail.com>
-  +mariadb-galera-5.5.33a.ebuild:
-  [mariadb-galera] Version bump to 5.5.33a
-
-*mariadb-galera-5.5.32 (17 Sep 2013)
-
-  17 Sep 2013; Brian Evans <grknight@tuffmail.com>
-  +mariadb-galera-5.5.32.ebuild:
-  [mariadb-galera] Version bump to 5.5.32 sys_vars.all_vars test fails but known
-  upstream per IRC as a variable name was missed and not added in test
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
deleted file mode 100644
index 3012b7e..0000000
--- a/dev-db/mariadb-galera/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
-DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256 3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512 49eeeed9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4 WHIRLPOOL c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
diff --git a/dev-db/mariadb-galera/files/my.cnf-5.5 b/dev-db/mariadb-galera/files/my.cnf-5.5
deleted file mode 100644
index 237c97c..0000000
--- a/dev-db/mariadb-galera/files/my.cnf-5.5
+++ /dev/null
@@ -1,159 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size				= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-# These settings are required for Galera clustering
-#mysql settings
-binlog_format=ROW
-default-storage-engine=innodb
-innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
-bind-address=0.0.0.0
-# Uncomment this section to activate Galera clustering
-#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
-# You should change this name to something meaningful
-#wsrep_cluster_name="my_wsrep_cluster"
-# List all nodes of the cluster including this one
-#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
-#wsrep_sst_method=rsync
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
deleted file mode 100644
index e1bf28b..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-WSREP_REVISION="23"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-		# sys_vars.all_vars
-		# Fails in 5.5.32 only due to known issue upstream, forgotten variable from test.
-		# Should be fixed in next release.
-		#
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql \
-			sys_vars.all_vars ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
deleted file mode 100644
index 801fd97..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-WSREP_REVISION="25"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
deleted file mode 100644
index 59e6784..0000000
--- a/dev-db/mariadb-galera/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
-<use>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mariadb-native-client/ChangeLog b/dev-db/mariadb-native-client/ChangeLog
deleted file mode 100644
index bb6ae82..0000000
--- a/dev-db/mariadb-native-client/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-*mariadb-native-client-9999 (26 Jun 2013)
-
-  26 Jun 2013; Brian Evans <grknight@lavabit.com>
-  +mariadb-native-client-9999.ebuild, mariadb-native-client-1.0.ebuild,
-  metadata.xml:
-  Add live ebuild with mysqlcompat feature, optional ssl support and external
-  zlib
-
-*mariadb-native-client-1.0 (22 May 2013)
-
-  22 May 2013;  <grknight@lavabit.com> +files/multilib-install.patch,
-  +mariadb-native-client-1.0.ebuild, +metadata.xml:
-  Add new C library for MySQL
diff --git a/dev-db/mariadb-native-client/Manifest b/dev-db/mariadb-native-client/Manifest
deleted file mode 100644
index a3cdbfd..0000000
--- a/dev-db/mariadb-native-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mariadb-native-client.tar.gz 548121 SHA256 848c45ec1e685412abe020d934eee45d17cf81e7cbfa79ef6317343eb8557354 SHA512 ece36c3333cf6dbd4fc4f2be54542d05d7fe44a9387586afc0367356fdadae5d24c41d977b1d5f829156d6a54c9e89afc3d18d3f4b1510fcea2527ac701fa6af WHIRLPOOL 48a92dd2dc0655455a68aab91860a218463d95feec21b00fb43b406efc185838fb97d40880cba39d44bfff2f8c0ae4af85a4459a57cb050550b0d8809a0bb3bc
diff --git a/dev-db/mariadb-native-client/files/multilib-install.patch b/dev-db/mariadb-native-client/files/multilib-install.patch
deleted file mode 100644
index 6dfa270..0000000
--- a/dev-db/mariadb-native-client/files/multilib-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -aruN a/CMakeLists.txt b/CMakeLists.txt
---- a/libmysql/CMakeLists.txt	2013-05-17 14:16:47.621519747 -0400
-+++ b/libmysql/CMakeLists.txt	2013-05-17 14:18:04.570428917 -0400
-@@ -166,9 +166,9 @@
- 
- INSTALL(TARGETS
-           libmariadb mariadbclient
--          RUNTIME DESTINATION "lib"
--          LIBRARY DESTINATION "lib"
--          ARCHIVE DESTINATION "lib")
-+          RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- 
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include
-         DESTINATION mariadbclient)
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
deleted file mode 100644
index fb43970..0000000
--- a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="bzr"
-	EBZR_REPO_URI="lp:${PN}"
-else
-	S="${WORKDIR}/${PN}"
-fi
-
-inherit cmake-multilib eutils "${VCS_INHERIT}"
-
-DESCRIPTION="Client Library for C is used to connect applications developed in C/C++ to MariaDB/MySQL databases"
-HOMEPAGE="http://mariadb.org/"
-SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz
-	"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/openssl:=
-	amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  ) )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	epatch "${FILESDIR}/multilib-install.patch"
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		$(cmake-utils_use_build doc DOCS)
-	)
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	strip_static_libraries() {
-		einfo "IN ${T}/usr/$(get_libdir)"
-		rm "${T}/usr/$(get_libdir)/mariadb/libmariadbclient.a"
-	}
-
-	cmake-multilib_src_install
-	if ! use static-libs ; then
-		multilib_foreach_abi strip_static_libraries
-	fi
-}
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
deleted file mode 100644
index a0a135c..0000000
--- a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="bzr"
-	EBZR_REPO_URI="lp:${PN}"
-else
-	S="${WORKDIR}/${PN}"
-fi
-
-inherit cmake-multilib eutils "${VCS_INHERIT}"
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/my_config.h
-)
-
-DESCRIPTION="Client Library for C is used to connect applications developed in C/C++ to MariaDB/MySQL databases"
-HOMEPAGE="http://mariadb.org/"
-SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz
-	"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="doc +mysqlcompat +ssl static-libs"
-
-RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:=
-		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  )  )
-	 )
-	mysqlcompat? (
-		!dev-db/mysql
-		!dev-db/mysql-cluster
-		!dev-db/mariadb
-		!dev-db/mariadb-galera
-		!dev-db/percona-server
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	sed -i 	-e "s~DESTINATION \"lib/mariadb~DESTINATION \"\$\{CMAKE_INSTALL_LIBDIR\}~" \
-		-e "s~DESTINATION lib/mariadb~DESTINATION \$\{CMAKE_INSTALL_LIBDIR\}~" \
-		"${S}/libmariadb/CMakeLists.txt"
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_EXTERNAL_ZLIB=ON
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
-		$(cmake-utils_use_build doc DOCS)
-	)
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	strip_static_libraries() {
-		rm "${ED}/usr/$(get_libdir)/libmariadbclient.a"
-		use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a"
-	}
-
-	cmake-multilib_src_install
-	if ! use static-libs ; then
-		multilib_foreach_abi strip_static_libraries
-	fi
-	dodoc README
-}
diff --git a/dev-db/mariadb-native-client/metadata.xml b/dev-db/mariadb-native-client/metadata.xml
deleted file mode 100644
index 069fbde..0000000
--- a/dev-db/mariadb-native-client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<use>
-<flag name='mysqlcompat'>Enable mysqlclient library symbolic links</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
deleted file mode 100644
index 6a9d494..0000000
--- a/dev-db/mariadb/ChangeLog
+++ /dev/null
@@ -1,233 +0,0 @@
-# ChangeLog for dev-db/mariadb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*mariadb-10.0.7 (30 Dec 2013)
-
-  30 Dec 2013; Brian Evans <grknight@tuffmail.com> files/my.cnf-5.5,
-  -mariadb-10.0.4.ebuild, +mariadb-10.0.7.ebuild:
-  [mariadb] Version bump for 10 series
-
-*mariadb-5.5.34 (22 Nov 2013)
-
-  22 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.34.ebuild:
-  [mariadb] Version bump
-
-  19 Nov 2013; Brian Evans <grknight@tuffmail.com> -mariadb-10.0.1.ebuild,
-  -mariadb-10.0.2.ebuild, -mariadb-10.0.3.ebuild, -mariadb-5.5.31.ebuild:
-  [mariadb] Drop old
-
-*mariadb-10.0.6 (19 Nov 2013)
-
-  19 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.6.ebuild:
-  [mariadb] Version bump to 10.0.6
-
-*mariadb-10.0.4 (09 Oct 2013)
-
-  09 Oct 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.4.ebuild:
-  [mariadb] Version bump for 10.0.4 All tests pass
-
-*mariadb-5.5.33a (20 Sep 2013)
-
-  20 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33a.ebuild,
-  -mariadb-5.5.33.ebuild:
-  [mariadb] Version Bump to 5.5.33a All tests pass Fix crashes upstream Remove
-  hacks for jemalloc and tokudb per upstream
-
-*mariadb-5.5.33 (18 Sep 2013)
-
-  18 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33.ebuild,
-  metadata.xml:
-  [mariadb] Bump to version 5.5.33 PBXT was removed upstream TokuDB was added.
-  TokuDB only builds on amd64 according to author. jemalloc was added by
-  upstream. Small hack in cmake to use system lib.
-
-  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mariadb-5.1.66.ebuild,
-  -mariadb-5.2.13.ebuild, -mariadb-5.3.11.ebuild, -mariadb-5.5.28a.ebuild,
-  -mariadb-5.5.29.ebuild, -mariadb-5.5.30.ebuild:
-  [dev-db/mariadb] Trim old
-
-*mariadb-5.5.32 (19 Jul 2013)
-
-  19 Jul 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.32.ebuild:
-  Version bump
-
-*mariadb-10.0.3 (12 Jun 2013)
-
-  12 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.3.ebuild:
-  Bump, tests still running for now.
-
-*mariadb-5.5.31 (28 May 2013)
-
-  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.31.ebuild:
-  Bump.
-
-*mariadb-10.0.1 (21 Mar 2013)
-
-  21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.1.ebuild:
-  Very untested MariaDB 10 series.
-
-*mariadb-5.5.30 (13 Mar 2013)
-
-  13 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.30.ebuild:
-  Bump.
-
-  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.67.ebuild,
-  mariadb-5.2.14.ebuild, mariadb-5.3.12.ebuild, mariadb-5.5.29.ebuild:
-  Update headers and keywords.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.1,
-  files/my.cnf-5.1, files/my.cnf-5.5:
-  Sync with gentoo-x86 for prefix changes.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.62-r1.ebuild,
-  mariadb-5.1.62.ebuild, mariadb-5.1.66.ebuild, mariadb-5.2.12-r1.ebuild,
-  mariadb-5.2.12.ebuild, mariadb-5.2.13.ebuild, mariadb-5.3.11.ebuild,
-  mariadb-5.3.6.ebuild, mariadb-5.3.7.ebuild, mariadb-5.3.9.ebuild,
-  mariadb-5.5.24.ebuild, mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild,
-  mariadb-5.5.28.ebuild, mariadb-5.5.28a.ebuild:
-  HPPA has decided not to support mariadb for the present time.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mariadb-5.1.55.ebuild:
-  Trim old versions.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.5.24.ebuild,
-  mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild, mariadb-5.5.28.ebuild,
-  mariadb-5.5.28a.ebuild:
-  Fix {tests} typo.
-
-  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.1.62.ebuild, mariadb-5.2.7.ebuild,
-  mariadb-5.2.8.ebuild, mariadb-5.2.9.ebuild, mariadb-5.2.10.ebuild,
-  mariadb-5.2.12.ebuild, mariadb-5.3.0_beta.ebuild, mariadb-5.3.1_beta.ebuild,
-  mariadb-5.3.3_rc.ebuild, mariadb-5.3.5.ebuild, mariadb-5.3.6.ebuild,
-  mariadb-5.5.22.ebuild, mariadb-5.5.23.ebuild:
-  Move EAPI assignment to the top.
-  Whitespace.
-
-*mariadb-5.3.3_rc (12 Jan 2012)
-
-  12 Jan 2012; <atlantis@gentoo.org> +mariadb-5.3.3_rc.ebuild:
-  [dev-db/mariadb] 5.3.3_rc version bump.
-
-*mariadb-5.2.10 (12 Jan 2012)
-
-  12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.10.ebuild:
-  [dev-db/mariadb] Bump to 5.2.10 revision.
-
-  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.2.7.ebuild, mariadb-5.2.8.ebuild, mariadb-5.3.0_beta.ebuild:
-  [dev-db/mariadb] Bump EAPI to 4 on old mariadb versions.
-
-  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.9.ebuild, mariadb-5.3.1_beta.ebuild:
-  [dev-db/mariadb] Use EAPI-4 to support the new Prefix support of the
-  eclasses.
-
-*mariadb-5.2.9 (27 Sep 2011)
-
-  27 Sep 2011; <atlantis@gentoo.org> +mariadb-5.2.9.ebuild:
-  Bumped mariadb to 5.2.9 release.
-
-*mariadb-5.3.1_beta (22 Sep 2011)
-
-  22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.3.1_beta.ebuild:
-  Bumped mariadb to the 5.3.1_beta release. This needs more work as even unit
-  tests are failing.
-
-*mariadb-5.2.8 (19 Aug 2011)
-
-  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.8.ebuild:
-  [dev-db/maria] Bumped to release 5.2.8.
-
-  19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild:
-  Added patch by Diego to fix the multiple install of files.
-
-*mariadb-5.3.0_beta (29 Jul 2011)
-
-  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.3.0_beta.ebuild:
-  [dev-db/mariadb] Bump to the first 5.3.0 beta release.
-
-  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mariadb-5.1.42-r1.ebuild, -mariadb-5.1.50.ebuild, -mariadb-5.1.50-r1.ebuild,
-  -mariadb-5.1.53.ebuild, -mariadb-5.2.4.ebuild, -mariadb-5.2.5.ebuild,
-  -mariadb-5.2.6.ebuild:
-  Dropped old versions of mariadb from the overlay.
-
-  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild:
-  [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
-  Drop irrelevant code and use mysql-v2 and not mysql-autotools.
-
-*mariadb-5.2.6 (13 May 2011)
-
-  13 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.5.ebuild, +mariadb-5.2.6.ebuild:
-  Bumped mariadb to the 5.2.6 release.
-  Fixed the calls to the mysql-autotools functions in the ebuilds using the
-  mysql-v2 eclass.
-
-  28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.55.ebuild, mariadb-5.2.4.ebuild, mariadb-5.2.5.ebuild:
-  Review the build type support in the eclass / ebuilds.
-
-*mariadb-5.2.5 (27 Mar 2011)
-
-  27 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mariadb-5.2.3.ebuild, +mariadb-5.2.5.ebuild:
-  Bumped mariadb to the 5.2.5 release.
-
-*mariadb-5.1.55 (05 Mar 2011)
-
-  05 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.42-r1.ebuild, mariadb-5.1.50.ebuild, mariadb-5.1.50-r1.ebuild,
-  mariadb-5.1.53.ebuild, +mariadb-5.1.55.ebuild, mariadb-5.2.3.ebuild,
-  mariadb-5.2.4.ebuild:
-  Bumped mariadb to the 5.1.55 release.
-  Updated testing instructions for mariadb ebuilds.
-
-*mariadb-5.2.3 (29 Nov 2010)
-
-  29 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.2.3.ebuild:
-  Added initial ebuild to test 5.2.3 release. Updated eclass as the maria
-  plugin was renamed to aria in the maria-5.2 tree.
-  This ebuild is currently dying on the configure run - it seems autoconf is
-  eating a case in the plugins.m4 file.
-
-*mariadb-5.1.50-r1 (06 Oct 2010)
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild,
-  +mariadb-5.1.50-r1.ebuild:
-  Release ready for tree now.
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild:
-  Ready for release.
-
-  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.50.ebuild:
-  Dropped the block on amarok[embedded].
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mariadb-5.1.50.ebuild:
-  Drop the EGIT_REPO_URI used to test locally.
-
-*mariadb-5.1.50 (24 Sep 2010)
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mariadb-5.1.50.ebuild:
-  Updated mariadb to the 5.1.50 release and added embedded support based on
-  Kristian Nielsen's <knielsen AT knielsen-hq DOT org> updated patch - bug
-  306315.
-
-*mariadb-5.1.42 (15 Mar 2010)
-
-  15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-4.1,
-  +mariadb-5.1.42.ebuild, +metadata.xml:
-  Add MariaDB. Bug #303130, based on the submission by Brian Evans
-  <grknight@tuffmail.com>.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
deleted file mode 100644
index 8c16e7c..0000000
--- a/dev-db/mariadb/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST mariadb-10.0.10.tar.gz 51946792 SHA256 66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512 806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948 WHIRLPOOL 79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
-DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512 2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064 WHIRLPOOL 0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
-DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
-DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
-DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
-DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
-DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1
deleted file mode 100644
index 211deaa..0000000
--- a/dev-db/mariadb/files/my.cnf-4.1
+++ /dev/null
@@ -1,147 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-default-character-set		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= /var/run/mysqld/mysqld.sock
-pid-file 					= /var/run/mysqld/mysqld.pid
-log-error 					= /var/log/mysql/mysqld.err
-basedir 					= /usr
-datadir 					= @DATADIR@
-skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= /tmp/
-#log-update 				= /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= /tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= /var/lib/mysql/
-#innodb_log_arch_dir		= /var/lib/mysql/
-#innodb_log_group_home_dir	= /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
deleted file mode 100644
index baf41c5..0000000
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ /dev/null
@@ -1,146 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.3 2013/01/20 02:39:55 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
deleted file mode 100644
index 42ebd39..0000000
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ /dev/null
@@ -1,150 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size				= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-[mariadb]
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild b/dev-db/mariadb/mariadb-10.0.10.ebuild
deleted file mode 100644
index d4a66b7..0000000
--- a/dev-db/mariadb/mariadb-10.0.10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
deleted file mode 100644
index d4a66b7..0000000
--- a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
deleted file mode 100644
index 24ac7f4..0000000
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
deleted file mode 100644
index 0c99bfd..0000000
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.14.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
deleted file mode 100644
index d58f658..0000000
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.12.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.2.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.37.ebuild b/dev-db/mariadb/mariadb-5.5.37.ebuild
deleted file mode 100644
index 8cdf607..0000000
--- a/dev-db/mariadb/mariadb-5.5.37.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
deleted file mode 100644
index df3c16c..0000000
--- a/dev-db/mariadb/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
-<use>
-  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libevent'>Use libevent for connection handling</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
deleted file mode 100644
index ea31e05..0000000
--- a/dev-db/mysql-cluster/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-# ChangeLog for dev-db/mysql-cluster
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*mysql-cluster-7.0.37 (03 Jul 2013)
-
-  03 Jul 2013; Brian Evans <grknight@lavabit.com> +mysql-cluster-7.0.37.ebuild,
-  -mysql-cluster-7.0.9.ebuild:
-  [mysql-cluster] Bump 7.0 series to 7.0.37
-
-*mysql-cluster-7.2.13 (01 Jul 2013)
-*mysql-cluster-7.3.0 (01 Jul 2013)
-
-  01 Jul 2013; Brian Evans <grknight@lavabit.com> 
-  +mysql-cluster-7.2.13.ebuild, +mysql-cluster-7.3.0.ebuild:
-  Bump to version 7.2.13 and 7.3.0
-
-  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-cluster-7.0.9.ebuild:
-  Move EAPI assignment to the top.
-  Whitespace.
-
-*mysql-cluster-7.0.9 (09 Aug 2010)
-
-  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
-  +mysql-cluster-7.0.9.ebuild:
-  Bug #331691: mysql-cluster support from Nathan Sullivan
-  <nathan@nightsys.net> for Gentoo telco users. Needs more polish still and
-  init.d scripts.
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
deleted file mode 100644
index 2dd4ef9..0000000
--- a/dev-db/mysql-cluster/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mysql-cluster-gpl-7.0.37.tar.gz 26875310 SHA256 4711275321aa4b1e5565327323320b95d89f07fd7f076d10a5a7f51653a50754 SHA512 d84cb77bce86a6438697a0d0caed517a8e1537c56d1af23575338c789dd5e9305b3684f37fd237d6a39cc64f6d1df7fe1180e3906eecff04581d3a2962d0d870 WHIRLPOOL f7a6de3046090236dc8c28d418b3bb00f32c326c388a8a3fdcf088ee3eea8fe06366a2732f210ff1904d05fd28edd825f23adf0c87e60c7be5bc16000fba110e
-DIST mysql-cluster-gpl-7.2.13.tar.gz 28571637 SHA256 3ea1061617bf2421fc7020c48e39b7539d04580171a663c778f98aa9c0176e85 SHA512 3dbc2ae8c9827b86bc88e89e07d26f1dd72cf3de88929dc9ae520f749a435b06202cdeb026689e8ced696d7440e23b86cf89e24cb0dd9084a8fb2c307ac02cee WHIRLPOOL c5f7b7b0951acc005b0f8b08ddbdb979b94fbe17353203a83b364a6d8c41de0d95caf621eb28c96627e6318240ba1ef604517993645a5878a78734d5f5ab137d
-DIST mysql-cluster-gpl-7.3.0.tar.gz 28623955 SHA256 ef0a8474e7debd7d4e2e900e60a08651d0c47d6d395d402061e100dc0fabcc03 SHA512 8c4eeb0d4d422bcffec0ab32286967d5fac8c54b4965f688f79794acfb90b7f477d86a8e980b62d47c68a468ff254c97569db34d2306eb6403a43a0afca64eee WHIRLPOOL 605ad60b6fa1f5948613f86568a94e21031ed7f611f3a621ae67a0ab3a387e0331c48cf2490ab4308a9ebac49e3bf0e25a7b084a4366f756a28dba3d59bcfcb3
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
deleted file mode 100644
index 22c35e3..0000000
--- a/dev-db/mysql-cluster/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<use>
-  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
-  <flag name='cluster'>Add support for NDB clustering</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
deleted file mode 100644
index b944856..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER="live"
-BUILD="autotools"
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
deleted file mode 100644
index afe0df0..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.13.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER="live"
-BUILD="cmake"
-
-# PBXT
-#PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 \
-			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
deleted file mode 100644
index afe0df0..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER="live"
-BUILD="cmake"
-
-# PBXT
-#PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 \
-			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
deleted file mode 100644
index 8363a18..0000000
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for dev-db/mysql-init-scripts
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-conf.d,
-  files/mysql-5.1.53-init.d:
-  Add stop timeout.
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> files/mysql-5.1.53-init.d:
-  Fix typo.
-
-*mysql-init-scripts-2.0_pre1 (06 Dec 2010)
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org>
-  +mysql-init-scripts-2.0_pre1.ebuild, +files/mysql-5.1.53-conf.d,
-  +files/mysql-5.1.53-init.d, +files/logrotate.mysql, +metadata.xml:
-  Finally revamp init scripts, based on bug #175783 submission from Davide
-  Pesavento <davidepesa@gmail.com>.
-
diff --git a/dev-db/mysql-init-scripts/files/logrotate.mysql b/dev-db/mysql-init-scripts/files/logrotate.mysql
deleted file mode 100644
index b3d50de..0000000
--- a/dev-db/mysql-init-scripts/files/logrotate.mysql
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
-monthly
-create 660 mysql mysql
-notifempty
-size 5M
-sharedscripts
-missingok
-postrotate
-/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
-endscript
-}
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
deleted file mode 100644
index 3c79b13..0000000
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-# If you want a non-stock location for the config file, uncomment or update
-# either of these as needed. If you do use it, you must make sure that none of
-# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
-# files collide with each other.
-MY_CNF="/etc/mysql/my.cnf"
-#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
-
-# Place any additional arguments here that you might need
-# Common/useful options:
-# --skip-slave-start=1 - For bringing up replication initially
-# --server-id=NNN - Server ID for replication
-# --skip-networking - lock it down to UNIX sockets only
-MY_ARGS=""
-
-# This setting (in seconds) should be high enough to allow InnoDB to do a full
-# checkpoint recovery. 900 is the default used in the upstream RPM startup
-# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
-# database. After the core startup is done, we wait this long for the UNIX
-# socket to appear.
-STARTUP_TIMEOUT="900"
-
-# This is how long, in milliseconds, we wait for pidfile to be created, early
-# in the startup.
-STARTUP_EARLY_TIMEOUT="1000"
-
-# How long (in seconds) should we wait for shutdown?
-STOP_TIMEOUT=120
-
-# integer [-20 .. 19 ] default 0
-# change the priority of the server -20 (high) to 19 (low)
-# see "man nice 1" for description
-#NICE=0
-
-# See start-stop-daemon(8) for possible settings
-#IONICE=2
-
-# If defined, --verbose gets passed to S-S-D
-#DEBUG=1
-
-# Depending on your usage of MySQL, you may also wish to start it after some
-# other services are up. Uncomment the lines below as needed. If these aren't
-# enough for you, we encourage you to file a bug, and help us understand how
-# you are using MySQL.
-
-# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
-# If so, you need DNS before you can accept connections.
-# Avoid dependency circular loops if you use MySQL to power a local DNS server.
-#rc_use="dns"
-#rc_after="dns"
-
-# Does your MySQL bind to an IP on an interface other than net.lo?
-# Alternatively you might wish to specify the exact interface here.
-#rc_use="net"
-#rc_after="net"
-
-# Do you store your MySQL files on a SAN or other network filesystem, that is
-# provided by the netmount init script?
-#rc_need="netmount"
-
-# Or from NFS? P.S. This is not a good idea in most cases, but does have some
-# valid usage cases, so we provide the option.
-#rc_need="nfsmount"
-
-# Should any one of the instances satisfy the requirement for MySQL coming up?
-# By default, we say no.
-[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
-# But uncomment this next instead if you think it should.
-#rc_provide="mysql"
-
-# Tell OpenRC about our config file
-[ -n "${MY_CNF}" ] && rc_config="${MY_CNF}"
-
-# vim: ft=gentoo-conf-d et ts=4 sw=4:
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
deleted file mode 100644
index 308e314..0000000
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount
-}
-
-get_config() {
-	my_print_defaults --config-file="$1" mysqld |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${SVCNAME}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${SVCNAME}${ebextra}"
-}
-
-start() {
-	# Check for old conf.d variables that mean migration was not yet done.
-	local varlist="${!mysql_slot_*} ${!MYSQL_BLOG_PID_FILE*} ${!STOPTIMEOUT*}"
-	varlist="${varlist// /}"
-	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
-	# It does have a use in testing, as it is possible to build a config file
-	# that works with both the old and new init scripts simulateously.
-	if [ -n "${varlist}" -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
-		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
-		eerror "Not proceeding because it may be dangerous."
-		return 1
-	fi
-
-	# Now we can startup
-	ebegin "Starting $(mysql_svcname)"
-
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-
-	if [ ! -d "${datadir}" ] ; then
-		eerror "MySQL datadir \`${datadir}' is empty or invalid"
-		eerror "Please check your config file \`${MY_CNF}'"
-		return 1
-	fi
-
-	if [ ! -d "${datadir}"/mysql ] ; then
-		eerror "You don't appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		return 1
-	fi
-
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
-	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	start-stop-daemon \
-		${DEBUG/*/"--verbose"} \
-		--start \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--background \
-		--wait ${startup_early_timeout} \
-		${tmpnice} \
-		${tmpionice} \
-		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	local ret=$?
-	if [ ${ret} -ne 0 ] ; then
-		eend ${ret}
-		return ${ret}
-	fi
-
-	ewaitfile ${startup_timeout} "${socket}"
-	eend $? || return 1
-
-	save_options pidfile "${pidfile}"
-	save_options basedir "${basedir}"
-}
-
-stop() {
-	ebegin "Stopping $(mysql_svcname)"
-
-	local pidfile="$(get_options pidfile)"
-	local basedir="$(get_options basedir)"
-	local stop_timeout=${STOP_TIMEOUT:-120}
-
-	start-stop-daemon \
-		${DEBUG/*/"--verbose"} \
-		--stop \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--retry ${stop_timeout}
-	eend $?
-}
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/metadata.xml b/dev-db/mysql-init-scripts/metadata.xml
deleted file mode 100644
index abf3529..0000000
--- a/dev-db/mysql-init-scripts/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>mysql</herd>
-</pkgmetadata>
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
deleted file mode 100644
index 2a33efa..0000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild,v 1.4 2010/10/19 05:53:42 leio Exp $
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc.
-RDEPEND="!<dev-db/mysql-5.1 sys-apps/openrc"
-
-src_install() {
-	newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
-	newinitd "${FILESDIR}/mysql-5.1.53-init.d" "mysql"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
deleted file mode 100644
index 202fea8..0000000
--- a/dev-db/mysql/ChangeLog
+++ /dev/null
@@ -1,388 +0,0 @@
-# ChangeLog for dev-db/mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*mysql-5.1.73 (12 Dec 2013)
-
-  12 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.1.73.ebuild:
-  [mysql] Bump 5.1 series
-
-*mysql-5.5.35 (10 Dec 2013)
-*mysql-5.6.15 (10 Dec 2013)
-
-  10 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.35.ebuild,
-  +mysql-5.6.15.ebuild, -mysql-5.6.10.ebuild:
-  [mysql] Version bumps for 5.5 and 5.6 series
-
-  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mysql-5.1.66-r1.ebuild,
-  -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild,
-  -mysql-5.1.68.ebuild, -mysql-5.1.69.ebuild, -mysql-5.5.29-r1.ebuild,
-  -mysql-5.5.29.ebuild, -mysql-5.5.30.ebuild, -mysql-5.5.31.ebuild,
-  -mysql-5.6.7_rc.ebuild, -mysql-5.6.9_rc.ebuild:
-  [dev-db/mysql] Trim old
-
-*mysql-5.6.13 (26 Aug 2013)
-
-  26 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.6.13.ebuild:
-  [dev-db/mysql] Version bump to 5.6.13.  Failing test(s):
-  rpl.rpl_spec_variables similar to bug 473002
-
-*mysql-5.5.33 (16 Aug 2013)
-
-  16 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.33.ebuild:
-  Version bump w/ failing tests Failing test(s): rpl.rpl_deadlock_innodb
-  main.plugin_auth main.mysqladmin main.mysqlhotcopy_archive
-  main.mysqlhotcopy_myisam
-
-*mysql-5.6.12 (06 Jun 2013)
-
-  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.12.ebuild,
-  mysql-5.6.10.ebuild, mysql-5.6.7_rc.ebuild, mysql-5.6.9_rc.ebuild,
-  mysql-5.7.1_alpha_pre11.ebuild:
-  Bump. Fails tests: rpl.rpl_spec_variables (mix,stmt),
-  binlog.binlog_mysqlbinlog_filter (stmt), perfschema.binlog_edge_mix,
-  perfschema.binlog_edge_stmt, funcs_1.is_columns_mysql,
-  funcs_1.is_tables_mysql, funcs_1.is_triggers,
-  sys_vars.table_definition_cache_basic, sys_vars.table_open_cache_basic.
-
-*mysql-4.0.27-r1 (06 Jun 2013)
-*mysql-4.1.22-r1 (06 Jun 2013)
-*mysql-5.1.68 (06 Jun 2013)
-*mysql-5.5.32 (06 Jun 2013)
-
-  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.27-r1.ebuild,
-  +mysql-4.1.22-r1.ebuild, +mysql-5.1.68.ebuild, +mysql-5.5.32.ebuild,
-  mysql-5.1.66.ebuild, mysql-5.1.69.ebuild, mysql-5.5.30.ebuild,
-  mysql-5.5.31.ebuild:
-  Bump.
-
-*mysql-5.5.31 (03 Jun 2013)
-
-  03 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.31.ebuild,
-  mysql-5.1.69.ebuild:
-  Bump.
-
-*mysql-5.1.69 (28 May 2013)
-
-  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.69.ebuild:
-  Bump, please see bug #471632 for test failures.
-
-*mysql-5.5.30 (08 Mar 2013)
-
-  08 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.30.ebuild:
-  Bump.
-
-  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
-  mysql-5.1.67.ebuild:
-  Update headers and keywords.
-
-*mysql-5.6.9_rc (28 Jan 2013)
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.9_rc.ebuild:
-  Add still-broken 5.6 for development. As a problem with as-needed link order
-  still.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.0,
-  files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild,
-  mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild:
-  Sync with gentoo-x86 for prefix changes & headers.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.19.ebuild,
-  -mysql-5.5.20.ebuild, -mysql-5.5.21.ebuild, -mysql-5.5.22.ebuild,
-  -mysql-5.5.25a.ebuild, -mysql-5.5.27.ebuild, -mysql-5.5.28.ebuild,
-  -mysql-5.6.2_alpha_pre5.ebuild:
-  Trim.
-
-*mysql-5.1.66-r1 (28 Jan 2013)
-*mysql-5.1.67-r1 (28 Jan 2013)
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.66-r1.ebuild,
-  +mysql-5.1.67-r1.ebuild, mysql-5.1.66.ebuild, mysql-5.1.67.ebuild:
-  Actually move PBXT fix to revbump.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
-  mysql-5.1.67.ebuild:
-  Include PBXT nice fix per bug #374349.
-
-  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
-  mysql-5.1.66.ebuild, mysql-5.1.67.ebuild, mysql-5.5.19.ebuild,
-  mysql-5.5.20.ebuild, mysql-5.5.21.ebuild, mysql-5.5.22.ebuild,
-  mysql-5.5.28.ebuild, mysql-5.5.29.ebuild:
-  Sync from gentoo-x86.
-
-  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.96.ebuild:
-  Copy keywords from gentoo-x86.
-
-*mysql-5.1.65 (14 Aug 2012)
-
-  14 Aug 2012; <atlantis@gentoo.org> +mysql-5.1.65.ebuild:
-  [dev-db/mysql] Bump to the 5.1.65 release.
-
-*mysql-5.5.25a (07 Jul 2012)
-
-  07 Jul 2012; <atlantis@gentoo.org> +mysql-5.5.25a.ebuild:
-  [dev-db/mysql-5.5.25a] Version bump.
-
-  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
-  Move EAPI assignment to the top.
-  Whitespace.
-
-  15 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  files/my.cnf-5.1:
-  Update table_cache to table_open_cache variable for mysql-5.1 my.cnf file.
-  Fixes bug 403425 - thanks to Alex Efros <powerman-asdf@yandex.ru> for the
-  report.
-
-*mysql-5.1.61 (31 Jan 2012)
-*mysql-5.5.20 (31 Jan 2012)
-
-  31 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.61.ebuild,
-  +mysql-5.5.20.ebuild:
-  Version bump, passes all tests.
-
-  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.58-r1.ebuild, mysql-5.5.10.ebuild, mysql-5.5.12.ebuild,
-  mysql-5.5.14.ebuild, mysql-5.5.15.ebuild:
-  [dev-db/mysql] Bump EAPI to 4 on old mysql versions.
-
-*mysql-5.5.18 (20 Nov 2011)
-
-  20 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.18.ebuild:
-  Version bump.
-
-*mysql-5.1.60 (19 Nov 2011)
-
-  19 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.60.ebuild:
-  Version bump.
-
-*mysql-5.5.17 (26 Oct 2011)
-
-  26 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.5.17.ebuild:
-  [dev-db/mysql] Bumped to the 5.5.17 version.
-
-  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.59.ebuild, mysql-5.5.16.ebuild, mysql-5.6.2_alpha_pre5.ebuild:
-  [dev-db/mysql] Use EAPI-4 to support the new Prefix support of the eclasses.
-
-*mysql-5.5.16 (22 Sep 2011)
-
-  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.5.16.ebuild:
-  Bumped mysql to the 5.5.16 release.
-
-*mysql-5.1.59 (22 Sep 2011)
-
-  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.1.59.ebuild:
-  Bumped mysql to the 5.1.59 release.
-
-*mysql-5.5.15 (30 Jul 2011)
-
-  30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.5.15.ebuild:
-  [dev-db/mysql] 5.5.15 release version bump.
-
-  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mysql-5.1.58.ebuild:
-  Dropped broken mysql-5.1.58 ebuild.
-
-*mysql-5.1.58-r1 (21 Jul 2011)
-
-  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.58-r1.ebuild:
-  [dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to
-  the ebuild and the mysql-v2 eclass. Fixes bug 375063.
-
-  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.58.ebuild:
-  [dev-db/mysql-5.5.14] Don't use live version of mysql_extras.
-  [dev-db/mysql-5.1.58] Don't use live version of mysql_extras.
-  Synced from the tree.
-
-  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.13.ebuild:
-  5.5.13 removed from uptream mirrors, unable to verify digest.
-
-  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.56.ebuild,
-  -mysql-5.1.56-r1.ebuild, -mysql-5.1.57.ebuild:
-  Old versions moved to tree.
-
-  13 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.57.ebuild, mysql-5.1.58.ebuild, mysql-5.5.13.ebuild,
-  mysql-5.5.14.ebuild:
-  Replace mysql_disable_test calls with mysql-v2_disable_test.
-  Should finally disable the remaining failing tests.
-
-  18 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.57.ebuild:
-  Update mysql-v2 eclass to use the git-2 eclass.
-  Update the mysql-5.1.57 ebuild to use the mysql-v2 eclass.
-
-  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
-  Really disable binlog.binlog_statement_insert_delayed test. 
-
-  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
-  Disable tests that fail for mysql-5.5.*:
-  3 tests fail for latin/utf-8 charsets and 1 causes segmentation faults.
-
-  15 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  -mysql-5.0.91.ebuild, -mysql-5.1.50-r2.ebuild, -mysql-5.1.50-r3.ebuild,
-  -mysql-5.1.51.ebuild, -mysql-5.1.51-r1.ebuild, -mysql-5.1.52-r2.ebuild,
-  -mysql-5.1.53-r1.ebuild, -mysql-5.5.4_alpha_pre3.ebuild:
-  Dropping old versions.
-
-*mysql-5.5.12 (11 May 2011)
-*mysql-5.1.57 (11 May 2011)
-
-  11 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.57.ebuild, +mysql-5.5.12.ebuild:
-  Bumped mysql to the 5.1.57 and 5.5.12 releases.
-
-*mysql-5.1.56-r1 (18 Apr 2011)
-
-  18 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.56.ebuild,
-  +mysql-5.1.56-r1.ebuild:
-  Make a release of 5.1.56 using the old eclass.
-
-*mysql-5.1.56 (28 Mar 2011)
-
-  28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.56.ebuild, mysql-5.5.10.ebuild, metadata.xml:
-  Bumped mysql to the 5.1.56 release.
-  More updates to the 5.5.10 ebuild.
-
-  26 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.5.10.ebuild:
-  Applied a few more fixes to mysql-5.5.10.
-
-  21 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.5.10.ebuild:
-  A few more updates for mysql-5.5.10 including a reworked patch from upstream
-  ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.
-
-*mysql-5.5.10 (17 Mar 2011)
-
-  17 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.5.10.ebuild:
-  Introduce new eclasses and update mysql_fx.eclass to support the cmake based
-  mysql-5.5 ebuilds.
-  Add initial support for mysql-5.5.10 - this is still a work in progress.
-
-*mysql-5.0.92 (17 Feb 2011)
-
-  17 Feb 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.0.92.ebuild:
-  Bumped mysql to the 5.0.92 release.
-  This version is still breaking on a missing #endif at sql/sql_parse.cc.
-
-  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.53-r1.ebuild:
-  Add ~mips per main tree.
-
-  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.51-r1.ebuild,
-  mysql-5.1.52-r2.ebuild, mysql-5.1.53-r1.ebuild:
-  Update libtool changes from main tree.
-
-*mysql-5.1.53-r1 (28 Nov 2010)
-*mysql-5.1.52-r2 (28 Nov 2010)
-
-  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.52.ebuild,
-  +mysql-5.1.52-r2.ebuild, +mysql-5.1.53-r1.ebuild:
-  Add 5.1.53 ebuild and bump 5.1.52 to be ahead of main tree versions.
-
-*mysql-5.1.52 (03 Nov 2010)
-
-  03 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.52.ebuild:
-  Add 5.1.52 release, just need to integrate MIPS and federated fixes
-
-*mysql-5.1.51-r1 (06 Oct 2010)
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.51.ebuild,
-  +mysql-5.1.51-r1.ebuild:
-  Release ready for tree now.
-
-  06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild,
-  mysql-5.1.50-r3.ebuild, mysql-5.1.51.ebuild:
-  Ready for release.
-
-*mysql-5.1.51 (04 Oct 2010)
-
-  04 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.51.ebuild:
-  Bumped to mysql-5.1.51.
-
-  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.50-r3.ebuild:
-  Dropped the block on amarok[embedded].
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.1.50-r3.ebuild:
-  Drop the EGIT_REPO_URI used to test locally.
-
-*mysql-5.1.50-r3 (24 Sep 2010)
-
-  24 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.50-r3.ebuild:
-  Bumped mysql to 5.1.50-r3 to add the embedded patch.
-
-  07 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.49.ebuild,
-  -mysql-5.5.1_alpha_pre2-r1.ebuild:
-  cleanup.
-
-  07 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
-  Hello again bug #332565.
-
-  05 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
-  Refix bug #332565.
-
-  01 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50-r2.ebuild:
-  Block the new sharedlib patch since it doesn't work fully yet.
-
-*mysql-5.1.50-r2 (01 Sep 2010)
-
-  01 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.50.ebuild,
-  +mysql-5.1.50-r2.ebuild:
-  Rename to avoid conflict.
-
-  21 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.50.ebuild:
-  Some tests false-positive with XtraDB.
-
-*mysql-5.1.50 (20 Aug 2010)
-
-  20 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.50.ebuild:
-  Verbump.
-
-  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
-  -mysql-5.0.90-r3.ebuild, -mysql-5.1.44-r4.ebuild, -mysql-5.1.45-r2.ebuild,
-  -mysql-5.1.46.ebuild:
-  Cleanup.
-
-  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.90-r3.ebuild,
-  mysql-5.0.91.ebuild:
-  Add prefix keywords.
-
-  09 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.91.ebuild:
-  Clean up 5.0.91 for release.
-
-*mysql-5.1.49 (27 Jul 2010)
-
-  27 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.49.ebuild:
-  Added mysql-5.1.49 release.
-
-*mysql-5.0.91 (22 May 2010)
-
-  22 May 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.91.ebuild:
-  Bug #319489: new version for GLSA, but critically broken.
-
-*mysql-5.1.42 (02 Jan 2010)
-
-  02 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.42.ebuild:
-  Bumped mysql to 5.1.42.
-
-*mysql-5.1.41 (29 Nov 2009)
-
-  29 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  +mysql-5.1.41.ebuild:
-  Initial bump to mysql-5.1.41.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
deleted file mode 100644
index a9d6217..0000000
--- a/dev-db/mysql/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
-DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
-DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
-DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
-DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
-DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
-DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
-DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
-DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf
deleted file mode 100644
index 4e7d0f6..0000000
--- a/dev-db/mysql/files/my.cnf
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.5 2008/11/14 01:49:37 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 32M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-#skip-networking
-skip-innodb
-innodb_file_per_table
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-log		= /var/log/mysql/mysql.log
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=1M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
deleted file mode 100644
index abc8690..0000000
--- a/dev-db/mysql/files/my.cnf-4.0
+++ /dev/null
@@ -1,113 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 64M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-log-error	= /var/log/mysql/mysqld.err
-# If set, mysql logs all queries (general query log). This will be deprecated in
-# MySQL 5.0. This logs all queries, even error queries and is slow.
-# log          = /var/log/mysql/mysql.log
-#
-# If you really need logging, you'd rather use binary logging. Especially when doing
-# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info.
-# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
-# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
-# running.
-# Before doing that, check which logfile slave curently uses by running
-# mysql> SHOW SLAVE STATUS
-# To list logfiles on master do:
-# mysql> SHOW MASTER LOGS
-# Then use PURGE for those not needed anymore only! Never remove the files
-# manually!
-#
-# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
-# mysql> RESET MASTER - Deletes all binary logs listed in the index
-#                       file, resetting the binlog index file to be empty.
-# mysql> RESET SLAVE - Makes the slave forget its replication position in
-#                      the master logs.
-# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
-# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
-#
-# log-bin
-# set-variable  = binlog-do-db=non_existant
-# set-variable  = binlog-ignore-db=database_name
-#
-# server-id has to unique for each master or slave in your network,
-# lets use the last number from IP address
-# server-id	= 207
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-# be secure by default!
-bind-address    = 127.0.0.1
-port			= 3306
-# this can make it even more secure:
-#skip-networking
-#
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-set-variable = innodb_buffer_pool_size=32M
-# this is the default, increase it if you have lots of tables
-set-variable = innodb_additional_mem_pool_size=1M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-innodb_data_home_dir = /var/lib/mysql/
-innodb_log_arch_dir = /var/lib/mysql/
-innodb_log_group_home_dir = /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-set-variable = innodb_log_file_size=8M
-# this is the default, increase it if you have very large transactions going on
-set-variable = innodb_log_buffer_size=1M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-loose-innodb_file_per_table=1
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completion
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
deleted file mode 100644
index 458a58a..0000000
--- a/dev-db/mysql/files/my.cnf-4.1
+++ /dev/null
@@ -1,147 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-default-character-set		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= /var/run/mysqld/mysqld.sock
-pid-file 					= /var/run/mysqld/mysqld.pid
-log-error 					= /var/log/mysql/mysqld.err
-basedir 					= /usr
-datadir 					= @DATADIR@
-skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= /tmp/
-#log-update 				= /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= /tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= /var/lib/mysql/
-#innodb_log_arch_dir		= /var/lib/mysql/
-#innodb_log_group_home_dir	= /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
deleted file mode 100644
index f1ee4f2..0000000
--- a/dev-db/mysql/files/my.cnf-5.1
+++ /dev/null
@@ -1,146 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
deleted file mode 100644
index eb4f859..0000000
--- a/dev-db/mysql/files/my.cnf-5.5
+++ /dev/null
@@ -1,149 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
deleted file mode 100644
index 16ea7bc..0000000
--- a/dev-db/mysql/files/mysql.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.7 2004/07/14 21:41:15 agriffis Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
-		eerror "No /etc/mysql/my.cnf file exists!"
-	fi
-
-    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
-
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting mysqld"
-	/usr/bin/safe_mysqld >/dev/null 2>&1 &
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping mysqld"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/mysqld/mysqld.pid --retry 20
-	eend $?
-}
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
deleted file mode 100644
index 9ecd928..0000000
--- a/dev-db/mysql/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
-<use>
-  <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='raid'>Deprecated option, removed in the 5.0 series</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
deleted file mode 100644
index dc82246..0000000
--- a/dev-db/mysql/mysql-4.0.27-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.27-r1.ebuild,v 1.6 2008/12/14 20:17:13 klausman Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! use "minimal" ; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		cd mysql-test
-		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
-		./mysql-test-run
-		retstatus=$?
-
-		# Just to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "make test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
deleted file mode 100644
index d5fa1b6..0000000
--- a/dev-db/mysql/mysql-4.1.22-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.22-r1.ebuild,v 1.8 2011/07/08 10:05:34 ssuominen Exp $
-
-MY_EXTRAS_VER="20090228-2228Z"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! use "minimal" ; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local testopts="--force"
-
-		# sandbox makes ndbd zombie
-		has "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
-
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		cd mysql-test
-		sed -i -e "s|3306|3307|g" mysql-test-run.pl
-
-		# from Makefile.am:
-		retstatus=1
-		./mysql-test-run.pl ${testopts} \
-		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
-		&& retstatus=0
-
-		# Just to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
deleted file mode 100644
index f22bc53..0000000
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.96.ebuild,v 1.4 2013/01/20 01:49:23 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20120401-2131Z"
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND=""
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.0 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-			5.0.96)
-				for t in \
-					client_xml compress connect ctype_recoding drop \
-					federated grant information_schema \
-					information_schema_db innodb lowercase_table \
-					lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \
-					mysqlcheck mysqldump-max mysqldump mysqldump_restore \
-					mysqlshow ps ps_1general rename rpl000009 rpl_ddl \
-					rpl_delete_all rpl_drop_db rpl_dual_pos_advance \
-					rpl_error_ignored_table rpl_filter_tables_not_exist \
-					rpl_replicate_do rpl_trigger_not_windows select \
-					show_check sp system_mysql_db system_mysql_db_fix30020 \
-					system_mysql_db_fix40123 view \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-		esac
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
deleted file mode 100644
index 06c804b..0000000
--- a/dev-db/mysql/mysql-5.1.70.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130626-0127Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73.ebuild
deleted file mode 100644
index 721099e..0000000
--- a/dev-db/mysql/mysql-5.1.73.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.35.ebuild b/dev-db/mysql/mysql-5.5.35.ebuild
deleted file mode 100644
index 2df1496..0000000
--- a/dev-db/mysql/mysql-5.5.35.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20140121-1138Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.37.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
deleted file mode 100644
index ebb6824..0000000
--- a/dev-db/mysql/mysql-5.5.37.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-                # main.mysql_tzinfo_to_sql_symlink
-                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-                #
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.6.17.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
deleted file mode 100644
index 3de9afc..0000000
--- a/dev-db/mysql/mysql-5.6.17.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
-			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
deleted file mode 100644
index 9026213..0000000
--- a/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_columns_mysql, 
-		# funcs_1.is_tables_mysql, funcs_1.is_triggers,
-		# binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
-		# perfschema.binlog_edge_stmt
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-                # main.mysql_tzinfo_to_sql_symlink
-                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-                #
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql funcs_1.is_triggers \
-			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000 --testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-java/mariadb-java-client/ChangeLog b/dev-java/mariadb-java-client/ChangeLog
deleted file mode 100644
index 1d1c502..0000000
--- a/dev-java/mariadb-java-client/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-*mariadb-java-client-1.1.4 (10 Sep 2013)
-
-  10 Sep 2013; Brian Evans <grknight@tuffmail.com> +files/maven-build-1.1.4.xml,
-  +mariadb-java-client-1.1.4.ebuild:
-  [mariadb-java-client] Version bump
-
-*mariadb-java-client-1.1.3 (01 Jul 2013)
-*mariadb-java-client-9999 (01 Jul 2013)
-
-  01 Jul 2013; Brian Evans <grknight@lavabit.com> +files/maven-build.xml,
-  +mariadb-java-client-1.1.3.ebuild, +mariadb-java-client-9999.ebuild,
-  +metadata.xml:
-  New ebuilds for MariaDB's LGPL JDBC Client
diff --git a/dev-java/mariadb-java-client/Manifest b/dev-java/mariadb-java-client/Manifest
deleted file mode 100644
index e1bc387..0000000
--- a/dev-java/mariadb-java-client/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mariadb-java-client-1.1.3.tar.gz 179751 SHA256 bb9927e3bacaa501e8a0a04ac1a93cccf43c64d4a4742d17b115b54869964076 SHA512 22ed23483b5ab741bfbd82825ce21cb55533c78fa8ea839effda2eca185f283b92a3b551a12761c3e00de6a0722e95c4ebd670462d553b33dbe9925541ae5b97 WHIRLPOOL 0896218d64c5e488322a745a7819c2f9c39d5b5ed677d013abae7270455caea0b4394d013d8ee17b8fb166679f1a3f89af6ff06e2a9d026f525df5088e813ffa
-DIST mariadb-java-client-1.1.4.tar.gz 184565 SHA256 6feec7634572577fed376a19927d05d5abea01aa81615451b259f4fec52d72cd SHA512 4be86df3949845f48741e98a5f1ef17d30229af15966f86e502890f01b05b518bbf0aad8814e50512554cbb318b1048dfa9ff3f5540c41111a60c0059e526236 WHIRLPOOL 4966ae823933d2aefbcb2e86a1302b11b635def426500033e256277fd91a6ade0bfffe995b023a84b4c8fd448c3a78df7c2ea64f8c8e298dfc7f12a16662a42c
diff --git a/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml b/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
deleted file mode 100644
index 0a62494..0000000
--- a/dev-java/mariadb-java-client/files/maven-build-1.1.4.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 7/1/13 1:49 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="mariadb-java-client-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="mariadb-java-client"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/net/java/dev/jna/jna/3.3.0/jna-3.3.0-platform.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/main/resources/META-INF/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.6"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.6/junit-4.6.jar" 
-         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.6/junit-4.6.jar" 
-         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/mariadb-java-client/files/maven-build.xml b/dev-java/mariadb-java-client/files/maven-build.xml
deleted file mode 100644
index 3251eb1..0000000
--- a/dev-java/mariadb-java-client/files/maven-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 7/1/13 1:49 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="mariadb-java-client-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="mariadb-java-client"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/main/resources/META-INF/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.6"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.6/junit-4.6.jar" 
-         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.6/junit-4.6.jar" 
-         dest="${maven.repo.local}/junit/junit/4.6/junit-4.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
deleted file mode 100644
index 7ce3bfc..0000000
--- a/dev-java/mariadb-java-client/mariadb-java-client-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VCS_INHERIT=""
-MY_PN="client-java"
-
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="bzr"
-	EBZR_REPO_URI="lp:${PN}"
-else
-SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	"
-fi
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils "${VCS_INHERIT}"
-
-DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="${IUSE}"
-
-# Tests require a server running on localhost port 3306
-RESTRICT="test"
-
-RDEPEND="${RDEPEND} >=virtual/jre-1.6"
-DEPEND="${DEPEND} >=virtual/jdk-1.6"
-
-src_prepare() {
-	cp "${FILESDIR}/maven-build.xml" build.xml
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-}
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
deleted file mode 100644
index f6b371f..0000000
--- a/dev-java/mariadb-java-client/mariadb-java-client-1.1.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VCS_INHERIT=""
-MY_PN="client-java"
-
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="bzr"
-	EBZR_REPO_URI="lp:${PN}"
-else
-SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	"
-fi
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 "${VCS_INHERIT}"
-
-DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="${IUSE}"
-
-# Tests require a server running on localhost port 3306
-RESTRICT="test"
-
-COMMON_DEPEND="dev-java/jna"
-RDEPEND="${RDEPEND} >=virtual/jre-1.6 ${COMMON_DEPEND}"
-DEPEND="${DEPEND} >=virtual/jdk-1.6 ${COMMON_DEPEND}"
-
-src_prepare() {
-	cp "${FILESDIR}/maven-build-1.1.4.xml" build.xml || die
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-}
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild b/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
deleted file mode 100644
index 46173b3..0000000
--- a/dev-java/mariadb-java-client/mariadb-java-client-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-VCS_INHERIT=""
-MY_PN="client-java"
-
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="bzr"
-	EBZR_REPO_URI="lp:${PN}"
-else
-SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/${P}.tar.gz
-	"
-fi
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils "${VCS_INHERIT}"
-
-DESCRIPTION="Client Library for Java is used to connect applications to MariaDB/MySQL databases"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="${IUSE}"
-
-# Tests require a server running on localhost port 3306
-RESTRICT="test"
-
-RDEPEND="${RDEPEND} >=virtual/jre-1.6"
-DEPEND="${DEPEND} >=virtual/jdk-1.6"
-
-src_prepare() {
-	cp "${FILESDIR}/maven-build.xml" build.xml
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-}
diff --git a/dev-java/mariadb-java-client/metadata.xml b/dev-java/mariadb-java-client/metadata.xml
deleted file mode 100644
index eada174..0000000
--- a/dev-java/mariadb-java-client/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<use>
-</use>
-</pkgmetadata>
diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
deleted file mode 100644
index 2cfa3f2..0000000
--- a/eclass/mysql-autotools.eclass
+++ /dev/null
@@ -1,676 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.17 2013/03/16 19:20:34 robbat2 Exp $
-
-# @ECLASS: mysql-autotools.eclass
-# @MAINTAINER:
-# MySQL Team <mysql-bugs@gentoo.org>
-# Robin H. Johnson <robbat2@gentoo.org>
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# Luca Longinotti <chtekk@gentoo.org>
-# @AUTHOR:
-# Francesco Riosa <vivo@gentoo.org> (retired)
-# @BLURB: This eclass provides support for autotools based mysql releases
-# @DESCRIPTION:
-# The mysql-autotools.eclass provides the support to build the mysql
-# ebuilds using the autotools build system. This eclass provides
-# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
-# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
-
-inherit autotools flag-o-matic multilib prefix
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-autotools_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-autotools_disable_test() {
-
-	local rawtestname testname testsuite reason mysql_disable_file
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	mysql_disable_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo "${testname} : ${reason}" >> "${mysql_disable_file}"
-
-	# ${S}/mysql-tests/t/disabled.def
-	#
-	# ${S}/mysql-tests/suite/federated/disabled.def
-	#
-	# ${S}/mysql-tests/suite/jp/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl/t/disabled.def
-	# ${S}/mysql-tests/suite/parts/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
-	# ${S}/mysql-tests/suite/binlog/t/disabled.def
-	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-	if [[ -n ${testsuite} ]]; then
-		for mysql_disable_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
-			FAILED ; do
-			[[ -f ${mysql_disable_file} ]] && break
-		done
-		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
-		else
-			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-autotools_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure a minimal build
-mysql-autotools_configure_minimal() {
-
-	# These are things we exclude from a minimal build, please
-	# note that the server actually does get built and installed,
-	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
-
-	for i in ${minimal_exclude_list} ; do
-		myconf="${myconf} --without-${i}"
-	done
-	myconf="${myconf} --with-extra-charsets=none"
-	myconf="${myconf} --enable-local-infile"
-
-	if use static ; then
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-
-	# MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
-	# A note is added to the configure output
-	if [[ ${PN} == "mariadb" ]]  && mysql_version_is_at_least "5.1.61" ; then
-		myconf="${myconf} --disable-distribution"
-	fi
-}
-
-# @FUNCTION: mysql-autotools_configure_common
-# @DESCRIPTION:
-# Helper function to configure the common builds
-mysql-autotools_configure_common() {
-
-	myconf="${myconf} $(use_with big-tables)"
-	myconf="${myconf} --enable-local-infile"
-	myconf="${myconf} --with-extra-charsets=all"
-	myconf="${myconf} --with-mysqld-user=mysql"
-	myconf="${myconf} --with-server"
-	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
-	myconf="${myconf} --without-libwrap"
-
-	if use static ; then
-		myconf="${myconf} --with-mysqld-ldflags=-all-static"
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if use debug ; then
-		myconf="${myconf} --with-debug=full"
-	else
-		myconf="${myconf} --without-debug"
-		if ( use cluster ); then
-			myconf="${myconf} --without-ndb-debug"
-		fi
-	fi
-
-	if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
-		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
-	elif ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-
-	if use embedded ; then
-		myconf="${myconf} --with-embedded-privilege-control"
-		myconf="${myconf} --with-embedded-server"
-	else
-		myconf="${myconf} --without-embedded-privilege-control"
-		myconf="${myconf} --without-embedded-server"
-	fi
-
-}
-
-# @FUNCTION: mysql-autotools_configure_51
-# @DESCRIPTION:
-# Helper function to configure 5.1 and later builds
-mysql-autotools_configure_51() {
-
-	# TODO: !!!! readd --without-readline
-	# the failure depend upon config/ac-macros/readline.m4 checking into
-	# readline.h instead of history.h
-	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-geometry"
-	myconf="${myconf} --with-readline"
-	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
-	myconf="${myconf} --without-pstack"
-	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
-
-	# This is an explict die here, because if we just forcibly disable it, then the
-	# user's data is not accessible.
-	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
-	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-	myconf="${myconf} $(use_enable community community-features)"
-	if use community; then
-		myconf="${myconf} $(use_enable profiling)"
-	else
-		myconf="${myconf} --disable-profiling"
-	fi
-
-	# Scan for all available plugins
-	local plugins_avail="$(
-	LANG=C \
-	find "${S}" \
-		\( \
-		-name 'plug.in' \
-		-o -iname 'configure.in' \
-		-o -iname 'configure.ac' \
-		\) \
-		-print0 \
-	| xargs -0 sed -r -n \
-		-e '/^MYSQL_STORAGE_ENGINE/{
-			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp;
-		}' \
-	| tr -s '\n' ' '
-	)"
-
-	# 5.1 introduces a new way to manage storage engines (plugins)
-	# like configuration=none
-	# This base set are required, and will always be statically built.
-	local plugins_sta="csv myisam myisammrg heap"
-	local plugins_dyn=""
-	local plugins_dis="example ibmdb2i"
-
-	# These aren't actually required by the base set, but are really useful:
-	plugins_sta="${plugins_sta} archive blackhole"
-
-	# Now the extras
-	if use extraengine ; then
-		# like configuration=max-no-ndb, archive and example removed in 5.1.11
-		# not added yet: ibmdb2i
-		# Not supporting as examples: example,daemon_example,ftexample
-		plugins_sta="${plugins_sta} partition"
-
-		if [[ ${PN} != "mariadb" ]] ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_dyn} federated"
-		else
-			elog "MariaDB includes the FederatedX engine. Be sure to read"
-			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_dyn} federatedx"
-		fi
-	else
-		plugins_dis="${plugins_dis} partition federated"
-	fi
-
-	# Upstream specifically requests that InnoDB always be built:
-	# - innobase, innodb_plugin
-	# Build falcon if available for 6.x series.
-	for i in innobase falcon ; do
-		[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
-	done
-	for i in innodb_plugin ; do
-		[[ -e ${S}/storage/${i} ]] && plugins_dyn="${plugins_dyn} ${i}"
-	done
-
-	# like configuration=max-no-ndb
-	if ( use cluster ) ; then
-		plugins_sta="${plugins_sta} ndbcluster partition"
-		plugins_dis="${plugins_dis//partition}"
-		myconf="${myconf} --with-ndb-binlog"
-	else
-		plugins_dis="${plugins_dis} ndbcluster"
-	fi
-
-	if [[ ${PN} == "mariadb" ]] ; then
-		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
-		# caught above.
-		# This is not optional, without it several upstream testcases fail.
-		# Also strongly recommended by upstream.
-		if [[ ${PV} < "5.2.0" ]] ; then
-			myconf="${myconf} --with-maria-tmp-tables"
-			plugins_sta="${plugins_sta} maria"
-		else
-			myconf="${myconf} --with-aria-tmp-tables"
-			plugins_sta="${plugins_sta} aria"
-		fi
-
-		[[ ( -e ${S}/storage/innobase ) || ( -e ${S}/storage/xtradb ) ]] ||
-			die "The ${P} package doesn't provide innobase nor xtradb"
-
-		for i in innobase xtradb ; do
-			[[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
-		done
-
-		myconf="${myconf} $(use_with libevent)"
-
-		if mysql_version_is_at_least "5.2" ; then
-			for i in oqgraph ; do
-				use ${i} \
-				&& plugins_dyn="${plugins_dyn} ${i}" \
-				|| plugins_dis="${plugins_dis} ${i}"
-			done
-		fi
-
-		if mysql_version_is_at_least "5.2.5" ; then
-			for i in sphinx ; do
-				use ${i} \
-				&& plugins_dyn="${plugins_dyn} ${i}" \
-				|| plugins_dis="${plugins_dis} ${i}"
-			done
-		fi
-
-		#Authentication plugins
-		if mysql_version_is_at_least "5.2.11" ; then
-			for i in pam ; do
-				use ${i} \
-				&& plugins_dyn="${plugins_dyn} auth_${i}" \
-				|| plugins_dis="${plugins_dis} auth_${i}"
-			done
-		fi
-	fi
-
-	if pbxt_available && [[ ${PBXT_NEWSTYLE} == "1" ]]; then
-		use pbxt \
-		&& plugins_sta="${plugins_sta} pbxt" \
-		|| plugins_dis="${plugins_dis} pbxt"
-	fi
-
-	use static && \
-	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
-	plugins_dyn=""
-
-	# Google MySQL, bundle what upstream supports
-	if [[ ${PN} == "google-mysql" ]]; then
-		for x in innobase innodb_plugin innodb ; do
-			plugins_sta="${plugins_sta//$x}"
-			plugins_dyn="${plugins_dyn//$x}"
-		done
-		plugins_sta="${plugins_sta} innodb_plugin googlestats"
-		myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc"
-		# use system lzo for google-mysql
-		myconf="${myconf} --with-lzo2-dir=/usr"
-	fi
-
-	einfo "Available plugins: ${plugins_avail}"
-	einfo "Dynamic plugins: ${plugins_dyn}"
-	einfo "Static plugins: ${plugins_sta}"
-	einfo "Disabled plugins: ${plugins_dis}"
-
-	# These are the static plugins
-	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
-	# And the disabled ones
-	for i in ${plugins_dis} ; do
-		myconf="${myconf} --without-plugin-${i}"
-	done
-}
-
-pbxt_src_configure() {
-
-	mysql_init_vars
-
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-
-	einfo "Reconfiguring dir '${PWD}'"
-	eautoreconf
-
-	local myconf=""
-	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	use debug && myconf="${myconf} --with-debug=full"
-	econf ${myconf} || die "Problem configuring PBXT storage engine"
-}
-
-pbxt_src_compile() {
-
-	# TODO: is it safe/needed to use emake here ?
-	make || die "Problem making PBXT storage engine (${myconf})"
-
-	popd
-	# TODO: modify test suite for PBXT
-}
-
-pbxt_src_install() {
-
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-		emake install DESTDIR="${D}" || die "Failed to install PBXT"
-	popd
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-autotools_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-autotools_src_prepare() {
-
-	cd "${S}"
-
-	if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-		# Apply the patches for this MySQL version
-		EPATCH_SUFFIX="patch"
-		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-		# Clean out old items
-		rm -f "${EPATCH_SOURCE}"/*
-		# Now link in right patches
-		mysql_mv_patches
-		# And apply
-		epatch
-	fi
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	# Additional checks, remove bundled zlib (Cluster needs this, for static
-	# memory management in zlib, leave available for Cluster)
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		rm -f "${S}/zlib/"*.[ch]
-		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-	fi
-	rm -f "scripts/mysqlbug"
-
-	# Make charsets install in the right place
-	find . -name 'Makefile.am' \
-		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
-
-	# Remove what needs to be recreated, so we're sure it's actually done
-	einfo "Cleaning up old buildscript files"
-	find . -name Makefile \
-		-o -name Makefile.in \
-		-o -name configure \
-		-exec rm -f {} \;
-	rm -f "ltmain.sh"
-	rm -f "scripts/mysqlbug"
-
-	local rebuilddirlist d
-
-	if xtradb_patch_available && use xtradb ; then
-		einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
-		pushd "${S}"/storage >/dev/null
-		i="innobase"
-		o="${WORKDIR}/storage-${i}.mysql-upstream"
-		# Have we been here already?
-		[[ -d ${o} ]] && rm -f "${i}"
-		# Or maybe we haven't
-		[[ ( -d ${i} ) && ! ( -d ${o} ) ]] && mv "${i}" "${o}"
-		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
-		popd >/dev/null
-	fi
-
-	if pbxt_patch_available && [[ ${PBXT_NEWSTYLE} == "1" ]] && use pbxt ; then
-		einfo "Adding storage engine: PBXT"
-		pushd "${S}"/storage >/dev/null
-		i='pbxt'
-		[[ -d ${i} ]] && rm -rf "${i}"
-		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
-		f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
-		[[ -f $f ]] && epatch "$f"
-		popd >/dev/null
-	fi
-
-	rebuilddirlist="."
-	# This does not seem to be needed presently. robbat2 2010/02/23
-	#einfo "Updating innobase cmake"
-	## TODO: check this with a cmake expert
-	#cmake \
-	#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-	#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-	#	"storage/innobase"
-
-	for d in ${rebuilddirlist} ; do
-		einfo "Reconfiguring dir '${d}'"
-		pushd "${d}" &>/dev/null
-		eautoreconf
-		popd &>/dev/null
-	done
-}
-
-# @FUNCTION: mysql-autotools_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-autotools_src_configure() {
-	# bug 401733
-	export QA_CONFIGURE_OPTIONS=".*"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# $myconf is modified by the configure_* functions
-	local myconf=""
-
-	if use minimal ; then
-		mysql-autotools_configure_minimal
-	else
-		mysql-autotools_configure_common
-		mysql-autotools_configure_51
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# glib-2.3.2_pre fix, bug #16496
-	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
-	# fail badly during cluster startup.
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector-all"
-	fi
-
-	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	# storage/googlestats, sql/ in google-mysql are using C++ templates
-	# implicitly. Upstream might be interested in this, exclude
-	# -fno-implicit-templates for google-mysql for now.
-	mysql_version_is_at_least "5.0" \
-	&& [[ ${PN} != "google-mysql" ]] \
-	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
-	# causes a mis-compile.
-	# Upstream bugs:
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
-	# http://bugs.mysql.com/bug.php?id=45205
-	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
-		append-flags -fno-omit-frame-pointer && \
-		filter-flags -fomit-frame-pointer
-
-	econf \
-		--libexecdir="${EPREFIX}/usr/sbin" \
-		--sysconfdir="${MY_SYSCONFDIR}" \
-		--localstatedir="${MY_LOCALSTATEDIR}" \
-		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
-		--libdir="${MY_LIBDIR}" \
-		--includedir="${MY_INCLUDEDIR}" \
-		--with-low-memory \
-		--with-client-ldflags=-lstdc++ \
-		--enable-thread-safe-client \
-		--with-comment="Gentoo Linux ${PF}" \
-		--without-docs \
-		--with-LIBDIR="$(get_libdir)" \
-		${myconf} || die "econf failed"
-
-	# TODO: Move this before autoreconf !!!
-	find . -type f -name Makefile -print0 \
-	| xargs -0 -n100 sed -i \
-	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
-
-	if [[ $EAPI == 2 ]] && [[ ${PBXT_NEWSTYLE} != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_configure
-	fi
-}
-
-# @FUNCTION: mysql-autotools_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-autotools_src_compile() {
-
-	emake || die "emake failed"
-
-	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_compile
-	fi
-}
-
-# @FUNCTION: mysql-autotools_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-autotools_src_install() {
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	emake install \
-		DESTDIR="${D}" \
-		benchdir_root="${MY_SHAREDSTATEDIR}" \
-		testroot="${MY_SHAREDSTATEDIR}" \
-		|| die "emake install failed"
-
-	if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_install
-	fi
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-	rm -Rf "${ED}/usr/share/info"
-	for removeme in  "mysql-log-rotate" mysql.server* \
-		binary-configure* my-*.cnf mi_test_all*
-	do
-		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
-	done
-
-	# Clean up stuff for a minimal build
-	if use minimal ; then
-		einfo "Remove all extra content for minimal build"
-		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-		rm -f "${ED}/usr/sbin/mysqld"
-		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if use !test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	doins scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		-e "s!/tmp!${EPREFIX}/tmp!" \
-		-e "s!/usr!${EPREFIX}/usr!" \
-		-e "s!= /var!= ${EPREFIX}/var!" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok"
-	fi
-	eprefixify "${TMPDIR}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		keepdir "${MY_DATADIR#${EPREFIX}}"
-		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			chown -R mysql:mysql "${ED}/${folder}"
-		done
-	fi
-
-	# Docs
-	einfo "Installing docs"
-	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
-		[[ -f $i ]] && dodoc "$i"
-	done
-	doinfo "${S}"/Docs/mysql.info
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini
-		do
-			[[ -f $script ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
-		done
-
-	fi
-
-	mysql_lib_symlinks "${ED}"
-
-	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" ]] && ! use perl \
-	&& mysql_version_is_at_least "5.3" \
-	&& rm -f "${ED}/usr/bin/mytop"
-
-	#Bug 455462 remove unnecessary libtool files
-	prune_libtool_files --modules
-}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
deleted file mode 100644
index 81159ac..0000000
--- a/eclass/mysql-cmake.eclass
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $
-
-# @ECLASS: mysql-cmake.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# @BLURB: This eclass provides the support for cmake based mysql releases
-# @DESCRIPTION:
-# The mysql-cmake.eclass provides the support to build the mysql
-# ebuilds using the cmake build system. This eclass provides
-# the src_prepare, src_configure, src_compile, and src_install
-# phase hooks.
-
-inherit cmake-utils flag-o-matic multilib prefix eutils
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_cmake_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-cmake_disable_test() {
-
-	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def  \
-		${S}/mysql-test/t/disabled.def ; do
-		[[ -f ${mysql_disabled_file} ]] && break
-	done
-	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
-			FAILED ; do
-			[[ -f ${mysql_disabled_file} ]] && break
-		done
-		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
-		else
-			for mysql_disabled_dir in \
-				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t  \
-				FAILED ; do
-				[[ -d ${mysql_disabled_dir} ]] && break
-			done
-			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
-			else
-				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-			fi
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-	if use_if_iuse $1 ; then
-		echo "-DWITH_$2=1"
-	else
-		echo "-DWITHOUT_$2=1 -DWITH_$2=0"
-	fi
-}
-
-# @FUNCTION: configure_cmake_locale
-# @DESCRIPTION:
-# Helper function to configure locale cmake options
-configure_cmake_locale() {
-
-	if ! use minimal && [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-
-	elif ! use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8
-			-DDEFAULT_COLLATION=utf8_general_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	fi
-}
-
-# @FUNCTION: configure_cmake_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_cmake_minimal() {
-
-	mycmakeargs+=(
-		-DWITHOUT_SERVER=1
-		-DWITHOUT_EMBEDDED_SERVER=1
-		-DEXTRA_CHARSETS=none
-		-DINSTALL_SQLBENCHDIR=
-		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITHOUT_CSV_STORAGE_ENGINE=1
-		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-		-DWITHOUT_HEAP_STORAGE_ENGINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-	)
-}
-
-# @FUNCTION: configure_cmake_standard
-# @DESCRIPTION:
-# Helper function to configure standard build
-configure_cmake_standard() {
-
-	mycmakeargs+=(
-		-DEXTRA_CHARSETS=all
-		-DMYSQL_USER=mysql
-		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		$(cmake-utils_use_disable !static SHARED)
-		$(cmake-utils_use_with debug)
-		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
-		$(cmake-utils_use_with profiling)
-		$(cmake-utils_use_enable systemtap DTRACE)
-		$(cmake-utils_use_enable static-libs STATIC_LIBS)
-	)
-
-	if use static; then
-		mycmakeargs+=( -DWITH_PIC=1 )
-	fi
-
-	if use jemalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	if use tcmalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	# Storage engines
-	mycmakeargs+=(
-		-DWITH_ARCHIVE_STORAGE_ENGINE=1
-		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITH_CSV_STORAGE_ENGINE=1
-		-DWITH_HEAP_STORAGE_ENGINE=1
-		-DWITH_INNOBASE_STORAGE_ENGINE=1
-		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITH_MYISAM_STORAGE_ENGINE=1
-		-DWITH_PARTITION_STORAGE_ENGINE=1
-		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
-	)
-
-	if in_iuse pbxt ; then
-		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
-	fi
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		mycmakeargs+=(
-			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
-			$(mysql-cmake_use_plugin sphinx SPHINX)
-			$(mysql-cmake_use_plugin extraengine FEDERATEDX)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-			$(mysql-cmake_use_plugin pam AUTH_PAM)
-		)
-
-		if mysql_version_is_at_least 10.0.5 ; then
-			# CassandraSE needs Apache Thrift which is not in portage
-			# TODO: Add use and deps for Connect SE external deps
-			mycmakeargs+=(
-				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
-				$(mysql-cmake_use_plugin extraengine SEQUENCE)
-				$(mysql-cmake_use_plugin extraengine SPIDER)
-				$(mysql-cmake_use_plugin extraengine CONNECT)
-				-DCONNECT_WITH_MYSQL=1
-				$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
-				$(cmake-utils_use odbc CONNECT_WITH_ODBC)
-			)
-		fi
-	fi
-
-	if [[ ${PN} == "percona-server" ]]; then
-		mycmakeargs+=(
-			$(cmake-utils_use_with pam)
-		)
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]]; then
-		# TODO: This really should include the following options,
-		# but the memcached package doesn't install the files it seeks.
-		# -DWITH_BUNDLED_MEMCACHED=OFF
-		# -DMEMCACHED_HOME=${EPREFIX}/usr
-		mycmakeargs+=(
-			-DWITH_BUNDLED_LIBEVENT=OFF
-			$(cmake-utils_use_with java NDB_JAVA)
-		)
-	fi
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-cmake_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-cmake_src_prepare() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	cd "${S}"
-
-	if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-		# Apply the patches for this MySQL version
-		EPATCH_SUFFIX="patch"
-		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-		# Clean out old items
-		rm -f "${EPATCH_SOURCE}"/*
-		# Now link in right patches
-		mysql_mv_patches
-		# And apply
-		epatch
-	fi
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	rm -f "scripts/mysqlbug"
-	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33"  ); then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if in_iuse tokudb ; then
-		# Don't build bundled xz-utils
-		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-	fi
-
-	epatch_user
-}
-
-# @FUNCTION: mysql-cmake_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-cmake_src_configure() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-		-DSYSCONFDIR=${EPREFIX}/etc/mysql
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${P}
-		-DINSTALL_DOCREADMEDIR=share/doc/${P}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_ELIBDIR=$(get_libdir)/mysql
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_SQLBENCHDIR=share/mysql
-		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		$(cmake-utils_use_with test UNIT_TESTS)
-		-DWITH_READLINE=0
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-	)
-
-	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-		mycmakeargs+=( -DWITH_EDITLINE=system )
-	fi
-
-	if use ssl; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	# Bug 412851
-	# MariaDB requires this flag to compile with GPLv3 readline linked
-	# Adds a warning about redistribution to configure
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
-	fi
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC="system" )
-		else
-			mycmakeargs+=( -DWITH_JEMALLOC=no )
-		fi
-		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
-	fi
-
-	configure_cmake_locale
-
-	if use minimal ; then
-		configure_cmake_minimal
-	else
-		configure_cmake_standard
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors"
-	# Causes linkage failures.  Upstream bug #59607 removes it
-	if ! mysql_version_is_at_least "5.6" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-	fi
-	# As of 5.7, exceptions and rtti are used!
-	if ! mysql_version_is_at_least "5.7" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
-	fi
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	cmake-utils_src_configure
-}
-
-# @FUNCTION: mysql-cmake_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-cmake_src_compile() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_compile
-}
-
-# @FUNCTION: mysql-cmake_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-cmake_src_install() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	cmake-utils_src_install
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# Create a mariadb_config symlink
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	rm -Rf "${ED}/usr/data"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-
-	# Clean up stuff for a minimal build
-#	if use minimal ; then
-#		einfo "Remove all extra content for minimal build"
-#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-#		rm -f "${ED}/usr/sbin/mysqld"
-#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-#	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		5.[1-4]*) mysql_mycnf_version="5.1" ;;
-		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	doins scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok"
-	fi
-	eprefixify "${TMPDIR}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			chown -R mysql:mysql "${ED}/${folder}"
-		done
-	fi
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf.sh \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini.sh
-		do
-			[[ -f $script ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
-		done
-	fi
-
-#	cat <<-EOF > "${T}"/80mysql-libdir
-#	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
-#	EOF
-#	doenvd "${T}"/80mysql-libdir
-
-	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
-	&& rm -f "${ED}/usr/bin/mytop"
-}
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
deleted file mode 100644
index e2dd614..0000000
--- a/eclass/mysql-multilib.eclass
+++ /dev/null
@@ -1,859 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: mysql-multilib.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-multilib.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# This eclass uses the mysql-cmake eclass for the
-# specific bits related to the build system.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
-
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
-	toolchain-funcs user cmake-utils multilib-build
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-	5) ;;
-	*) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
-
-#
-# VARIABLES:
-#
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-	EGIT_PROJECT=mysql-extras
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	RESTRICT="userpriv"
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.5.35
-mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35"
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
-		mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
-			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-		if [[ ${PN} == "mariadb-galera" ]]; then
-			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
-		fi
-	elif [[ ${PN} == "percona-server" ]]; then
-		PERCONA_PN="Percona-Server"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		MY_PV=$(get_version_component_range 1-3 ${PV})
-		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-		PERCONA_RC=$(get_version_component_range 6 ${PV})
-		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
-#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz
-#		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
-	else
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-if [[ ${PN} == "mariadb" ]]; then
-	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-fi
-if [[ ${PN} == "mariadb-galera" ]]; then
-	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
-fi
-if [[ ${PN} == "percona-server" ]]; then
-	HOMEPAGE="http://www.percona.com/software/percona-server"
-	DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal 
-	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-	IUSE="${IUSE} oqgraph pam sphinx tokudb"
-	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
-	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \
-		REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )"
-	REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
-fi
-
-if [[ ${PN} == "percona-server" ]]; then
-	IUSE="${IUSE} pam"
-fi
-
-REQUIRED_USE="
-	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-	 minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-DEPEND="
-	ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?]
-	)
-	kernel_linux? ( 
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	amd64? ( abi_x86_32? (
-		app-emulation/emul-linux-x86-baselibs[abi_x86_32]
-	) )
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-	!dev-db/mariadb-native-client[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-"
-
-# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
-else
-	DEPEND="${DEPEND} >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]"
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	# Bug 441700 MariaDB >=5.3 include custom mytop
-	DEPEND="${DEPEND} 
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= )
-		sphinx? ( app-misc/sphinx:0= )
-		!minimal? ( pam? ( virtual/pam:0= ) )
-		perl? ( !dev-db/mytop )"
-	if mysql_version_is_at_least "10.0.5" ; then
-		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-			"
-	fi
-	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
-	if mysql_version_is_at_least "10.0.9" ; then
-		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \
-		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
-	fi
-fi
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
-	[[ ${i} == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-	# TODO: This really should include net-misc/memcached
-	# but the package does not install the files it seeks.
-	mysql_version_is_at_least "7.2.3" && \
-		DEPEND="${DEPEND} dev-libs/libevent:0="
-fi
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	selinux? ( sec-policy/selinux-mysql )
-"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	# Bug 455016 Add dependencies of mytop
-	RDEPEND="${RDEPEND} perl? (
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes ) "
-fi
-
-if [[ ${PN} == "mariadb-galera" ]] ; then
-	# The wsrep API version must match between the ebuild and sys-cluster/galera.
-	# This will be indicated by WSREP_REVISION in the ebuild and the first number
-	# in the version of sys-cluster/galera
-	RDEPEND="${RDEPEND} 
-		=sys-cluster/galera-${WSREP_REVISION}*
-	"
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-       mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
-               DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
-fi
-
-# compile-time-only
-DEPEND="${DEPEND}
-	virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	>=dev-util/cmake-2.8.9
-"
-
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 ~virtual/mysql-${MYSQL_PV_MAJOR}"
-
-# my_config.h includes ABI specific data
-MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h )
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-multilib_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-multilib_disable_test() {
-	mysql-cmake_disable_test "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-multilib_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql-multilib_pkg_setup() {
-
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
-	fi
-
-	if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
-		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-
-}
-
-# @FUNCTION: mysql-multilib_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-multilib_src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-multilib_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-multilib_src_prepare() {
-	mysql-cmake_src_prepare "$@"
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
-	fi
-}
-
-
-# @FUNCTION: mysql-multilib_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_mysql-multilib_src_configure() {
-
-		debug-print-function ${FUNCNAME} "$@"
-
-		CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-		# debug hack wrt #497532
-		mycmakeargs=(
-			-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-			-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-			-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-			-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-			-DSYSCONFDIR=${EPREFIX}/etc/mysql
-			-DINSTALL_BINDIR=bin
-			-DINSTALL_DOCDIR=share/doc/${P}
-			-DINSTALL_DOCREADMEDIR=share/doc/${P}
-			-DINSTALL_INCLUDEDIR=include/mysql
-			-DINSTALL_INFODIR=share/info
-			-DINSTALL_LIBDIR=$(get_libdir)
-			-DINSTALL_ELIBDIR=$(get_libdir)/mysql
-			-DINSTALL_MANDIR=share/man
-			-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-			-DINSTALL_MYSQLSHAREDIR=share/mysql
-			-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-			-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-			-DINSTALL_SBINDIR=sbin
-			-DINSTALL_SCRIPTDIR=share/mysql/scripts
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-			-DWITH_COMMENT="Gentoo Linux ${PF}"
-			$(cmake-utils_use_with test UNIT_TESTS)
-			-DWITH_READLINE=0
-			-DWITH_LIBEDIT=0
-			-DWITH_ZLIB=system
-			-DWITHOUT_LIBWRAP=1
-			-DENABLED_LOCAL_INFILE=1
-			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		)
-
-		if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-			mycmakeargs+=( -DWITH_EDITLINE=system )
-		fi
-
-		if use ssl; then
-			mycmakeargs+=( -DWITH_SSL=system )
-		else
-			mycmakeargs+=( -DWITH_SSL=bundled )
-		fi
-
-		# Bug 412851
-		# MariaDB requires this flag to compile with GPLv3 readline linked
-		# Adds a warning about redistribution to configure
-		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-			mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
-
-                	if use jemalloc ; then
-                        	mycmakeargs+=( -DWITH_JEMALLOC="system" )
-	                else
-        	                mycmakeargs+=( -DWITH_JEMALLOC=no )
-                	fi
-			# TODO: uncomment this when libpcre 8.35 is released to remove bundled library
-#			mysql_version_is_at_least "10.0.9" mycmakeargs+=( -DWITH_PCRE=system )
-	        fi
-
-		configure_cmake_locale
-
-		if multilib_build_binaries ; then
-			if use minimal ; then
-				configure_cmake_minimal
-			else
-				configure_cmake_standard
-			fi
-		else
-			configure_cmake_minimal
-		fi
-
-		# Bug #114895, bug #110149
-		filter-flags "-O" "-O[01]"
-
-		CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-		# Causes linkage failures.  Upstream bug #59607 removes it
-		if ! mysql_version_is_at_least "5.6" ; then
-			CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-		fi
-		# As of 5.7, exceptions are used!
-		if ! mysql_version_is_at_least "5.7" ; then
-			CXXFLAGS="${CXXFLAGS} -fno-exceptions"
-		fi
-		export CXXFLAGS
-
-		# bug #283926, with GCC4.4, this is required to get correct behavior.
-		append-flags -fno-strict-aliasing
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi _mysql-multilib_src_configure "${@}"
-}
-
-# @FUNCTION: mysql-multilib_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-multilib_src_compile() {
-	#_mysql-multilib_src_compile() {
-	#
-	#	if ! multilib_build_binaries ; then
-	#		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
-	#	else
-	#		cmake-utils_src_compile
-	#	fi
-	#}
-
-	debug-print-function ${FUNCNAME} "$@"
-
-#	multilib_foreach_abi _mysql-multilib_src_compile "${@}"
-	multilib_foreach_abi cmake-utils_src_compile "${@}"
-}
-
-# @FUNCTION: mysql-multilib_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-multilib_src_install() {
-	_mysql-multilib_src_install() {
-		debug-print-function ${FUNCNAME} "$@"
-
-		if multilib_build_binaries; then
-			mysql-cmake_src_install
-		else
-		#	BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
-			cmake-utils_src_install
-			if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
-				insinto /usr/include/mysql/private
-				doins sql/*.h
-			fi
-			
-		fi
-		# Do multilib magic only when >1 ABI is used.
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			# Make sure all headers are the same for each ABI.
-			multilib_check_headers
-		fi
-	}
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	multilib_foreach_abi _mysql-multilib_src_install "${@}"
-	multilib_install_wrappers
-}
-
-# @FUNCTION: mysql-multilib_pkg_preinst
-# @DESCRIPTION:
-# Call java-pkg-opt-2 eclass when mysql-cluster is installed
-mysql-multilib_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
-	fi
-}
-
-# @FUNCTION: mysql-multilib_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql-multilib_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Secure the logfiles
-	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
-				dodoc "${script}"
-			fi
-		done
-
-		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-			if use_if_iuse pam ; then
-				einfo
-				elog "This install includes the PAM authentication plugin."
-				elog "To activate and configure the PAM plugin, please read:"
-				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
-				einfo
-			fi
-		fi
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-	fi
-}
-
-# @FUNCTION: mysql-multilib_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib_getopt() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-multilib_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib_getoptval() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-multilib_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-multilib_pkg_config() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)"
-	fi
-	MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-multilib_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-multilib_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options="--log-warnings=0"
-	local sqltmp="$(emktemp)"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	use prefix || options="${options} --user=mysql"
-
-	# Fix bug 446200.  Don't reference host my.cnf
-	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
-		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	pushd "${TMPDIR}" &>/dev/null
-	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
-	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
-	einfo "Command: $cmd"
-	eval $cmd \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
-	fi
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--user=mysql \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		--password="${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
deleted file mode 100644
index 67f9499..0000000
--- a/eclass/mysql-v2.eclass
+++ /dev/null
@@ -1,878 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $
-
-# @ECLASS: mysql-v2.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-v2.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
-# specific bits related to the build system.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-# @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION:
-# Build type of the mysql version
-: ${BUILD:=autotools}
-
-case ${BUILD} in
-	"cmake")
-		BUILD_INHERIT="mysql-cmake"
-		;;
-	"autotools")
-		BUILD_INHERIT="mysql-autotools"
-
-		WANT_AUTOCONF="latest"
-		WANT_AUTOMAKE="latest"
-		;;
-	*)
-		die "${BUILD} is not a valid build system for mysql"
-		;;
-esac
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2"
-
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-	4|5) ;;
-	*) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
-
-#
-# VARIABLES:
-#
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-	EGIT_PROJECT=mysql-extras
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	RESTRICT="userpriv"
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.1.50
-mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
-		mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
-			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-		if [[ ${PN} == "mariadb-galera" ]]; then
-			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
-		fi
-	elif [[ ${PN} == "percona-server" ]]; then
-		PERCONA_PN="Percona-Server"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		MY_PV=$(get_version_component_range 1-3 ${PV})
-		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-		PERCONA_RC=$(get_version_component_range 6 ${PV})
-		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
-#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz
-#		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
-	else
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-if [[ ${PN} == "mariadb" ]]; then
-	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-fi
-if [[ ${PN} == "mariadb-galera" ]]; then
-	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
-fi
-if [[ ${PN} == "percona-server" ]]; then
-	HOMEPAGE="http://www.percona.com/software/percona-server"
-	DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-case "${BUILD}" in
-	"autotools")
-		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
-		;;
-	"cmake")
-		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
-		;;
-esac
-
-# Common IUSE
-IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
-	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
-	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
-	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
-	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
-	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \
-		REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )"
-	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
-		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )"
-fi
-
-if mysql_version_is_at_least "5.5"; then
-	REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
-	IUSE="${IUSE} jemalloc tcmalloc"
-fi
-
-if mysql_version_is_at_least "5.5.7"; then
-	IUSE="${IUSE} systemtap"
-fi
-
-if [[ ${PN} == "percona-server" ]]; then
-	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
-fi
-
-REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kernel_linux? ( sys-process/procps )
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3
-"
-# TODO: add this as a dep if it is moved from the overlay
-#	!dev-db/mariadb-native-client[mysqlcompat]
-
-# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then
-	DEPEND="${DEPEND} dev-libs/libedit"
-else
-	DEPEND="${DEPEND} >=sys-libs/readline-4.1"
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
-	mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
-	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
-	# Bug 441700 MariaDB >=5.3 include custom mytop
-	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
-	if mysql_version_is_at_least "10.0.5" ; then
-		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC )
-			xml? ( dev-libs/libxml2 )
-			"
-	fi
-	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
-	if mysql_version_is_at_least "10.0.9" ; then
-		use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \
-			DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
-	fi
-fi
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
-	[[ ${i} == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-if mysql_version_is_at_least "5.5.7" ; then
-	DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] ) 
-	tcmalloc? ( dev-util/google-perftools )
-	>=sys-libs/zlib-1.2.3[static-libs?]
-        ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	kernel_linux? ( dev-libs/libaio )"
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-	# TODO: This really should include net-misc/memcached
-	# but the package does not install the files it seeks.
-	mysql_version_is_at_least "7.2.3" && \
-		DEPEND="${DEPEND} dev-libs/libevent"
-fi
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	selinux? ( sec-policy/selinux-mysql )
-"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	# Bug 455016 Add dependencies of mytop
-	if mysql_version_is_at_least "5.3" ; then
-		RDEPEND="${RDEPEND} perl? (
-			virtual/perl-Getopt-Long
-			dev-perl/TermReadKey
-			virtual/perl-Term-ANSIColor
-			virtual/perl-Time-HiRes ) "
-	fi
-fi
-
-if [[ ${PN} == "mariadb-galera" ]] ; then
-	# The wsrep API version must match between the ebuild and sys-cluster/galera.
-	# This will be indicated by WSREP_REVISION in the ebuild and the first number
-	# in the version of sys-cluster/galera
-	RDEPEND="${RDEPEND} 
-		=sys-cluster/galera-${WSREP_REVISION}*
-	"
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-       mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
-               DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
-fi
-
-DEPEND="${DEPEND}
-	virtual/yacc
-"
-
-DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-
-# compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-# compile-time-only
-if mysql_version_is_at_least "5.5.8" ; then
-	DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
-fi
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
-
-#
-# External patches
-#
-
-# MariaDB has integrated PBXT until it was dropped in version 5.5.33
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
-		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
-	return $?
-}
-
-if pbxt_patch_available; then
-
-	PBXT_P="pbxt-${PBXT_VERSION}"
-	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
-	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
-
-	IUSE="${IUSE} pbxt"
-	PBXT_NEWSTYLE=1
-	REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
-fi
-
-if xtradb_patch_available; then
-	XTRADB_P="percona-xtradb-${XTRADB_VER}"
-	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
-	XTRADB_SRC_B1="http://www.percona.com/"
-	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
-	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
-	IUSE="${IUSE} xtradb"
-	REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
-fi
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-v2_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-v2_disable_test() {
-	${BUILD_INHERIT}_disable_test "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_minimal() {
-	${BUILD_INHERIT}_configure_minimal "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_common
-# @DESCRIPTION:
-# Helper function to configure common builds
-configure_common() {
-	${BUILD_INHERIT}_configure_common "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-v2_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql-v2_pkg_setup() {
-
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# Check for USE flag problems in pkg_setup
-	if ! mysql_version_is_at_least "5.2" && use debug ; then
-		# Also in package.use.mask
-		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
-	fi
-
-	if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
-		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-
-}
-
-# @FUNCTION: mysql-v2_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-v2_src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-v2_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-v2_src_prepare() {
-	${BUILD_INHERIT}_src_prepare "$@"
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
-	fi
-}
-
-# @FUNCTION: mysql-v2_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v2_src_configure() {
-	${BUILD_INHERIT}_src_configure "$@"
-}
-
-# @FUNCTION: mysql-v2_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-v2_src_compile() {
-	${BUILD_INHERIT}_src_compile "$@"
-}
-
-# @FUNCTION: mysql-v2_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-v2_src_install() {
-	${BUILD_INHERIT}_src_install "$@"
-}
-
-# @FUNCTION: mysql-v2_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql-v2_pkg_preinst() {
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
-	fi
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql-v2_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql-v2_pkg_postinst() {
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Secure the logfiles
-	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
-				dodoc "${script}"
-			fi
-		done
-
-		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-			if use_if_iuse pam ; then
-				einfo
-				elog "This install includes the PAM authentication plugin."
-				elog "To activate and configure the PAM plugin, please read:"
-				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
-				einfo
-			fi
-		fi
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-
-		if [[ ${PN} == "mariadb-galera" ]] ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-		fi
-	fi
-
-	if use_if_iuse pbxt ; then
-		elog "Note: PBXT is now statically built when enabled."
-		elog ""
-		elog "If, you previously installed as a plugin and "
-		elog "you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
-}
-
-# @FUNCTION: mysql-v2_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getopt() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-v2_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getoptval() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-v2_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-v2_pkg_config() {
-
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)"
-	fi
-	MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options="--log-warnings=0"
-	local sqltmp="$(emktemp)"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	use prefix || options="${options} --user=mysql"
-
-	# Fix bug 446200.  Don't reference host my.cnf
-	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
-		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	pushd "${TMPDIR}" &>/dev/null
-	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
-	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
-	einfo "Command: $cmd"
-	eval $cmd \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		mkdir "${PID_DIR}"
-		chown mysql:mysql "${PID_DIR}"
-		chmod 755 "${PID_DIR}"
-	fi
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--user=mysql \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		--password="${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-# @FUNCTION: mysql-v2_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql-v2_pkg_postrm() {
-
-	: # mysql_lib_symlinks "${ED}"
-}
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
deleted file mode 100644
index 01f1c6d..0000000
--- a/eclass/mysql.eclass
+++ /dev/null
@@ -1,1528 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.177 2013/03/16 19:20:34 robbat2 Exp $
-
-# @ECLASS: mysql.eclass
-# @MAINTAINER:
-# MySQL Team <mysql-bugs@gentoo.org>
-# Luca Longinotti <chtekk@gentoo.org>
-# Robin H. Johnson <robbat2@gentoo.org>
-# @AUTHOR:
-# Francesco Riosa (Retired) <vivo@gentoo.org>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql.eclass provides almost all the code to build the mysql ebuilds
-# including the src_unpack, src_prepare, src_configure, src_compile,
-# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
-	EGIT_PROJECT=mysql-extras
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	inherit git-2
-fi
-
-case "${EAPI:-0}" in
-	2|3|4|5)
-		EXPORT_FUNCTIONS pkg_setup \
-					src_unpack src_prepare \
-					src_configure src_compile \
-					src_install \
-					pkg_preinst pkg_postinst \
-					pkg_config pkg_postrm
-		IUSE_DEFAULT_ON='+'
-		;;
-	0 | 1)
-		EXPORT_FUNCTIONS pkg_setup \
-					src_unpack \
-					src_compile \
-					src_install \
-					pkg_preinst pkg_postinst \
-					pkg_config pkg_postrm
-		;;
-	*)
-		die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-	esac
-fi
-
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
-# @DESCRIPTION:
-# Specifiy if community features are available. Possible values are 1 (yes)
-# and 0 (no).
-# Community features are available in mysql-community
-# AND in the re-merged mysql-5.0.82 and newer
-if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.4}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.5}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#6}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#7}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-else
-	MYSQL_COMMUNITY_FEATURES=0
-fi
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-XTRADB_VER="${XTRADB_VER}"
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-PERCONA_VER="${PERCONA_VER}"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-		kernel_linux? ( sys-process/procps )
-		>=sys-apps/sed-4
-		>=sys-apps/texinfo-4.7-r1
-		>=sys-libs/readline-4.1
-		>=sys-libs/zlib-1.2.3"
-
-[[ "${PN}" == "mariadb" ]] \
-&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
-	[[ "${i}" == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-		!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-		selinux? ( sec-policy/selinux-mysql )"
-
-DEPEND="${DEPEND}
-		virtual/yacc"
-
-if [ "${EAPI:-0}" = "2" ]; then
-	DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-fi
-
-# compile-time-only
-mysql_version_is_at_least "5.1" \
-|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
-
-# compile-time-only
-mysql_version_is_at_least "5.1.12" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
-#	sphinx? ( app-misc/sphinx )"
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
-
-# Work out the default SERVER_URI correctly
-if [ -z "${SERVER_URI}" ]; then
-	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
-	if [ "${PN}" == "mariadb" ]; then
-		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-	# The community and cluster builds are on the mirrors
-	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	# The (old) enterprise source is on the primary site only
-	elif [ "${PN}" == "mysql" ]; then
-		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-[[ ${MY_EXTRAS_VER} != live ]] \
-&& SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-if [[ "${PN}" == "mariadb" ]]; then
-	HOMEPAGE="http://askmonty.org/"
-	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
-fi
-if [[ "${PN}" == "mysql-community" ]]; then
-	DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
-
-mysql_version_is_at_least "4.1" \
-&& IUSE="${IUSE} latin1"
-
-if mysql_version_is_at_least "4.1.3" ; then
-	IUSE="${IUSE} extraengine"
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		IUSE="${IUSE} cluster"
-	fi
-fi
-
-mysql_version_is_at_least "5.0" \
-|| IUSE="${IUSE} raid"
-
-mysql_version_is_at_least "5.0.18" \
-&& IUSE="${IUSE} max-idx-128"
-
-mysql_version_is_at_least "5.1" \
-|| IUSE="${IUSE} berkdb"
-
-[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
-
-[[ "${PN}" == "mariadb" ]] \
-&& IUSE="${IUSE} libevent"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& IUSE="${IUSE} oqgraph"
-#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
-#&& IUSE="${IUSE} oqgraph sphinx"
-
-# MariaDB has integrated PBXT
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.12" \
-	&& [[ -n "${PBXT_VERSION}" ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.26" \
-	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
-	return $?
-}
-
-
-pbxt_patch_available \
-&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-pbxt_available \
-&& IUSE="${IUSE} pbxt" \
-&& mysql_version_is_at_least "5.1.40" \
-&& PBXT_NEWSTYLE=1
-
-xtradb_patch_available \
-&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
-&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& XTRADB_SRC_B1="http://www.percona.com/" \
-&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
-&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
-&& IUSE="${IUSE} xtradb"
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql_disable_test() {
-	local rawtestname testname testsuite reason mysql_disable_file
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	mysql_disable_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disable_file}"
-
-	# ${S}/mysql-tests/t/disabled.def
-	#
-	# ${S}/mysql-tests/suite/federated/disabled.def
-	#
-	# ${S}/mysql-tests/suite/jp/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl/t/disabled.def
-	# ${S}/mysql-tests/suite/parts/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
-	# ${S}/mysql-tests/suite/binlog/t/disabled.def
-	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-	if [ -n "${testsuite}" ]; then
-		for mysql_disable_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
-			FAILED ; do
-			[ -f "${mysql_disable_file}" ] && break
-		done
-		if [ "${mysql_disabled_file}" != "FAILED" ]; then
-			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
-		else
-			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-		fi
-	fi
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <vivo@gentoo.org>
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-		MY_SOURCEDIR=${SERVER_URI##*/}
-		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
-
-configure_minimal() {
-	# These are things we exclude from a minimal build, please
-	# note that the server actually does get built and installed,
-	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
-
-	for i in ${minimal_exclude_list} ; do
-		myconf="${myconf} --without-${i}"
-	done
-	myconf="${myconf} --with-extra-charsets=none"
-	myconf="${myconf} --enable-local-infile"
-
-	if use static ; then
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if mysql_version_is_at_least "4.1" && ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-}
-
-configure_common() {
-	myconf="${myconf} $(use_with big-tables)"
-	myconf="${myconf} --enable-local-infile"
-	myconf="${myconf} --with-extra-charsets=all"
-	myconf="${myconf} --with-mysqld-user=mysql"
-	myconf="${myconf} --with-server"
-	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
-	myconf="${myconf} --without-libwrap"
-
-	if use static ; then
-		myconf="${myconf} --with-mysqld-ldflags=-all-static"
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if use debug ; then
-		myconf="${myconf} --with-debug=full"
-	else
-		myconf="${myconf} --without-debug"
-		mysql_version_is_at_least "4.1.3" \
-		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
-		&& myconf="${myconf} --without-ndb-debug"
-	fi
-
-	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
-		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
-	elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-
-	if use embedded ; then
-		myconf="${myconf} --with-embedded-privilege-control"
-		myconf="${myconf} --with-embedded-server"
-	else
-		myconf="${myconf} --without-embedded-privilege-control"
-		myconf="${myconf} --without-embedded-server"
-	fi
-
-}
-
-configure_40_41_50() {
-	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
-	myconf="${myconf} $(use_with perl bench)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-extra-tools"
-	myconf="${myconf} --with-innodb"
-	myconf="${myconf} --without-readline"
-	myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
-	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
-
-	# --with-vio is not needed anymore, it's on by default and
-	# has been removed from configure
-	#  Apply to 4.x and 5.0.[0-3]
-	if use ssl ; then
-		 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
-	fi
-
-	if mysql_version_is_at_least "5.0.60" ; then
-			if use berkdb ; then
-				elog "Berkeley DB support was disabled due to build failures"
-				elog "on multiple arches, go to a version earlier than 5.0.60"
-				elog "if you want it again. Gentoo bug #224067."
-			fi
-			myconf="${myconf} --without-berkeley-db"
-	elif use berkdb ; then
-		# The following fix is due to a bug with bdb on SPARC's. See:
-		# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-		# It comes down to non-64-bit safety problems.
-		if use alpha || use amd64 || use hppa || use mips || use sparc ; then
-			elog "Berkeley DB support was disabled due to compatibility issues on this arch"
-			myconf="${myconf} --without-berkeley-db"
-		else
-			myconf="${myconf} --with-berkeley-db=./bdb"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		myconf="${myconf} --with-geometry"
-		if [[ "${PN}" != "mysql-cluster" ]] ; then
-			myconf="${myconf} $(use_with cluster ndbcluster)"
-		fi
-	fi
-
-	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
-		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
-		myconf="${myconf} --with-archive-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-		myconf="${myconf} --with-csv-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
-		myconf="${myconf} --with-blackhole-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
-		# http://dev.mysql.com/doc/mysql/en/federated-description.html
-		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		if mysql_version_is_at_least "5.0.3" ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-			myconf="${myconf} --with-federated-storage-engine"
-		fi
-	fi
-
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} `use_enable community community-features`"
-		if use community; then
-			myconf="${myconf} `use_enable profiling`"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	mysql_version_is_at_least "5.0.18" \
-	&& use max-idx-128 \
-	&& myconf="${myconf} --with-max-indexes=128"
-}
-
-configure_51() {
-	# TODO: !!!! readd --without-readline
-	# the failure depend upon config/ac-macros/readline.m4 checking into
-	# readline.h instead of history.h
-	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-geometry"
-	myconf="${myconf} --with-readline"
-	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
-	myconf="${myconf} --without-pstack"
-	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
-
-	# This is an explict die here, because if we just forcibly disable it, then the
-	# user's data is not accessible.
-	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
-	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} $(use_enable community community-features)"
-		if use community; then
-			myconf="${myconf} $(use_enable profiling)"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	# Scan for all available plugins
-	local plugins_avail="$(
-	LANG=C \
-	find "${S}" \
-		\( \
-		-name 'plug.in' \
-		-o -iname 'configure.in' \
-		-o -iname 'configure.ac' \
-		\) \
-		-print0 \
-	| xargs -0 sed -r -n \
-		-e '/^MYSQL_STORAGE_ENGINE/{
-			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp;
-		}' \
-	| tr -s '\n' ' '
-	)"
-
-	# 5.1 introduces a new way to manage storage engines (plugins)
-	# like configuration=none
-	# This base set are required, and will always be statically built.
-	local plugins_sta="csv myisam myisammrg heap"
-	local plugins_dyn=""
-	local plugins_dis="example ibmdb2i"
-
-	# These aren't actually required by the base set, but are really useful:
-	plugins_sta="${plugins_sta} archive blackhole"
-
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
-	# Now the extras
-	if use extraengine ; then
-		# like configuration=max-no-ndb, archive and example removed in 5.1.11
-		# not added yet: ibmdb2i
-		# Not supporting as examples: example,daemon_example,ftexample
-		plugins_sta="${plugins_sta} partition"
-
-		if [[ "${PN}" != "mariadb" ]] ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_sta} federated"
-		else
-			elog "MariaDB includes the FederatedX engine. Be sure to read"
-			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_sta} federatedx"
-		fi
-	else
-		plugins_dis="${plugins_dis} partition federated"
-	fi
-
-	# Upstream specifically requests that InnoDB always be built:
-	# - innobase, innodb_plugin
-	# Build falcon if available for 6.x series.
-	for i in innobase falcon ; do
-		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-	done
-	for i in innodb_plugin ; do
-		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
-	done
-
-	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
-		plugins_sta="${plugins_sta} ndbcluster partition"
-		plugins_dis="${plugins_dis//partition}"
-		myconf="${myconf} --with-ndb-binlog"
-	else
-		plugins_dis="${plugins_dis} ndbcluster"
-	fi
-
-	if [[ "${PN}" == "mariadb" ]] ; then
-		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
-		# caught above.
-		# This is not optional, without it several upstream testcases fail.
-		# Also strongly recommended by upstream.
-		if [[ "${PV}" < "5.2.0" ]] ; then
-			myconf="${myconf} --with-maria-tmp-tables"
-			plugins_sta="${plugins_sta} maria"
-		else
-			myconf="${myconf} --with-aria-tmp-tables"
-			plugins_sta="${plugins_sta} aria"
-		fi
-
-		[ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
-			die "The ${P} package doesn't provide innobase nor xtradb"
-
-		for i in innobase xtradb ; do
-			[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-		done
-
-		myconf="${myconf} $(use_with libevent)"
-
-		if mysql_version_is_at_least "5.2" ; then
-			#This should include sphinx, but the 5.2.4 archive forgot the plug.in file
-			#for i in oqgraph sphinx ; do
-			for i in oqgraph ; do
-				use ${i} \
-				&& plugins_dyn="${plugins_dyn} ${i}" \
-				|| plugins_dis="${plugins_dis} ${i}"
-			done
-		fi
-	fi
-
-	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
-		use pbxt \
-		&& plugins_sta="${plugins_sta} pbxt" \
-		|| plugins_dis="${plugins_dis} pbxt"
-	fi
-
-	use static && \
-	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
-	plugins_dyn=""
-
-	einfo "Available plugins: ${plugins_avail}"
-	einfo "Dynamic plugins: ${plugins_dyn}"
-	einfo "Static plugins: ${plugins_sta}"
-	einfo "Disabled plugins: ${plugins_dis}"
-
-	# These are the static plugins
-	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
-	# And the disabled ones
-	for i in ${plugins_dis} ; do
-		myconf="${myconf} --without-plugin-${i}"
-	done
-}
-
-pbxt_src_configure() {
-	mysql_init_vars
-
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-
-	einfo "Reconfiguring dir '${PWD}'"
-	eautoreconf
-
-	local myconf=""
-	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	use debug && myconf="${myconf} --with-debug=full"
-	econf ${myconf} || die "Problem configuring PBXT storage engine"
-}
-
-pbxt_src_compile() {
-
-	# Be backwards compatible for now
-	if [[ $EAPI != 2 ]]; then
-		pbxt_src_configure
-	fi
-	# TODO: is it safe/needed to use emake here ?
-	make || die "Problem making PBXT storage engine (${myconf})"
-
-	popd
-	# TODO: modify test suite for PBXT
-}
-
-pbxt_src_install() {
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-		emake install DESTDIR="${D}" || die "Failed to install PBXT"
-	popd
-}
-
-#
-# EBUILD FUNCTIONS
-#
-# @FUNCTION: mysql_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql_pkg_setup() {
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if [[ $UID -eq 0 ]]; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# bug 350844
-	case "${EAPI:-0}" in
-		0 | 1)
-			if use static && ! built_with_use sys-libs/ncurses static-libs; then
-				die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
-			fi
-			;;
-	esac
-
-	# Check for USE flag problems in pkg_setup
-	if use static && use ssl ; then
-		M="MySQL does not support being built statically with SSL support enabled!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if mysql_version_is_at_least "5.1.51" \
-	   && ! mysql_version_is_at_least "5.2" \
-	   && use debug ; then
-	   # Also in package.use.mask
-	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
-	if ! mysql_version_is_at_least "5.0" \
-	&& use raid \
-	&& use static ; then
-		eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
-		eerror "with RAID support enabled."
-		die "USE flags 'raid' and 'static' conflict!"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" \
-	&& ( use cluster || use extraengine || use embedded ) \
-	&& use minimal ; then
-		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if mysql_version_is_at_least "5.1" \
-	&& xtradb_patch_available \
-	&& use xtradb \
-	&& use embedded ; then
-		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	# Bug #290570, 284946, 307251
-	# Upstream changes made us need a fairly new GCC4.
-	# But only for 5.0.8[3-6]!
-	if mysql_version_is_at_least "5.0.83"  && ! mysql_version_is_at_least 5.0.87 ; then
-		GCC_VER=$(gcc-version)
-		case ${CHOST}:${GCC_VER} in
-			*-darwin*:4.*) : ;; # bug #310615
-			*:2*|*:3*|*:4.0|*:4.1|*:4.2)
-			eerror "Some releases of MySQL required a very new GCC, and then"
-			eerror "later release relaxed that requirement again. Either pick a"
-			eerror "MySQL >=5.0.87, or use a newer GCC."
-			die "Active GCC too old!" ;;
-		esac
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-
-	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-		ewarn ""
-		ewarn "If you need NDB support, you should instead move to the new"
-		ewarn "mysql-cluster package that represents that upstream NDB"
-		ewarn "development."
-	fi
-}
-
-# @FUNCTION: mysql_src_unpack
-# @DESCRIPTION:
-# Unpack the source code and call mysql_src_prepare for EAPI < 2.
-mysql_src_unpack() {
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-
-	# Be backwards compatible for now
-	case ${EAPI:-0} in
-        	2) : ;;
-        	0 | 1) mysql_src_prepare ;;
-	esac
-}
-
-# @FUNCTION: mysql_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql_src_prepare() {
-	cd "${S}"
-
-	# Apply the patches for this MySQL version
-	EPATCH_SUFFIX="patch"
-	mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-	# Clean out old items
-	rm -f "${EPATCH_SOURCE}"/*
-	# Now link in right patches
-	mysql_mv_patches
-	# And apply
-	epatch
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	# Additional checks, remove bundled zlib (Cluster needs this, for static
-	# memory management in zlib, leave available for Cluster)
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		rm -f "${S}/zlib/"*.[ch]
-		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-	fi
-	rm -f "scripts/mysqlbug"
-
-	# Make charsets install in the right place
-	find . -name 'Makefile.am' \
-		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
-
-	if mysql_version_is_at_least "4.1" ; then
-		# Remove what needs to be recreated, so we're sure it's actually done
-		einfo "Cleaning up old buildscript files"
-		find . -name Makefile \
-			-o -name Makefile.in \
-			-o -name configure \
-			-exec rm -f {} \;
-		rm -f "ltmain.sh"
-		rm -f "scripts/mysqlbug"
-	fi
-
-	local rebuilddirlist d
-
-	if xtradb_patch_available && use xtradb ; then
-		einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
-		pushd "${S}"/storage >/dev/null
-		i="innobase"
-		o="${WORKDIR}/storage-${i}.mysql-upstream"
-		# Have we been here already?
-		[ -d "${o}" ] && rm -f "${i}"
-		# Or maybe we haven't
-		[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
-		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
-		popd >/dev/null
-	fi
-
-	if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
-		einfo "Adding storage engine: PBXT"
-		pushd "${S}"/storage >/dev/null
-		i='pbxt'
-		[ -d "${i}" ] && rm -rf "${i}"
-		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
-		popd >/dev/null
-	fi
-
-	if mysql_version_is_at_least "5.1.12" ; then
-		rebuilddirlist="."
-		# This does not seem to be needed presently. robbat2 2010/02/23
-		#einfo "Updating innobase cmake"
-		## TODO: check this with a cmake expert
-		#cmake \
-		#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		#	"storage/innobase"
-	else
-		rebuilddirlist=". innobase"
-	fi
-
-	for d in ${rebuilddirlist} ; do
-		einfo "Reconfiguring dir '${d}'"
-		pushd "${d}" &>/dev/null
-		eautoreconf
-		popd &>/dev/null
-	done
-
-	if mysql_check_version_range "4.1 to 5.0.99.99" \
-	&& use berkdb ; then
-		einfo "Fixing up berkdb buildsystem"
-		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
-		cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
-		|| die "Could not copy libtool.m4 to bdb/dist/"
-		#These files exist only with libtool-2*, and need to be included.
-		if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
-			cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
-		fi
-		pushd "bdb/dist" &>/dev/null
-		sh s_all \
-		|| die "Failed bdb reconfigure"
-		popd &>/dev/null
-	fi
-}
-
-# @FUNCTION: mysql_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql_src_configure() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# $myconf is modified by the configure_* functions
-	local myconf=""
-
-	if use minimal ; then
-		configure_minimal
-	else
-		configure_common
-		if mysql_version_is_at_least "5.1.10" ; then
-			configure_51
-		else
-			configure_40_41_50
-		fi
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# glib-2.3.2_pre fix, bug #16496
-	append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
-	# fail badly during cluster startup.
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector-all"
-	fi
-
-	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	mysql_version_is_at_least "5.0" \
-	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
-	# causes a mis-compile.
-	# Upstream bugs:
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
-	# http://bugs.mysql.com/bug.php?id=45205
-	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
-		append-flags -fno-omit-frame-pointer && \
-		filter-flags -fomit-frame-pointer
-
-	econf \
-		--libexecdir="${EPREFIX}"/usr/sbin \
-		--sysconfdir=${MY_SYSCONFDIR} \
-		--localstatedir=${MY_LOCALSTATEDIR} \
-		--sharedstatedir=${MY_SHAREDSTATEDIR} \
-		--libdir=${MY_LIBDIR} \
-		--includedir=${MY_INCLUDEDIR} \
-		--with-low-memory \
-		--with-client-ldflags=-lstdc++ \
-		--enable-thread-safe-client \
-		--with-comment="Gentoo Linux ${PF}" \
-		--without-docs \
-		--with-LIBDIR="$(get_libdir)" \
-		${myconf} || die "econf failed"
-
-	# TODO: Move this before autoreconf !!!
-	find . -type f -name Makefile -print0 \
-	| xargs -0 -n100 sed -i \
-	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
-
-	if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_configure
-	fi
-}
-
-# @FUNCTION: mysql_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql_src_compile() {
-	# Be backwards compatible for now
-	case ${EAPI:-0} in
-		2) : ;;
-		0 | 1) mysql_src_configure ;;
-	esac
-
-	emake || die "emake failed"
-
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_compile
-	fi
-}
-
-# @FUNCTION: mysql_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql_src_install() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	emake install \
-		DESTDIR="${D}" \
-		benchdir_root=${MY_SHAREDSTATEDIR} \
-		testroot="${MY_SHAREDSTATEDIR}" \
-		|| die "emake install failed"
-
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_install
-	fi
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-	rm -Rf "${ED}/usr/share/info"
-	for removeme in  "mysql-log-rotate" mysql.server* \
-		binary-configure* my-*.cnf mi_test_all*
-	do
-		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
-	done
-
-	# Clean up stuff for a minimal build
-	if use minimal ; then
-		einfo "Remove all extra content for minimal build"
-		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-		rm -f "${ED}/usr/sbin/mysqld"
-		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if use !test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		3*|4.0) mysql_mycnf_version="4.0" ;;
-		4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
-		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	doins scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		-e "s!/tmp!${EPREFIX}/tmp!" \
-		-e "s!/usr!${EPREFIX}/usr!" \
-		-e "s!= /var!= ${EPREFIX}/var!" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok"
-	use prefix && sed -i -e '/^user[ 	]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok"
-	fi
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			chown -R mysql:mysql "${ED}/${folder}"
-		done
-	fi
-
-	# Docs
-	einfo "Installing docs"
-	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
-		[[ -f "$i" ]] && dodoc "$i"
-	done
-	doinfo "${S}"/Docs/mysql.info
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
-		done
-
-	fi
-
-	mysql_lib_symlinks "${ED}"
-}
-
-# @FUNCTION: mysql_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql_pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql_pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Secure the logfiles
-	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			[[ -f "${script}" ]] \
-			&& [[ "${script%.sh}" == "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-	fi
-
-	if pbxt_available && use pbxt ; then
-                elog "Note: PBXT is now statically built when enabled."
-                elog ""
-                elog "If, you previously installed as a plugin and "
-                elog "you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-}
-
-# @FUNCTION: mysql_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql_getopt() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql_getoptval() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql_pkg_config() {
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ -d "${old_MY_DATADIR_s}" ]]  && [[ "${old_MY_DATADIR_s}" != / ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
-	fi
-	MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options="--log-warnings=0"
-	local sqltmp="$(emktemp)"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
-		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	use prefix || options="${options} --user=mysql"
-
-	pushd "${TMPDIR}" &>/dev/null
-	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
-	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-	[ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
-	einfo "Command: $cmd"
-	eval $cmd \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		# Filling timezones, see
-		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-		"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it ..."
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--user=mysql \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		--password="${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-# @FUNCTION: mysql_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql_pkg_postrm() {
-	: # mysql_lib_symlinks "${ED}"
-}
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
deleted file mode 100644
index c62bd8c..0000000
--- a/eclass/mysql_fx.eclass
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.30 2012/01/09 10:42:19 grobian Exp $
-
-# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainer:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Luca Longinotti <chtekk@gentoo.org>
-
-inherit multilib
-
-#
-# Helper function, version (integer) may have sections separated by dots
-# for readability.
-#
-stripdots() {
-	local dotver=${1:-"0"}
-	local v=""
-	local ret=0
-	if [[ "${dotver/./}" != "${dotver}" ]] ; then
-		# dotted version number
-		for i in 1000000 10000 100 1 ; do
-			v=${dotver%%\.*}
-			# remove leading zeroes
-			while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
-			# increment integer version number
-			ret=$(( ${v} * ${i} + ${ret} ))
-			if [[ "${dotver}" == "${dotver/\.}" ]] ; then
-				dotver=0
-			else
-				dotver=${dotver#*\.}
-			fi
-		done
-		echo "${ret}"
-	else
-		# already an integer
-		v=${dotver}
-		while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
-		echo "${v}"
-	fi
-}
-
-#
-# Check if a version number falls inside a given range.
-# The range includes the extremes and must be specified as
-# "low_version to high_version" i.e. "4.1.2 to 5.1.99.99".
-# Returns true if inside the range.
-#
-mysql_check_version_range() {
-	local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
-	local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
-	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-	[[ ${lbound} -le ${my_ver} ]] && [[ ${my_ver} -le ${rbound} ]] && return 0
-	return 1
-}
-
-#
-# True if at least one applicable range is found for the patch.
-#
-_mysql_test_patch_ver_pn() {
-	local allelements=", version, package name"
-	# So that it fails the directory test if none of them exist
-	local filesdir="/dev/null"
-	for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-		"${WORKDIR}/mysql-extras" ; do
-		if [ -d "${d}" ]; then
-			filesdir="${d}"
-			break
-		fi
-	done
-
-	[[ -d "${filesdir}" ]] || die "Source dir must be a directory"
-	local flags=$1 pname=$2
-	if [[ $(( $flags & $(( 1 + 4 + 16 )) )) -eq 21 ]] ; then
-		einfo "using '${pname}'"
-		ln -sf "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "Couldn't move ${pname}"
-		return 0
-	fi
-
-	[[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \
-	&& allelements="${allelements//", version"}"
-
-	[[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \
-	&& allelements="${allelements//", package name"}"
-
-	[[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \
-	&& ewarn "QA notice: ${allelements} missing in ${pname} patch"
-
-	return 1
-}
-
-#
-# Parse a "index_file" looking for patches to apply to the
-# current MySQL version.
-# If the patch applies, print its description.
-#
-mysql_mv_patches() {
-	# So that it fails the directory test if none of them exist
-	local filesdir="/dev/null"
-	if [[ -z "${1}" ]]; then
-		for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-			"${WORKDIR}/mysql-extras" ; do
-			if [ -d "${d}" ]; then
-				filesdir="${d}"
-				break
-			fi
-		done
-		[[ -d "${filesdir}" ]] || die "No patches directory found!"
-	fi
-
-	for i in "$1" "${filesdir}/0000_index.txt" "${filesdir}/000_index.txt" ; do
-		if [ -n "$i" -a -f "$i" ]; then
-			local index_file="$i"
-			break
-		fi
-	done
-
-	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-	local my_test_fx=${3:-"_mysql_test_patch_ver_pn"}
-	_mysql_mv_patches "${index_file}" "${my_ver}" "${my_test_fx}"
-}
-
-_mysql_mv_patches() {
-	local index_file="${1}"
-	local my_ver="${2}"
-	local my_test_fx="${3}"
-	local dsc ndsc=0 i
-	dsc=( )
-
-	# Values for flags are (2^x):
-	#  1 - one patch found
-	#  2 - at least one version range is wrong
-	#  4 - at least one version range is ok
-	#  8 - at least one ${PN} did not match
-	#  16 - at least one ${PN} has been matched
-	local flags=0 pname=""
-	while read row ; do
-		case "${row}" in
-			@patch\ *)
-				[[ -n "${pname}" ]] \
-				&& ${my_test_fx} ${flags} "${pname}" \
-				&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
-				flags=1 ; ndsc=0 ; dsc=( )
-				pname=${row#"@patch "}
-				;;
-			@ver\ *)
-				if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
-					flags=$(( ${flags} | 4 ))
-				else
-					flags=$(( ${flags} | 2 ))
-				fi
-				;;
-			@pn\ *)
-				if [[ ${row#"@pn "} == "${PN}" ]] ; then
-					flags=$(( ${flags} | 16 ))
-				else
-					flags=$(( ${flags} | 8 ))
-				fi
-				;;
-			# @use\ *) ;;
-			@@\ *)
-				dsc[$ndsc]="${row#"@@ "}"
-				(( ++ndsc ))
-				;;
-		esac
-	done < "${index_file}"
-
-	${my_test_fx} ${flags} "${pname}" \
-	&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
-}
-
-#
-# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
-# (nice) idea from versionator.eclass
-#
-mysql_version_is_at_least() {
-	local want_s=$(stripdots "$1") have_s=$(stripdots "${2:-${MYSQL_VERSION_ID}}")
-	[[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value to check"
-	[[ ${want_s} -le ${have_s} ]] && return 0 || return 1
-}
-
-#
-# To be called on the live filesystem, reassigning symlinks of each MySQL
-# library to the best version available.
-#
-mysql_lib_symlinks() {
-
-	local d dirlist maxdots libname libnameln libsuffix reldir
-	libsuffix=$(get_libname)
-
-	einfo "libsuffix = ${libsuffix}"
-	einfo "Updating MySQL libraries symlinks"
-
-	reldir="${1}"
-	pushd "${reldir}/usr/$(get_libdir)" &> /dev/null
-
-	# dirlist must contain the less significative directory left
-	dirlist="mysql"
-
-	# waste some time in removing and recreating symlinks
-	for d in $dirlist ; do
-		for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
-			# maxdot is a limit versus infinite loop
-			maxdots=0
-			libnameln=${libname##*/}
-			# loop in version of the library to link it, similar to how
-			# libtool works
-			if [[ ${CHOST} == *-darwin* ]] ; then
-				# macho: libname.x.y.z.dylib
-				local libbasename=${libnameln%%.*}       # libname
-				local libver=${libnameln#${libbasename}} # .x.y.z.dylib
-				libver=${libver%${libsuffix}}            # .x.y.z
-				while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 ]] ; do
-					libnameln="${libbasename}${libver}${libsuffix}"
-					rm -f "${libnameln}"
-					ln -s "${libname}" "${libnameln}"
-					(( ++maxdots ))
-					libver=${libver%.*}
-				done
-				libnameln="${libbasename}${libsuffix}"
-				rm -f "${libnameln}"
-				ln -s "${libname}" "${libnameln}"
-			else
-				# elf: libname.so.x.y.z
-				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
-					rm -f "${libnameln}"
-					ln -s "${libname}" "${libnameln}"
-					(( ++maxdots ))
-					libnameln="${libnameln%.*}"
-				done
-				rm -f "${libnameln}"
-				ln -s "${libname}" "${libnameln}"
-			fi
-		done
-	done
-
-	popd &> /dev/null
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <vivo@gentoo.org>
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-		MY_SOURCEDIR=${SERVER_URI##*/}
-		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
diff --git a/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt b/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
deleted file mode 100644
index 6a45d49..0000000
--- a/metadata/news/2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: MySQL 5.1 init script revamp
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-12-31
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <dev-db/mysql-init-init-scripts-1.99
-
-The MySQL init scripts are being revamped to handle more corner cases in MySQL
-usage, and migrate from the old mixed multi-instance to symlinked init
-instances instead.
-
-This does mean that you MUST review and merge the changes in the conf.d script
-to the new style. For each instance of the mysql_slot_* variable in your old
-/etc/conf.d/mysql, you should have a seperate /etc/conf.d/$FOO file, as well
-as making /etc/init.d/$FOO a symlink back to /etc/init.d/mysql.
-
-The following variables have moved:
-- MY_CNF (was 'mycnf' in mysql_slot_*)
-- STARTUP_TIMEOUT (was 'startup_timeout' in mysql_slot_*)
-- NICE (was 'nice' in the mysql_slot_* array)
-
-All other items from the mysql_slot_* variable array should be merged to form
-the new MY_ARGS variable.
-
-Lastly, the new init scripts allow more flexibility in init dependency
-ordering. Please see the rc_* variables in the new conf.d file for more
-details.
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
deleted file mode 100644
index 2c619f9..0000000
--- a/virtual/mysql/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-# ChangeLog for virtual/mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*mysql-5.7 (10 Dec 2013)
-
-  10 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.7.ebuild:
-  [virtual] Add missing 5.7 virtual
-
-*mysql-10.0 (21 Mar 2013)
-
-  21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-10.0.ebuild:
-  Update virtual for MariaDB, but perhaps it should be in virtual/mysql-5.6.
-
-  04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> -Manifest,
-  mysql-5.2.ebuild, mysql-5.3.ebuild:
-  Update headers and keywords.
-
-  29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  mysql-5.2.ebuild:
-  [virtual/mysql-5.2] Adjust keywords for the virtual.
-
-  08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.ebuild,
-  mysql-5.1.ebuild:
-  mysql-community is long gone, removal time.
-
-*mysql-5.5 (04 Sep 2010)
-*mysql-5.4 (04 Sep 2010)
-*mysql-5.1 (04 Sep 2010)
-*mysql-5.0 (04 Sep 2010)
-
-  04 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.ebuild,
-  +mysql-5.1.ebuild, +mysql-5.4.ebuild, +mysql-5.5.ebuild, +metadata.xml:
-  Add in virtual in overlay for cluster.
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
deleted file mode 100644
index 0ea2af6..0000000
--- a/virtual/mysql/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>mysql</herd>
-  <use>
-    <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  </use>
-</pkgmetadata>
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
deleted file mode 100644
index 8e28056..0000000
--- a/virtual/mysql/mysql-10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
deleted file mode 100644
index 9ecbe43..0000000
--- a/virtual/mysql/mysql-4.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.5 2010/11/06 19:21:13 leio Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*
-)"
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
deleted file mode 100644
index d3f2f2c..0000000
--- a/virtual/mysql/mysql-4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.7 2010/11/06 19:21:13 leio Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="=dev-db/mysql-${PV}*"
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
deleted file mode 100644
index ec5667c..0000000
--- a/virtual/mysql/mysql-5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.9 2011/01/07 23:57:45 robbat2 Exp $
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*
-)"
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
deleted file mode 100644
index a41eabc..0000000
--- a/virtual/mysql/mysql-5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-# TODO: add mysql-cluster here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mysql/mysql-5.2.ebuild
deleted file mode 100644
index ae0e162..0000000
--- a/virtual/mysql/mysql-5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mysql/mysql-5.3.ebuild
deleted file mode 100644
index 45e3e68..0000000
--- a/virtual/mysql/mysql-5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
deleted file mode 100644
index c2ade9a..0000000
--- a/virtual/mysql/mysql-5.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.5 2012/04/18 06:12:08 robbat2 Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
deleted file mode 100644
index 36f49c1..0000000
--- a/virtual/mysql/mysql-5.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-# TODO: add Drizzle and MariaDB here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
deleted file mode 100644
index eeec7d1..0000000
--- a/virtual/mysql/mysql-5.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"

From 89947d72de0d46a30645494bbd80c0d63f21c5fa Mon Sep 17 00:00:00 2001
From: Lisa Simpson <lisa@safesoftsolutions.com>
Date: Thu, 17 Apr 2014 23:04:21 -0700
Subject: [PATCH 018/261] fixed the repo names

---
 metadata/news/ChangeLog | 8 --------
 profiles/repo_name      | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 metadata/news/ChangeLog

diff --git a/metadata/news/ChangeLog b/metadata/news/ChangeLog
deleted file mode 100644
index c693dad..0000000
--- a/metadata/news/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for news
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  06 Dec 2010; Robin H. Johnson <robbat2@gentoo.org>
-  +2010-12-31-mysql-init-revamp/2010-12-31-mysql-init-revamp.en.txt:
-  Add news file about MySQL init migration work.
-
diff --git a/profiles/repo_name b/profiles/repo_name
index 0eaebf1..975a719 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-mysql
+ScurvyNet

From 1fcb9c3838028d775e4ced544a4321e65eb3938b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 10 Jun 2014 17:48:02 -0700
Subject: [PATCH 019/261] updated sipp to latest version

---
 net-misc/sipp/Manifest          |  3 +--
 net-misc/sipp/sipp-3.4.1.ebuild | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/sipp/sipp-3.4.1.ebuild

diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index 541dd7d..baa31c9 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -1,3 +1,2 @@
-AUX sipp-3.1-gcc43.patch 490 SHA256 13aea89d251cfecec37a31b3fe773029059689a588e56a422656232e5ff84f1f SHA512 bee03f831f353026f53bf455b423ac8abc6f71549eedfc4dd29e33ab998b2b947f0ad821c85ebd9f0b6a9a59e9b71c901c093efcfa2e3494b6357b1890712e73 WHIRLPOOL 3ee27b798e0c66a69ddf73258fdaced6f8ef2e92d6895e893e4ad27060e9d4eb0fa3c0454abb27485ceb9096ffedb409a83a6a5bf81dcaeb0a86832686b9efed
+DIST sipp-3.4.1.tar.gz 439326 SHA256 bb6829a1f3af8d8b5f08ffcd7de40e2692b4dfb9a83eccec3653a51f77a82bc4 SHA512 a9c792b9cad5a59ef02cc1cd62d55de584f4b73a9d0ff3d3969bdb68dc5835c7f8fed52ccc7691707332cc88b2e4bf0c29471e408b9f9076131cdb68084fbd57 WHIRLPOOL 4dfddb4650a1ad76007e8e123cd1b05b2f356b0f3d612c675bee44b9c53406b8e9d82282e00db5a1c18f8b55fac074ccb32c95548f1d1f2c55bab6342fcd5011
 DIST sipp-3.4_beta2.tar.gz 424771 SHA256 bb71aea20d9ceb0d153e3c917fe8be36cfc452945815176dbcb0159815d52367 SHA512 bedf54af237576f15955417177e0a4e1a330f68e87f4b09a06af4fd3eba121833d90a4e3963bc4d67abd74f656ce4ff7523553c90c8c91cd8d79e2106d5d9dee WHIRLPOOL 2059617efa1ab45c828345243090b50dc709955fca281d5ae3fb5cbd5381396ca7057ff9fea491fa9e1e57e8e2c9806103c62e5b68879e35cd7d3072a289e6e9
-EBUILD sipp-3.4_beta2.ebuild 755 SHA256 ed4a783208e607cb7eda8469d4bacb88118a459349a1ecb749ea19d106954bb2 SHA512 23b910e7b2d8a01805a99d541386250352b8f260289e772636a7cace670b0e38a01eb516cd707c381de39c5d24cb0e9ee76dc895b3259eda5772d7bb8c84ed93 WHIRLPOOL a02dcf7e1cc39635b877a055e195068f9c17ac2e8561dc1bc8a1eb56a3693d09584f0c517b678f0704bf30a34eeb311b29bdfdce71611eb709e799a1056eb973
diff --git a/net-misc/sipp/sipp-3.4.1.ebuild b/net-misc/sipp/sipp-3.4.1.ebuild
new file mode 100644
index 0000000..33b6777
--- /dev/null
+++ b/net-misc/sipp/sipp-3.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit eutils
+
+MY_PV=${PV/_beta/-beta}
+
+DESCRIPTION="SipBomber is a tool to stress SIP server/proxy implementations."
+HOMEPAGE="http://sipp.sourceforge.net/"
+SRC_URI="https://github.com/SIPp/sipp/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcap sctp ssl"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/$PN-${MY_PV}
+
+src_configure() {
+	econf \
+		$(use_with pcap) \
+		$(use_with sctp) \
+		$(use_with ssl openssl)
+}
+
+#src_install () {
+#	dobin sipp
+#	dodoc README.txt
+#}

From eeba6ee8bfa0eae0d91007852f418ace9b620bc1 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 17 Jun 2014 15:00:42 -0700
Subject: [PATCH 020/261] new asterisk-1.8 with vicidial patch

---
 net-misc/asterisk/Manifest                    |  79 +-
 net-misc/asterisk/asterisk-1.8.26.1.ebuild    | 319 ++++++
 net-misc/asterisk/files/1.6.0/asterisk.confd  |  98 ++
 .../asterisk/files/1.6.2/asterisk.logrotate3  |  25 +
 net-misc/asterisk/files/1.6.2/call_data.txt   |  32 +
 .../asterisk/files/1.6.2/find_call_ids.sh     |  17 +
 .../files/1.6.2/find_call_sip_trace.sh        |  21 +
 net-misc/asterisk/files/1.6.2/sip_calc_auth   |  25 +
 net-misc/asterisk/files/1.8.0/asterisk.confd  |  95 ++
 net-misc/asterisk/files/1.8.0/asterisk.initd4 | 273 +++++
 net-misc/asterisk/files/1.8.0/asterisk.initd5 | 295 ++++++
 net-misc/asterisk/files/1.8.0/asterisk.initd6 | 345 +++++++
 net-misc/asterisk/files/1.8.0/asterisk.initd7 | 347 +++++++
 .../asterisk/files/1.8.0/find_call_ids.sh     |  68 ++
 .../files/1.8.0/find_call_sip_trace.sh        |  76 ++
 .../files/1.8.0/patches/vicidial.patch        | 972 ++++++++++++++++++
 16 files changed, 3010 insertions(+), 77 deletions(-)
 create mode 100644 net-misc/asterisk/asterisk-1.8.26.1.ebuild
 create mode 100644 net-misc/asterisk/files/1.6.0/asterisk.confd
 create mode 100644 net-misc/asterisk/files/1.6.2/asterisk.logrotate3
 create mode 100644 net-misc/asterisk/files/1.6.2/call_data.txt
 create mode 100644 net-misc/asterisk/files/1.6.2/find_call_ids.sh
 create mode 100644 net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
 create mode 100644 net-misc/asterisk/files/1.6.2/sip_calc_auth
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.confd
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd4
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd5
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd6
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd7
 create mode 100644 net-misc/asterisk/files/1.8.0/find_call_ids.sh
 create mode 100644 net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
 create mode 100644 net-misc/asterisk/files/1.8.0/patches/vicidial.patch

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e958f43..3dc40ce 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,78 +1,3 @@
-AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c 3131 SHA256 65974f24ae758f43fb3235830618685e6f257b7c6f9b076209796e7f790fd309 SHA512 fffa8d6798277b904ffd95699c78f9f85928b1bf51d9fd98c164f54026293cc48e76a99df5ca2962c2dd6fbecb4b69f449cda6556683fa9aa47c1b99ce35418e WHIRLPOOL 45144e8601fe79e09fc728cb86332fb0f1a6bebeed232fcffd79046e61bdd6390eef221e6e1fa8a0db2bae06c6f385c1d7fb16c025ade30d7c8f9e67f4c41aca
-AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h 613 SHA256 ff05c73dfd410b764af250bac75af8955825186ca8358cb11a2ceb900953d4a2 SHA512 0fbacea90fab45892a41004901e323bfde157b203afe911cd870238f0629a3028752ef54f8ca8b6f6f9b58e72b4532b364ca9e98a9ac3f7ed84f3e3d91820e1a WHIRLPOOL 6b5e5f250741278a7f68eb8192a418c54bdb2708716260658e892e68f8c2d55381d4270924ab7d6f9f13e37e9224cc8cec58a17c458ff468d3d114aff6a750b2
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c 4847 SHA256 903e62dfeb760c45c8ebae3166715615c85da285ce590ef5feb6e7c66682cfa5 SHA512 6afe96330a806422b3a11e47e3d5aca8686f5bb3e4f3bda30c56e74037cc3bf0d55f2d39dafe7c9b67982647e7384aad485d63d29cc512ac5df9cd4b32100b19 WHIRLPOOL 4f8997df5d8add1b3b1fab91dc146bd295d19ec4b8dd2d93b8b04f53c54d03999d862d9dc7df853d5d9c4a4153102105adc679dc1b4d30e97761dd4175d94994
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h 1376 SHA256 5e231946e10d23a5d17b6182808fef7850092f344618c4c8db60aaa39dca15bb SHA512 cb0b4375bace1c61d3884d47e82691063a1fdfb8ad6e4c28016963c83bdda2843479abab89bc571d5d3dfaba896cce4dd5632756fc5ed25fc96eecc1c2c3a3cf WHIRLPOOL 0d43bb16491197f763b53353909c0c78b15dce0642b9e2d0cc10d2d599d2b2235cdda37be0766779670d371be4de5ae34d430b4d96a04b8921bc30f722f8ed6f
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c 8335 SHA256 fa53f7cd92f830d2fa950cfa2256e545bc1a1cd56a5ea2683e3a1fda4b53e187 SHA512 1d71f9b7abd37c3b643edf62c0feb866fae936033ffd33f829bd8818b8c918628adaa8ccae9d4903742bdb91910075e47891ec0aec32e9dd438649462ff0433e WHIRLPOOL bf2296f11109965566bbb43bd1bc83bd66dead18ff0cf3f42b96195ea791cea9255c7b3aafdee446e3422533e33bc8302140dbf671e324510249dbd0fe922d5e
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h 866 SHA256 ca183c69364e2a9dfb209c340c5eab7a14c6818e9334f4c0f9cc9ff8938a4ba1 SHA512 78ca2a9ea565ce9f35df2f1fb93d7d8c6c2174258d621cfad353e04c6bb1c7b2333270c4d2bfef621c6436a58f1d388ada3e7be64119a60f97b663133d6b8938 WHIRLPOOL 7fc1fd1743498e912d486acc509e9086da10d4684c9998cb12cae3569a2b99972a0678478af1baa24f9e0b9a0d655ea3fb24829ea369aa2c5b9dbc1f7b9b319a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c 2233 SHA256 454a7645f4dfba5a1f778fe5fbf072e854c7eb1bfdadb1f9dee80e7040b1de69 SHA512 2472c52534dac936900190a2c3c0003424d484a78f392158d16ed8017ec1223c2108aa332dba096558aed11dcee7f6fc18bfe6dcb98ed8294d7757f9e325a52a WHIRLPOOL 2651c257ea416761d3719b03095ee7609f91c0a2fc587de1c53763fbb86e048207d183dfcf90b5f7677d9f06c601cb5b2eada9e59311f4c7632318051937d554
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h 791 SHA256 8fa3fcfe60b9b6715ec367e741d7bb6b6bf48a20a47434037055d3024407ea71 SHA512 adaf1b484034e833c7fe374dd2d5a95a66c85cf68ac134ba3162d771574f969934ddcfa06dac0461c19e7265f303d8adfc50fdd5334576a16c944fb81a2503d6 WHIRLPOOL 2ce220eed411159c1bbfca98d1faee471e4e36cae740129921211a3388e9a7f2eb59cdf0b79e372f764cc1c178d94048c148d1860eb4caebc4e61718f2fe0478
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c 6028 SHA256 0b63cd18d011a814c5b250e7328e66189c012d41503ef6740d0c85efacb8b78b SHA512 e46b2cfeae0817926692e427692aec201f9c1c7b01716949958b6a3031ae175816b6f5caadabaabf0d794b302a19d98f00577190008cb6d5487e7bfa7fcec3bd WHIRLPOOL c3667ec3a9244cbbd2335fae14b2b80097dddd91d1aef2462dde3b41b0715c31fc6a0c0cef9acccc5527c765c5caa00373b8f1f37925eacc21ce7d0220cbf393
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h 1626 SHA256 1cc6c4a1723b8fe27ff35f55b0fff5dcc0a9cbc90072259000ddd6cfff030fa8 SHA512 6b6d8a1ba3f4d8aa95b62c726ed7ab7197c9987f2596a6adb8e9b317b47e6b4b3ba1b61f61355f9415ff1813443fbdcf968b144c628f0dcdcb76f7c590eebccf WHIRLPOOL 558a4f5ba73184bc5ff6c77cb35f9eb4d1be95472c626f9f7536d703f6aa70c9ed264b1f46eddd88e42dc884584f0b2a918d84d9afa7fc3e095b2ba8678dcb3a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c 1701 SHA256 cdc1f00965079e598c9f60c91bedf552605bfabfebaaf2c5e745e423548607f9 SHA512 bd46c1e217fe0efbfc68aa350e5b26714422ba0bb711fe487a87b76487cd1161730d5ba91f713b1a6b57e09c18e7a5ea397f08f05cd625c4313d0f13e1f1b129 WHIRLPOOL 4db10848f3c9c489ce982103a268942f6dfbb7f4191a5de3896ddab9c38aa1bc778ddcd91fc3d9af3828676090631b43e6d173f3adf6946936aa4471211a656b
-AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h 617 SHA256 5600c59f34a4a3ce3cf93a1cc5a6964f0f9f619b10cdf91c6050d002064beba4 SHA512 f758014a8d0c9f4ac286eecfbabff08ca6a54cbaea1bb801a2264a6eeb2393ca2bbe52bb98f12a448e98415127cbc4662fa5ad65767a1e2787dd5513b1205998 WHIRLPOOL 670402f97718fe7bf3a845a1f5f37ca38ea0e1a51841d3b31bacb77f81c34db396f340b773dd6664998b292f9a576b6dd5c8f6ab0d58cf621ac4ffc2a314b10d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.c 36801 SHA256 cb1e41c3db63770b9a40159d196ed80ac6ebbf42d2e664e4bb9efc68eb855812 SHA512 591fd5226c44bc52ac44bb328ddd1de81c3c07d12dcdeb15fcf87a0589ba37dd3284e1906588aa8fb9c6c80e8be0859d29ec7101769d07db99b474db50f7b160 WHIRLPOOL fc15a6787ec0b0acffae05d35e175d7edff9a90cdb7bb128dc37bc895386007a9d64b873f0caeebbd2a03fca1c56e59a6e28a716abfac56d8e5bc66fb11e5853
-AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.h 1607 SHA256 a99d6a17f4961429a4b61d2a052d86d6d32d9bd6cfa9714c59c1c5faef724be1 SHA512 7ed00076dceb3b6dc75467157daf1be38269b8de4890e238452c962306d3a9f05d7521b11fa60d2fca71fa5b8908dad2cf85bc86c5761068a5b182d42a48d7ab WHIRLPOOL b1c2980d5e746852ca1c430e102f3b2a52f93043b719582803db25df11444b1f1786f7c8c5f13a31cf2758382a26b1bc31a3816a483a45db562a44a48b25ca74
-AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.c 6751 SHA256 955913c3a9deaa2a49c3a84181ba16d51c5106793d566b1bbb3c3423366dafc3 SHA512 5d58fe85e244f613bbe3f3d756fa4d0fdfb1de384836133b2077633588915dbcc1305631aaaf9cfe39c68fd0c6a9e7cc0b999fe0a6937370681001a20eb6e957 WHIRLPOOL d0ea64386475ce650f187f833ae51a3414790aa8f2b6d61459fcd9a6e533209b2fcadffb75e38635da0223c39219decd6dbe08afaef2a967d50acc2b8bc12bf3
-AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.h 1993 SHA256 d46a70ad1cc9f465a8f9e0bfb82ec8d31e8e65a94d2a57a0e354543ec342fba3 SHA512 e569740b62e45cbe8bc5c20dd0a0c095530845d8353254debe8d03e9fdf5c47f5dbce972f69d8e831acb08bf3ac61e91079637b2c35288354762a7c2298b7a23 WHIRLPOOL d41bf42b25e3894b709cd94a9f966c5e3e2517bee41cf56fc3115179c7b55695da7372a77342d553eb02491ffb051290d284a26dba28f57b2ba5e9d145e0079c
-AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c 7826 SHA256 68e34fb75db5fcaade4e9a58b254d80bca0b062502fb86090da30eaa27a3cd33 SHA512 89f1d3a68e2013abb2d60355c9ed57652f03332267ccbb1c4a9f5658e5f7e201fad6f8544fc14b9ac9227be401edee10a2d65a9b9ba410ecc2ff3140666efada WHIRLPOOL 8b578c86ae873195d44a9535a4f0861c9c7d1c5a15cea5bef3a849cfbb26c6acd8cf91642109b101fce9cd4da98131f81f686e451215d168d947c5b53f4de5df
-AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h 864 SHA256 8dde21a55ca985b657028a93c8f837c3ab98557854e41859864523c52d8777c4 SHA512 2b25bc764488bd831764880e8597a418ce824f111230e146f56627d474e9dd22d79488b56676fc9d41c3185bb92dfb8894e3a6569de76dfdace3bf41a55e9aa0 WHIRLPOOL f529a014ba19c1f035135c88c90ee7cd1d0186237cf8c1965cd4baadab636a3d7e30091ef414c38c16a8e67161b4ae656d9fe82a4a3b31548438362b675ed716
-AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.c 20605 SHA256 c2cbcfd67edf91bcbb27cd4e88fece09242466c80c733583f6c54cda1b363964 SHA512 788f81f8d32790417847dcbcd9aa4eace84a140cffaa16e0d3ae2a17419142e4e5dd40ecb98a785e48c25f060b14a2878fccf879e8a169e412ea4b89668376cf WHIRLPOOL 4bf8633345dcdfaf0d085090ee03c90774c8d9d6f586fbbaf0c1e16dfb43d8e6123a340f2b3536b30cb7d633e71c697c0c521b24ba69c507e5fa6bbb36d72ebe
-AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.h 828 SHA256 6504cbd083f939a0578be86db60223306de90b833c23178c9cd39f15b995b288 SHA512 99d94e49d8c0d12cd456fc007ae9a5ca6a406e72d17308a72c6ca9a57d513b3d822e67504262ee7790213e265825305775f7c893166a55abfbac7402682c57c8 WHIRLPOOL 5f66a06bfa3ea6fb6498f6d3d815bfa4ee39ead8ffbb52c8d5b83a4a3dced1f0a121424aa7c8320e01ec791a4378db9a0e6391f6aae677d586fdbd882451c621
-AUX 1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk 643 SHA256 cdf3927d184f82e28d94f6614c7e9dd107db5d3f58f59c5fd22aabaf2936a755 SHA512 0af248f3f09fadb3e9dbc496878694d273c47b6294dce7a3b76b343e0e198496ffbf47116edefd3f2e790641ee94441295a84145c36c0a9654587449ebe60458 WHIRLPOOL 73f5f31e5ff003dfb36c9ddc6596d0d7b8b0a8085adffa08897df22d60b9106ad7458e606532ff1ae8afa6d2b6186602f665383c2a907dd0eff6b1877a3159bf
-AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.c 5639 SHA256 0b252aee26607ff1b21834f5dac25f6a0356f3214fffb908ccd66776d04d4513 SHA512 d4a1b40099cf6041a00270b77b60e93a8e75aeaedbf060b2b8ef0387d810686646dbe6fc64cc19666939651dceebd38b6e38a7ab95d23784a6a89fe8c5c59a93 WHIRLPOOL 669e966ea4d29e3307a94f9249530a0d4243e9717ebac273d8eae207fe5f3ef1f1929e8ec6d519fbe2f5d13a4127493f45ab975d665bf40555153b9106f21646
-AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.h 2999 SHA256 f917999699fa2fcc8934401cd42093d4032c23f1316e6480ecbd0acc63d30465 SHA512 2a3e7f25b1312830e04dc0beeb39f07b9fbda0dcf319db66c1632a4b3c5801e530d52b2d0153bfa3f7ba939ba4f70cc7470d71d604b9ef74ff37f2dcc90bdd32 WHIRLPOOL 2a916b712af72da3da22a79d113b1983e783df262c69b7654279ef793565ae7e5f27c15b67150b9222b7441d5f081b3d09f6dbb90cf6fd512f8f22bbf6788cea
-AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.c 2665 SHA256 354890fd77ed9669f24deb288619cc51b2caed5043135e994b95006a598f7d1b SHA512 42fa6a57c2756565487bf5986cb4e3845c815342f16e65fc36efe261764dcdc9e3363298fc92cd93778fbd057f154320e5a8c118278b18fbc7c94db7b0cee565 WHIRLPOOL 0186018b7d4577744592c329bdfd7dbfb822ceff8cb3d7dec8651306799a02c16cbe6b44bce5346ac6145818c732d4165b9e0ce8b4f2931d040ff988f9854600
-AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.h 863 SHA256 8554210e762cfb79c89282ea028957d1ca91fe3d924f887c41b6a8e70ea9c9ef SHA512 217bc0397cde4f4aa9f48fb1bda2a9860343a4029d4e91a9541a08fb4a37626f3ab2a0e2d3d24b7446c2b1141887c2d467c67c71a13b9f2d99f53db469379f93 WHIRLPOOL 1da8466d668c0fbf73140031f35fc9c82ea95a49323c476b6ce4804ed73f19df5e25cd5fd2c798ee4189e58af3e57d99c4acf3f6db1e18e11ae24e6df1723827
-AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c 5043 SHA256 1dfe5eecb11d9ca2afecc11188c243cf25e560e458a1636d35e9575ede9b95d4 SHA512 51a8f6e8532d4b94430993b5f33405b81c457b59ecc2b1105819be85d3bd033bc6ee6554845457a6aa0130906c2600eb24a4eb9607e801fdb01104a7efc473db WHIRLPOOL a683e9022342e8b029b678c25d2250a339eb1cfa3cec3649be8e7d81fc7f2da4f8f99d0e22d6505704845fa476f753b01a0283cec4dde63e3ffa779e9349b6bd
-AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h 652 SHA256 dd2fc6a5038fb6df8b005348fdb067b595b123d1e4f035ab90d5d95d65f495b8 SHA512 a4dd1cba1696ed668c99fdc0dd05dc880ed6d683585f83f8c58bd206ce2ee97671da9232717818570ddfdcc5df9d3968978fdac69c70590b5da3ebea454f806e WHIRLPOOL 5b6d2630e20efa70dda2867582f47ccd123f595f50bf2be041f95ecf66b767764514818bc246cd57aebc2f5a009fe8c33bf16868c94ee8c00196b430e247643d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.c 9314 SHA256 426f51a9af77f05baf3d30a4a6a7275c6a63ecdb0c518c2a3e8d8bb714958efa SHA512 2a69a5bbfc3ca5e98a052644896f6342c136b484ff6973b4bc8dce31937685dda16790f3907671635e8a7e67297cf1e88be8b284ce13f2f074f4cc9d835a4853 WHIRLPOOL c7bb97de0898b7545aa32f13ef72594f319a0cfd881b6d6d985d4d536774324a6b081acb0f67606633fb81fd6bd7235889d805ddb377eebdec8754e01c84287d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.h 3471 SHA256 b0db99729d1dd224981543884ebb058ef7646129e1995166dc6f14a4090532a0 SHA512 cda538d5f1740c364683f06f3293e632dad8149eeed72069e5111e7984425a44dd4ab0e9a6d046463e21f89f02535bcd1dbd947ce1563ba0fcd3659561d0b452 WHIRLPOOL 2e24f429c246d66469c2d9d21c7866697fcc5f65daca0841aad6964252c5fcdd84d2a2d655f20a9536520ac6dc1bb3a6ad66d27f351a73ac10fe396d729c3a62
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.c 1378 SHA256 1b64cb361a3100fa408b5c6cc6a26e5f48c32128026e53ce6c2208538e3a4301 SHA512 da3d6c66ccda960791d88f2bc28a6216badfa2b41e1a1925e0a56e214dbe0e9b62c1304fd8f0fb90e2c5cccff1b9d5353413f3ea92e67131eb257c51fb986fc8 WHIRLPOOL e9ec9996747c2319ac216b77c3f0a5f175c14c15108da978936d16ee89b5cce0e3e6b40e6e208b07e8879738380d6fdf60775451211f3742ee543385c3c21d46
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.h 588 SHA256 b3a2c0c917216ce1cb3e4199dd68adf7b4ee13ba51faf31836368b1791962423 SHA512 84a894760438e9915431201a5d37ab34afb22b712a2e681fd9c7bd688da7d116b68feb3234eb6f50dd4f7b8e49a3c1faf4db0a1d6aa7450be8f04a2b7367e7d9 WHIRLPOOL 36107abb5c99a6b6235dc385c6bbaa249a26637314dc8792274d8d546e7991be13f94662d07eb604e0ed89d773512f8bc71d7e1ab53fffd21d2cfadc9c90783a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c 1373 SHA256 0fae033bc1c53122f3fb3bd7e5f1888d4cb76b26e80ec2897b6bd965193448ab SHA512 e7ab5667a23b4c19a204ce1fde2c580ad1cae4b55821efcdb76201b71dcf7856cde1d1b1fd6fe3cf94ed6f3bdd47823ec533185f72910500dc7ceb66ffaaa9c4 WHIRLPOOL d8308194e89bc2919bf7a3bf16db42bc4fadbf4678d48315c35acc1ab1f7c259c929e56dcd66b07494d464b8bf2a22d227a3b2970877ff4c5131478e874916c6
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h 588 SHA256 e0fc0c1410940b4d68ca6c1987f27372376dae3a8ca272d71230b11c7e0e1f24 SHA512 3a56a7d3bf2ad086eafe1b05d3514f0275ec4d00e19fbd22418374953d7e36b85ba44d1e72fae5587772f2cd22833e4e65acfbb25bbe1ab788250b40d39b4e12 WHIRLPOOL 036f488d319eaf830c0b0be43868d5c529a3e490657421ff59380edd3d98ba3119efa8c68ccce37850aa8209d0d80f6d249a340693e9b2934c4bffe28cca1a40
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c 2885 SHA256 0baae1dc6cf43583814f85fae53622ccee0205d78f35b81dd16856394a474395 SHA512 20211f18544285e615292225284f1bdb3264e8c900be3d28c31ee7e83432ce810dfd182a7941caf778a47f70adefcf6eb26d52e757043f1ba16a356d3841ab4f WHIRLPOOL c08085a0d1a5e0319302f0833d3b52d6db079c6640766942e59da4d0d8aaf1093f4ea968f8b33d82a42922861e4a5b3d06be5a242e05a536b4819c48cfa222ec
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h 986 SHA256 717e603767a286de36d7bf6587cf161cb05bab968453d50b16cda8a519b79475 SHA512 89dfddcb8ca0eac9c096b0d73d28194ab8f090798ed479a117f3f474e750d9fc6fd56eee9d778ed200aaf0bddfd7c2e905f8158652ab03a098c84a6cf90834e1 WHIRLPOOL edb9f7fa35252b61c8652271bfd097da8ef9695cf931891b973708749892f5c6df6ce8d78320c96eb5181c721a0158d124c70d5c36b91d6b4a81fbba4c14884d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c 14051 SHA256 f0db960244b8c58b505ad8293ffb51acab0e7f99ba1be58cceb6c15d6a5f7df8 SHA512 795b8cb0bfefabef66a0af84953cbcfb77f698b6bfeb468113ec2d2542c48890eba99a6f5e6a0964cbd6e988d7a094c80b4742301d0b785c682fed011fa73d18 WHIRLPOOL f2f1c6ba96a037ffb0c2dd6b0d942e4fc44bc35699e625565d3104be35a54811cf37684019473ac1c76d42d6fb5eb6f1a7cdf6591976c78b3d82610e30d604bc
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h 1086 SHA256 f00855f862619efdb20e29b5423b71a0c289359879f4ffc4b08bd38385d3b272 SHA512 7efcbd65bd3b8431e976254c5e840beebea057041906f575d65294951c7eb5284ca02a0ce5cc3fb8cbd3f01dc0faa4ae9cc8cc6dd7ef7e23087eeca78616f6c9 WHIRLPOOL 0d417a60496c3034081273a2a31b8f7dc9935090ff7e030cc12b4670d33ca86cd4bdfa49ab37a7f31aee7d2d9d7cda51ab42661e2f3173024e08db651910fe17
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c 20730 SHA256 869ce48ad05eac43d7fdf19fb5841614618674aaff87a1ce51de8552dd792337 SHA512 79cd2cd13523151123cc26da8f319af1cc2a831ab1865e371d1c108bddf85d18f4a93991440a057c0c77eb727f79a8da09bf1038658da85f573427be08d9da29 WHIRLPOOL a844e74990c79d8525e90c6cd7f111f267c230273fb633cf76f13a3c744f52514552e63ff4b2c0a3b9929b6aefd31069bc5f620d5bf01f857163f8c611c67ae2
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h 1258 SHA256 02017803f44419ff2e2dd86dd199ba183cdbbe0e84e683bb9ce38b604099c393 SHA512 272807b3e15a7160f1e14557c5e0217479b192821b0e9eadccdc65deb93ccebd57dac1b3bf571551b219841cd1d6701a3d7e44253576becb79ac0c4d3b898f00 WHIRLPOOL f8bd722f6d07f6db244b688dd25cf1bee49cae6f47df04f33c9f77147a3b9dc91ee1877cc126bc64dc1811b2a7a172cab1bae5d3c05bb0dbdc527da5374ebbce
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h 6251 SHA256 77fc1ed8b7d427340bda49df146a219ffba56f1cb9562e0032f104d33217d860 SHA512 7940fd069a4d6a230701b0d86fd83cbd7f6cf4c2f3362a2205e78bcf8bd86e7b4c5a423693a263b2df972dde53e6b33b0b4142470a09548ca46d2bc1175b3c24 WHIRLPOOL d314e6761321485010727c90e2d60efa3560bf509e63bdf21f1ebad57bc8ba111c88dae15ab5597d946d15f30c5c0a527872cf19159a94dc851feb916f0062ff
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c 17526 SHA256 b20b4ceb50a17b050b56387ec616a497c2d3613845d26ab370866f1ac5accfdd SHA512 80e112e3c11a8588c7582deb78e1c28d92eedb638e0813e7f44527aa9a5f302cf9bb10a39dcc097794ac6fe1ab2e23238167f4f5c3c7c3dafff0df8ad5196b76 WHIRLPOOL 1b5b20d6f8f9f85205c4b66a08db31d17b0024e67035207c755d7692656f511e7d7be37822d2f2c7004c14124eeb027086e58617dc109b2b9cb30c0c597aebb5
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h 997 SHA256 4bb62c648dd187367e5787e9b2af4c331257b02ca14b9179deaae2eed5436c52 SHA512 d011d3e153009485fc29e8dfa1d2ceb78e5393d1f3acb4dc3d4a4590ac0cb65b13181202d804639ced5e6fac7867d6dae098f92229bf96a7e03131f098d896a8 WHIRLPOOL d022a17256191b0de5716d086e4722a1cb3f106e5c8195982b49eb9130626fa8f78f9040f8b3c9913f781e2c9277bc6f5a50c54ab6997727f4c3a82701418330
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c 9078 SHA256 be1a99b227857570fcedca398c989bf201fb71356dc2a88ac77a46b4bdc1c834 SHA512 484038334898804952a7fe3534dae654fa798c2df4e0d13eddfc59083697305cd6dc677db13aa7d42a80ecc8a6238c4d825d7819c5eec0c7dc10f59b903a43bf WHIRLPOOL 418ee6d97fd9d81efd118acb4369162063c138832437eb02242e748fb8f0d9c593b4560ee5064556cfa27cdd25babbb62dcacb6f97cf1d8c346d40c050d328fd
-AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.c 7667 SHA256 ed2940504c832075bde8d6b8819b8b43a0f609e1543c4ab45feeae9fd4737d8a SHA512 06f1c936fd7e144c0cd16f9780140a8056a6fba96a4b3136acfb405d161313369250b1d87a1d973e7e214c2201e58835d30c6907131ec03dbabebfb41af7014d WHIRLPOOL 8b70576d17f3706ca49cf54f89cff6c143216a15bf1666a85ce6babd889565d0dad43a407c05a726e75b68c7f2cd5e778944903bf40bcb446b878aed29475271
-AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.h 579 SHA256 47024fb68e7c00f8b89cf2df41a57debcea098912fc80915fbf258f1377b3ea8 SHA512 2a912d218e6850483126dbd30f2026e29e513a101123fc2b55ce48eed9ac3e81192a410e08d0667a95b522b08f16a363bee574ce1e8ad8fb408135271a42a130 WHIRLPOOL 77830511830166c37c6fc27324fe337864d7639305b1f45c18a4646ed0de6599a5bf9d0051777c46ff354f7b12c8b953d91e915aefd9c5be90efea3c9d1e7e46
-AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.c 5628 SHA256 8715717aeb9cdf79f235793abd6cfa07dec0ef39605d9acb02cabb8f8498090a SHA512 4c9e06f54ffdb9e90fe0553d308390ec9b41e6c082189798a39e0b748a18541f726e364b5cc4793f159a9d44ef043a84d882012b7e89c7ea91d1672dd077b7d6 WHIRLPOOL ef94337cc199a015911cd11cd65b5c3784a861d69f3e66203fe44846c528ae3dc24fbb3ee2f06aa51a3dff6b78d9c7dec479be59dab4f133ffcdcc982fb11770
-AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.h 2688 SHA256 4daa342a3a2255d23d9fea030ccbeeb24c74e0e04ca101294a81c5c7feff3ec3 SHA512 f0d123298b112c6f46afa4b2a804398faba2a71eaed9537a0f99ad648901067ffcbfd224edc2aa62897a225ea66ca7af35c1f28f364d711263ddacf9e35b860f WHIRLPOOL 44b2602be68c7729ddf15438557dcb55fa7868ef4bf75d4bba0759a5b5e24e27d299658b641f4c20c486fe72360deaab40a080ce508b1b27a326e1062ea26638
-AUX 1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt 373442 SHA256 be5d79cc62d72ddc8ead6dede0ee5fff225305852b0beab2fca67f39e2aec47d SHA512 ad3df37c2dd65f4aeef4cb57f0052577e59bf9b0b5dce92664e77db016ae02519050d2ae4db66f034affec40f466c83dafdd56f29197ff3442b47d4fa358b7b6 WHIRLPOOL c98d09382df6f6872db855ddd9d090ec782db58871d22335e5639292d631c9371f9a4dd588f6a6a4f8e29e9cce518b743736a2c3880fcacc462a9082acd0fb2b
-AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c 1630 SHA256 aaa8be099a90e35d9f84dc2ee3294288d3f8d701a4191535c5eeefff3bec7ee4 SHA512 2ce9a5208e005ef9614fc7198a6858195d542ceae9ac78688ba6c5706fdc33a0014aecbb21d23721f9a9aaf67d6021247b30fd0618bb65c5486e241d3a85ff56 WHIRLPOOL 0572f8f8c46363aadaace26b5a017021be79b46f0ae418488c39b94f68d63a041f32ef7b2a97710a7310f0ae33ff53b1a732ea9c2d6da143501a18e18d46b248
-AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h 589 SHA256 62d687a7f3d11ebd19d9db9d6f29195a5dbbb8be6fd03740769ea22024b1dd1c SHA512 e7b8dc42e632153b45be4162fb166862e508c92d424ca4a1ba2ea4105d3ad7017b7e8dd141116de7b75f89084ee1b43d57b37046e355f3c064dbca0d4013ecae WHIRLPOOL 0a8890d9fba910b187cc554cb3fdb0b1d5e37c75cdf848756514ef78f45ff97f37fd456e7c1575d5acb819c4327b53668cc5c136214307a20f29ccba49b88ab0
-AUX 1.4.39.1/asterisk.confd 2207 SHA256 8d1e6061651291a754cab409bb7fd79171784c324c1e93d81f8f4b7a158d902e SHA512 5efb2e9944c0d6a22f4c5c3b746d44f03f2a862116eebbdb2e2b414ff6418aa14e61c7180053bcc9a6f8472aead98d18c9ed384fd119cc042b9bf30639fe5bf1 WHIRLPOOL 159d69a8ed3bee8bf31b46ba47a78bf1b7cea5be35982de42a0f0092885fd2ff55f712ee87909cbb23a0026537bd1959c8e328309093427f61d60fd30e75a855
-AUX 1.4.39.1/asterisk.initd 7274 SHA256 51eeb0a06fcac7680d8d21fda8b801d06f98045a824a820b6b474c0de97b0258 SHA512 c4f86b3ca301913a5e174c04e6fef234e5bf8c4f88673d900d50f120747206218b206238927ae881446c8eaa26b63a1ecb5f75cba17b397c168552704b859ac7 WHIRLPOOL 19db63ef40715efa4c94c29e8e05c9416dfd580611f52b84ed43de16996c39925558767b3b7675e764283a8cb51f8f3c7b5cfc828b268a3f89d70c4b9c1ffc11
-AUX 1.4.39.1/asterisk.logrotate 247 SHA256 b61c3d7614654c9a4c48b8963f7c4caf60ed74e0ae916fe3b0212619fab1cc24 SHA512 68a9fb2f3c5c992583ec4d5b5d2427d460a268f8b3b86c39314f1a481aac025c5e39c71a775c687df40d4d1f1e2178ba9aa1c3796f4cb0bc9e67af3a27628453 WHIRLPOOL f3065acc5f82b02a371e022dd50a20c63724f9853da8c593d457046dfe958bba32bfad783f16cd124775208d33608a5af6e378216e2a681bb7c841ceb1019064
-AUX 1.4.39.1/dahdi.initd 5962 SHA256 319003d37d0608edab1a8d8411fe666f2ddaede791e7bda5b0beafa3b4bda07a SHA512 d70184172cb83e37bbe6403de3488471b6339e8d10379a80eb497895a41ce4d5a248d13900736223e5629723ea164802edd6ae14b54c786464a4da426fe109c5 WHIRLPOOL 43263a4a5ac1be34e676b23b19040a4514db2bb4c11ae224720da10c381790687d2901b41d1b16e1fb32d6ae9b7f9816016c9b7df01e32b85fdc9bc662364de2
-AUX 1.4.39.1/patches/apps_.moduleinfo.patch 22296 SHA256 c7923ec9b5b2d62b8c7766f77a3f718709c66e2a498a96ee3965c4a9687541c6 SHA512 5bcd36a56e6b1d008ae58e9398ebd0a51b98b649f1a91b45775a0c807234f2f83e132644c1fa05e88f9365012c68ebc59b5695472b3c944beee157d8d2f70553 WHIRLPOOL dd3a44837969a8f0ad197f73f992e91a8429537695704ac04457e067d786c3305b852a0b6f0d6b011e280165053b0ee632d333bc8058ea19fd550214f4d62f3b
-AUX 1.4.39.1/patches/apps_app_meetme.c.patch 424 SHA256 32935b7cfe6e6a0f6d3a5c1510cb4ca829d9c3d8e5bf6379177b31b3e491c27c SHA512 9a510bfc09acd1b1946f407cc1fc2b066e66604f6e487cd5eb90c70cbb4151ba110001b3204988c7135f979c6d3ed27287a77d1e43fa82a0f780ad4cb98b583e WHIRLPOOL 16085b59bde8555e4d6b8980d23af40fde29e770cde7cdf6fdd9c04abd4478475b1f888d150af3231c6ddab8874c40a80e51385a60a42bfcf51baf5538e879cd
-AUX 1.4.39.1/patches/apps_app_waitforsilence.c.patch 1148 SHA256 581f27ef827cb77ef691e5432808d381836599927c3eb9a1fb657ff97bc66f67 SHA512 658f86fd89b7cd749ce353a3cdcf75c7a04fe1f926c43768fab8d9f74fee971248cffaaa55b10b11a319097faedaad08fa0aec7f81f81bd4810f11e443502712 WHIRLPOOL 71aeb0350b91ed1ce76dcd23909fef32a30935c83c4101759d6034c854ce6c626eb02e73a7765611b3c56539bfdbf68f1c04b33f77004ae065f654f191ae3514
-AUX 1.4.39.1/patches/build_tools_menuselect-deps.in.patch 357 SHA256 b4e0635fd44bae5dd4ee0326fea2d8236db01b7ed223af188706bf4ba30f6d41 SHA512 991f5c44095e4e39bc0089ed382956705e0fceb2579e708203564a297f867f70323af93d2375d4bcae308dedb59a22c709b915614acdcfb8a1a45d70911ac0bd WHIRLPOOL aa7f47c9905f6432e128b3d018b0adc3bc8ea6eda3acf1e561cf54b4cf9fff5741dc84917bb7f05cd677855b5bcb5d54b75e11ecc680efae1cffb454227e1fff
-AUX 1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch 309 SHA256 a1571d189c7eb3b128da4455901ac5a7d1729aa436d3ec5f9c9242bc725dc6dd SHA512 62e3580f8438a2ef8e3de4ce3e88d83bdfd598ba613ade58d4466932f3489bb22ed602d5b8c834ba25f1e4694a88dda5635749097b9d508a73cf373a8db9ab96 WHIRLPOOL f998580662dc1c46561bcc07c4a186aac64ae7890040a5ca7d4613dd5ff0633eee0bbc1b62cca21657d60576f8524acaf494609d17faab201e76b5d9253ab29c
-AUX 1.4.39.1/patches/channels_.moduleinfo.patch 471 SHA256 a86d18367d573a0aef594b134152db872564a32c9ac7d7bf589a4da3f902343f SHA512 65a19d221a2ba4cc79ea39036c47ffb18c1721b724903bccc614d29510bd50ac4533f37a0378f2ab872833dd002716614320ce1027009c56f9ff5ee1b60d5a76 WHIRLPOOL b229889b44b0faf82ace6951f341571ab84e1ff96108e502f904ff65a4ec41bbc61aa480f46e83df9a7f34e3b399a63e049b695ee4d7d71727cd9c46643e1703
-AUX 1.4.39.1/patches/channels_chan_dahdi.c.patch 68606 SHA256 c9ad2b9504a46ec03152bfed9db986c5ac0b639e9137c55628652f7fc98eb77e SHA512 4340b56589c3bc199c0b3e64144f17b99eb8d38759409eb37ae661ff25836f5434b8d8e373cd57d8ec458f10a98607df1d74ee0f9652b63c668810a0a75a5d87 WHIRLPOOL 55b33908d07135b142d12360720f93f13768c3feaa4d5c6975fe99979256e82e13357cd7dd07507595d144180de36492baf7b7f77313ab6b6cc0789a412a58a8
-AUX 1.4.39.1/patches/channels_chan_sip.c.patch 2986 SHA256 9a8979de38816e1b88b6f62ef88e2231e399911b3bf8776f6faebd43305473dd SHA512 22dde38de229635d8557d6350e88486fa3d981ee4e88148224359c53cb9a00b6b8e6bea7d09129a851148d6bdb6607289ddc42ef332b3ddce9d7a3f8bf36c0b3 WHIRLPOOL 06ae2e1d561ebf07d695460f48e257ec916e109f5b5e143197a6e57325249a6de59407cd86022fc7007cd2ef4432464586373c2326bce414bf7347e8f949fd73
-AUX 1.4.39.1/patches/configure.ac.patch 958 SHA256 944a1f08e49246a3bb89564798eadcc8c3c374c7f9979d98134e698fde2fd424 SHA512 4a7a9c9e05de8005379cb8664ab420147ade05144fab12ef13cf54811c9a74461a6492c9532b17c6ba22523a238ca4110c792d7d1f00c7e353901f806c984389 WHIRLPOOL 6178daf41c038c9b241b1f5864a9aae4735b140a76f7c8061492e5816a947e8f46fef1c585f99a78d29f824cc90e59d45c23106a6c2160f35d6e3d3c8047e523
-AUX 1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch 579 SHA256 618382d3ea634929676107ec08c75d11d8abb77a303cd265bd04329ba43d866c SHA512 f609b2c3967e97d9b61a1d1b46e897071294c78ff3eac3b10a0419b2c5744912e126a230f15b5a791a6a372a08c2395c0400fd54d16abc943645925a4df7186c WHIRLPOOL 35a97ddc399c29fdcfcd7f8e647a5656c3a4b7bcae51d544695fff3497d1c5b6aa4c6a3ab7bb89d8d946056fd9a29dca1c7c4da1cb32cf4e293bf14d0b7e5202
-AUX 1.4.39.1/patches/include_asterisk_channel.h.patch 1315 SHA256 9ca0f0d9975147d4fdc1ba83a103644966dda141af103052c6e6eae162ce4fe1 SHA512 4b8ca0549c3f608d10b85703e1a21f6341578b04611877a9c3ff57e6f2af57032b21dc7af4ff6bf745fe99bb7990762e07941e9b314ca754df0ed53b24a3746b WHIRLPOOL 939a4ea4fa9c7343deeb7146abdf2e607ac866701f3d1dd05326acb03bcf76bd848c8af2895aacc33987dd7c6e847bbf76f1fb2d20e4d6c10421d56b4906229d
-AUX 1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch 424 SHA256 fffcf7ce5185dca3d39588651cca7e971bcb7806097a78e7d507b3953363c20e SHA512 d0f22a71b197d366e590844ccff8c3bca2e7108c4cbbb020ef9ff3f04de1be0c9d955bbe90df1e6b675cb64a6f72d56fe1c81099e46209a4f2d21752d66808ed WHIRLPOOL 4837e9a2af92d8ddefe7d078f1c68ace0ea153f071319e08b5bd79e93dce14bbeec21dd7c697b5a9473592eb703e18da4509b6a6dc3a3789cda9f80215438697
-AUX 1.4.39.1/patches/main_channel.c.patch 2205 SHA256 c8dd25ff0b90cdcc3916dcb3f1d36520b6b629b4d34e57d27633a995197d917e SHA512 fc4e6ee97c8b018efa27bc61a1713311dd131ac96a30d791064c6a60e80ce8c3a7ce1b9a8f157bf6703b28ff44f144a1264d2423e714d644ee462984414ed7a9 WHIRLPOOL 93cbe3acfb9762b7536e95cdf52fd65eff3870c188067e8a3398c0a3124bb002a6f2738b7370f8cf2e5047f31661cb266be981f59e97750abba8cf7f3d4382fb
-AUX 1.4.39.1/patches/main_manager.c.patch 1708 SHA256 175df28eccbc39d9b367d908dfe64a8fdcc7d5d1488151db459c47fe3c6f91e2 SHA512 5005888c0ddb753597bbe58971043fe82e15cadb3ef02c93b9896fe86937e03305eb0b3d7cfe36e3390685a3c757c684d5c39b5abfaf406b4c4c74453e40b554 WHIRLPOOL 7b2cafc0c0313ee40591f1d27b892cb06016b65ed05825a71036b80b62f11eab6b822741f9a2eba9bb2c44e818e9607be188dfafda124ff0631907f6bdb17292
-AUX 1.4.39.1/patches/main_pbx.c.patch 2337 SHA256 3807d9633ec385ca94b8263334730ad861fa4bfde62dec4946e7d290ff42e160 SHA512 a30ab565b7bbf949e298b6fa76372641e65a25b05ddef26bacedbfcedb419d0d4e8e959b2c0f8491ab6f13a88444d6b161d57bf41ce9ee933474f7e72ce29414 WHIRLPOOL 7886801991967861ae3c39b5af2f2731297df35f9edeffa05e108c8696c5e91bb9b32f52f221a0a1ba24af47d4c61d907c5f99eb9ee5e5005918a98579eaecd4
-AUX 1.4.39.1/patches/main_utils.c.patch 855 SHA256 44cf32f85a3954fa22737c331dc3966912d34b269e68be536cccc602fa3b84e5 SHA512 38249a64252650f0dd1773fcd5f4c8e06c80f8ef33d6be2c1608db1c888b7e8f05d1b46ac7f1649a49234940825bbc319f465ceb35b9d857a8f7a3637a78159d WHIRLPOOL 1c37368a8beed6b8a1851c9688913bba4d6fc539ea79696759d6ef17ace801328841e2ed630df30c160c64a23485367ba9db6e1842278e2a9171b7b2720f0761
-AUX 1.4.39.1/patches/makeopts.in.patch 349 SHA256 ae2ee0657d38f79b2c9947f02014c22fd1492c8cfd302f7d486a3f46c078f5be SHA512 7379b00c59bf81f97e0adba769de882452fc1d52ab04ecfb26961c1a6280b19f8d3622091bb41f5bf79b1c79890751714d64cd48c96d874ff9483d7c7e909563 WHIRLPOOL 47b4055a03e504234f9786764ab851a4d2c0269bde45476cc5939c58af7e0c4022a44a69af933f0053eaba54e46c10d5cde345617c9bfc93335ad440016afdb1
-AUX 1.4.39.1/patches/menuselect-tree.patch 22770 SHA256 cf604fd5f36c237450339009a68974462899e6b8d9744fd9d6c65b932c1c8429 SHA512 1ab9a57a195f64c3c81771f30370ccd96e3d99cec95aa41dbe39597ea532b0e8dfa4d1dac5c7eaf7aecfc257fa2951a7b4ebbd4e2f3469ecdee712d6dc2794f3 WHIRLPOOL 398233d38045c0bf4ead08b34d5f1e89a5566692cfc1395c2ef9fe783a00024b87a3a24aae27a234ea3a289f016d650fa9c5ce6d874961c74c05dc2f446e124b
-AUX 1.4.39.1/patches/res_res_features.c.patch 455 SHA256 4e502ba368e37b5127edeaa168363d589df8bd11c584a87b43b65e1647e375fc SHA512 154cf2ed615c22db1fc13bc8acdb61b83b824f4a59f80053363c1aece78293980674555a8750a05c39225fd03567365baa1b283bc13ea911ae189928d597adcc WHIRLPOOL e4ddf6687f867355650bafcb61fd543ba442db2bebd19a36ae516b8aea69bea5a5dd00f702acbf77b94014ed19c0e34c3bb84b77d0e17cfa6b519592b540d748
-AUX 1.4.39.1/patches/res_res_musiconhold.c.patch 5019 SHA256 328bab1bd68aef365b06a1348fd3907f517eedcfe40e4d30b163a8fa986c24d1 SHA512 ea09e57587bc38a818283e18601cf2dc1032261544c1dfd76e2db29d1b24b83d960f665e2f2bac8918c4a9cdad34be71ce2139c50b8c3fc7c3b2006b5a867a18 WHIRLPOOL 9191c34d10e1185ff05a00d2c634eb86220cf11f81fec44e41c2dcacf51fb65cc08d0f1c109b6fb6adcde478b3964f81cc745f21b20b90a02c7f8190a9c8cddf
-AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
-EBUILD asterisk-1.4.39.1.ebuild 10969 SHA256 24ce22116aeecb3b96bef86e9dcc6338fcae87ccd4d5fd33d73f219389c43518 SHA512 d57400f9e55cf383f3af4ff4327aa1e217215c7082a46d30d0acd41a353e74665861dfe9f860c9e0f3af564525cad9002a1025022ab07a6965a4ec4cc73cf58a WHIRLPOOL a5ca0194c2845f2f5bda7b7dd5954a4f508c73827d1ef1711e9fb435fc885ecba86da52049031f2bb5c51ab29bd017c149c51d090219cd22a64bfa1448b7a907
-MISC README.md 506 SHA256 5082006680271a3a8c38da5dc7d5f503f57b5f1e452677ecd1564e42dce3dce4 SHA512 7e30721da544a9aa8942dc2432330fc43c0073405b1092de59c226093a616e2b9259ca62032acb50787da0ae7fb16dc84f58dd481457519ddc335a41d0834033 WHIRLPOOL 6d214d26ff4c68af88a5ace2f537732ddc885ecc7e694fce0d1c68a6b00efcf56b6e2f1a4a7b0d232d1f3451b88f83efa1e46fe9b91e16e987f4c5f314d724c8
+DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
+DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
diff --git a/net-misc/asterisk/asterisk-1.8.26.1.ebuild b/net-misc/asterisk/asterisk-1.8.26.1.ebuild
new file mode 100644
index 0000000..0c2a188
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.8.26.1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.26.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-1.17.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex sqlite sqlite3 srtp static syslog vorbis ilbc"
+
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+
+REQUIRED_USE="
+	gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset"
+	   "${FILESDIR}/1.8.0/patches/vicidial.patch"
+)
+
+RDEPEND="dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	ais? ( sys-cluster/openais )
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	jingle? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( dev-db/sqlite:3 )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	!net-libs/openh323
+	!net-libs/pjsip"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+
+        einfo "downloading ilbc source"
+        "${S}"/contrib/scripts/get_ilbc_source.sh
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select ais			res_ais
+	use_select alsa			chan_alsa
+	use_select bluetooth	chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_gtalk
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_jabber
+	use_select jingle		chan_jingle
+	use_select ilbc                 codec_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup	app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select sqlite		cdr_sqlite
+	use_select sqlite3		{cdr,cel}_sqlite3_custom
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bugs #300832 & #414585
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "1.6 -> 1.8 changes that you may care about:"
+	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.6.0/asterisk.confd b/net-misc/asterisk/files/1.6.0/asterisk.confd
new file mode 100644
index 0000000..576c322
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.0/asterisk.confd
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.6.0/asterisk.confd,v 1.1 2009/03/10 23:33:27 chainsaw Exp $
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#
+#         ":asterisk" to run as user "root" and group "asterisk"
+#
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+#
+# Wrapper script
+#
+# Value: yes or no/empty
+#
+ASTERISK_WRAPPER="no"
+
+############# Wrapper script settings #############
+
+#
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+#ASTERISK_MAX_FD="1024"
+
+#
+# Kill these tasks after asterisk crashed (ASTERISK_WRAPPER=yes only!)
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
new file mode 100644
index 0000000..69296c9
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
@@ -0,0 +1,25 @@
+/var/log/asterisk/messages /var/log/asterisk/queue_log {
+	missingok
+	notifempty
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/debug /var/log/asterisk/full {
+	missingok
+	notifempty
+	daily
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
+	missingok
+	notifempty
+	weekly
+	rotate 52
+}
diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt
new file mode 100644
index 0000000..ba9cbbb
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/call_data.txt
@@ -0,0 +1,32 @@
+It's sometimes useful to look at SIP conversations in retrospect.  If you have
+a troublesome system, enable sip debug (in the CLI: sip set debug on), set up
+logger.conf to log it to some file and then you can use the two scripts here to
+extract the SIP converssations as seen by asterisk.
+
+find_call_ids.sh:
+
+This script will locate Call-ID values given an A and B number. Just invoke it with:
+
+find_call_ids.sh /path/to/log A-num B-num
+
+eg:
+
+find_call_ids.sh /var/log/asterisk/debug 102 105
+
+To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your
+exact setup and the actual values being passed in the SIP INVITE packets)
+
+find_call_sip_trace.sh
+
+This script will extract a SIP conversation from the log for one or more
+Call-ID values.  Invoke with:
+
+find_call_sip_trace.sh /path/to/log Call-ID [...]
+
+Eg:
+
+find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3
+
+This will find the SIP packets for those two conversations from the log
+(interleaving the packets in the order asterisk output them - useful for
+analysing the two SIP legs of the same call).
diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
new file mode 100644
index 0000000..c4689bd
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}'
diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
new file mode 100644
index 0000000..5b2e69e
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$'
diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth
new file mode 100644
index 0000000..3f050ad
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/sip_calc_auth
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1
+
+un=$1
+realm=$2
+pw=$3
+method=$4
+uri=$5
+alg=$6
+nonce=$7
+
+echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)"
+
+a1=$un:$realm:$pw
+a2=$method:$uri
+ha1=$(echo -n "$a1" | openssl $alg)
+ha2=$(echo -n "$a2" | openssl $alg)
+resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg)
+
+echo "a1=$a1"
+echo "a2=$a2"
+echo "ha1=$ha1"
+echo "ha2=$ha2"
+echo "resp=$resp"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd
new file mode 100644
index 0000000..e46ad23
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.confd
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.confd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#
+#         ":asterisk" to run as user "root" and group "asterisk"
+#
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+ASTERISK_RESTART_DELAY=5
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd4 b/net-misc/asterisk/files/1.8.0/asterisk.initd4
new file mode 100644
index 0000000..f54aec3
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd4
@@ -0,0 +1,273 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd4,v 1.1 2012/12/01 22:07:59 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	if [ -z "`pidof asterisk`" ]; then
+		return 1
+	else
+		PID="`cat /var/run/asterisk/asterisk.pid`"
+		for x in `pidof asterisk`; do
+			if [ "${x}" = "${PID}" ]; then
+				return 0
+			fi	
+		done
+	fi
+
+	return 1
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing asterisk wrapper"
+	OPTS="$*"
+
+	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
+	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
+
+	while :; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F ${TTY} sane
+			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ $result -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ $result -gt 128 ]; then
+				signal=`expr $result - 128`
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 `pidof ${X}`;
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >${TTY} \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID NICE=""
+	local tmp x
+
+	local OPTS ARGS 
+		
+	ebegin "Starting asterisk PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
+
+	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
+		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
+		if [ -n "${USER}" ]; then
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
+		for element in `find /var/{log,run}/asterisk`; do
+			if [ `stat -c %U $element` != "${USER}" ]; then
+ 				ewarn "${USER} is not the owner of $element, fixing."
+				chown -R ${USER} /var/{log,run}/asterisk
+				chmod -R u+r /var/{log,run}/asterisk
+				chmod u+x /var/{log,run}/asterisk
+			fi;
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+	fi
+
+	eoutdent
+	eend $result
+}
+
+forcestop() {
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+
+	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
+		ebegin "Killing wrapper script"
+		kill `cat /var/run/asterisk/wrapper_loop.pid`
+		eend $?
+	fi
+
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd5 b/net-misc/asterisk/files/1.8.0/asterisk.initd5
new file mode 100644
index 0000000..9f5334e
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd5
@@ -0,0 +1,295 @@
+#!/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/asterisk/files/1.8.0/asterisk.initd5,v 1.1 2013/01/24 13:10:46 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r /var/run/asterisk/asterisk.pid ] || return 1
+	local ast_pid="`pidof asterisk`"
+	if [ -z "${ast_pid}" ]; then
+		return 1
+	else
+		PID="`cat /var/run/asterisk/asterisk.pid`"
+		for x in ${ast_pid}; do
+			if [ "${x}" = "${PID}" ]; then
+				return 0
+			fi	
+		done
+	fi
+
+	return 1
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing asterisk wrapper"
+	OPTS="$*"
+
+	trap "rm -f /var/run/asterisk/wrapper_loop.running" EXIT
+	touch "/var/run/asterisk/wrapper_loop.running"
+
+	while [ -r "/var/run/asterisk/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F ${TTY} sane
+			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ $result -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ $result -gt 128 ]; then
+				signal=`expr $result - 128`
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 `pidof ${X}`;
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >${TTY} \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID NICE=""
+	local tmp x
+
+	local OPTS ARGS 
+		
+	ebegin "Starting asterisk PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
+
+	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
+		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
+		if [ -n "${USER}" ]; then
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
+		for element in `find /var/{log,run}/asterisk`; do
+			if [ `stat -c %U $element` != "${USER}" ]; then
+ 				ewarn "${USER} is not the owner of $element, fixing."
+				chown -R ${USER} /var/{log,run}/asterisk
+				chmod -R u+r /var/{log,run}/asterisk
+				chmod u+x /var/{log,run}/asterisk
+			fi;
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+	fi
+
+	eoutdent
+	eend $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
+		ebegin "Killing wrapper script"
+		kill `cat /var/run/asterisk/wrapper_loop.pid`
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r /var/run/asterisk/wrapper_loop.running ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm /var/run/asterisk/wrapper_loop.running
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd6 b/net-misc/asterisk/files/1.8.0/asterisk.initd6
new file mode 100644
index 0000000..35bb8bb
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd6
@@ -0,0 +1,345 @@
+#!/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/asterisk/files/1.8.0/asterisk.initd6,v 1.1 2013/07/23 09:21:04 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+# ast_spooldir: 
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID
+	local tmp x
+
+	local OPTS ARGS 
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
+
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
+		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
+		if [ -n "${USER}" ]; then
+			if ! getent passwd "${USER}" &>/dev/null; then
+				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			if ! getent group "${GROUP}" &>/dev/null; then
+				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}"
+		find "${ast_logdir}" "${ast_rundir}" ! -user "${USER}" | while read element; do
+ 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
+			chown ${USER} "${element}"
+			chmod u+rX "${element}"
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
+		ebegin "Waiting for ${ast_instancename} to fully boot"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+		eend $?
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+	
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 1)"
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7
new file mode 100644
index 0000000..a4a27eb
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd7
@@ -0,0 +1,347 @@
+#!/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/asterisk/files/1.8.0/asterisk.initd7,v 1.1 2013/08/28 10:15:35 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+# ast_spooldir: 
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_spooldir=/var/spool/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID
+	local tmp x
+
+	local OPTS ARGS 
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
+
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
+		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
+		if [ -n "${USER}" ]; then
+			if ! getent passwd "${USER}" &>/dev/null; then
+				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			if ! getent group "${GROUP}" &>/dev/null; then
+				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
+		find "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" ! -user "${USER}" | while read element; do
+ 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
+			chown ${USER} "${element}"
+			chmod u+rX "${element}"
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
+		ebegin "Waiting for ${ast_instancename} to fully boot"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+		eend $?
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+	
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 1)"
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/find_call_ids.sh b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
new file mode 100644
index 0000000..321f3da
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
@@ -0,0 +1,68 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+#echo "Finding calls from '${anum}' to '${bnum}' in ${logfile}."
+
+# modes:
+# 0 - not processing an INVITE.
+# 1 - processing an INVITE.
+# 2 - from matched (processing).
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode==0 && $1=="INVITE" && $2 ~ "^sip:'"${bnum}"'@" {
+		#print
+
+		mode=1
+
+		split($2, a, "[:@]")
+		bnum=a[2]
+	}
+
+	mode==1 && $1=="From:" {
+		#print
+		if ($3 ~ "^<sip:'"${anum}"'@.*>") {
+			mode=2
+			split($3, a, "[:@]")
+			anum=a[2]
+		} else {
+			#print "From does not match ... leaving block."
+			mode = 0
+		}
+	}
+
+	mode!=0 && $1=="Call-ID:" {
+		callid=$2
+
+		if (NF!=2) {
+			print "WTF @ Call-ID header having NF!=2"
+		}
+	}
+
+	mode==1 && $0=="" {
+		#print "Leaving block (no match)"
+		mode = 0
+	}
+
+	mode==2 && $0=="" {
+		#print "Leaving block (match)"
+		print dt " " anum " " bnum " " callid
+		mode = 0
+	}
+'
diff --git a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
new file mode 100644
index 0000000..06ae824
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
@@ -0,0 +1,76 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+# modes:
+# 0 - searching for SIP start block ...
+# 1 - transmit of sorts
+# 2 - receive
+
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode!=0 && $1 == "Call-ID:" {
+		#print
+
+		if ($2 ~ /('"${callid}"')/) {
+			callidmatch=1
+		} else {
+			#print $2" does not match ^('"${callid}"')$"
+			mode=0
+		}
+	}
+
+	(mode==1 && $0=="---") || (mode==2 && $0=="<------------->") {
+		if (callidmatch) {
+			print dt" "sipmode"\n"pckt"---"
+		}
+
+		mode=0
+	}
+
+	mode!=0 {
+		pckt = pckt $0 "\n"
+	}
+
+	mode==0 && $0 ~ "chan_sip[.]c: .*[tT]ransmitting" {
+		#print
+
+		if ($6 == "Retransmitting") {
+			sipmode = $6" "$7" to "$NF
+		} else {
+			sipmode = "Transmitting to "$NF
+		}
+
+		mode=1
+		pckt=""
+		callidmatch=0
+	}
+
+	mode==0 && $0 ~ "SIP read from" {
+		#print
+		mode=2
+		pckt=""
+		callidmatch=0
+		sipmode="Received from "$5":"
+	}
+'
diff --git a/net-misc/asterisk/files/1.8.0/patches/vicidial.patch b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
new file mode 100644
index 0000000..a424437
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
@@ -0,0 +1,972 @@
+diff -ur asterisk-1.8.23.0/apps/enter.h asterisk-1.8.23.0-vici/apps/enter.h
+--- asterisk-1.8.23.0/apps/enter.h	2006-02-14 11:14:15.000000000 -0800
++++ asterisk-1.8.23.0-vici/apps/enter.h	2013-10-08 12:17:11.000000000 -0700
+@@ -1,287 +1,106 @@
+ /*
+   * U-law 8-bit audio data
+-  *
+-  * Source: enter.raw
+-  *
+-  * Copyright (C) 1999, Mark Spencer and Linux Support Services
+-  *
+-  * Distributed under the terms of the GNU General Public License
+-  *
++  * Source: enter.raw (/usr/bin/hexdump -C ./enter.raw)
++  * Copyright (C) 2007, Matt Florell
++  * Distributed under the terms of the GPLv2
+   */
+ 
+ static unsigned char enter[] = {
+-0xba, 0xba, 0xb0, 0xa6, 0xa9, 0xb8, 0xfe, 0x46, 0x42, 0x46, 
+-0x4a, 0xfe, 0xac, 0xa2, 0x9f, 0x9f, 0xa8, 0xb8, 0x3b, 0x29, 
+-0x35, 0x4a, 0xfe, 0xc1, 0xad, 0xa2, 0xad, 0xc5, 0x4e, 0x68, 
+-0x68, 0xe7, 0xb8, 0xb0, 0xb2, 0xc1, 0xc1, 0xb0, 0xae, 0xcd, 
+-0xfe, 0xfe, 0xcd, 0xcd, 0xfe, 0x68, 0xd3, 0xb2, 0xae, 0xab, 
+-0xb2, 0xfe, 0x35, 0x31, 0xdb, 0xac, 0xab, 0xaf, 0xab, 0xaa, 
+-0xb4, 0x68, 0x3b, 0x39, 0x3f, 0x68, 0xb4, 0xa8, 0xa8, 0xb0, 
+-0xbc, 0xbc, 0xc5, 0x3f, 0x31, 0x37, 0xfe, 0xc1, 0xbc, 0xb0, 
+-0xa5, 0xa2, 0xa8, 0xaf, 0xbe, 0x3b, 0x28, 0x26, 0x3d, 0xbc, 
+-0xb0, 0xae, 0xa2, 0x9f, 0xa2, 0xfe, 0x29, 0x24, 0x29, 0x4a, 
+-0xc5, 0xaa, 0xa8, 0xa9, 0xa8, 0xa5, 0xa7, 0xdb, 0x2c, 0x27, 
+-0x2d, 0x4a, 0xfe, 0xdb, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0xe7, 
+-0x2c, 0x22, 0x2b, 0xfe, 0xba, 0xb0, 0xaa, 0x9f, 0xa3, 0xb0, 
+-0x5c, 0x33, 0x33, 0x39, 0x5c, 0xdb, 0xc1, 0xb4, 0xb0, 0xaa, 
+-0xad, 0xba, 0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xe7, 0xaf, 
+-0xa6, 0xa7, 0xb0, 0xfe, 0x46, 0x39, 0x5c, 0xe7, 0xdb, 0xfe, 
+-0xba, 0xac, 0xa8, 0xc5, 0x46, 0x33, 0x54, 0xc5, 0xae, 0xad, 
+-0xb2, 0xc1, 0xcd, 0xc1, 0xbc, 0xfe, 0x3f, 0x37, 0xfe, 0xb4, 
+-0xb6, 0xcd, 0xdb, 0xc1, 0xb0, 0xb6, 0xcd, 0x4e, 0x39, 0x37, 
+-0xfe, 0xb0, 0xab, 0xa9, 0xa9, 0xa9, 0xb0, 0x5c, 0x29, 0x25, 
+-0x31, 0xfe, 0xc1, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xcd, 0x3b, 
+-0x2a, 0x2c, 0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, 
+-0xfe, 0x33, 0x27, 0x2a, 0x39, 0xfe, 0xc1, 0xbe, 0xb0, 0xa2, 
+-0x9f, 0xb0, 0x33, 0x22, 0x25, 0x46, 0xc1, 0xb8, 0xb0, 0xab, 
+-0xa8, 0xa8, 0xb0, 0xbe, 0x42, 0x2c, 0x2e, 0x4a, 0xfe, 0x5c, 
+-0xfe, 0xb4, 0xa8, 0xa8, 0xba, 0xfe, 0x4a, 0x39, 0x39, 0x46, 
+-0xfe, 0xbc, 0xaf, 0xa5, 0xa5, 0xae, 0x68, 0x37, 0x4a, 0xfe, 
+-0xfe, 0x4a, 0x4a, 0xd3, 0xb0, 0xb0, 0xc1, 0x5c, 0x46, 0x46, 
+-0xd3, 0xb6, 0xbe, 0x54, 0x54, 0xc9, 0xab, 0xae, 0xc5, 0x46, 
+-0x4a, 0xfe, 0xcd, 0xc9, 0xcd, 0xe7, 0xe7, 0xc9, 0xb4, 0xc5, 
+-0x4a, 0x2c, 0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, 
+-0xfe, 0x4a, 0x46, 0x3f, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, 
+-0xb2, 0xcd, 0x33, 0x2e, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xaf, 
+-0xa7, 0xa7, 0xad, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xcd, 
+-0xc5, 0xac, 0xa6, 0xac, 0xfe, 0x3b, 0x2c, 0x2d, 0x3d, 0xc1, 
+-0xb4, 0xbe, 0xcd, 0xaf, 0xa5, 0xa8, 0xe7, 0x31, 0x2f, 0x39, 
+-0x46, 0x5c, 0xdb, 0xbc, 0xba, 0xaf, 0xa9, 0xad, 0xfe, 0x2f, 
+-0x2d, 0xba, 0xad, 0xba, 0xfe, 0x3d, 0x42, 0x5c, 0xc9, 0xc1, 
+-0xcd, 0xfe, 0xc1, 0xae, 0xa6, 0xcd, 0x33, 0x25, 0x3b, 0xdb, 
+-0xb0, 0xb6, 0xb8, 0xb6, 0xb4, 0xb8, 0xba, 0xfe, 0x3d, 0x37, 
+-0xfe, 0xba, 0xc1, 0x54, 0x54, 0xd3, 0xb0, 0xb4, 0xe7, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xb6, 0xa9, 0xa7, 0xba, 
+-0x3d, 0x35, 0xfe, 0xc1, 0xcd, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, 
+-0xfe, 0x46, 0x3b, 0xfe, 0xba, 0xab, 0xc5, 0x46, 0x3b, 0xbc, 
+-0xaa, 0xab, 0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xdb, 0x54, 0x3d, 
+-0x4a, 0xbc, 0xac, 0xb4, 0x3f, 0x2e, 0x3d, 0xba, 0xb0, 0xb8, 
+-0xba, 0xb6, 0xba, 0xcd, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, 
+-0xbe, 0x54, 0x54, 0xcd, 0xb6, 0xc9, 0x46, 0x54, 0xcd, 0xc5, 
+-0xdb, 0xfe, 0xfe, 0xc1, 0xae, 0xa9, 0xac, 0xfe, 0x35, 0x2e, 
+-0xfe, 0xba, 0xc1, 0x5c, 0xfe, 0xb6, 0xaa, 0xb0, 0xe7, 0x35, 
+-0x2e, 0x39, 0xc1, 0xac, 0xb0, 0xfe, 0xfe, 0xbc, 0xa6, 0xac, 
+-0xc1, 0x42, 0x46, 0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xc9, 0xae, 
+-0xa9, 0xb0, 0x54, 0x35, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xae, 
+-0xab, 0xb6, 0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x4e, 
+-0xfe, 0xb0, 0xac, 0xb8, 0xfe, 0xfe, 0xc1, 0xb6, 0xc5, 0x46, 
+-0x3d, 0xe7, 0xb4, 0xa7, 0xab, 0xbc, 0x3f, 0x37, 0x54, 0xba, 
+-0xcd, 0x54, 0x42, 0xc5, 0xae, 0xac, 0xc9, 0x46, 0x3d, 0x54, 
+-0xba, 0xb0, 0xb0, 0xfe, 0x5c, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, 
+-0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xc1, 0xba, 0xc5, 
+-0xfe, 0x42, 0x46, 0xfe, 0xc5, 0xba, 0xb2, 0xa7, 0xa7, 0xb0, 
+-0xfe, 0x3d, 0x4a, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xb0, 
+-0xae, 0xc5, 0x4e, 0x39, 0xfe, 0xc5, 0xbe, 0xfe, 0x54, 0xc9, 
+-0xa9, 0xa2, 0xa5, 0xbc, 0x3b, 0x2f, 0x35, 0xfe, 0xc9, 0xfe, 
+-0xfe, 0xc5, 0xa9, 0xa6, 0xb0, 0x54, 0x31, 0x31, 0x3f, 0xd3, 
+-0xbc, 0xc1, 0xcd, 0xb8, 0xae, 0xa8, 0xb4, 0xd3, 0x54, 0x4e, 
+-0x5c, 0x54, 0xfe, 0xdb, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, 
+-0x3d, 0x3f, 0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0xfe, 
+-0xfe, 0xe7, 0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xb8, 0xaf, 0xb0, 
+-0xe7, 0x42, 0x4a, 0xcd, 0xbc, 0xdb, 0x46, 0x68, 0xcd, 0xb0, 
+-0xab, 0xbc, 0xfe, 0x3d, 0x46, 0xfe, 0xb8, 0xbc, 0xd3, 0xd3, 
+-0xb6, 0xb0, 0xb6, 0x5c, 0x3b, 0x35, 0x54, 0xdb, 0xba, 0xb4, 
+-0xc1, 0xc9, 0xc1, 0xba, 0xc9, 0x5c, 0x3d, 0x46, 0xfe, 0xcd, 
+-0xc5, 0xb8, 0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3d, 0x35, 0x46, 
+-0xfe, 0xdb, 0xbc, 0xb2, 0xa9, 0xab, 0xba, 0x3f, 0x31, 0x39, 
+-0xfe, 0xe7, 0xdb, 0xcd, 0xb8, 0xae, 0xab, 0xac, 0xe7, 0x3d, 
+-0x2d, 0x3f, 0xfe, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa8, 0xb0, 
+-0xfe, 0x31, 0x2d, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xb4, 0xa8, 
+-0xad, 0xc5, 0x46, 0x39, 0x3f, 0x5c, 0xfe, 0xd3, 0xc5, 0xc1, 
+-0xb6, 0xb0, 0xbc, 0x68, 0x46, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, 
+-0xc1, 0xaf, 0xb0, 0xb8, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, 
+-0xfe, 0xe7, 0xb0, 0xab, 0xb2, 0x4a, 0x37, 0x3f, 0xcd, 0xbe, 
+-0xc1, 0xe7, 0xe7, 0xd3, 0xb6, 0xb4, 0xc9, 0x3b, 0x33, 0x4a, 
+-0xba, 0xb4, 0xc5, 0xfe, 0xc9, 0xb6, 0xb4, 0xcd, 0xfe, 0x3b, 
+-0x3b, 0xfe, 0xc1, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xba, 0x4a, 
+-0x31, 0x35, 0x68, 0xcd, 0xc5, 0xba, 0xb4, 0xb0, 0xb0, 0xba, 
+-0x5c, 0x35, 0x2f, 0x4e, 0xd3, 0xc1, 0xdb, 0xd3, 0xb4, 0xa9, 
+-0xab, 0xcd, 0x3b, 0x2f, 0x35, 0xfe, 0xd3, 0xd3, 0xdb, 0xbc, 
+-0xad, 0xa4, 0xb0, 0xfe, 0x2d, 0x2f, 0x3f, 0xe7, 0xe7, 0xe7, 
+-0xcd, 0xb4, 0xaf, 0xad, 0xc5, 0x3d, 0x31, 0x3d, 0xe7, 0xd3, 
+-0xe7, 0xe7, 0xc1, 0xaf, 0xad, 0xb6, 0xfe, 0x4a, 0x42, 0x54, 
+-0xfe, 0x68, 0xfe, 0xd3, 0xb2, 0xae, 0xb4, 0xfe, 0x42, 0x4e, 
+-0xcd, 0xc5, 0xcd, 0xdb, 0xc9, 0xb4, 0xb0, 0xb6, 0xfe, 0x3b, 
+-0x42, 0xe7, 0xb0, 0xb8, 0xcd, 0xfe, 0xc9, 0xb6, 0xb8, 0xfe, 
+-0x42, 0x3d, 0xfe, 0xc1, 0xb0, 0xba, 0xd3, 0xfe, 0xc1, 0xb0, 
+-0xb6, 0xfe, 0x3b, 0x3f, 0xe7, 0xba, 0xb8, 0xbc, 0xc5, 0xc1, 
+-0xc1, 0xcd, 0xfe, 0x3b, 0x37, 0xfe, 0xc1, 0xb4, 0xb6, 0xb8, 
+-0xb6, 0xb8, 0xc5, 0x5c, 0x3f, 0x46, 0xfe, 0xcd, 0xc5, 0xcd, 
+-0xcd, 0xc1, 0xb2, 0xb2, 0xfe, 0x3f, 0x35, 0x54, 0xdb, 0xc1, 
+-0xcd, 0xcd, 0xbc, 0xaf, 0xac, 0xb6, 0x54, 0x35, 0x31, 0x68, 
+-0xba, 0xb8, 0xcd, 0xdb, 0xc9, 0xb2, 0xb4, 0xc9, 0x46, 0x39, 
+-0x42, 0xdb, 0xbc, 0xbc, 0xcd, 0xcd, 0xbe, 0xb2, 0xb8, 0xe7, 
+-0x54, 0x46, 0xfe, 0xfe, 0xdb, 0xc9, 0xc5, 0xbe, 0xbe, 0xc9, 
+-0xfe, 0x5c, 0x5c, 0xfe, 0xd3, 0xcd, 0xcd, 0xc5, 0xb6, 0xb2, 
+-0xc5, 0x68, 0x4e, 0xfe, 0xc5, 0xc1, 0xcd, 0x68, 0x5c, 0xe7, 
+-0xb8, 0xb6, 0xd3, 0x4a, 0x46, 0xfe, 0xbc, 0xb8, 0xc1, 0xe7, 
+-0xe7, 0xc1, 0xb4, 0xbe, 0xfe, 0x3f, 0x3f, 0xfe, 0xba, 0xb2, 
+-0xba, 0xe7, 0xfe, 0xcd, 0xcd, 0xfe, 0x4e, 0x46, 0xfe, 0xc5, 
+-0xb8, 0xb2, 0xba, 0xc1, 0xcd, 0xd3, 0xe7, 0xfe, 0x5c, 0x5c, 
+-0xfe, 0xe7, 0xc5, 0xbe, 0xb6, 0xba, 0xc5, 0xfe, 0x3f, 0x3f, 
+-0x54, 0xfe, 0xd3, 0xc1, 0xbc, 0xb6, 0xb0, 0xb0, 0xd3, 0x54, 
+-0x39, 0x46, 0xfe, 0xc1, 0xcd, 0xe7, 0xe7, 0xc5, 0xb8, 0xb4, 
+-0xd3, 0x54, 0x37, 0x42, 0xdb, 0xbe, 0xc1, 0xd3, 0xcd, 0xb8, 
+-0xb0, 0xb0, 0xcd, 0x4a, 0x3b, 0x42, 0xe7, 0xc5, 0xbe, 0xcd, 
+-0xe7, 0xd3, 0xc5, 0xcd, 0xfe, 0x54, 0x54, 0x68, 0xe7, 0xc5, 
+-0xc1, 0xc1, 0xcd, 0xcd, 0xc9, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, 
+-0xfe, 0xe7, 0xc5, 0xbe, 0xc1, 0xfe, 0x5c, 0x5c, 0xfe, 0xcd, 
+-0xcd, 0xcd, 0xdb, 0xd3, 0xc1, 0xbc, 0xbe, 0xfe, 0x4e, 0x54, 
+-0xcd, 0xb6, 0xb8, 0xd3, 0x5c, 0x5c, 0xfe, 0xc5, 0xc9, 0xfe, 
+-0x46, 0x4a, 0xe7, 0xb4, 0xb6, 0xc5, 0xfe, 0xe7, 0xcd, 0xc9, 
+-0xdb, 0xfe, 0x4e, 0x68, 0xd3, 0xb6, 0xb2, 0xbc, 0xfe, 0x68, 
+-0xfe, 0xfe, 0x68, 0x54, 0x68, 0xe7, 0xc5, 0xbc, 0xb8, 0xbe, 
+-0xcd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, 0xcd, 
+-0xc1, 0xb8, 0xbc, 0xdb, 0x4e, 0x42, 0x4a, 0xfe, 0xc9, 0xc1, 
+-0xcd, 0xd3, 0xcd, 0xba, 0xb8, 0xcd, 0x46, 0x3b, 0xfe, 0xc9, 
+-0xba, 0xcd, 0xe7, 0xfe, 0xd3, 0xc1, 0xba, 0xdb, 0x54, 0x3d, 
+-0x68, 0xd3, 0xbc, 0xcd, 0xfe, 0xfe, 0xc5, 0xbe, 0xc1, 0xe7, 
+-0x54, 0x4a, 0xfe, 0xc9, 0xc1, 0xcd, 0xfe, 0xfe, 0xd3, 0xd3, 
+-0xd3, 0xfe, 0xe7, 0xe7, 0xe7, 0xdb, 0xd3, 0xe7, 0xe7, 0xe7, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xcd, 0xc9, 0xdb, 0xfe, 0xfe, 0xdb, 
+-0xbe, 0xc9, 0xfe, 0x5c, 0xfe, 0xc9, 0xbc, 0xbe, 0xdb, 0x68, 
+-0x5c, 0xdb, 0xc5, 0xd3, 0x54, 0x46, 0xfe, 0xbc, 0xb2, 0xb8, 
+-0xdb, 0x68, 0x68, 0xe7, 0xcd, 0xdb, 0x5c, 0x54, 0xfe, 0xc1, 
+-0xb8, 0xc1, 0xe7, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, 
+-0xd3, 0xc5, 0xc1, 0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0x54, 0x4e, 
+-0xfe, 0xd3, 0xcd, 0xd3, 0xd3, 0xc5, 0xc1, 0xc1, 0xe7, 0x5c, 
+-0x4e, 0x5c, 0xd3, 0xc1, 0xcd, 0xfe, 0xfe, 0xcd, 0xba, 0xba, 
+-0xe7, 0x4a, 0x4a, 0x68, 0xcd, 0xc5, 0xcd, 0xfe, 0xfe, 0xcd, 
+-0xb8, 0xc1, 0xe7, 0x4e, 0x5c, 0xe7, 0xc1, 0xc9, 0xdb, 0xfe, 
+-0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0x68, 0xfe, 0xdb, 0xd3, 0xe7, 
+-0xfe, 0xfe, 0xcd, 0xc9, 0xcd, 0xd3, 0xd3, 0xd3, 0xcd, 0xe7, 
+-0xfe, 0xfe, 0xe7, 0xc5, 0xc5, 0xe7, 0x68, 0x68, 0xe7, 0xc1, 
+-0xc5, 0xfe, 0x5c, 0xfe, 0xd3, 0xc1, 0xd3, 0xfe, 0x68, 0xe7, 
+-0xc5, 0xb6, 0xc5, 0xe7, 0x68, 0xfe, 0xcd, 0xc5, 0xe7, 0xfe, 
+-0x54, 0xfe, 0xc9, 0xc5, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, 
+-0xfe, 0xfe, 0xfe, 0xcd, 0xc1, 0xc1, 0xc9, 0xd3, 0xd3, 0xe7, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xd3, 0xdb, 0xe7, 0xe7, 0xd3, 
+-0xcd, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xd3, 0xe7, 0xe7, 
+-0xc9, 0xbc, 0xbe, 0xe7, 0x68, 0x4a, 0xfe, 0xdb, 0xcd, 0xfe, 
+-0xfe, 0xfe, 0xcd, 0xc1, 0xc9, 0xfe, 0x54, 0x5c, 0xe7, 0xc9, 
+-0xc5, 0xe7, 0xfe, 0xfe, 0xcd, 0xc5, 0xc5, 0xe7, 0xfe, 0xfe, 
+-0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xdb, 0xd3, 0xd3, 0xdb, 0xe7, 
+-0xfe, 0xfe, 0xe7, 0xe7, 0xdb, 0xd3, 0xc9, 0xd3, 0xe7, 0xfe, 
+-0xfe, 0xd3, 0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xcd, 0xcd, 
+-0xfe, 0xfe, 0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, 
+-0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xdb, 0xc9, 0xcd, 0xe7, 0xfe, 
+-0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, 0xd3, 0xc5, 0xcd, 
+-0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xe7, 0xcd, 0xcd, 0xd3, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 
+-0xe7, 0xe7, 0xdb, 0xc9, 0xc1, 0xc5, 0xfe, 0x5c, 0x68, 0xfe, 
+-0xd3, 0xdb, 0xe7, 0xe7, 0xe7, 0xd3, 0xc5, 0xcd, 0xe7, 0x68, 
+-0xfe, 0xe7, 0xcd, 0xd3, 0xe7, 0xfe, 0xe7, 0xcd, 0xc1, 0xc1, 
+-0xdb, 0xfe, 0x54, 0xfe, 0xe7, 0xcd, 0xe7, 0xfe, 0xe7, 0xd3, 
+-0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xcd, 0xfe, 
+-0xfe, 0xe7, 0xcd, 0xd3, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, 
+-0xd3, 0xd3, 0xe7, 0xfe, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xdb, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, 
+-0xcd, 0xe7, 0xfe, 0xfe, 0xd3, 0xcd, 0xdb, 0xfe, 0x5c, 0xfe, 
+-0xcd, 0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, 0xcd, 0xfe, 
+-0x68, 0xfe, 0xd3, 0xc1, 0xc1, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, 
+-0xfe, 0xfe, 0x68, 0xfe, 0xe7, 0xc5, 0xc9, 0xdb, 0xfe, 0xfe, 
+-0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xdb, 0xc5, 0xc5, 
+-0xd3, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 
+-0xc9, 0xc1, 0xc5, 0xfe, 0x54, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, 
+-0xfe, 0xfe, 0xdb, 0xc5, 0xc9, 0xfe, 0x5c, 0x68, 0xfe, 0xcd, 
+-0xcd, 0xfe, 0xfe, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, 
+-0xdb, 0xc9, 0xc5, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 
+-0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xe7, 0xd3, 0xcd, 0xd3, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, 
+-0xfe, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xd3, 0xc5, 
+-0xc9, 0xfe, 0x5c, 0x54, 0xfe, 0xcd, 0xc1, 0xcd, 0xe7, 0xfe, 
+-0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x5c, 0xe7, 0xc1, 0xc1, 0xd3, 
+-0xfe, 0xfe, 0xe7, 0xd3, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, 
+-0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xe7, 0xd3, 0xcd, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 
+-0xc9, 0xcd, 0xe7, 0xfe, 0xe7, 0xc9, 0xc5, 0xdb, 0xfe, 0x5c, 
+-0xfe, 0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, 
+-0xfe, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, 
+-0xd3, 0xe7, 0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, 
+-0xfe, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xe7, 0xdb, 0xcd, 0xd3, 
+-0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, 0xdb, 0xd3, 0xdb, 0xe7, 
+-0xe7, 0xdb, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xc5, 
+-0xcd, 0xe7, 0xfe, 0xdb, 0xd3, 0xe7, 0xfe, 0x68, 0xfe, 0xe7, 
+-0xcd, 0xcd, 0xd3, 0xfe, 0xfe, 0xe7, 0xdb, 0xe7, 0xfe, 0x68, 
+-0xfe, 0xdb, 0xfe, 0x68, 0xbe, 0xb2, 0xae, 0xab, 0xb2, 0xfe, 
+-0x2f, 0x31, 0xdb, 0xac, 0xad, 0xaf, 0xab, 0xab, 0xb4, 0x68, 
+-0x37, 0x39, 0x3f, 0xe7, 0xb4, 0xa8, 0xaa, 0xb0, 0xbc, 0xbc, 
+-0xc5, 0x3f, 0x31, 0x3d, 0xfe, 0xc1, 0xb8, 0xb0, 0xa5, 0xa2, 
+-0xa8, 0xaf, 0xdb, 0x3b, 0x28, 0x2a, 0x3d, 0xbc, 0xb0, 0xaa, 
+-0xa2, 0x9f, 0xab, 0xfe, 0x29, 0x24, 0x29, 0x4a, 0xb4, 0xaa, 
+-0xa8, 0xa9, 0xa8, 0xa5, 0xac, 0xdb, 0x2c, 0x27, 0x35, 0x4a, 
+-0xfe, 0xcd, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0x4e, 0x2c, 0x22, 
+-0x33, 0xfe, 0xba, 0xb0, 0xa6, 0x9f, 0xa3, 0xbc, 0x5c, 0x33, 
+-0x31, 0x39, 0x5c, 0xcd, 0xc1, 0xb4, 0xad, 0xaa, 0xad, 0xcd, 
+-0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xc5, 0xaf, 0xa6, 0xa9, 
+-0xb0, 0xfe, 0x3d, 0x39, 0x5c, 0xdb, 0xdb, 0xfe, 0xba, 0xac, 
+-0xa8, 0xc5, 0x39, 0x33, 0x54, 0xb8, 0xae, 0xad, 0xb8, 0xc1, 
+-0xcd, 0xbe, 0xbc, 0xfe, 0x39, 0x37, 0xfe, 0xb4, 0xba, 0xcd, 
+-0xdb, 0xb8, 0xb0, 0xb6, 0xfe, 0x4e, 0x39, 0x3d, 0xfe, 0xb0, 
+-0xaa, 0xa9, 0xa9, 0xaa, 0xb0, 0x5c, 0x29, 0x28, 0x31, 0xfe, 
+-0xba, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xfe, 0x3b, 0x2a, 0x2f, 
+-0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, 0xfe, 0x2c, 
+-0x27, 0x2a, 0x46, 0xfe, 0xc1, 0xbc, 0xb0, 0xa2, 0xa2, 0xb0, 
+-0x33, 0x22, 0x2b, 0x46, 0xc1, 0xb4, 0xb0, 0xab, 0xa8, 0xa8, 
+-0xb0, 0xdb, 0x42, 0x2c, 0x33, 0x4a, 0xfe, 0x5c, 0xdb, 0xb4, 
+-0xa8, 0xad, 0xba, 0xfe, 0x46, 0x39, 0x39, 0x4a, 0xfe, 0xbc, 
+-0xab, 0xa5, 0xa5, 0xb8, 0x68, 0x37, 0x4a, 0xe7, 0xfe, 0x4a, 
+-0x5c, 0xd3, 0xb0, 0xb2, 0xc1, 0x5c, 0x42, 0x46, 0xd3, 0xb4, 
+-0xbe, 0x54, 0x54, 0xb6, 0xab, 0xae, 0xe7, 0x46, 0x4a, 0xfe, 
+-0xcd, 0xc9, 0xd3, 0xe7, 0xe7, 0xbe, 0xb4, 0xc5, 0x37, 0x2c, 
+-0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, 0x54, 0x4a, 
+-0x46, 0x42, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, 0xb6, 0xcd, 
+-0x33, 0x2f, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xac, 0xa7, 0xa7, 
+-0xb2, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xd3, 0xc5, 0xac, 
+-0xa6, 0xac, 0xfe, 0x33, 0x2c, 0x2d, 0x54, 0xc1, 0xb4, 0xcd, 
+-0xcd, 0xaf, 0xa4, 0xa8, 0xe7, 0x31, 0x31, 0x39, 0x46, 0xfe, 
+-0xdb, 0xbc, 0xb6, 0xaf, 0xa9, 0xb2, 0xfe, 0x2f, 0xfe, 0xba, 
+-0xad, 0xba, 0x4e, 0x3d, 0x42, 0xfe, 0xc9, 0xc1, 0xe7, 0xfe, 
+-0xc1, 0xa9, 0xa6, 0xcd, 0x2a, 0x25, 0x3b, 0xbc, 0xb0, 0xb6, 
+-0xb8, 0xb4, 0xb4, 0xb8, 0xc1, 0xfe, 0x3d, 0x3d, 0xfe, 0xba, 
+-0xd3, 0x54, 0x54, 0xbe, 0xb0, 0xb4, 0xe7, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xc5, 0xb6, 0xa9, 0xaa, 0xba, 0x3d, 0x39, 
+-0xfe, 0xc1, 0xfe, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, 0xfe, 0x3d, 
+-0x3b, 0xfe, 0xb0, 0xab, 0xc5, 0x39, 0x3b, 0xbc, 0xa7, 0xab, 
+-0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x3d, 0xfe, 0xbc, 
+-0xac, 0xc9, 0x3f, 0x2e, 0xfe, 0xba, 0xb0, 0xba, 0xba, 0xb6, 
+-0xba, 0xd3, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, 0xbe, 0x54, 
+-0x68, 0xcd, 0xb6, 0xfe, 0x46, 0x54, 0xcd, 0xc5, 0xdb, 0xfe, 
+-0xe7, 0xc1, 0xae, 0xa8, 0xac, 0xfe, 0x2e, 0x2e, 0xfe, 0xb6, 
+-0xc1, 0x5c, 0xe7, 0xb6, 0xaa, 0xb0, 0x54, 0x35, 0x2e, 0x4a, 
+-0xc1, 0xac, 0xbc, 0xfe, 0xfe, 0xaf, 0xa6, 0xac, 0xfe, 0x42, 
+-0x46, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xae, 0xa9, 0xb0, 
+-0x54, 0x31, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xac, 0xab, 0xb6, 
+-0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x54, 0xfe, 0xb0, 
+-0xae, 0xb8, 0xfe, 0xe7, 0xc1, 0xb6, 0xe7, 0x46, 0x3d, 0xe7, 
+-0xae, 0xa7, 0xab, 0xdb, 0x3f, 0x37, 0xfe, 0xba, 0xcd, 0x3f, 
+-0x42, 0xc5, 0xab, 0xac, 0xc9, 0x46, 0x3d, 0x54, 0xba, 0xad, 
+-0xb0, 0xfe, 0x68, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, 0x54, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xbe, 0xba, 0xc5, 0x68, 0x42, 
+-0x46, 0xe7, 0xc5, 0xba, 0xaf, 0xa7, 0xa7, 0xbc, 0xfe, 0x3d, 
+-0x4a, 0x68, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xaf, 0xae, 0xc5, 
+-0x3d, 0x39, 0xfe, 0xbc, 0xbe, 0xfe, 0x68, 0xc9, 0xa9, 0xa2, 
+-0xaa, 0xbc, 0x3b, 0x2d, 0x35, 0xfe, 0xcd, 0xfe, 0xfe, 0xb4, 
+-0xa9, 0xa6, 0xbc, 0x54, 0x31, 0x31, 0x54, 0xd3, 0xbc, 0xc5, 
+-0xcd, 0xb8, 0xab, 0xa8, 0xb4, 0xfe, 0x54, 0x4e, 0x68, 0x54, 
+-0xfe, 0xc9, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, 0x3b, 0x3f, 
+-0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0x68, 0xfe, 0xe7, 
+-0xdb, 0xfe, 0xfe, 0xfe, 0xcd, 0xb8, 0xaf, 0xb6, 0xe7, 0x42, 
+-0x5c, 0xcd, 0xbc, 0xfe, 0x46, 0x68, 0xba, 0xb0, 0xab, 0xbc, 
+-0x54, 0x3d, 0x46, 0xc9, 0xb8, 0xbc, 0xdb, 0xd3, 0xb6, 0xb0, 
+-0xb6, 0x5c, 0x37, 0x35, 0x54, 0xc9, 0xba, 0xb4, 0xc1, 0xc9, 
+-0xc1, 0xba, 0xe7, 0x5c, 0x3d, 0x54, 0xfe, 0xcd, 0xc5, 0xb8, 
+-0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3b, 0x35, 0x46, 0xfe, 0xdb, 
+-0xbc, 0xaf, 0xa9, 0xab, 0xd3, 0x3f, 0x31, 0x3f, 0xfe, 0xe7, 
+-0xdb, 0xcd, 0xb8, 0xae, 0xaa, 0xac, 0xe7, 0x33, 0x2d, 0x3f, 
+-0xd3, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa9, 0xb0, 0xfe, 0x31, 
+-0x2f, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xae, 0xa8, 0xad, 0xfe, 
+-0x46, 0x39, 0x46, 0x5c, 0xfe, 0xcd, 0xc5, 0xc1, 0xb6, 0xb0, 
+-0xbc, 0x68, 0x42, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, 0xb6, 0xaf, 
+-0xb0, 0xc5, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, 0x68, 0xe7, 
+-0xb0, 0xac, 0xb2, 0x4a, 0x35, 0x3f, 0xcd, 0xbc, 0xc1, 0xe7, 
+-0xe7, 0xd3, 0xb6, 0xb4, 0xfe, 0x3b, 0x33, 0xfe, 0xba, 0xb4, 
+-0xd3, 0xfe, 0xc9, 0xb4, 0xb4, 0xcd, 0x4a, 0x3b, 0x3b, 0xfe, 
+-0xb8, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xcd, 0x4a, 0x31, 0x3b, 
+-0x68, 0xcd, 0xc1, 0xba, 0xb4, 0xb0, 0xb0, 0xba, 0x5c, 0x2f, 
+-0x2f, 0x4e, 0xc9, 0xc1, 0xdb, 0xc9, 0xb4 };
++0xff, 0xff, 0x26, 0x26, 0x29, 0xce, 0xbe, 0xbf, 0xb2, 0xb6, 
++0xb6, 0x3d, 0x37, 0x36, 0x24, 0x26, 0x26, 0x28, 0x2d, 0x30, 
++0x48, 0x5c, 0xf2, 0xc4, 0xc5, 0xc4, 0xbe, 0xc2, 0xc7, 0xc5, 
++0xc8, 0xce, 0xc5, 0xc5, 0xc7, 0xbd, 0xbd, 0xbd, 0x3b, 0x2e, 
++0x2e, 0x27, 0x25, 0x1c, 0x1c, 0x1e, 0x25, 0x32, 0x66, 0xb3, 
++0xa7, 0x9f, 0x9f, 0xa1, 0x9a, 0x9d, 0xa3, 0xad, 0xcd, 0x75, 
++0x36, 0x2b, 0x2a, 0x27, 0x2d, 0x30, 0x48, 0xc1, 0xb7, 0x9f, 
++0x99, 0x98, 0x96, 0x99, 0x99, 0x97, 0x99, 0x9d, 0x9a, 0x9e, 
++0xa4, 0xa9, 0xbf, 0xd8, 0x4b, 0x5c, 0xd8, 0x5d, 0xb5, 0xab, 
++0xa9, 0x9c, 0x9b, 0x9e, 0x9e, 0xa3, 0x9f, 0x9b, 0x9d, 0x9d, 
++0x9e, 0x9f, 0xa6, 0xcb, 0x4b, 0x31, 0x2b, 0x2a, 0x23, 0x31, 
++0x45, 0x66, 0xab, 0xa3, 0x9d, 0x9a, 0x9c, 0x9a, 0x99, 0x9b, 
++0x9b, 0xa1, 0xb4, 0xd4, 0x3d, 0x27, 0x1f, 0x1e, 0x1d, 0x1e, 
++0x25, 0x35, 0x5d, 0xb9, 0xa6, 0xa0, 0x9e, 0x9b, 0x9a, 0x99, 
++0x9e, 0xa8, 0xad, 0xf4, 0x36, 0x26, 0x1b, 0x18, 0x16, 0x14, 
++0x15, 0x1a, 0x1f, 0x29, 0x3d, 0xc8, 0xaf, 0xa9, 0xa4, 0xa1, 
++0x9f, 0x9f, 0xaa, 0xbc, 0x44, 0x22, 0x19, 0x13, 0x0e, 0x0d, 
++0x0f, 0x0f, 0x13, 0x1c, 0x2a, 0x4e, 0xba, 0xaa, 0xa5, 0xa5, 
++0xa9, 0xae, 0xc0, 0x39, 0x27, 0x1e, 0x15, 0x0f, 0x0d, 0x0b, 
++0x0c, 0x0d, 0x0e, 0x10, 0x15, 0x1c, 0x28, 0x3c, 0xd6, 0xba, 
++0xb6, 0xb7, 0xbf, 0x5b, 0x32, 0x23, 0x19, 0x11, 0x0d, 0x0a, 
++0x08, 0x08, 0x09, 0x0a, 0x0d, 0x12, 0x1c, 0x2c, 0x6e, 0xaf, 
++0xa2, 0x9d, 0x9c, 0x9e, 0xa8, 0xc1, 0x36, 0x1e, 0x14, 0x0d, 
++0x09, 0x07, 0x07, 0x08, 0x0a, 0x0f, 0x18, 0x29, 0xe0, 0xa8, 
++0x9b, 0x95, 0x93, 0x95, 0x9a, 0xa7, 0xd4, 0x2c, 0x1a, 0x11, 
++0x0d, 0x0b, 0x0c, 0x0e, 0x14, 0x1d, 0x33, 0xba, 0x9f, 0x96, 
++0x91, 0x8f, 0x90, 0x95, 0x9d, 0xae, 0x47, 0x24, 0x18, 0x11, 
++0x0f, 0x0e, 0x11, 0x17, 0x20, 0x3c, 0xb5, 0x9f, 0x96, 0x90, 
++0x8f, 0x8f, 0x92, 0x9a, 0xa6, 0xcb, 0x30, 0x1e, 0x18, 0x14, 
++0x13, 0x15, 0x1a, 0x26, 0x45, 0xb4, 0x9f, 0x96, 0x91, 0x8f, 
++0x8f, 0x91, 0x97, 0x9f, 0xaf, 0x52, 0x2b, 0x1e, 0x1a, 0x18, 
++0x19, 0x1d, 0x27, 0x3d, 0xbe, 0xa6, 0x9c, 0x96, 0x92, 0x92, 
++0x94, 0x98, 0x9f, 0xac, 0xd4, 0x37, 0x27, 0x1f, 0x1d, 0x1e, 
++0x23, 0x2d, 0x4c, 0xba, 0xa6, 0x9d, 0x98, 0x95, 0x95, 0x96, 
++0x9a, 0xa0, 0xad, 0xcb, 0x3d, 0x2b, 0x23, 0x20, 0x20, 0x25, 
++0x2e, 0x46, 0xc2, 0xab, 0x9f, 0x9b, 0x99, 0x98, 0x9a, 0x9d, 
++0xa6, 0xb7, 0x59, 0x30, 0x25, 0x1e, 0x1c, 0x1d, 0x1f, 0x28, 
++0x36, 0xf9, 0xb5, 0xa7, 0x9f, 0x9d, 0x9d, 0x9f, 0xa6, 0xb2, 
++0xdf, 0x38, 0x28, 0x1f, 0x1b, 0x1a, 0x1b, 0x1e, 0x26, 0x33, 
++0x60, 0xba, 0xab, 0xa3, 0xa0, 0xa1, 0xa6, 0xaf, 0xc9, 0x41, 
++0x2c, 0x22, 0x1d, 0x1b, 0x1a, 0x1c, 0x1f, 0x26, 0x31, 0x4d, 
++0xc8, 0xb4, 0xac, 0xab, 0xac, 0xb1, 0xc1, 0x59, 0x36, 0x29, 
++0x21, 0x1d, 0x1b, 0x1b, 0x1d, 0x1f, 0x27, 0x2f, 0x40, 0xe8, 
++0xbf, 0xb7, 0xb3, 0xb5, 0xbe, 0xdb, 0x44, 0x2f, 0x26, 0x1f, 
++0x1d, 0x1c, 0x1c, 0x1f, 0x26, 0x31, 0x4a, 0xcb, 0xb5, 0xad, 
++0xab, 0xac, 0xb3, 0xc5, 0x54, 0x34, 0x28, 0x20, 0x1d, 0x1c, 
++0x1d, 0x1f, 0x26, 0x32, 0x50, 0xc1, 0xaf, 0xa9, 0xa6, 0xa6, 
++0xab, 0xb6, 0xd9, 0x3d, 0x2c, 0x23, 0x1e, 0x1d, 0x1e, 0x21, 
++0x29, 0x38, 0xf4, 0xb7, 0xa9, 0xa2, 0x9f, 0x9f, 0xa2, 0xaa, 
++0xba, 0x66, 0x36, 0x29, 0x23, 0x21, 0x22, 0x27, 0x30, 0x4b, 
++0xbf, 0xac, 0xa2, 0x9d, 0x9c, 0x9c, 0x9f, 0xa6, 0xb1, 0xd2, 
++0x3e, 0x2d, 0x27, 0x24, 0x24, 0x29, 0x33, 0x4f, 0xbe, 0xab, 
++0xa1, 0x9d, 0x9b, 0x9b, 0x9e, 0xa3, 0xae, 0xc5, 0x4d, 0x35, 
++0x2c, 0x29, 0x2a, 0x2e, 0x3d, 0xe5, 0xb7, 0xaa, 0xa1, 0x9e, 
++0x9d, 0x9d, 0xa0, 0xa7, 0xb0, 0xc6, 0x57, 0x3c, 0x33, 0x31, 
++0x34, 0x3d, 0x5a, 0xc7, 0xb4, 0xab, 0xa5, 0xa3, 0xa3, 0xa6, 
++0xac, 0xb7, 0xd2, 0x4c, 0x3a, 0x32, 0x30, 0x35, 0x3e, 0x65, 
++0xc2, 0xb1, 0xa9, 0xa5, 0xa3, 0xa4, 0xa8, 0xae, 0xbc, 0xf2, 
++0x3f, 0x31, 0x2c, 0x2a, 0x2b, 0x31, 0x40, 0xdf, 0xb9, 0xac, 
++0xa5, 0xa1, 0xa1, 0xa4, 0xab, 0xb8, 0xe3, 0x3d, 0x2e, 0x28, 
++0x25, 0x26, 0x2a, 0x31, 0x43, 0xd8, 0xb8, 0xac, 0xa8, 0xa7, 
++0xa8, 0xad, 0xb9, 0xdb, 0x40, 0x2f, 0x28, 0x24, 0x23, 0x25, 
++0x2a, 0x32, 0x48, 0xd6, 0xba, 0xaf, 0xad, 0xad, 0xb2, 0xbd, 
++0xe4, 0x42, 0x32, 0x2b, 0x27, 0x26, 0x28, 0x2c, 0x35, 0x45, 
++0xe9, 0xc1, 0xba, 0xb9, 0xbe, 0xca, 0xfc, 0x49, 0x37, 0x2e, 
++0x2a, 0x29, 0x29, 0x2c, 0x32, 0x3e, 0x5a, 0xd2, 0xc3, 0xbe, 
++0xc1, 0xd0, 0x5e, 0x3e, 0x31, 0x2b, 0x27, 0x25, 0x26, 0x2a, 
++0x30, 0x3f, 0x7a, 0xc5, 0xba, 0xb4, 0xb5, 0xbb, 0xcc, 0x56, 
++0x3a, 0x2e, 0x28, 0x25, 0x24, 0x25, 0x29, 0x2f, 0x3f, 0x7c, 
++0xc1, 0xb5, 0xaf, 0xae, 0xb1, 0xb9, 0xc8, 0x6c, 0x44, 0x37, 
++0x2f, 0x2e, 0x2e, 0x30, 0x37, 0x43, 0x5f, 0xd2, 0xbe, 0xb6, 
++0xb2, 0xb4, 0xba, 0xc8, 0xd6, 0x7e, 0x59, 0x54, 0x57, 0x63, 
++0xfb, 0xdd, 0xd2, 0xc9, 0xc4, 0xc4, 0xc4, 0xc6, 0xcd, 0xde, 
++0x6b, 0x56, 0x52, 0x55, 0x5f, 0xd8, 0xc0, 0xb7, 0xae, 0xa9, 
++0xa7, 0xa7, 0xa9, 0xae, 0xb9, 0xce, 0x51, 0x3d, 0x35, 0x33, 
++0x37, 0x3f, 0x5e, 0xc3, 0xb1, 0xaa, 0xa5, 0xa2, 0xa2, 0xa4, 
++0xa9, 0xb0, 0xc0, 0xfe, 0x47, 0x3c, 0x39, 0x3c, 0x45, 0x5f, 
++0xca, 0xb8, 0xaf, 0xab, 0xa9, 0xa9, 0xab, 0xae, 0xb5, 0xbe, 
++0xcc, 0xe6, 0x67, 0x5c, 0x5f, 0xe9, 0xcd, 0xc0, 0xb9, 0xb5, 
++0xb2, 0xb4, 0xb9, 0xbe, 0xca, 0xe3, 0x63, 0x57, 0x58, 0x6a, 
++0xde, 0xcb, 0xbf, 0xbb, 0xb9, 0xb8, 0xba, 0xbf, 0xca, 0xde, 
++0x60, 0x49, 0x3f, 0x3c, 0x3c, 0x3e, 0x47, 0x5b, 0xde, 0xc9, 
++0xbe, 0xbb, 0xbb, 0xbe, 0xc7, 0xdb, 0x5c, 0x47, 0x3e, 0x3b, 
++0x3c, 0x3f, 0x48, 0x54, 0x73, 0xdc, 0xcf, 0xcc, 0xcf, 0xd9, 
++0xfe, 0x58, 0x4a, 0x42, 0x3e, 0x3e, 0x40, 0x47, 0x52, 0x73, 
++0xda, 0xcd, 0xcb, 0xcf, 0xdf, 0x5f, 0x49, 0x3d, 0x37, 0x33, 
++0x32, 0x33, 0x37, 0x3e, 0x4a, 0x63, 0xdf, 0xd0, 0xcd, 0xd0, 
++0xe1, 0x61, 0x4c, 0x3e, 0x38, 0x34, 0x32, 0x33, 0x37, 0x3c, 
++0x47, 0x58, 0xf9, 0xdd, 0xda, 0xdf, 0x7e, 0x58, 0x4a, 0x41, 
++0x3d, 0x3b, 0x3b, 0x3d, 0x41, 0x49, 0x55, 0x68, 0xf1, 0xe6, 
++0xe9, 0xff, 0x5d, 0x4d, 0x45, 0x3e, 0x3c, 0x3c, 0x3d, 0x41, 
++0x4a, 0x56, 0x6d, 0xe7, 0xdd, 0xdc, 0xe4, 0x77, 0x5b, 0x4e, 
++0x49, 0x45, 0x44, 0x46, 0x4b, 0x53, 0x61, 0xf9, 0xe0, 0xda, 
++0xda, 0xdd, 0xe8, 0x7c, 0x64, 0x5b, 0x56, 0x4f, 0x4c, 0x4a, 
++0x4a, 0x4d, 0x50, 0x59, 0x67, 0xfe, 0xec, 0xe8, 0xec, 0xf9, 
++0x70, 0x61, 0x5c, 0x59, 0x58, 0x5a, 0x5e, 0x64, 0x6c, 0x79, 
++0xf8, 0xf0, 0xef, 0xef, 0xf3, 0xfa, 0xff, 0x7c, 0x7a, 0x7d, 
++0xfb, 0xf3, 0xeb, 0xe6, 0xe2, 0xdf, 0xdf, 0xdf };
+diff -ur asterisk-1.8.23.0/apps/leave.h asterisk-1.8.23.0-vici/apps/leave.h
+--- asterisk-1.8.23.0/apps/leave.h	2006-02-14 11:14:15.000000000 -0800
++++ asterisk-1.8.23.0-vici/apps/leave.h	2013-10-08 12:17:16.000000000 -0700
+@@ -1,207 +1,110 @@
+ /*
+   * U-law 8-bit audio data
+-  *
+-  * Source: leave.raw
+-  *
+-  * Copyright (C) 1999, Mark Spencer and Linux Support Services
+-  *
+-  * Distributed under the terms of the GNU General Public License
+-  *
++  * Source: leave.raw (/usr/bin/hexdump -C ./leave.raw)
++  * Copyright (C) 2007, Matt Florell
++  * Distributed under the terms of the GPLv2
+   */
+ 
+ static unsigned char leave[] = {
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc1, 0x3d, 
+-0x42, 0x46, 0x3f, 0x3f, 0x46, 0x3f, 0x4e, 0xba, 0xbe, 0xbe, 
+-0xbc, 0xba, 0xbe, 0xc5, 0xb6, 0x2e, 0x2c, 0x33, 0x2f, 0x2e, 
+-0x2f, 0x33, 0x2b, 0x54, 0xac, 0xb0, 0xb0, 0xad, 0xaf, 0xb0, 
+-0xae, 0xcd, 0x3b, 0x2f, 0x31, 0x2e, 0x2f, 0x31, 0x2e, 0x46, 
+-0xc5, 0xaf, 0xb0, 0xaf, 0xae, 0xaf, 0xaf, 0xb0, 0xfe, 0x2d, 
+-0x31, 0x31, 0x2e, 0x31, 0x2f, 0x31, 0xfe, 0xae, 0xaf, 0xaf, 
+-0xae, 0xb0, 0xae, 0xaf, 0xfe, 0xdb, 0x2e, 0x2e, 0x31, 0x31, 
+-0x2d, 0x2e, 0xdb, 0x68, 0xaf, 0xad, 0xb0, 0xb0, 0xae, 0xaf, 
+-0x5c, 0xe7, 0x39, 0x2d, 0x31, 0x31, 0x31, 0x2d, 0xfe, 0xfe, 
+-0x68, 0xad, 0xaf, 0xb0, 0xaf, 0xac, 0xbc, 0xfe, 0xd3, 0x2f, 
+-0x2e, 0x33, 0x31, 0x2d, 0x4e, 0xdb, 0xfe, 0xfe, 0xac, 0xaf, 
+-0xb0, 0xac, 0xb6, 0x68, 0xe7, 0xdb, 0x2e, 0x2f, 0x35, 0x2f, 
+-0x31, 0xe7, 0xe7, 0x68, 0xad, 0xac, 0xb0, 0xae, 0xac, 0xfe, 
+-0xfe, 0xdb, 0xfe, 0x2d, 0x33, 0x31, 0x2e, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xbc, 0xaf, 0xb0, 0xad, 0xfe, 0xfe, 0xfe, 0xe7, 0x5c, 
+-0x2e, 0x33, 0x2e, 0x35, 0xe7, 0xfe, 0xfe, 0xfe, 0xad, 0xb0, 
+-0xaf, 0xc1, 0xfe, 0xe7, 0xfe, 0xe7, 0x3d, 0x31, 0x2f, 0x37, 
+-0xe7, 0xfe, 0xfe, 0xe7, 0xfe, 0xaf, 0xad, 0xbe, 0xfe, 0xdb, 
+-0xfe, 0xfe, 0xdb, 0x35, 0x2d, 0x39, 0xdb, 0xfe, 0xfe, 0xdb, 
+-0xfe, 0xfe, 0xad, 0xaf, 0xfe, 0xfe, 0xe7, 0x68, 0xfe, 0xd3, 
+-0x2e, 0x2c, 0xdb, 0xdb, 0x2c, 0x35, 0xd3, 0x68, 0xaf, 0xad, 
+-0xb0, 0xb0, 0xad, 0xba, 0x68, 0xe7, 0xe7, 0x2e, 0x2f, 0x33, 
+-0x31, 0x2d, 0xdb, 0xd3, 0x5c, 0xae, 0xaa, 0xe7, 0x68, 0xaa, 
+-0xe7, 0xfe, 0xdb, 0xe7, 0xfe, 0xe7, 0xd3, 0x2d, 0xfe, 0xdb, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc5, 0xfe, 0xe7, 0xe7, 
+-0xfe, 0xfe, 0xe7, 0xe7, 0x3b, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xc5, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0x3b, 
+-0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xb0, 0xfe, 0xfe, 
+-0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0x2e, 0x5c, 0xdb, 0xfe, 0xfe, 
+-0xe7, 0xe7, 0x68, 0xb0, 0xbe, 0x68, 0xe7, 0xe7, 0xfe, 0xfe, 
+-0xdb, 0x39, 0x2f, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xbe, 
+-0xaf, 0xe7, 0x68, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0x33, 0x33, 
+-0xdb, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xb0, 0xb0, 0xfe, 0xfe, 
+-0xe7, 0xfe, 0xfe, 0xfe, 0x35, 0x33, 0xe7, 0xe7, 0xfe, 0xe7, 
+-0xe7, 0xfe, 0xb0, 0xb2, 0xb0, 0xfe, 0xfe, 0xe7, 0xfe, 0xe7, 
+-0x46, 0x35, 0x35, 0x3f, 0xe7, 0xfe, 0xe7, 0xfe, 0xb2, 0xb0, 
+-0xb2, 0xb0, 0xfe, 0xfe, 0xfe, 0xfe, 0x42, 0x35, 0x37, 0x33, 
+-0xe7, 0xfe, 0xfe, 0xfe, 0xb8, 0xb0, 0xb6, 0xb0, 0xba, 0xfe, 
+-0xfe, 0xe7, 0xe7, 0x33, 0x39, 0x39, 0x33, 0xe7, 0xdb, 0xfe, 
+-0xe7, 0xb0, 0xb4, 0xb6, 0xb0, 0xcd, 0xfe, 0xe7, 0xe7, 0x33, 
+-0x39, 0x3b, 0x33, 0x46, 0xd3, 0xfe, 0xfe, 0xb0, 0xb2, 0xb6, 
+-0xb4, 0xb0, 0xfe, 0xfe, 0xdb, 0x35, 0x37, 0x39, 0x39, 0x35, 
+-0x37, 0xdb, 0x68, 0xcd, 0xb2, 0xb6, 0xb6, 0xb4, 0xb4, 0x68, 
+-0xe7, 0x42, 0x37, 0x3b, 0x3b, 0x39, 0x37, 0xdb, 0xfe, 0xcd, 
+-0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb4, 0xfe, 0x54, 0x37, 0x3b, 
+-0x39, 0x3b, 0x3b, 0x39, 0xe7, 0xfe, 0xb6, 0xb6, 0xb6, 0xb4, 
+-0xb6, 0xb6, 0xbc, 0xfe, 0x3f, 0x3b, 0x3b, 0x39, 0x3b, 0x3b, 
+-0x39, 0xe7, 0xb6, 0xb8, 0xb8, 0xb6, 0xb8, 0xb8, 0xb4, 0xfe, 
+-0x3b, 0x3d, 0x3d, 0x3b, 0x39, 0x3d, 0x3b, 0x39, 0xbe, 0xb8, 
+-0xba, 0xb8, 0xb6, 0xb8, 0xba, 0xb4, 0xfe, 0x39, 0x3f, 0x3d, 
+-0x3b, 0x3d, 0x3f, 0x39, 0xdb, 0xb4, 0xba, 0xb8, 0xb6, 0xb8, 
+-0xbc, 0xb4, 0xba, 0x39, 0x42, 0x3f, 0x3d, 0x3d, 0x3f, 0x3f, 
+-0x3b, 0xb8, 0xb6, 0xbc, 0xb8, 0xb8, 0xba, 0xbc, 0xb8, 0xe7, 
+-0x3d, 0x42, 0x3f, 0x3d, 0x3f, 0x42, 0x3d, 0xfe, 0xb8, 0xbc, 
+-0xbc, 0xba, 0xba, 0xbc, 0xba, 0xe7, 0x3d, 0x3f, 0x42, 0x3f, 
+-0x3f, 0x42, 0x42, 0xfe, 0xfe, 0xbc, 0xbc, 0xbe, 0xbc, 0xbe, 
+-0xbc, 0xc5, 0xe7, 0x68, 0x42, 0x46, 0x42, 0x46, 0x42, 0x46, 
+-0xfe, 0xfe, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xc5, 0xfe, 0xdb, 
+-0x46, 0x46, 0x4a, 0x4a, 0x46, 0x46, 0xe7, 0xfe, 0xd3, 0xbe, 
+-0xc9, 0xc9, 0xc5, 0xc5, 0xe7, 0xdb, 0xd3, 0x4a, 0x4e, 0x54, 
+-0x4e, 0x4e, 0xfe, 0x5c, 0x54, 0xd3, 0xcd, 0xd3, 0xd3, 0xcd, 
+-0xd3, 0xd3, 0xcd, 0xfe, 0x5c, 0x68, 0x5c, 0x5c, 0x5c, 0x68, 
+-0x5c, 0x5c, 0xcd, 0xcd, 0xd3, 0xcd, 0xdb, 0xe7, 0xe7, 0xdb, 
+-0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 
+-0xfe, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0xfe, 0x46, 0x35, 0x35, 
+-0x37, 0x39, 0x3b, 0x39, 0x35, 0x33, 0x35, 0x5c, 0xd3, 0xcd, 
+-0xdb, 0xfe, 0xfe, 0xd3, 0xb0, 0xb0, 0xb0, 0xb4, 0xb4, 0xb6, 
+-0xb2, 0xb0, 0xb0, 0xb6, 0xcd, 0x5c, 0x68, 0xfe, 0xfe, 0xfe, 
+-0x3b, 0x33, 0x35, 0x37, 0x39, 0x3b, 0x39, 0x37, 0x35, 0x35, 
+-0x3f, 0xdb, 0xcd, 0xcd, 0xdb, 0xfe, 0xe7, 0xc5, 0xb0, 0xb0, 
+-0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb0, 0xb0, 0xcd, 0x5c, 0x5c, 
+-0xfe, 0xe7, 0xe7, 0xfe, 0x35, 0x35, 0x35, 0x39, 0x3b, 0x3b, 
+-0x39, 0x35, 0x33, 0x39, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 
+-0xba, 0xb0, 0xb0, 0xb2, 0xb4, 0xb6, 0xb6, 0xb4, 0xb2, 0xb0, 
+-0xb4, 0xc9, 0x5c, 0x68, 0xfe, 0xfe, 0x5c, 0x3b, 0x35, 0x37, 
+-0x39, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, 0x3d, 0xe7, 0xcd, 
+-0xdb, 0xfe, 0xe7, 0xbe, 0xb2, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, 
+-0xb6, 0xb4, 0xb0, 0xb0, 0xc5, 0x5c, 0x5c, 0xfe, 0xe7, 0xe7, 
+-0x4e, 0x35, 0x35, 0x37, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, 
+-0x3b, 0xe7, 0xc9, 0xcd, 0xe7, 0xfe, 0xd3, 0xb4, 0xb2, 0xb2, 
+-0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, 0xb4, 0xc1, 0x68, 
+-0x68, 0xfe, 0xfe, 0x42, 0x39, 0x37, 0x39, 0x3b, 0x3b, 0x3b, 
+-0x3b, 0x3b, 0x39, 0x37, 0x3b, 0xfe, 0xd3, 0xdb, 0xfe, 0xcd, 
+-0xb4, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, 
+-0xb2, 0xc1, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0x3d, 0x37, 0x37, 
+-0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x37, 0x37, 0x39, 0xfe, 0xcd, 
+-0xd3, 0xfe, 0xfe, 0xc1, 0xb2, 0xb2, 0xb4, 0xb6, 0xb6, 0xb6, 
+-0xb6, 0xb6, 0xb6, 0xb4, 0xb4, 0xbc, 0x68, 0xfe, 0xfe, 0xfe, 
+-0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x39, 
+-0x39, 0x3b, 0xfe, 0xdb, 0xe7, 0xfe, 0xbc, 0xb6, 0xb6, 0xb6, 
+-0xb8, 0xb6, 0xb6, 0xb6, 0xb8, 0xb6, 0xb4, 0xb4, 0xbc, 0xfe, 
+-0x68, 0xfe, 0xe7, 0x5c, 0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, 
+-0x3d, 0x3d, 0x3b, 0x39, 0x3b, 0x68, 0xdb, 0xdb, 0xfe, 0xe7, 
+-0xb8, 0xb6, 0xb6, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb6, 
+-0xb4, 0xb6, 0xdb, 0x68, 0xfe, 0xfe, 0x46, 0x3b, 0x3b, 0x3b, 
+-0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3b, 0x5c, 
+-0xdb, 0xdb, 0xc9, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 
+-0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xbc, 0xcd, 0xfe, 0xfe, 0x3d, 
+-0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, 
+-0x3b, 0x3d, 0x46, 0xfe, 0xe7, 0xe7, 0xc5, 0xb8, 0xb8, 0xb8, 
+-0xba, 0xba, 0xb8, 0xb8, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xcd, 
+-0xfe, 0xfe, 0x68, 0x3f, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 
+-0x3d, 0x3d, 0x3f, 0x3f, 0x3d, 0x3b, 0x4a, 0xfe, 0xdb, 0xbc, 
+-0xb8, 0xba, 0xba, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xba, 0xba, 
+-0xba, 0xba, 0xba, 0xc5, 0xfe, 0x54, 0x3f, 0x3f, 0x3f, 0x3f, 
+-0x3f, 0x3f, 0x3d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, 
+-0xfe, 0xe7, 0xdb, 0xbc, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 
+-0xba, 0xba, 0xbc, 0xba, 0xba, 0xba, 0xc5, 0xfe, 0xfe, 0x4e, 
+-0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, 
+-0x42, 0x42, 0x3f, 0x46, 0xfe, 0xcd, 0xb8, 0xba, 0xbc, 0xbc, 
+-0xbc, 0xba, 0xba, 0xba, 0xba, 0xbc, 0xbc, 0xbc, 0xba, 0xb8, 
+-0xbe, 0xfe, 0x42, 0x3d, 0x3f, 0x42, 0x42, 0x42, 0x3f, 0x3f, 
+-0x3f, 0x42, 0x42, 0x42, 0x42, 0x3f, 0x3f, 0x68, 0xdb, 0xc5, 
+-0xba, 0xbc, 0xbc, 0xbc, 0xbc, 0xba, 0xba, 0xba, 0xbc, 0xbc, 
+-0xbc, 0xbc, 0xba, 0xc1, 0xfe, 0xfe, 0x3f, 0x42, 0x46, 0x46, 
+-0x46, 0x42, 0x42, 0x42, 0x42, 0x42, 0x46, 0x46, 0x42, 0x3f, 
+-0x42, 0x68, 0xbe, 0xba, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xbc, 
+-0xbc, 0xbc, 0xbe, 0xc1, 0xbe, 0xbc, 0xba, 0xbe, 0x68, 0x3f, 
+-0x42, 0x46, 0x4a, 0x4a, 0x46, 0x42, 0x42, 0x42, 0x46, 0x46, 
+-0x46, 0x46, 0x42, 0x42, 0x68, 0xd3, 0xbc, 0xbc, 0xbe, 0xc1, 
+-0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, 0xc1, 0xbe, 0xbe, 
+-0xc1, 0xfe, 0x4e, 0x42, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, 
+-0x46, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, 0x68, 0xdb, 0xbe, 
+-0xbe, 0xc1, 0xc5, 0xc1, 0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, 
+-0xc5, 0xc5, 0xbe, 0xbc, 0xc1, 0x4e, 0x46, 0x46, 0x4a, 0x4e, 
+-0x4e, 0x4a, 0x46, 0x46, 0x46, 0x4a, 0x4a, 0x4e, 0x4a, 0x46, 
+-0x46, 0xfe, 0xbe, 0xbe, 0xc1, 0xc9, 0xc5, 0xc5, 0xc1, 0xc1, 
+-0xc1, 0xc1, 0xc5, 0xc5, 0xc5, 0xc5, 0xbe, 0xc1, 0xfe, 0x4a, 
+-0x4a, 0x4e, 0x4e, 0x4e, 0x4e, 0x4e, 0x4a, 0x4a, 0x4a, 0x4e, 
+-0x54, 0x4e, 0x4a, 0x4a, 0x4e, 0xcd, 0xc1, 0xc5, 0xc5, 0xc9, 
+-0xc5, 0xc5, 0xc5, 0xc5, 0xc9, 0xcd, 0xcd, 0xcd, 0xcd, 0xc9, 
+-0xc9, 0xd3, 0x68, 0x54, 0x5c, 0x68, 0x68, 0x68, 0x5c, 0x5c, 
+-0x5c, 0x5c, 0x5c, 0x68, 0x68, 0x5c, 0x54, 0x5c, 0xdb, 0xcd, 
+-0xcd, 0xdb, 0xdb, 0xdb, 0xdb, 0xd3, 0xd3, 0xe7, 0xe7, 0xe7, 
+-0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+-0xfe, 0xfe, 0xfe };
++0xd6, 0xdc, 0x55, 0x5f, 0x63, 0x67, 0xf0, 0xf0, 0x74, 0x75, 
++0xd6, 0xee, 0x5d, 0x73, 0x66, 0x60, 0xdc, 0xfd, 0x62, 0x68, 
++0x5b, 0x5a, 0x57, 0x5e, 0x5b, 0x5c, 0xef, 0xfc, 0x4d, 0x51, 
++0x57, 0x4c, 0x5d, 0x66, 0x60, 0x51, 0x6c, 0x5f, 0x3e, 0x4d, 
++0x59, 0x47, 0x72, 0xe4, 0x52, 0x53, 0x58, 0x48, 0x3e, 0x51, 
++0x54, 0x4e, 0xf8, 0xd2, 0x4c, 0x45, 0x4e, 0x3e, 0x46, 0x58, 
++0x5a, 0x59, 0x5a, 0xdc, 0x44, 0x3a, 0x53, 0x43, 0x45, 0xe1, 
++0x78, 0x52, 0x5b, 0x5d, 0x3e, 0x39, 0x69, 0x4b, 0x56, 0xd4, 
++0xdc, 0x5b, 0xef, 0x65, 0x4b, 0x4f, 0x4b, 0x7c, 0x75, 0xd5, 
++0xcd, 0xdb, 0x72, 0x4a, 0x4d, 0x4b, 0x50, 0xd6, 0xd7, 0xdb, 
++0xdb, 0xc8, 0x6b, 0x44, 0xf7, 0x5c, 0x6e, 0xda, 0xcb, 0xbc, 
++0xcb, 0xc1, 0xd2, 0xcf, 0x62, 0x53, 0x7b, 0xe0, 0xc9, 0xcb, 
++0xbc, 0xbc, 0xcd, 0x54, 0x78, 0x53, 0x5a, 0x5c, 0xbd, 0xcc, 
++0xbd, 0xd3, 0xb7, 0xde, 0x79, 0x67, 0x53, 0xdc, 0x57, 0xbf, 
++0xbd, 0xbd, 0xc6, 0xc6, 0xda, 0xd9, 0x41, 0xe6, 0x49, 0xcb, 
++0x5c, 0xbf, 0xbe, 0xd0, 0xd9, 0x44, 0xcc, 0x3b, 0xd0, 0x3f, 
++0xce, 0xdd, 0x4b, 0xea, 0x47, 0xbe, 0x4a, 0xcc, 0x69, 0xc6, 
++0x64, 0x49, 0xed, 0x4f, 0x69, 0x46, 0xea, 0xc5, 0x6b, 0xdc, 
++0xe3, 0xd6, 0x5a, 0x3c, 0x61, 0x35, 0xdb, 0x3a, 0xdb, 0xff, 
++0xf8, 0xc2, 0x48, 0xd7, 0x46, 0x6a, 0x48, 0x47, 0x5e, 0x7d, 
++0xe8, 0xd3, 0x66, 0xcf, 0x50, 0x7e, 0x48, 0x3d, 0x5d, 0x3c, 
++0xd6, 0x3a, 0xbe, 0x5a, 0xe5, 0xe2, 0x4d, 0xcd, 0x41, 0xbb, 
++0x43, 0xbb, 0x49, 0xc4, 0xd0, 0x42, 0xc5, 0x3c, 0xc6, 0x4e, 
++0xd6, 0xc0, 0xe7, 0xbc, 0xd4, 0xde, 0xc5, 0x45, 0xcd, 0x6a, 
++0xed, 0x5d, 0x67, 0xb8, 0x55, 0xba, 0xe3, 0xbb, 0xc5, 0x4a, 
++0xc0, 0x3c, 0xc8, 0x49, 0x77, 0xbc, 0xe8, 0xb6, 0xdc, 0xae, 
++0xeb, 0x71, 0xcb, 0x51, 0xf2, 0x47, 0xea, 0x6b, 0xdd, 0xce, 
++0xc8, 0xcc, 0xc2, 0xdc, 0xc5, 0xe7, 0x5d, 0xcb, 0x4a, 0xc9, 
++0x55, 0xca, 0xbb, 0x4f, 0xb9, 0x5c, 0xca, 0xf3, 0x3d, 0xbf, 
++0x38, 0xc6, 0xf8, 0x56, 0xb0, 0x3a, 0xbb, 0x79, 0xe1, 0xd3, 
++0x33, 0xbe, 0x36, 0xdf, 0x4e, 0x4f, 0xbb, 0x58, 0xb5, 0x67, 
++0xbb, 0x63, 0x4e, 0xd6, 0x3b, 0x5f, 0x38, 0xd6, 0xe9, 0x52, 
++0xc9, 0x3f, 0xbc, 0xd7, 0x40, 0xbf, 0x34, 0x67, 0x6d, 0x32, 
++0xd0, 0x3b, 0xd4, 0xe3, 0x4d, 0xb6, 0x40, 0xdd, 0xeb, 0x3e, 
++0xf0, 0x3c, 0x4a, 0x56, 0x49, 0x7e, 0xf2, 0x67, 0xd2, 0xd8, 
++0xec, 0xe1, 0x4c, 0xf7, 0x5d, 0x37, 0x4c, 0x48, 0x46, 0x6d, 
++0x3c, 0x5f, 0xbd, 0xf5, 0xe9, 0xca, 0x6d, 0x4d, 0x5d, 0x4a, 
++0x43, 0x3f, 0x49, 0x67, 0x49, 0xc6, 0xcd, 0x48, 0xbc, 0x66, 
++0xd3, 0xd9, 0x2e, 0xc5, 0x4e, 0x2e, 0xca, 0x3a, 0x33, 0xb4, 
++0xf7, 0x40, 0xb5, 0xee, 0x67, 0xc4, 0x5c, 0x6a, 0x4b, 0x63, 
++0x51, 0x3e, 0xcf, 0x4a, 0xd5, 0xb8, 0x5a, 0xb6, 0xcc, 0xed, 
++0xaf, 0x3e, 0x67, 0xb8, 0x34, 0xec, 0xc5, 0x33, 0xba, 0xb6, 
++0x3f, 0xb4, 0xbb, 0x67, 0xb2, 0xc4, 0x41, 0xd1, 0xe5, 0x53, 
++0xe0, 0x48, 0x69, 0xbf, 0xe5, 0xcc, 0xb9, 0x7b, 0xc7, 0xae, 
++0x52, 0xdd, 0xb7, 0x3f, 0xf6, 0xc2, 0x3d, 0xd3, 0xb5, 0x3d, 
++0xca, 0xad, 0x54, 0xbb, 0xb1, 0x4f, 0xb9, 0xb8, 0x48, 0xc5, 
++0xce, 0x3e, 0xcf, 0xe2, 0x40, 0xd6, 0xc9, 0x50, 0xc6, 0xbe, 
++0x4e, 0xb9, 0xbb, 0x3e, 0xca, 0xc1, 0x3b, 0x73, 0xce, 0x30, 
++0x65, 0xba, 0x3e, 0xd9, 0xb5, 0x41, 0xcd, 0xab, 0x3f, 0xcd, 
++0xb0, 0x34, 0x6f, 0xbc, 0x31, 0x67, 0xb3, 0x2d, 0x7a, 0xaa, 
++0x3a, 0xc2, 0xad, 0x34, 0xbd, 0xac, 0x34, 0xbc, 0xb1, 0x2a, 
++0xcb, 0xb5, 0x29, 0x6e, 0xbb, 0x2c, 0xcd, 0xbc, 0x2e, 0xc2, 
++0xc2, 0x36, 0xbd, 0x6f, 0x31, 0xb1, 0x5e, 0x2e, 0xb7, 0x37, 
++0x2e, 0xb1, 0x3f, 0x2b, 0xb7, 0x4c, 0x29, 0xae, 0xdb, 0x2b, 
++0xaf, 0xbb, 0x2a, 0xbb, 0xb3, 0x25, 0xc8, 0xaf, 0x25, 0x41, 
++0xaf, 0x2a, 0x3c, 0xa7, 0x2e, 0x2f, 0xa3, 0x5d, 0x2d, 0xac, 
++0xd5, 0x29, 0xbb, 0xbe, 0x26, 0xe2, 0xb6, 0x28, 0x44, 0xae, 
++0x32, 0x35, 0xac, 0x4a, 0x2f, 0xae, 0xcb, 0x2a, 0xb5, 0xb5, 
++0x2a, 0xcb, 0xae, 0x2c, 0x46, 0xab, 0x35, 0x32, 0xb0, 0x4b, 
++0x2b, 0xb5, 0xb8, 0x2c, 0xcd, 0xab, 0x3c, 0x44, 0xab, 0x4f, 
++0x30, 0xad, 0xc4, 0x28, 0xda, 0xb1, 0x2d, 0x61, 0xaa, 0x31, 
++0x3c, 0xa4, 0xea, 0x2f, 0xac, 0xb9, 0x2c, 0xbd, 0xad, 0x2e, 
++0x60, 0xaa, 0x40, 0x39, 0xad, 0xe0, 0x31, 0xaf, 0xb6, 0x37, 
++0xcb, 0xb4, 0x44, 0xd5, 0xad, 0x4d, 0x4a, 0xb2, 0xc7, 0xe3, 
++0xba, 0x50, 0x4c, 0xb2, 0xce, 0x3e, 0xc1, 0xe1, 0x3b, 0xb6, 
++0xb3, 0x34, 0xfe, 0xa9, 0x54, 0x49, 0xab, 0xd1, 0x36, 0xae, 
++0xb0, 0x2c, 0x55, 0xab, 0x4e, 0x3b, 0xb1, 0xcc, 0x32, 0xc8, 
++0xab, 0x43, 0x35, 0xae, 0xb5, 0x42, 0xcc, 0xb2, 0x47, 0x5b, 
++0xa8, 0xbc, 0x2c, 0x4e, 0xaa, 0xe5, 0x39, 0xbe, 0xcb, 0x33, 
++0xc6, 0xaa, 0x42, 0x34, 0xbb, 0xc9, 0x3b, 0xc8, 0xba, 0x3c, 
++0x3f, 0xb8, 0xc0, 0x44, 0xfb, 0xce, 0x49, 0x5e, 0xc2, 0x77, 
++0x3b, 0x62, 0xd1, 0x59, 0xf7, 0xdc, 0x3e, 0x45, 0xbb, 0xc8, 
++0x3f, 0x58, 0xcb, 0x58, 0x4c, 0xce, 0xec, 0x3a, 0x58, 0xbd, 
++0x56, 0x35, 0xe9, 0xd5, 0x40, 0xd9, 0xbf, 0x3b, 0x39, 0xb6, 
++0xc8, 0x32, 0x5c, 0xc1, 0x40, 0x3a, 0xb9, 0xfd, 0x2b, 0x58, 
++0xc0, 0x3d, 0x32, 0xd1, 0x74, 0x35, 0x5d, 0xc8, 0x3c, 0x34, 
++0xc0, 0xc8, 0x30, 0x45, 0xb7, 0xf9, 0x33, 0x5e, 0xc2, 0x3f, 
++0x40, 0xbe, 0xd1, 0x2f, 0x3b, 0xb9, 0x76, 0x2b, 0x3b, 0xce, 
++0x4a, 0x3b, 0xdc, 0xdf, 0x35, 0x3f, 0xbc, 0xd3, 0x37, 0x3e, 
++0xc7, 0x59, 0x48, 0xf8, 0x45, 0x3a, 0x3a, 0xec, 0x5a, 0x3a, 
++0x4e, 0x69, 0x4b, 0x48, 0xea, 0x5d, 0x34, 0x4d, 0xbe, 0x5c, 
++0x35, 0x47, 0xd5, 0x52, 0x4a, 0xdd, 0xfb, 0x46, 0x78, 0xc2, 
++0xdb, 0x40, 0x47, 0xc7, 0xc5, 0x75, 0x45, 0x4f, 0xeb, 0x55, 
++0xef, 0xc6, 0xfa, 0x3f, 0x5a, 0xc0, 0xd1, 0x4d, 0x58, 0xe0, 
++0xe5, 0x7d, 0xd3, 0xce, 0x4b, 0x47, 0xc3, 0xbd, 0x55, 0x49, 
++0xe0, 0xd6, 0xe2, 0xcb, 0xbf, 0xf2, 0x46, 0xf7, 0xb8, 0xbf, 
++0x56, 0x5c, 0xce, 0xc9, 0xda, 0xcd, 0xf3, 0x4b, 0xe2, 0xc9, 
++0xc6, 0xd6, 0x5e, 0x5d, 0xca, 0xbf, 0xcf, 0x75, 0xd3, 0xcc, 
++0x77, 0xca, 0xbe, 0xc8, 0x52, 0x72, 0xb6, 0xb6, 0xe5, 0x5c, 
++0xca, 0xbe, 0xc4, 0xc5, 0xbe, 0x5d, 0x57, 0xc3, 0xb7, 0xcb, 
++0x46, 0x59, 0xd4, 0xbe, 0xd2, 0xd2, 0xcb, 0x5d, 0xe8, 0xca, 
++0xb7, 0xc1, 0x51, 0x60, 0xbb, 0xb6, 0xce, 0x77, 0xc3, 0xc3, 
++0x62, 0xca, 0xb9, 0xc3, 0x48, 0x62, 0xb3, 0xb4, 0xe6, 0x4e, 
++0xd7, 0xc0, 0xc2, 0xcf, 0xcf, 0xe8, 0x5a, 0x6c, 0xd9, 0xc9, 
++0xcf, 0x4d, 0x47, 0xd5, 0xc4, 0xe3, 0x58, 0x6b, 0xe7, 0xe9, 
++0x79, 0xd5, 0xc8, 0x51, 0x44, 0xf4, 0xc7, 0xda, 0x4f, 0x67, 
++0xec, 0x6d, 0x54, 0x75, 0xd6, 0x71, 0x4a, 0x4e, 0xcc, 0xcd, 
++0x55, 0x55, 0x61, 0x68, 0x56, 0x5e, 0xce, 0xde, 0x43, 0x46, 
++0xce, 0xce, 0x59, 0x50, 0x7c, 0xfe, 0x52, 0x67, 0xcd, 0xeb, 
++0x49, 0x69, 0xe5, 0xfe, 0xde, 0x60, 0x5e, 0xf5, 0xde, 0xeb, 
++0x68, 0x6b, 0x71, 0xee, 0x78, 0x76, 0x76, 0x72, 0x6b, 0x6c, 
++0xfc, 0x7d, };
+diff -ur asterisk-1.8.23.0/channels/chan_sip.c asterisk-1.8.23.0-vici/channels/chan_sip.c
+--- asterisk-1.8.23.0/channels/chan_sip.c	2013-05-08 00:17:17.000000000 -0700
++++ asterisk-1.8.23.0-vici/channels/chan_sip.c	2013-10-08 12:31:49.000000000 -0700
+@@ -1473,6 +1473,7 @@
+ static int sip_reinvite_retry(const void *data);
+ 
+ /*--- Parsing SIP requests and responses */
++static int check_cpd_results(struct sip_pvt *p, struct sip_request *req);
+ static void append_date(struct sip_request *req);	/* Append date to SIP packet */
+ static int determine_firstline_parts(struct sip_request *req);
+ static const struct cfsubscription_types *find_subscription_type(enum subscriptiontype subtype);
+@@ -5693,6 +5694,7 @@
+ 	dialog->callgroup = peer->callgroup;
+ 	dialog->pickupgroup = peer->pickupgroup;
+ 	dialog->allowtransfer = peer->allowtransfer;
++	dialog->enable_netborder_cpd = peer->enable_netborder_cpd;
+ 	dialog->jointnoncodeccapability = dialog->noncodeccapability;
+ 
+ 	/* Update dialog authorization credentials */
+@@ -7777,6 +7779,66 @@
+ 	return _default;
+ }
+ 
++/*! \brief Check for a CPD-Result
++ *  This looks for a CPD-Result in the sip_request 
++ *  and throws a manager event if it finds one
++ */
++static int check_cpd_results(struct sip_pvt *p, struct sip_request *req) {
++	const char *cpdr = get_header(req, "CPD-Result");
++	const char *cpddr = get_header(req, "X-Netborder-Detailed-CPD-Result-v2-0");
++	const char *cpdcid = get_header(req, "X-Netborder-Call-ID");
++	const char *cpdrid = get_header(req, "X-Netborder-Cpa-Reference-ID");
++	const char *cpdcamp = get_header(req, "X-Netborder-Cpa-Campaign-Name");
++	/* See if NetBorder had anything to say */
++	if (!(ast_strlen_zero(cpdr))) {
++		if (p->owner) {
++			/* If so throw a manager event with the result */
++			manager_event(
++				EVENT_FLAG_SYSTEM, 
++				"CPD-Result", 
++				"Channeltype: SIP\r\n"
++				"Channel: %s\r\n"
++				"CallerIDName: %s\r\n"
++				"Uniqueid: %s\r\n"
++				"CPDResult: %s\r\n"
++				"CPDDetailedResult: %s\r\n"
++				"CPDCallID: %s\r\n"
++				"CPDReferenceID: %s\r\n"
++				"CPDCampaignName: %s\r\n",
++				p->owner->name,
++				S_COR(p->owner->caller.id.name.valid, p->owner->caller.id.name.str, "<unknown>"),
++				p->owner->uniqueid,
++				cpdr,
++				S_OR(cpddr, ""),
++				S_OR(cpdcid, ""),
++				S_OR(cpdrid, ""),
++				S_OR(cpdcamp, "")
++			);
++		} else {  
++			/* Apparently we can have a CPD-Result and no owner, better not crash it though */
++			manager_event(
++				EVENT_FLAG_SYSTEM,
++				"CPD-Result",
++				"Channeltype: SIP\r\n"
++				"Channel: UNKNOWN\r\n"
++				"CallerIDName: UNKNOWN\r\n"
++				"Uniqueid: UNKNOWN\r\n"
++				"CPDResult: %s\r\n"
++				"CPDDetailedResult: %s\r\n"
++				"CPDCallID: %s\r\n"
++				"CPDReferenceID: %s\r\n"
++				"CPDCampaignName: %s\r\n",
++				cpdr,
++				S_OR(cpddr, ""),
++				S_OR(cpdcid, ""),
++				S_OR(cpdrid, ""),
++				S_OR(cpdcamp, "")
++			);
++		}
++	} 
++	return 0;
++}
++
+ static const char *__get_header(const struct sip_request *req, const char *name, int *start)
+ {
+ 	/*
+@@ -8210,6 +8272,7 @@
+ 	ast_string_field_set(p, mohsuggest, default_mohsuggest);
+ 	p->capability = sip_cfg.capability;
+ 	p->allowtransfer = sip_cfg.allowtransfer;
++	p->enable_netborder_cpd = sip_cfg.enable_netborder_cpd;
+ 	if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) ||
+ 	    (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
+ 		p->noncodeccapability |= AST_RTP_DTMF;
+@@ -12454,6 +12517,7 @@
+ 	const char *n = NULL;	/* XXX what is this, exactly ? */
+ 	const char *d = NULL;	/* domain in from header */
+ 	const char *urioptions = "";
++	const char *netbordercpd = ";cpd=on";  /* string used to enable NetBorder's CPD */
+ 	int ourport;
+ 
+ 	if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) {
+@@ -12561,6 +12625,9 @@
+ 	/* If custom URI options have been provided, append them */
+ 	if (p->options && !ast_strlen_zero(p->options->uri_options))
+ 		ast_str_append(&invite, 0, ";%s", p->options->uri_options);
++
++	/* Tell NetBorder to enable CPD */
++	if (p->enable_netborder_cpd) ast_str_append(&invite, 0, "%s", netbordercpd);
+ 	
+  	/* This is the request URI, which is the next hop of the call
+  		which may or may not be the destination of the call
+@@ -18167,6 +18234,7 @@
+ 		if (!ast_strlen_zero(peer->accountcode))
+ 			ast_cli(fd, "  Accountcode  : %s\n", peer->accountcode);
+ 		ast_cli(fd, "  AMA flags    : %s\n", ast_cdr_flags2str(peer->amaflags));
++		ast_cli(fd, "  Netborder CPD: %s\n", AST_CLI_YESNO(peer->enable_netborder_cpd));
+ 		ast_cli(fd, "  Transfer mode: %s\n", transfermode2str(peer->allowtransfer));
+ 		ast_cli(fd, "  CallingPres  : %s\n", ast_describe_caller_presentation(peer->callingpres));
+ 		if (!ast_strlen_zero(peer->fromuser))
+@@ -18293,6 +18361,7 @@
+ 		astman_append(s, "MOHSuggest: %s\r\n", peer->mohsuggest);
+ 		peer_mailboxes_to_str(&mailbox_str, peer);
+ 		astman_append(s, "VoiceMailbox: %s\r\n", ast_str_buffer(mailbox_str));
++		astman_append(s, "Netborder CPD: %s\n", AST_CLI_YESNO(peer->enable_netborder_cpd));
+ 		astman_append(s, "TransferMode: %s\r\n", transfermode2str(peer->allowtransfer));
+ 		astman_append(s, "LastMsgsSent: %d\r\n", peer->lastmsgssent);
+ 		astman_append(s, "Maxforwards: %d\r\n", peer->maxforwards);
+@@ -18444,6 +18513,7 @@
+ 		if (!ast_strlen_zero(user->accountcode))
+ 			ast_cli(a->fd, "  Accountcode  : %s\n", user->accountcode);
+ 		ast_cli(a->fd, "  AMA flags    : %s\n", ast_cdr_flags2str(user->amaflags));
++		ast_cli(a->fd, "  Netborder CPD: %s\n", AST_CLI_YESNO(user->enable_netborder_cpd));
+ 		ast_cli(a->fd, "  Transfer mode: %s\n", transfermode2str(user->allowtransfer));
+ 		ast_cli(a->fd, "  MaxCallBR    : %d kbps\n", user->maxcallbitrate);
+ 		ast_cli(a->fd, "  CallingPres  : %s\n", ast_describe_caller_presentation(user->callingpres));
+@@ -18900,6 +18970,7 @@
+ 				sip_cfg.notifycid == IGNORE_CONTEXT ? " (Ignoring context)" : "");
+ 	}
+ 	ast_cli(a->fd, "  Notify hold state:      %s\n", AST_CLI_YESNO(sip_cfg.notifyhold));
++	ast_cli(a->fd, "  Enable Netborder CPD:   %s\n", AST_CLI_YESNO(sip_cfg.enable_netborder_cpd));
+ 	ast_cli(a->fd, "  SIP Transfer mode:      %s\n", transfermode2str(sip_cfg.allowtransfer));
+ 	ast_cli(a->fd, "  Max Call Bitrate:       %d kbps\n", default_maxcallbitrate);
+ 	ast_cli(a->fd, "  Auto-Framing:           %s\n", AST_CLI_YESNO(global_autoframing));
+@@ -19292,6 +19363,7 @@
+ 			ast_cli(a->fd, "  MaxCallBR:              %d kbps\n", cur->maxcallbitrate);
+ 			ast_cli(a->fd, "  Theoretical Address:    %s\n", ast_sockaddr_stringify(&cur->sa));
+ 			ast_cli(a->fd, "  Received Address:       %s\n", ast_sockaddr_stringify(&cur->recv));
++			ast_cli(a->fd, "  Enable Netborder CPD:   %s\n", AST_CLI_YESNO(cur->enable_netborder_cpd));
+ 			ast_cli(a->fd, "  SIP Transfer mode:      %s\n", transfermode2str(cur->allowtransfer));
+ 			ast_cli(a->fd, "  Force rport:            %s\n", AST_CLI_YESNO(ast_test_flag(&cur->flags[0], SIP_NAT_FORCE_RPORT)));
+ 			if (ast_sockaddr_isnull(&cur->redirip)) {
+@@ -21708,6 +21780,20 @@
+ 	if (owner) {
+ 		const char *rp = NULL, *rh = NULL;
+ 
++		/* Send manager event for sip hangup cause code */
++		if ((resp >= 400) && (resp <= 900))
++			manager_event(
++				EVENT_FLAG_SYSTEM,
++				"SIP-Hangup-Cause",
++				"ChannelDriver: SIP\r\nChannel: %s\r\nCallerIDName: %s\r\nUniqueid: %s\r\nResult: %i|%s\r\n",
++				p->owner->name,
++				S_COR(p->owner->caller.id.name.valid, p->owner->caller.id.name.str, "<unknown>"),
++				p->owner->uniqueid,
++				resp,
++				rest
++			);
++
++
+ 		owner->hangupcause = 0;
+ 		if (ast_test_flag(&p->flags[1], SIP_PAGE2_Q850_REASON) && (rh = get_header(req, "Reason"))) {
+ 			rh = ast_skip_blanks(rh);
+@@ -21723,6 +21809,16 @@
+ 
+ 		if (!owner->hangupcause)
+ 			owner->hangupcause = hangup_sip2cause(resp);
++	} else {
++		/* Send manager event for sip hangup cause code */
++		manager_event(
++			EVENT_FLAG_SYSTEM,
++			"SIP-Response",
++			"ChannelDriver: SIP\r\nMethod: %s\r\nResult: %i|%s\r\n",
++			sip_methods[sipmethod].text,
++			resp,
++			rest
++		);
+ 	}
+ 
+ 	if (p->socket.type == SIP_TRANSPORT_UDP) {
+@@ -21781,6 +21877,9 @@
+ 		return;
+ 	}
+ 
++	/* Check if NetBorder had anything to say */
++	check_cpd_results(p, req);
++
+ 	if (p->relatedpeer && sipmethod == SIP_OPTIONS) {
+ 		/* We don't really care what the response is, just that it replied back.
+ 		   Well, as long as it's not a 100 response...  since we might
+@@ -27902,6 +28001,7 @@
+ 	peer->rtpholdtimeout = global_rtpholdtimeout;
+ 	peer->rtpkeepalive = global_rtpkeepalive;
+ 	peer->allowtransfer = sip_cfg.allowtransfer;
++	peer->enable_netborder_cpd = sip_cfg.enable_netborder_cpd;
+ 	peer->autoframing = global_autoframing;
+ 	peer->t38_maxdatagram = global_t38_maxdatagram;
+ 	peer->qualifyfreq = global_qualifyfreq;
+@@ -28327,6 +28427,8 @@
+ 				peer->callgroup = ast_get_group(v->value);
+ 			} else if (!strcasecmp(v->name, "allowtransfer")) {
+ 				peer->allowtransfer = ast_true(v->value) ? TRANSFER_OPENFORALL : TRANSFER_CLOSED;
++			} else if (!strcasecmp(v->name, "enable-netborder-cpd")) {
++				peer->enable_netborder_cpd = ast_true(v->value);
+ 			} else if (!strcasecmp(v->name, "pickupgroup")) {
+ 				peer->pickupgroup = ast_get_group(v->value);
+ 			} else if (!strcasecmp(v->name, "allow")) {
+@@ -28896,6 +28998,7 @@
+ 	global_rtpholdtimeout = 0;
+ 	global_rtpkeepalive = DEFAULT_RTPKEEPALIVE;
+ 	sip_cfg.allowtransfer = TRANSFER_OPENFORALL;	/* Merrily accept all transfers by default */
++	sip_cfg.enable_netborder_cpd = 0;	/* Netborder CPD - Disable by default */
+ 	sip_cfg.rtautoclear = 120;
+ 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE);	/* Default for all devices: TRUE */
+ 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP_YES);	/* Default for all devices: Yes */
+@@ -29007,6 +29110,8 @@
+ 			}
+ 		} else if (!strcasecmp(v->name, "allowtransfer")) {
+ 			sip_cfg.allowtransfer = ast_true(v->value) ? TRANSFER_OPENFORALL : TRANSFER_CLOSED;
++		} else if (!strcasecmp(v->name, "enable-netborder-cpd")) {
++			sip_cfg.enable_netborder_cpd = ast_true(v->value);
+ 		} else if (!strcasecmp(v->name, "rtcachefriends")) {
+ 			ast_set2_flag(&global_flags[1], ast_true(v->value), SIP_PAGE2_RTCACHEFRIENDS);
+ 		} else if (!strcasecmp(v->name, "rtsavesysname")) {
+Only in asterisk-1.8.23.0-vici/channels: chan_sip.c.orig
+Only in asterisk-1.8.23.0-vici/channels: chan_sip.c.rej
+diff -ur asterisk-1.8.23.0/channels/sip/include/sip.h asterisk-1.8.23.0-vici/channels/sip/include/sip.h
+--- asterisk-1.8.23.0/channels/sip/include/sip.h	2013-05-02 00:53:55.000000000 -0700
++++ asterisk-1.8.23.0-vici/channels/sip/include/sip.h	2013-10-08 12:17:38.000000000 -0700
+@@ -705,6 +705,7 @@
+ 	int notifyhold;             /*!< Send notifications on hold */
+ 	enum notifycid_setting notifycid;  /*!< Send CID with ringing notifications */
+ 	enum transfermodes allowtransfer;  /*!< SIP Refer restriction scheme */
++	int enable_netborder_cpd;	/*!< Enable Sangoma Netborder CPD */
+ 	int allowsubscribe;         /*!< Flag for disabling ALL subscriptions, this is FALSE only if all peers are FALSE
+ 	                                 the global setting is in globals_flags[1] */
+ 	char realm[MAXHOSTNAMELEN]; /*!< Default realm */
+@@ -1058,6 +1059,7 @@
+ 	struct ast_sockaddr recv;            /*!< Received as */
+ 	struct ast_sockaddr ourip;           /*!< Our IP (as seen from the outside) */
+ 	enum transfermodes allowtransfer;   /*!< REFER: restriction scheme */
++	int enable_netborder_cpd;	/*!< Enable Sangoma Netborder CPD */
+ 	struct ast_channel *owner;          /*!< Who owns us (if we have an owner) */
+ 	struct sip_route *route;            /*!< Head of linked list of routing steps (fm Record-Route) */
+ 	struct sip_notify *notify;          /*!< Custom notify type */
+@@ -1235,6 +1237,7 @@
+ 	int busy_level;                 /*!< Level of active channels where we signal busy */
+ 	int maxforwards;                /*!< SIP Loop prevention */
+ 	enum transfermodes allowtransfer;   /*! SIP Refer restriction scheme */
++	int enable_netborder_cpd;	/*!< Enable Sangoma Netborder CPD */
+ 	struct ast_codec_pref prefs;    /*!<  codec prefs */
+ 	int lastmsgssent;
+ 	unsigned int sipoptions;        /*!<  Supported SIP options */
+Only in asterisk-1.8.23.0-vici/channels/sip/include: sip.h.orig

From d40d82a1055a77716cb27c583cf4d436bca46718 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 24 Jun 2014 12:32:16 -0700
Subject: [PATCH 021/261] updated patch

---
 .../files/1.8.0/patches/vicidial.patch        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/net-misc/asterisk/files/1.8.0/patches/vicidial.patch b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
index a424437..b8e144c 100644
--- a/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
+++ b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
@@ -970,3 +970,23 @@ diff -ur asterisk-1.8.23.0/channels/sip/include/sip.h asterisk-1.8.23.0-vici/cha
  	int lastmsgssent;
  	unsigned int sipoptions;        /*!<  Supported SIP options */
 Only in asterisk-1.8.23.0-vici/channels/sip/include: sip.h.orig
+diff -ur asterisk-1.8.23.0/main/utils.c asterisk-1.8.23.0-vici/main/utils.c
+--- asterisk-1.8.23.0/main/utils.c	2013-05-01 23:43:24.000000000 -0700
++++ asterisk-1.8.23.0-vici/main/utils.c	2014-06-24 12:10:43.877471981 -0700
+@@ -1229,11 +1229,11 @@
+ 
+ 		res = write(fd, s, len);
+ 
+-		if (res < 0 && errno != EAGAIN && errno != EINTR) {
+-			/* fatal error from write() */
+-			ast_log(LOG_ERROR, "write() returned error: %s\n", strerror(errno));
+-			return -1;
+-		}
++                if (res < 0 && errno != EAGAIN && errno != EINTR) {
++                        /* fatal error from write() */
++                        ast_log(LOG_ERROR, "write() returned error[%d]: %s\n",errno,strerror(errno));
++                        return -1;
++                }
+ 
+ 		if (res < 0) {
+ 			/* It was an acceptable error */

From afac3c420a1fae043f6958952eee19e1eaec720e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 24 Jun 2014 13:00:57 -0700
Subject: [PATCH 022/261] removed error code 32

---
 net-misc/asterisk/files/1.8.0/patches/vicidial.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/files/1.8.0/patches/vicidial.patch b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
index b8e144c..39cd3ec 100644
--- a/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
+++ b/net-misc/asterisk/files/1.8.0/patches/vicidial.patch
@@ -982,7 +982,7 @@ diff -ur asterisk-1.8.23.0/main/utils.c asterisk-1.8.23.0-vici/main/utils.c
 -			ast_log(LOG_ERROR, "write() returned error: %s\n", strerror(errno));
 -			return -1;
 -		}
-+                if (res < 0 && errno != EAGAIN && errno != EINTR) {
++                if (res < 0 && errno != EAGAIN && errno != EINTR && errno != 32) {
 +                        /* fatal error from write() */
 +                        ast_log(LOG_ERROR, "write() returned error[%d]: %s\n",errno,strerror(errno));
 +                        return -1;

From f9329eb0b82580bc4a2cb816a90d7699b488d749 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 25 Jun 2014 01:04:28 -0700
Subject: [PATCH 023/261] added asterisk 11 with meetme support sicne we cant
 use confbridge yet

---
 net-misc/asterisk/Manifest               |   2 +
 net-misc/asterisk/asterisk-11.8.1.ebuild | 320 +++++++++++++++++++++++
 2 files changed, 322 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.8.1.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 3dc40ce..8fbb418 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,5 @@
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
+DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
+DIST gentoo-asterisk-patchset-3.9.tar.bz2 7857 SHA256 d41b2c47a56040e3eb55b9354f05df6857f6efc60b35c081b8cdf50a8f6eed50 SHA512 97c49fdfb874e89a07abc0b129c9db0113a77feecd6bb1fea9b00a1f82161a9799f7a280fd2f6fc11c5e1e6984fc8374354967307f8e1b2d3a9fa713d350453c WHIRLPOOL ce7367cca3e6516d0e1fdb758f3463670b1cc2dad5a82abb3c3b1b3dc25ef07bc917ac0184e58674a02e88ffc6ac0b770f217a6870011791758e6612febf09f6
diff --git a/net-misc/asterisk/asterisk-11.8.1.ebuild b/net-misc/asterisk/asterisk-11.8.1.ebuild
new file mode 100644
index 0000000..3409eca
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.8.1.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.9.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	jabber? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua )
+	meetme? ( net-misc/dahdi )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select meetme		app_meetme
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 98c0309366b3df3fd8ae6b227218758c7202831e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sun, 6 Jul 2014 17:10:19 -0700
Subject: [PATCH 024/261] added asterisk 11.0.0 with a dtls patch

---
 net-misc/asterisk/Manifest                    |    1 +
 net-misc/asterisk/asterisk-11.10.0.ebuild     |  322 +++
 .../patches/asterisk-11.10.0-dtls.patch       | 2521 +++++++++++++++++
 3 files changed, 2844 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.10.0.ebuild
 create mode 100644 net-misc/asterisk/files/11.10.0/patches/asterisk-11.10.0-dtls.patch

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 8fbb418..cf3747a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,5 +1,6 @@
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
+DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
 DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.9.tar.bz2 7857 SHA256 d41b2c47a56040e3eb55b9354f05df6857f6efc60b35c081b8cdf50a8f6eed50 SHA512 97c49fdfb874e89a07abc0b129c9db0113a77feecd6bb1fea9b00a1f82161a9799f7a280fd2f6fc11c5e1e6984fc8374354967307f8e1b2d3a9fa713d350453c WHIRLPOOL ce7367cca3e6516d0e1fdb758f3463670b1cc2dad5a82abb3c3b1b3dc25ef07bc917ac0184e58674a02e88ffc6ac0b770f217a6870011791758e6612febf09f6
diff --git a/net-misc/asterisk/asterisk-11.10.0.ebuild b/net-misc/asterisk/asterisk-11.10.0.ebuild
new file mode 100644
index 0000000..0eddd55
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.10.0.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.9.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset"
+           "${FILESDIR}/11.10.0/patches/asterisk-11.10.0-dtls.patch"
+)
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	jabber? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua )
+	meetme? ( net-misc/dahdi )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select meetme		app_meetme
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/files/11.10.0/patches/asterisk-11.10.0-dtls.patch b/net-misc/asterisk/files/11.10.0/patches/asterisk-11.10.0-dtls.patch
new file mode 100644
index 0000000..6e52616
--- /dev/null
+++ b/net-misc/asterisk/files/11.10.0/patches/asterisk-11.10.0-dtls.patch
@@ -0,0 +1,2521 @@
+From 18fefcd0fde2a8798df8c630e03a8fdcbb2c28d0 Mon Sep 17 00:00:00 2001
+From: ichramm <jramirez@inconcertcc.com>
+Date: Mon, 2 Jun 2014 18:10:08 -0300
+Subject: [PATCH] Fixed DTLS issues
+
+* Set local fingerprint when making calls to WebRTC peers
+* Accept fingerprint when receiving a call from a WebRTC peer
+
+Required peer configuration (DTLS related only)
+
+   dtlsenable=yes
+   dtlsverify=no
+   dtlssetup=actpass
+   dtlscertfile=~/certs/crt.ca.pem
+   dtlsprivatekey=~/certs/private/key.ca.pem
+---
+ channels/chan_sip.c           | 450 +++++++++++++++----------------
+ include/asterisk/rtp_engine.h |   6 +-
+ res/res_rtp_asterisk.c        | 615 +++++++++++++++++++++++++++++++++++++++---
+ 3 files changed, 792 insertions(+), 279 deletions(-)
+
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index f382993..fa223f8 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -356,7 +356,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 413876 $")
+ 			<para>Since there are several headers (such as Via) which can occur multiple
+ 			times, SIP_HEADER takes an optional second argument to specify which header with
+ 			that name to retrieve. Headers start at offset <literal>1</literal>.</para>
+-			<para>Please observe that contents of the SDP (an attachment to the 
++			<para>Please observe that contents of the SDP (an attachment to the
+ 			SIP request) can't be accessed with this function.</para>
+ 		</description>
+ 	</function>
+@@ -1386,7 +1386,7 @@ static int process_sdp_a_video(const char *a, struct sip_pvt *p, struct ast_rtp_
+ static int process_sdp_a_text(const char *a, struct sip_pvt *p, struct ast_rtp_codecs *newtextrtp, char *red_fmtp, int *red_num_gen, int *red_data_pt, int *last_rtpmap_codec);
+ static int process_sdp_a_image(const char *a, struct sip_pvt *p);
+ static void add_ice_to_sdp(struct ast_rtp_instance *instance, struct ast_str **a_buf);
+-static void add_dtls_to_sdp(struct ast_rtp_instance *instance, struct ast_str **a_buf);
++static void add_dtls_to_sdp(struct ast_rtp_instance *instance, const struct sip_pvt *dialog, struct ast_str **a_buf);
+ static void start_ice(struct ast_rtp_instance *instance);
+ static void add_codec_to_sdp(const struct sip_pvt *p, struct ast_format *codec,
+ 			     struct ast_str **m_buf, struct ast_str **a_buf,
+@@ -2669,7 +2669,7 @@ static int sip_tls_read(struct sip_request *req, struct sip_request *reqcpy, str
+ 	size_t datalen = ast_str_strlen(req->data);
+ 	char buf[1024] = "";
+ 	int timeout = -1;
+- 
++
+  	/* Read in headers one line at a time */
+ 	while (datalen < 4 || strncmp(REQ_OFFSET_TO_STR(req, data->used - 4), "\r\n\r\n", 4)) {
+  		if (!tcptls_session->client && !authenticated) {
+@@ -2778,7 +2778,7 @@ static int sip_tls_read(struct sip_request *req, struct sip_request *reqcpy, str
+ 			}
+ 			content_length -= strlen(buf);
+ 			ast_str_append(&req->data, 0, "%s", buf);
+-		
++
+ 			datalen = ast_str_strlen(req->data);
+ 			if (datalen > SIP_MAX_PACKET_SIZE) {
+ 				ast_log(LOG_WARNING, "Rejecting TLS packet from '%s' because way too large: %zu\n",
+@@ -2999,7 +2999,7 @@ static int sip_tcp_read(struct sip_request *req, struct ast_tcptls_session_insta
+ 			ast_str_append(&req->data, 0, "%s", ast_str_buffer(tcptls_session->overflow_buf));
+ 			ast_str_reset(tcptls_session->overflow_buf);
+ 		}
+-		
++
+ 		datalen = ast_str_strlen(req->data);
+ 		if (datalen > SIP_MAX_PACKET_SIZE) {
+ 			ast_log(LOG_WARNING, "Rejecting TCP packet from '%s' because way too large: %zu\n",
+@@ -3130,7 +3130,7 @@ static void *_sip_tcp_helper_thread(struct ast_tcptls_session_instance *tcptls_s
+ 			}
+ 		}
+ 
+-		/* 
++		/*
+ 		 * handle the socket event, check for both reads from the socket fd or TCP overflow buffer,
+ 		 * and writes from alert_pipe fd.
+ 		 */
+@@ -3428,7 +3428,7 @@ void dialog_unlink_all(struct sip_pvt *dialog)
+ 	AST_SCHED_DEL_UNREF(sched, dialog->waitid, dialog_unref(dialog, "when you delete the waitid sched, you should dec the refcount for the stored dialog ptr"));
+ 
+ 	AST_SCHED_DEL_UNREF(sched, dialog->initid, dialog_unref(dialog, "when you delete the initid sched, you should dec the refcount for the stored dialog ptr"));
+-	
++
+ 	if (dialog->autokillid > -1) {
+ 		AST_SCHED_DEL_UNREF(sched, dialog->autokillid, dialog_unref(dialog, "when you delete the autokillid sched, you should dec the refcount for the stored dialog ptr"));
+ 	}
+@@ -3649,7 +3649,7 @@ static int method_match(enum sipmethod id, const char *name)
+ static int find_sip_method(const char *msg)
+ {
+ 	int i, res = 0;
+-	
++
+ 	if (ast_strlen_zero(msg)) {
+ 		return 0;
+ 	}
+@@ -5530,7 +5530,7 @@ static int register_realtime_peers_with_callbackextens(void)
+  * Checks the "sipregs" realtime family from extconfig.conf if it's configured.
+  * This returns a pointer to a peer and because we use build_peer, we can rest
+  * assured that the refcount is bumped.
+- * 
++ *
+  * \note This is never called with both newpeername and addr at the same time.
+  * If you do, be prepared to get a peer with a different name than newpeername.
+  */
+@@ -5876,10 +5876,6 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog)
+ 		ice->stop(dialog->rtp);
+ 	}
+ 
+-	if (dialog_initialize_dtls_srtp(dialog, dialog->rtp, &dialog->srtp)) {
+-		return -1;
+-	}
+-
+ 	if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_VIDEOSUPPORT_ALWAYS) ||
+ 			(ast_test_flag(&dialog->flags[1], SIP_PAGE2_VIDEOSUPPORT) && (ast_format_cap_has_type(dialog->caps, AST_FORMAT_TYPE_VIDEO)))) {
+ 		if (!(dialog->vrtp = ast_rtp_instance_new(dialog->engine, sched, &bindaddr_tmp, NULL))) {
+@@ -5890,16 +5886,17 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog)
+ 			ice->stop(dialog->vrtp);
+ 		}
+ 
+-		if (dialog_initialize_dtls_srtp(dialog, dialog->vrtp, &dialog->vsrtp)) {
+-			return -1;
+-		}
+-
+ 		ast_rtp_instance_set_timeout(dialog->vrtp, dialog->rtptimeout);
+ 		ast_rtp_instance_set_hold_timeout(dialog->vrtp, dialog->rtpholdtimeout);
+ 		ast_rtp_instance_set_keepalive(dialog->vrtp, dialog->rtpkeepalive);
+ 
+ 		ast_rtp_instance_set_prop(dialog->vrtp, AST_RTP_PROPERTY_RTCP, 1);
+ 		ast_rtp_instance_set_qos(dialog->vrtp, global_tos_video, global_cos_video, "SIP VIDEO");
++
++		/*SRTP_DTLS */
++		if (dialog_initialize_dtls_srtp(dialog, dialog->vrtp, &dialog->vsrtp)) {
++			return -1;
++		}
+ 	}
+ 
+ 	if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_TEXTSUPPORT)) {
+@@ -5911,14 +5908,15 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog)
+ 			ice->stop(dialog->trtp);
+ 		}
+ 
+-		if (dialog_initialize_dtls_srtp(dialog, dialog->trtp, &dialog->tsrtp)) {
+-			return -1;
+-		}
+-
+ 		/* Do not timeout text as its not constant*/
+ 		ast_rtp_instance_set_keepalive(dialog->trtp, dialog->rtpkeepalive);
+ 
+ 		ast_rtp_instance_set_prop(dialog->trtp, AST_RTP_PROPERTY_RTCP, 1);
++
++		/*SRTP_DTLS */
++		if (dialog_initialize_dtls_srtp(dialog, dialog->trtp, &dialog->tsrtp)) {
++			return -1;
++		}
+ 	}
+ 
+ 	ast_rtp_instance_set_timeout(dialog->rtp, dialog->rtptimeout);
+@@ -5929,7 +5927,12 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog)
+ 	ast_rtp_instance_set_prop(dialog->rtp, AST_RTP_PROPERTY_DTMF, ast_test_flag(&dialog->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833);
+ 	ast_rtp_instance_set_prop(dialog->rtp, AST_RTP_PROPERTY_DTMF_COMPENSATE, ast_test_flag(&dialog->flags[1], SIP_PAGE2_RFC2833_COMPENSATE));
+ 
+-	ast_rtp_instance_set_qos(dialog->rtp, global_tos_audio, global_cos_audio, "SIP RTP");
++	/*SRTP_DTLS */
++	if (dialog_initialize_dtls_srtp(dialog, dialog->rtp, &dialog->srtp)) {
++		return -1;
++	}
++
++ 	ast_rtp_instance_set_qos(dialog->rtp, global_tos_audio, global_cos_audio, "SIP RTP");
+ 
+ 	do_setnat(dialog);
+ 
+@@ -6177,7 +6180,7 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_soc
+ 		 * an A record lookup should be used instead of SRV.
+ 		 */
+ 		if (!hostport.port && sip_cfg.srvlookup) {
+-			snprintf(service, sizeof(service), "_%s._%s.%s", 
++			snprintf(service, sizeof(service), "_%s._%s.%s",
+ 				 get_srv_service(dialog->socket.type),
+ 				 get_srv_protocol(dialog->socket.type), peername);
+ 			if ((srv_ret = ast_get_srv(NULL, host, sizeof(host), &tportno,
+@@ -6438,7 +6441,7 @@ static void sip_subscribe_mwi_destroy(struct sip_subscription_mwi *mwi)
+ 		mwi->call->mwi = NULL;
+ 		sip_destroy(mwi->call);
+ 	}
+-	
++
+ 	AST_SCHED_DEL(sched, mwi->resub);
+ 	ast_string_field_free_memory(mwi);
+ 	ast_free(mwi);
+@@ -6494,16 +6497,16 @@ void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
+ 		p->relatedpeer->mwipvt = dialog_unref(p->relatedpeer->mwipvt, "delete ->relatedpeer->mwipvt");
+ 	if (p->relatedpeer && p->relatedpeer->call == p)
+ 		p->relatedpeer->call = dialog_unref(p->relatedpeer->call, "unset the relatedpeer->call field in tandem with relatedpeer field itself");
+-	
++
+ 	if (p->relatedpeer)
+ 		p->relatedpeer = sip_unref_peer(p->relatedpeer,"unsetting a dialog relatedpeer field in sip_destroy");
+-	
++
+ 	if (p->registry) {
+ 		if (p->registry->call == p)
+ 			p->registry->call = dialog_unref(p->registry->call, "nulling out the registry's call dialog field in unlink_all");
+ 		p->registry = registry_unref(p->registry, "delete p->registry");
+ 	}
+-	
++
+ 	if (p->mwi) {
+ 		p->mwi->call = NULL;
+ 		p->mwi = NULL;
+@@ -7190,8 +7193,8 @@ static int sip_hangup(struct ast_channel *ast)
+ 			} else {
+ 				/* Note we will need a BYE when this all settles out
+ 				   but we can't send one while we have "INVITE" outstanding. */
+-				ast_set_flag(&p->flags[0], SIP_PENDINGBYE);	
+-				ast_clear_flag(&p->flags[0], SIP_NEEDREINVITE);	
++				ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
++				ast_clear_flag(&p->flags[0], SIP_NEEDREINVITE);
+ 				AST_SCHED_DEL_UNREF(sched, p->waitid, dialog_unref(p, "when you delete the waitid sched, you should dec the refcount for the stored dialog ptr"));
+ 				if (sip_cancel_destroy(p)) {
+ 					ast_log(LOG_WARNING, "Unable to cancel SIP destruction.  Expect bad things.\n");
+@@ -7228,7 +7231,7 @@ static void try_suggested_sip_codec(struct sip_pvt *p)
+ 		codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
+ 	}
+ 
+-	if (!codec) 
++	if (!codec)
+ 		return;
+ 
+ 	ast_getformatbyname(codec, &fmt);
+@@ -7706,7 +7709,7 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
+ 		if (ast_channel_state(ast) == AST_STATE_RING) {
+ 			p->invitestate = INV_EARLY_MEDIA;
+ 			if (!ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) ||
+-			    (ast_test_flag(&p->flags[0], SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {				
++			    (ast_test_flag(&p->flags[0], SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {
+ 				/* Send 180 ringing if out-of-band seems reasonable */
+ 				transmit_provisional_response(p, "180 Ringing", &p->initreq, 0);
+ 				ast_set_flag(&p->flags[0], SIP_RINGING);
+@@ -7896,7 +7899,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
+ 
+ 	{
+ 		const char *my_name;	/* pick a good name */
+-	
++
+ 		if (title) {
+ 			my_name = title;
+ 		} else {
+@@ -8046,7 +8049,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
+ 		struct ast_tone_zone *zone;
+ 		if (!(zone = ast_get_indication_zone(i->zone))) {
+ 			ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", i->zone);
+-		} 
++		}
+ 		ast_channel_zone_set(tmp, zone);
+ 	}
+ 	i->owner = tmp;
+@@ -8315,7 +8318,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
+ {
+ 	/* Retrieve audio/etc from channel.  Assumes p->lock is already held. */
+ 	struct ast_frame *f;
+-	
++
+ 	if (!p->rtp) {
+ 		/* We have no RTP allocated for this channel */
+ 		return &ast_null_frame;
+@@ -8721,7 +8724,7 @@ struct sip_pvt *sip_alloc(ast_string_field callid, struct ast_sockaddr *addr,
+ 
+ 	p->do_history = recordhistory;
+ 
+-	p->branch = ast_random();	
++	p->branch = ast_random();
+ 	make_our_tag(p);
+ 	p->ocseq = INITIAL_CSEQ;
+ 	p->allowed_methods = UINT_MAX;
+@@ -8921,14 +8924,14 @@ static enum match_req_res match_req_to_dialog(struct sip_pvt *sip_pvt_ptr, struc
+ 
+ 	/*
+ 	 * Compare incoming request against initial transaction.
+-	 * 
++	 *
+ 	 * This is a best effort attempt at distinguishing forked requests from
+ 	 * our initial transaction.  If all the elements are NOT in place to evaluate
+ 	 * this, this block is ignored and the dialog match is made regardless.
+ 	 * Once the totag is established after the dialog is confirmed, this is not necessary.
+ 	 *
+ 	 * CRITERIA required for initial transaction matching.
+-	 * 
++	 *
+ 	 * 1. Is a Request
+ 	 * 2. Callid and theirtag match (this is done in the dialog matching block)
+ 	 * 3. totag is NOT present
+@@ -9523,7 +9526,7 @@ static unsigned int parse_allowed_methods(struct sip_request *req)
+ static unsigned int set_pvt_allowed_methods(struct sip_pvt *pvt, struct sip_request *req)
+ {
+ 	pvt->allowed_methods = parse_allowed_methods(req);
+-	
++
+ 	if (ast_test_flag(&pvt->flags[1], SIP_PAGE2_RPID_UPDATE)) {
+ 		mark_method_allowed(&pvt->allowed_methods, SIP_UPDATE);
+ 	}
+@@ -9759,7 +9762,7 @@ static int find_sdp(struct sip_request *req)
+ 		}
+ 		if (!strcasecmp(line, "Content-Type: application/sdp"))
+ 			found_application_sdp = TRUE;
+-		
++
+ 		if (ast_strlen_zero(line)) {
+ 			if (found_application_sdp && !found_end_of_headers){
+ 				req->sdp_start = x;
+@@ -9942,6 +9945,9 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 	/* SRTP */
+ 	int secure_audio = FALSE;
+ 	int secure_video = FALSE;
++	/** SRTP_DTLS **/
++	int processed_dtls = FALSE;
++	/** SRTP_DTLS **/
+ 
+ 	/* Others */
+ 	int sendonly = -1;
+@@ -10034,12 +10040,15 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 			}
+ 
+ 			if (process_sdp_a_dtls(value, p, p->rtp)) {
++				processed_dtls = TRUE;
+ 				processed = TRUE;
+ 			}
+ 			if (process_sdp_a_dtls(value, p, p->vrtp)) {
++				processed_dtls = TRUE;
+ 				processed = TRUE;
+ 			}
+ 			if (process_sdp_a_dtls(value, p, p->trtp)) {
++				processed_dtls = TRUE;
+ 				processed = TRUE;
+ 			}
+ 
+@@ -10132,7 +10141,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 					}
+ 				} else if (!strcmp(protocol, "UDP/TLS/RTP/SAVP") || !strcmp(protocol, "UDP/TLS/RTP/SAVPF")) {
+ 					secure_audio = 1;
+-
+ 					if (p->srtp) {
+ 						ast_set_flag(p->srtp, SRTP_CRYPTO_OFFER_OK);
+ 					}
+@@ -10447,6 +10455,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 						processed = TRUE;
+ 					} else if (process_sdp_a_dtls(value, p, p->rtp)) {
+ 						processed = TRUE;
++						processed_dtls = TRUE;
+ 					} else if (process_sdp_a_sendonly(value, &sendonly)) {
+ 						processed = TRUE;
+ 					} else if (!processed_crypto && process_crypto(p, p->rtp, &p->srtp, value)) {
+@@ -10462,6 +10471,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 						processed = TRUE;
+ 					} else if (process_sdp_a_dtls(value, p, p->vrtp)) {
+ 						processed = TRUE;
++						processed_dtls = TRUE;
+ 					} else if (!processed_crypto && process_crypto(p, p->vrtp, &p->vsrtp, value)) {
+ 						processed_crypto = TRUE;
+ 						processed = TRUE;
+@@ -10495,10 +10505,11 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 		}
+ 
+ 		/* Ensure crypto lines are provided where necessary */
+-		if (audio && secure_audio && !processed_crypto) {
++		ast_debug(3, "Processed DTLS [%s]\n", processed_dtls?"TRUE":"FALSE");
++		if (audio && secure_audio && !(processed_crypto || processed_dtls)) {
+ 			ast_log(LOG_WARNING, "Rejecting secure audio stream without encryption details: %s\n", m);
+ 			return -1;
+-		} else if (video && secure_video && !processed_crypto) {
++		} else if (video && secure_video && !(processed_crypto || processed_dtls)) {
+ 			ast_log(LOG_WARNING, "Rejecting secure video stream without encryption details: %s\n", m);
+ 			return -1;
+ 		}
+@@ -10520,6 +10531,10 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
+ 		goto process_sdp_cleanup;
+ 	}
+ 
++	if (processed_dtls && p->srtp) {
++		ast_set_flag(p->srtp, SRTP_CRYPTO_OFFER_OK);
++	}
++
+ 	if (secure_audio && !(p->srtp && (ast_test_flag(p->srtp, SRTP_CRYPTO_OFFER_OK)))) {
+ 		ast_log(LOG_WARNING, "Can't provide secure audio requested in SDP offer\n");
+ 		res = -1;
+@@ -11005,6 +11020,7 @@ static int process_sdp_a_dtls(const char *a, struct sip_pvt *p, struct ast_rtp_i
+ {
+ 	struct ast_rtp_engine_dtls *dtls;
+ 	int found = FALSE;
++	int found_setup = FALSE;
+ 	char value[256], hash[6];
+ 
+ 	if (!instance || !p->dtls_cfg.enabled || !(dtls = ast_rtp_instance_get_dtls(instance))) {
+@@ -11013,7 +11029,7 @@ static int process_sdp_a_dtls(const char *a, struct sip_pvt *p, struct ast_rtp_i
+ 
+ 	if (sscanf(a, "setup: %255s", value) == 1) {
+ 		found = TRUE;
+-
++		found_setup = TRUE;
+ 		if (!strcasecmp(value, "active")) {
+ 			dtls->set_setup(instance, AST_RTP_DTLS_SETUP_ACTIVE);
+ 		} else if (!strcasecmp(value, "passive")) {
+@@ -11037,17 +11053,23 @@ static int process_sdp_a_dtls(const char *a, struct sip_pvt *p, struct ast_rtp_i
+ 			ast_log(LOG_WARNING, "Unsupported connection attribute value '%s' received on dialog '%s'\n",
+ 				value, p->callid);
+ 		}
+-	} else if (sscanf(a, "fingerprint: %5s %255s", hash, value) == 2) {
++	} else if (sscanf(a, "fingerprint: %s %255s", hash, value) == 2) {
+ 		found = TRUE;
+ 
+ 		if (!strcasecmp(hash, "sha-1")) {
+ 			dtls->set_fingerprint(instance, AST_RTP_DTLS_HASH_SHA1, value);
++		} else if (!strcasecmp(hash, "sha-256")) {
++			dtls->set_fingerprint(instance, AST_RTP_DTLS_HASH_SHA256, value);
+ 		} else {
+ 			ast_log(LOG_WARNING, "Unsupported fingerprint hash type '%s' received on dialog '%s'\n",
+ 				hash, p->callid);
+ 		}
+ 	}
+ 
++	if (found && !found_setup) { /* No setup line provided by WebRTC peer */
++		dtls->set_setup(instance, AST_RTP_DTLS_SETUP_PASSIVE);
++	}
++
+ 	return found;
+ }
+ 
+@@ -11398,12 +11420,12 @@ static int add_header(struct sip_request *req, const char *var, const char *valu
+ 
+ 	req->headers++;
+ 
+-	return 0;	
++	return 0;
+ }
+ 
+-/*! 
++/*!
+  * \pre dialog is assumed to be locked while calling this function
+- * \brief Add 'Max-Forwards' header to SIP message 
++ * \brief Add 'Max-Forwards' header to SIP message
+  */
+ static int add_max_forwards(struct sip_pvt *dialog, struct sip_request *req)
+ {
+@@ -11930,7 +11952,7 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, ui
+ 				sizeof(stripped));
+ 		n = get_in_brackets(stripped);
+ 		c = remove_uri_parameters(n);
+-	}	
++	}
+ 	init_req(req, sipmethod, c);
+ 
+ 	snprintf(tmp, sizeof(tmp), "%u %s", seqno, sip_methods[sipmethod].text);
+@@ -12353,7 +12375,7 @@ static void get_realm(struct sip_pvt *p, const struct sip_request *req)
+ 			}
+ 		}
+ 	}
+-	
++
+ 	/* Use default realm from config file */
+ 	ast_string_field_set(p, realm, sip_cfg.realm);
+ }
+@@ -12505,7 +12527,6 @@ static int add_rpid(struct sip_request *req, struct sip_pvt *p)
+ 	const char *privacy = NULL;
+ 	const char *screen = NULL;
+ 	struct ast_party_id connected_id;
+-	const char *anonymous_string = "\"Anonymous\" <sip:anonymous@anonymous.invalid>";
+ 
+ 	if (!ast_test_flag(&p->flags[0], SIP_SENDRPID)) {
+ 		return 0;
+@@ -12525,41 +12546,16 @@ static int add_rpid(struct sip_request *req, struct sip_pvt *p)
+ 	}
+ 	lid_pres = ast_party_id_presentation(&connected_id);
+ 
+-	if (((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) &&
+-			(ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) == SIP_PAGE2_TRUST_ID_OUTBOUND_NO)) {
+-		/* If pres is not allowed and we don't trust the peer, we don't apply an RPID header */
+-		return 0;
+-	}
+-
+-	fromdomain = p->fromdomain;
+-	if (!fromdomain ||
+-			((ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) == SIP_PAGE2_TRUST_ID_OUTBOUND_YES) &&
+-			!strcmp("anonymous.invalid", fromdomain))) {
+-		/* If the fromdomain is NULL or if it was set to anonymous.invalid due to privacy settings and we trust the peer,
+-		 * use the host IP address */
+-		fromdomain = ast_sockaddr_stringify_host_remote(&p->ourip);
+-	}
++	fromdomain = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip));
+ 
+ 	lid_num = ast_uri_encode(lid_num, tmp2, sizeof(tmp2), ast_uri_sip_user);
+ 
+ 	if (ast_test_flag(&p->flags[0], SIP_SENDRPID_PAI)) {
+-		if (ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) != SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY) {
+-			/* trust_id_outbound = yes - Always give full information even if it's private, but append a privacy header
+-			 * When private data is included */
+-			ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
+-			if ((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) {
+-				add_header(req, "Privacy", "id");
+-			}
+-		} else {
+-			/* trust_id_outbound = legacy - behave in a non RFC-3325 compliant manner and send anonymized data when
+-			 * when handling private data. */
+-			if ((lid_pres & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED) {
+-				ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
+-			} else {
+-				ast_str_set(&tmp, -1, "%s", anonymous_string);
+-			}
+-		}
++		ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
+ 		add_header(req, "P-Asserted-Identity", ast_str_buffer(tmp));
++		if ((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) {
++			add_header(req, "Privacy", "id");
++		}
+ 	} else {
+ 		ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>;party=%s", lid_name, lid_num, fromdomain, p->outgoing_call ? "calling" : "called");
+ 
+@@ -12693,11 +12689,15 @@ static void start_ice(struct ast_rtp_instance *instance)
+ }
+ 
+ /*! \brief Add DTLS attributes to SDP */
+-static void add_dtls_to_sdp(struct ast_rtp_instance *instance, struct ast_str **a_buf)
++static void add_dtls_to_sdp(struct ast_rtp_instance *instance, const struct sip_pvt *dialog, struct ast_str **a_buf)
+ {
+ 	struct ast_rtp_engine_dtls *dtls;
+ 	const char *fingerprint;
+ 
++	/*SRTP_DTLS */
++	dtls = ast_rtp_instance_get_dtls(instance);
++
++	/*SRTP_DTLS */
+ 	if (!instance || !(dtls = ast_rtp_instance_get_dtls(instance)) || !dtls->active(instance)) {
+ 		return;
+ 	}
+@@ -12730,8 +12730,13 @@ static void add_dtls_to_sdp(struct ast_rtp_instance *instance, struct ast_str **
+ 		break;
+ 	}
+ 
+-	if ((fingerprint = dtls->get_fingerprint(instance, AST_RTP_DTLS_HASH_SHA1))) {
++	if ((fingerprint = dtls->get_fingerprint(instance, &dialog->dtls_cfg, AST_RTP_DTLS_HASH_SHA256))) {
++		ast_str_append(a_buf, 0, "a=fingerprint:SHA-256 %s\r\n", fingerprint);
++	}
++	else if ((fingerprint = dtls->get_fingerprint(instance, &dialog->dtls_cfg, AST_RTP_DTLS_HASH_SHA1))) {
+ 		ast_str_append(a_buf, 0, "a=fingerprint:SHA-1 %s\r\n", fingerprint);
++	} else {
++		ast_log(LOG_WARNING, "No fingerprint was added to SDP, this may not work\n");
+ 	}
+ }
+ 
+@@ -13039,7 +13044,10 @@ static char *get_sdp_rtp_profile(const struct sip_pvt *p, unsigned int secure, s
+ 	struct ast_rtp_engine_dtls *dtls;
+ 
+ 	if ((dtls = ast_rtp_instance_get_dtls(instance)) && dtls->active(instance)) {
+-		return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "UDP/TLS/RTP/SAVPF" : "UDP/TLS/RTP/SAVP";
++		/*SRTP_DTLS */
++		//return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "UDP/TLS/RTP/SAVPF" : "UDP/TLS/RTP/SAVP";
++		return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "RTP/SAVPF" : "RTP/SAVP";
++		/*SRTP_DTLS */
+ 	} else {
+ 		if (ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF)) {
+ 			return secure ? "RTP/SAVPF" : "RTP/AVPF";
+@@ -13218,12 +13226,15 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
+ 				ast_verbose("Video is at %s\n", ast_sockaddr_stringify(&vdest));
+ 			}
+ 
++			/* Meetecho: add a=rtcp attribute */
++			ast_str_append(&a_video, 0, "a=rtcp:%d\r\n", ast_sockaddr_port(&vdest)+1);
++
+ 			if (!doing_directmedia) {
+ 				if (ast_test_flag(&p->flags[2], SIP_PAGE3_ICE_SUPPORT)) {
+ 					add_ice_to_sdp(p->vrtp, &a_video);
+ 				}
+ 
+-				add_dtls_to_sdp(p->vrtp, &a_video);
++				add_dtls_to_sdp(p->vrtp, p, &a_video);
+ 			}
+ 		}
+ 
+@@ -13244,7 +13255,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
+ 					add_ice_to_sdp(p->trtp, &a_text);
+ 				}
+ 
+-				add_dtls_to_sdp(p->trtp, &a_text);
++				add_dtls_to_sdp(p->trtp, p, &a_text);
+ 			}
+ 		}
+ 
+@@ -13301,6 +13312,9 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
+ 			ast_format_cap_add(alreadysent, &tmp_fmt);
+ 		}
+ 
++		/* Meetecho: add a=rtcp attribute */
++		ast_str_append(&a_audio, 0, "a=rtcp:%d\r\n", ast_sockaddr_port(&dest)+1);
++
+ 		/* Now send any other common audio and video codecs, and non-codec formats: */
+ 		ast_format_cap_iter_start(tmpcap);
+ 		while (!(ast_format_cap_iter_next(tmpcap, &tmp_fmt))) {
+@@ -13347,7 +13361,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
+ 				add_ice_to_sdp(p->rtp, &a_audio);
+ 			}
+ 
+-			add_dtls_to_sdp(p->rtp, &a_audio);
++			add_dtls_to_sdp(p->rtp, p, &a_audio);
+ 		}
+ 	}
+ 
+@@ -13700,7 +13714,7 @@ static int determine_firstline_parts(struct sip_request *req)
+ 	INVITE that opened the SIP dialogue
+ 	We reinvite so that the audio stream (RTP) go directly between
+ 	the SIP UAs. SIP Signalling stays with * in the path.
+-	
++
+ 	If t38version is TRUE, we send T38 SDP for re-invite from audio/video to
+ 	T38 UDPTL transmission on the channel
+ 
+@@ -13711,7 +13725,7 @@ static int determine_firstline_parts(struct sip_request *req)
+ static int transmit_reinvite_with_sdp(struct sip_pvt *p, int t38version, int oldsdp)
+ {
+ 	struct sip_request req;
+-	
++
+ 	reqprep(&req, p, ast_test_flag(&p->flags[0], SIP_REINVITE_UPDATE) ?  SIP_UPDATE : SIP_INVITE, 0, 1);
+ 
+ 	add_header(&req, "Allow", ALLOWED_METHODS);
+@@ -13944,7 +13958,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
+ 	/* If custom URI options have been provided, append them */
+ 	if (p->options && !ast_strlen_zero(p->options->uri_options))
+ 		ast_str_append(&invite, 0, ";%s", p->options->uri_options);
+-	
++
+  	/* This is the request URI, which is the next hop of the call
+  		which may or may not be the destination of the call
+  	*/
+@@ -14074,7 +14088,7 @@ static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_ty
+ 	return 0;
+ }
+ 
+-/*! 
++/*!
+  * \brief Build REFER/INVITE/OPTIONS/SUBSCRIBE message and transmit it
+  * \param p sip_pvt structure
+  * \param sipmethod
+@@ -14140,7 +14154,7 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
+ 		}
+ 
+ 		p->stimer->st_active = TRUE;
+-		if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE) {	
++		if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE) {
+ 			snprintf(i2astr, sizeof(i2astr), "%d", p->stimer->st_interval);
+ 			add_header(&req, "Session-Expires", i2astr);
+ 		}
+@@ -14156,7 +14170,7 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
+ 				  || (p->refer && global_refer_addheaders))) {
+ 		struct ast_channel *chan = p->owner; /* The owner channel */
+ 		struct varshead *headp;
+-	
++
+ 		ast_channel_lock(chan);
+ 
+ 		headp = ast_channel_varshead(chan);
+@@ -14248,15 +14262,15 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
+ static int sip_subscribe_mwi_do(const void *data)
+ {
+ 	struct sip_subscription_mwi *mwi = (struct sip_subscription_mwi*)data;
+-	
++
+ 	if (!mwi) {
+ 		return -1;
+ 	}
+-	
++
+ 	mwi->resub = -1;
+ 	__sip_subscribe_mwi_do(mwi);
+ 	ASTOBJ_UNREF(mwi, sip_subscribe_mwi_destroy);
+-	
++
+ 	return 0;
+ }
+ 
+@@ -14348,7 +14362,7 @@ static int __sip_subscribe_mwi_do(struct sip_subscription_mwi *mwi)
+ 		transmit_invite(mwi->call, SIP_SUBSCRIBE, 0, 0, NULL);
+ 		return 0;
+ 	}
+-	
++
+ 	/* Create a dialog that we will use for the subscription */
+ 	if (!(mwi->call = sip_alloc(NULL, NULL, 0, SIP_SUBSCRIBE, NULL, NULL))) {
+ 		return -1;
+@@ -14359,7 +14373,7 @@ static int __sip_subscribe_mwi_do(struct sip_subscription_mwi *mwi)
+ 	if (!ast_sockaddr_port(&mwi->us) && mwi->portno) {
+ 		ast_sockaddr_set_port(&mwi->us, mwi->portno);
+ 	}
+-	
++
+ 	/* Setup the destination of our subscription */
+ 	if (create_addr(mwi->call, mwi->hostname, &mwi->us, 0)) {
+ 		dialog_unlink_all(mwi->call);
+@@ -14368,14 +14382,14 @@ static int __sip_subscribe_mwi_do(struct sip_subscription_mwi *mwi)
+ 	}
+ 
+ 	mwi->call->expiry = mwi_expiry;
+-	
++
+ 	if (!mwi->dnsmgr && mwi->portno) {
+ 		ast_sockaddr_set_port(&mwi->call->sa, mwi->portno);
+ 		ast_sockaddr_set_port(&mwi->call->recv, mwi->portno);
+ 	} else {
+ 		mwi->portno = ast_sockaddr_port(&mwi->call->sa);
+ 	}
+-	
++
+ 	/* Set various other information */
+ 	if (!ast_strlen_zero(mwi->authuser)) {
+ 		ast_string_field_set(mwi->call, peername, mwi->authuser);
+@@ -14400,7 +14414,7 @@ static int __sip_subscribe_mwi_do(struct sip_subscription_mwi *mwi)
+ 	change_callid_pvt(mwi->call, NULL);
+ 
+ 	ast_set_flag(&mwi->call->flags[0], SIP_OUTGOING);
+-	
++
+ 	/* Associate the call with us */
+ 	mwi->call->mwi = ASTOBJ_REF(mwi);
+ 
+@@ -14892,7 +14906,7 @@ static int transmit_notify_with_sipfrag(struct sip_pvt *p, int cseq, char *messa
+ {
+ 	struct sip_request req;
+ 	char tmp[SIPBUFSIZE/2];
+-	
++
+ 	reqprep(&req, p, SIP_NOTIFY, 0, 1);
+ 	snprintf(tmp, sizeof(tmp), "refer;id=%d", cseq);
+ 	add_header(&req, "Event", tmp);
+@@ -15018,7 +15032,7 @@ static void update_connectedline(struct sip_pvt *p, const void *data, size_t dat
+ 			ast_set_flag(&p->flags[0], SIP_OUTGOING);
+ 			p->invitestate = INV_CALLING;
+ 			send_request(p, &req, XMIT_CRITICAL, p->ocseq);
+-		} else if ((is_method_allowed(&p->allowed_methods, SIP_UPDATE)) && (!ast_strlen_zero(p->okcontacturi))) { 
++		} else if ((is_method_allowed(&p->allowed_methods, SIP_UPDATE)) && (!ast_strlen_zero(p->okcontacturi))) {
+ 			reqprep(&req, p, SIP_UPDATE, 0, 1);
+ 			add_rpid(&req, p);
+ 			add_header(&req, "X-Asterisk-rpid-update", "Yes");
+@@ -15101,8 +15115,8 @@ static int sip_reregister(const void *data)
+ 	return 0;
+ }
+ 
+-/*! \brief Register with SIP proxy 
+-	\return see \ref __sip_xmit 
++/*! \brief Register with SIP proxy
++	\return see \ref __sip_xmit
+ */
+ static int __sip_do_register(struct sip_registry *r)
+ {
+@@ -15603,7 +15617,7 @@ static int transmit_info_with_aoc(struct sip_pvt *p, struct ast_aoc_decoded *dec
+ static int transmit_info_with_digit(struct sip_pvt *p, const char digit, unsigned int duration)
+ {
+ 	struct sip_request req;
+-	
++
+ 	reqprep(&req, p, SIP_INFO, 0, 1);
+ 	add_digit(&req, digit, duration, (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_SHORTINFO));
+ 	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
+@@ -15613,7 +15627,7 @@ static int transmit_info_with_digit(struct sip_pvt *p, const char digit, unsigne
+ static int transmit_info_with_vidupdate(struct sip_pvt *p)
+ {
+ 	struct sip_request req;
+-	
++
+ 	reqprep(&req, p, SIP_INFO, 0, 1);
+ 	add_vidupdate(&req);
+ 	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
+@@ -15625,7 +15639,7 @@ static int transmit_info_with_vidupdate(struct sip_pvt *p)
+ static int transmit_request(struct sip_pvt *p, int sipmethod, uint32_t seqno, enum xmittype reliable, int newbranch)
+ {
+ 	struct sip_request resp;
+-	
++
+ 	reqprep(&resp, p, sipmethod, seqno, newbranch);
+ 	if (sipmethod == SIP_CANCEL && p->answered_elsewhere) {
+ 		add_header(&resp, "Reason", "SIP;cause=200;text=\"Call completed elsewhere\"");
+@@ -15657,7 +15671,7 @@ void sip_auth_headers(enum sip_auth_type code, char **header, char **respheader)
+ static int transmit_request_with_auth(struct sip_pvt *p, int sipmethod, uint32_t seqno, enum xmittype reliable, int newbranch)
+ {
+ 	struct sip_request resp;
+-	
++
+ 	reqprep(&resp, p, sipmethod, seqno, newbranch);
+ 	if (!ast_strlen_zero(p->realm)) {
+ 		char digest[1024];
+@@ -15699,7 +15713,7 @@ static int transmit_request_with_auth(struct sip_pvt *p, int sipmethod, uint32_t
+ 		break;
+ 	}
+ 
+-	return send_request(p, &resp, reliable, seqno ? seqno : p->ocseq);	
++	return send_request(p, &resp, reliable, seqno ? seqno : p->ocseq);
+ }
+ 
+ /*! \brief Remove registration data from realtime database or AST/DB when registration expires */
+@@ -15894,7 +15908,7 @@ static int parse_ok_contact(struct sip_pvt *pvt, struct sip_request *req)
+ 
+ 	/* We should return false for URI:s we can't handle,
+ 		like tel:, mailto:,ldap: etc */
+-	return TRUE;		
++	return TRUE;
+ }
+ 
+ /*! \brief parse uri in a way that allows semicolon stripping if legacy mode is enabled
+@@ -15925,7 +15939,7 @@ static int __set_address_from_contact(const char *fullcontact, struct ast_sockad
+ 	ast_copy_string(contact_buf, fullcontact, sizeof(contact_buf));
+ 	contact = contact_buf;
+ 
+-	/* 
++	/*
+ 	 * We have only the part in <brackets> here so we just need to parse a SIP URI.
+ 	 *
+ 	 * Note: The outbound proxy could be using UDP between the proxy and Asterisk.
+@@ -16219,7 +16233,7 @@ static void list_route(struct sip_route *route)
+ 	}
+ }
+ 
+-/*! \brief Build route list from Record-Route header 
++/*! \brief Build route list from Record-Route header
+     \param resp the SIP response code or 0 for a request */
+ static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards, int resp)
+ {
+@@ -16339,7 +16353,7 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward
+ 	}
+ }
+ 
+-/*! \brief builds the sip_pvt's nonce field which is used for the authentication 
++/*! \brief builds the sip_pvt's nonce field which is used for the authentication
+  *  challenge.  When forceupdate is not set, the nonce is only updated if
+  *  the current one is stale.  In this case, a stalenonce is one which
+  *  has already received a response, if a nonce has not received a response
+@@ -17254,7 +17268,7 @@ static int get_pai(struct sip_pvt *p, struct sip_request *req)
+ 	if (!cid_name) {
+ 		no_name = 1;
+ 		cid_name = (char *)emptyname;
+-	}	
++	}
+ 	/* Only return true if the supplied caller id is different */
+ 	if (!strcasecmp(p->cid_num, cid_num) && !strcasecmp(p->cid_name, cid_name) && p->callingpres == callingpres) {
+ 		do_update = 0;
+@@ -17739,7 +17753,7 @@ static struct sip_pvt *get_sip_pvt_byid_locked(const char *callid, const char *t
+ 			sip_pvt_lock(sip_pvt_ptr);
+ 		}
+ 	}
+-	
++
+ 	return sip_pvt_ptr;
+ }
+ 
+@@ -17832,7 +17846,7 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi
+ 			to = strcasestr(ptr, "to-tag=");
+ 			from = strcasestr(ptr, "from-tag=");
+ 		}
+-		
++
+ 		/* Grab the to header */
+ 		if (to) {
+ 			ptr = to + 7;
+@@ -18745,7 +18759,7 @@ static char *sip_show_inuse(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
+ 	int showall = FALSE;
+ 	struct ao2_iterator i;
+ 	struct sip_peer *peer;
+-	
++
+ 	switch (cmd) {
+ 	case CLI_INIT:
+ 		e->command = "sip show inuse";
+@@ -18763,7 +18777,7 @@ static char *sip_show_inuse(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
+ 
+ 	if (a->argc == 4 && !strcmp(a->argv[3], "all"))
+ 		showall = TRUE;
+-	
++
+ 	ast_cli(a->fd, FORMAT, "* Peer name", "In use", "Limit");
+ 
+ 	i = ao2_iterator_init(peers, 0);
+@@ -19042,7 +19056,7 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
+ 		"ListItems: %d\r\n"
+ 		"%s"
+ 		"\r\n", total, idtext);
+-	
++
+ 	return 0;
+ }
+ 
+@@ -19330,7 +19344,7 @@ static int peer_dump_func(void *userobj, void *arg, int flags)
+ 	struct sip_peer *peer = userobj;
+ 	int refc = ao2_t_ref(userobj, 0, "");
+ 	struct ast_cli_args *a = (struct ast_cli_args *) arg;
+-	
++
+ 	ast_cli(a->fd, "name: %s\ntype: peer\nobjflags: %d\nrefcount: %d\n\n",
+ 		peer->name, 0, refc);
+ 	return 0;
+@@ -19341,7 +19355,7 @@ static int dialog_dump_func(void *userobj, void *arg, int flags)
+ 	struct sip_pvt *pvt = userobj;
+ 	int refc = ao2_t_ref(userobj, 0, "");
+ 	struct ast_cli_args *a = (struct ast_cli_args *) arg;
+-	
++
+ 	ast_cli(a->fd, "name: %s\ntype: dialog\nobjflags: %d\nrefcount: %d\n\n",
+ 		pvt->callid, 0, refc);
+ 	return 0;
+@@ -19352,7 +19366,7 @@ static int dialog_dump_func(void *userobj, void *arg, int flags)
+ static char *sip_show_objects(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+ {
+ 	char tmp[256];
+-	
++
+ 	switch (cmd) {
+ 	case CLI_INIT:
+ 		e->command = "sip show objects";
+@@ -19362,13 +19376,13 @@ static char *sip_show_objects(struct ast_cli_entry *e, int cmd, struct ast_cli_a
+ 		return NULL;
+ 	case CLI_GENERATE:
+ 		return NULL;
+-	}	
++	}
+ 
+ 	if (a->argc != 3)
+ 		return CLI_SHOWUSAGE;
+ 	ast_cli(a->fd, "-= Peer objects: %d static, %d realtime, %d autocreate =-\n\n", speerobjs, rpeerobjs, apeerobjs);
+ 	ao2_t_callback(peers, OBJ_NODATA, peer_dump_func, a, "initiate ao2_callback to dump peers");
+-	ast_cli(a->fd, "-= Peer objects by IP =-\n\n"); 
++	ast_cli(a->fd, "-= Peer objects by IP =-\n\n");
+ 	ao2_t_callback(peers_by_ip, OBJ_NODATA, peer_dump_func, a, "initiate ao2_callback to dump peers_by_ip");
+ 	ast_cli(a->fd, "-= Registry objects: %d =-\n\n", regobjs);
+ 	ASTOBJ_CONTAINER_DUMP(a->fd, tmp, sizeof(tmp), &regl);
+@@ -19442,18 +19456,6 @@ static const char *allowoverlap2str(int mode)
+ 	return map_x_s(allowoverlapstr, mode, "<error>");
+ }
+ 
+-static const struct _map_x_s trust_id_outboundstr[] = {
+-	{ SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY,  "Legacy" },
+-	{ SIP_PAGE2_TRUST_ID_OUTBOUND_NO,      "No" },
+-	{ SIP_PAGE2_TRUST_ID_OUTBOUND_YES,     "Yes" },
+-	{ -1,                                  NULL }, /* terminator */
+-};
+-
+-static const char *trust_id_outbound2str(int mode)
+-{
+-	return map_x_s(trust_id_outboundstr, mode, "<error>");
+-}
+-
+ /*! \brief Destroy disused contexts between reloads
+ 	Only used in reload_config so the code for regcontext doesn't get ugly
+ */
+@@ -19473,7 +19475,7 @@ static void cleanup_stale_contexts(char *new, char *old)
+ 			} else if (strcmp(newcontext, oldcontext)) {
+ 				stalecontext = oldcontext;
+ 			}
+-			
++
+ 		}
+ 		if (stalecontext)
+ 			ast_context_destroy(ast_context_find(stalecontext), "SIP");
+@@ -19571,7 +19573,7 @@ static char *sip_prune_realtime(struct ast_cli_entry *e, int cmd, struct ast_cli
+ 	struct ao2_iterator i;
+ 	static const char * const choices[] = { "all", "like", NULL };
+ 	char *cmplt;
+-	
++
+ 	if (cmd == CLI_INIT) {
+ 		e->command = "sip prune realtime [peer|all]";
+ 		e->usage =
+@@ -19645,7 +19647,7 @@ static char *sip_prune_realtime(struct ast_cli_entry *e, int cmd, struct ast_cli
+ 	if (multi) {
+ 		if (prunepeer) {
+ 			int pruned = 0;
+-			
++
+ 			i = ao2_iterator_init(peers, 0);
+ 			while ((pi = ao2_t_iterator_next(&i, "iterate thru peers table"))) {
+ 				ao2_lock(pi);
+@@ -20093,7 +20095,6 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
+ 		ast_cli(fd, "  Ign SDP ver  : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_IGNORESDPVERSION)));
+ 		ast_cli(fd, "  Trust RPID   : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_TRUSTRPID)));
+ 		ast_cli(fd, "  Send RPID    : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_SENDRPID)));
+-		ast_cli(fd, "  TrustIDOutbnd: %s\n", trust_id_outbound2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND)));
+ 		ast_cli(fd, "  Subscriptions: %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)));
+ 		ast_cli(fd, "  Overlap dial : %s\n", allowoverlap2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWOVERLAP)));
+ 		if (peer->outboundproxy)
+@@ -20413,7 +20414,7 @@ static char *sip_show_sched(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
+                                      sip_poke_noanswer,
+                                      sip_reregister,
+                                      sip_reinvite_retry}};
+-	
++
+ 	switch (cmd) {
+ 	case CLI_INIT:
+ 		e->command = "sip show sched";
+@@ -20459,7 +20460,7 @@ static char *sip_show_registry(struct ast_cli_entry *e, int cmd, struct ast_cli_
+ 	if (a->argc != 3)
+ 		return CLI_SHOWUSAGE;
+ 	ast_cli(a->fd, FORMAT2, "Host", "dnsmgr", "Username", "Refresh", "State", "Reg.Time");
+-	
++
+ 	ASTOBJ_CONTAINER_TRAVERSE(&regl, 1, do {
+ 		ASTOBJ_RDLOCK(iterator);
+ 		snprintf(host, sizeof(host), "%s:%d", iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT);
+@@ -20504,10 +20505,10 @@ static char *sip_unregister(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
+ 	case CLI_GENERATE:
+ 		return complete_sip_unregister(a->line, a->word, a->pos, a->n);
+ 	}
+-	
++
+ 	if (a->argc != 3)
+ 		return CLI_SHOWUSAGE;
+-	
++
+ 	if ((peer = sip_find_peer(a->argv[2], NULL, load_realtime, FINDPEERS, TRUE, 0))) {
+ 		if (peer->expire > 0) {
+ 			AST_SCHED_DEL_UNREF(sched, peer->expire,
+@@ -20521,7 +20522,7 @@ static char *sip_unregister(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
+ 	} else {
+ 		ast_cli(a->fd, "Peer unknown: \'%s\'. Not unregistered.\n", a->argv[2]);
+ 	}
+-	
++
+ 	return CLI_SUCCESS;
+ }
+ 
+@@ -20848,7 +20849,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
+ 	ast_cli(a->fd, "  MOH Suggest:            %s\n", default_mohsuggest);
+ 	ast_cli(a->fd, "  Voice Mail Extension:   %s\n", default_vmexten);
+ 
+-	
++
+ 	if (realtimepeers || realtimeregs) {
+ 		ast_cli(a->fd, "\nRealtime SIP Settings:\n");
+ 		ast_cli(a->fd, "----------------------\n");
+@@ -20868,7 +20869,7 @@ static char *sip_show_mwi(struct ast_cli_entry *e, int cmd, struct ast_cli_args
+ {
+ #define FORMAT  "%-30.30s  %-12.12s  %-10.10s  %-10.10s\n"
+ 	char host[80];
+-	
++
+ 	switch (cmd) {
+ 	case CLI_INIT:
+ 		e->command = "sip show mwi";
+@@ -20879,9 +20880,9 @@ static char *sip_show_mwi(struct ast_cli_entry *e, int cmd, struct ast_cli_args
+ 	case CLI_GENERATE:
+ 		return NULL;
+ 	}
+-	
++
+ 	ast_cli(a->fd, FORMAT, "Host", "Username", "Mailbox", "Subscribed");
+-	
++
+ 	ASTOBJ_CONTAINER_TRAVERSE(&submwil, 1, do {
+ 		ASTOBJ_RDLOCK(iterator);
+ 		snprintf(host, sizeof(host), "%s:%d", iterator->hostname, iterator->portno ? iterator->portno : STANDARD_SIP_PORT);
+@@ -20947,7 +20948,7 @@ static int show_channels_cb(void *__cur, void *__arg, int flags)
+ 		/* set if SIP transfer in progress */
+ 		const char *referstatus = cur->refer ? referstatus2str(cur->refer->status) : "";
+ 		char formatbuf[SIPBUFSIZE/2];
+-		
++
+ 		ast_cli(arg->fd, FORMAT, ast_sockaddr_stringify_addr(dst),
+ 				S_OR(cur->username, S_OR(cur->cid_num, "(None)")),
+ 				cur->callid,
+@@ -21011,7 +21012,7 @@ static char *sip_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_
+ 
+ 	/* iterate on the container and invoke the callback on each item */
+ 	ao2_t_callback(dialogs, OBJ_NODATA, show_channels_cb, &arg, "callback to show channels");
+-	
++
+ 	/* print summary information */
+ 	ast_cli(arg.fd, "%d active SIP %s%s\n", arg.numchans,
+ 		(arg.subscriptions ? "subscription" : "dialog"),
+@@ -21088,7 +21089,7 @@ static char *complete_sip_registered_peer(const char *word, int state, int flags
+        int which = 0;
+        struct ao2_iterator i;
+        struct sip_peer *peer;
+-       
++
+        i = ao2_iterator_init(peers, 0);
+        while ((peer = ao2_t_iterator_next(&i, "iterate thru peers table"))) {
+ 	       if (!strncasecmp(word, peer->name, wordlen) &&
+@@ -21147,7 +21148,7 @@ static char *complete_sip_notify(const char *line, const char *word, int pos, in
+ 
+ 		if (!notify_types)
+ 			return NULL;
+-		
++
+ 		while ( (cat = ast_category_browse(notify_types, cat)) ) {
+ 			if (!strncasecmp(word, cat, wordlen) && ++which > state) {
+ 				c = ast_strdup(cat);
+@@ -21203,7 +21204,7 @@ static char *sip_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_a
+ 	if (a->argc != 4)
+ 		return CLI_SHOWUSAGE;
+ 	len = strlen(a->argv[3]);
+-	
++
+ 	i = ao2_iterator_init(dialogs, 0);
+ 	while ((cur = ao2_t_iterator_next(&i, "iterate thru dialogs"))) {
+ 		sip_pvt_lock(cur);
+@@ -21982,7 +21983,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
+ 	} else {
+ 		/* No authentication, use peer or register= config */
+ 		username = p->authname;
+- 		secret = p->relatedpeer 
++ 		secret = p->relatedpeer
+ 			&& !ast_strlen_zero(p->relatedpeer->remotesecret)
+ 				? p->relatedpeer->remotesecret : p->peersecret;
+ 		md5secret = p->peermd5secret;
+@@ -22029,7 +22030,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
+ 	}
+ 	return 0;
+ }
+-	
++
+ /*! \brief Read SIP header (dialplan function) */
+ static int func_header_read(struct ast_channel *chan, const char *function, char *data, char *buf, size_t len)
+ {
+@@ -22482,7 +22483,7 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req, char
+ 	}
+ }
+ 
+-/*! \brief Check pending actions on SIP call 
++/*! \brief Check pending actions on SIP call
+  *
+  * \note both sip_pvt and sip_pvt's owner channel (if present)
+  *  must be locked for this function.
+@@ -22755,7 +22756,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
+  	if (resp >= 300 && (p->invitestate == INV_CALLING || p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA )) {
+  		p->invitestate = INV_COMPLETED;
+ 	}
+- 	
++
+ 	if ((resp >= 200 && reinvite)) {
+ 		p->ongoing_reinvite = 0;
+ 		if (p->reinviteid > -1) {
+@@ -23011,7 +23012,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
+ 				/* Bad contact - we don't know how to reach this device */
+ 				/* We need to ACK, but then send a bye */
+ 				if (!p->route && !req->ignore) {
+-					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);	
++					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
+ 				}
+ 			}
+ 
+@@ -23037,7 +23038,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
+ 				  by sending CANCEL */
+ 			/* First send ACK, then send bye */
+ 			if (!req->ignore) {
+-				ast_set_flag(&p->flags[0], SIP_PENDINGBYE);	
++				ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
+ 			}
+ 		}
+ 
+@@ -23050,7 +23051,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
+ 				int tmp_st_interval = 0;
+ 				rtn = parse_session_expires(p_hdrval, &tmp_st_interval, &st_ref_param);
+ 				if (rtn != 0) {
+-					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);	
++					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
+ 				} else if (tmp_st_interval < st_get_se(p, FALSE)) {
+ 					ast_log(LOG_WARNING, "Got Session-Expires less than local Min-SE in 200 OK, tearing down call\n");
+ 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
+@@ -23401,7 +23402,7 @@ static void handle_response_refer(struct sip_pvt *p, int resp, const char *rest,
+ 			pvt_set_needdestroy(p, "failed to authenticate REFER");
+ 		}
+ 		break;
+-	
++
+ 	case 405:   /* Method not allowed */
+ 		/* Return to the current call onhold */
+ 		/* Status flag needed to be reset */
+@@ -23445,7 +23446,7 @@ static void handle_response_refer(struct sip_pvt *p, int resp, const char *rest,
+ 		break;
+ 	default:
+ 		/* We should treat unrecognized 9xx as 900.  400 is actually
+-		   specified as a possible response, but any 4-6xx is 
++		   specified as a possible response, but any 4-6xx is
+ 		   theoretically possible. */
+ 
+ 		if (resp < 299) { /* 1xx cases don't get here */
+@@ -23469,7 +23470,7 @@ static int handle_response_register(struct sip_pvt *p, int resp, const char *res
+ 	int expires, expires_ms;
+ 	struct sip_registry *r;
+ 	r=p->registry;
+-	
++
+ 	switch (resp) {
+ 	case 401:	/* Unauthorized */
+ 		if (p->authtries == MAX_AUTHTRIES || do_register_auth(p, req, resp)) {
+@@ -23589,13 +23590,13 @@ static int handle_response_register(struct sip_pvt *p, int resp, const char *res
+ 					expires = 0;
+ 				}
+ 			}
+-			
++
+ 		}
+ 		if (!expires)
+ 			expires=atoi(sip_get_header(req, "expires"));
+ 		if (!expires)
+ 			expires=default_expiry;
+-		
++
+ 		expires_ms = expires * 1000;
+ 		if (expires <= EXPIRY_GUARD_LIMIT)
+ 			expires_ms -= MAX((expires_ms * EXPIRY_GUARD_PCT), EXPIRY_GUARD_MIN);
+@@ -23603,9 +23604,9 @@ static int handle_response_register(struct sip_pvt *p, int resp, const char *res
+ 			expires_ms -= EXPIRY_GUARD_SECS * 1000;
+ 		if (sipdebug)
+ 			ast_log(LOG_NOTICE, "Outbound Registration: Expiry for %s is %d sec (Scheduling reregistration in %d s)\n", r->hostname, expires, expires_ms/1000);
+-		
++
+ 		r->refresh= (int) expires_ms / 1000;
+-		
++
+ 		/* Schedule re-registration before we expire */
+ 		AST_SCHED_REPLACE_UNREF(r->expire, sched, expires_ms, sip_reregister, r,
+ 								registry_unref(_data,"unref in REPLACE del fail"),
+@@ -24091,7 +24092,7 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc
+ 				/* Fatal response */
+ 				if ((resp != 487))
+ 					ast_verb(3, "Got SIP response %d \"%s\" back from %s\n", resp, rest, ast_sockaddr_stringify(&p->sa));
+-	
++
+ 				if (sipmethod == SIP_INVITE)
+ 					stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
+ 
+@@ -24152,7 +24153,7 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc
+ 					}
+ 					break;
+ 				default:
+-					/* Send hangup */	
++					/* Send hangup */
+ 					if (owner && sipmethod != SIP_BYE)
+ 						ast_queue_hangup_with_cause(p->owner, hangup_sip2cause(resp));
+ 					break;
+@@ -24178,7 +24179,7 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc
+ 			} else
+ 				ast_log(LOG_NOTICE, "Don't know how to handle a %d %s response from %s\n", resp, rest, p->owner ? ast_channel_name(p->owner) : ast_sockaddr_stringify(&p->sa));
+ 		}
+-	} else {	
++	} else {
+ 		/* Responses to OUTGOING SIP requests on INCOMING calls
+ 		   get handled here. As well as out-of-call message responses */
+ 		if (req->debug)
+@@ -24681,7 +24682,7 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
+ 		A minimal, but complete, implementation can respond with a single
+ 		NOTIFY containing either the body:
+ 			SIP/2.0 100 Trying
+-		
++
+ 		if the subscription is pending, the body:
+ 			SIP/2.0 200 OK
+ 		if the reference was successful, the body:
+@@ -24692,7 +24693,7 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
+ 		if the REFER request was accepted before approval to follow the
+ 		reference could be obtained and that approval was subsequently denied
+ 		(see Section 2.4.7).
+-		
++
+ 		If there are several REFERs in the same dialog, we need to
+ 		match the ID of the event header...
+ 		*/
+@@ -26048,7 +26049,7 @@ static void parse_oli(struct sip_request *req, struct ast_channel *chan)
+ /*! \brief  Find all call legs and bridge transferee with target
+  *	called from handle_request_refer
+  *
+- *	\note this function assumes two locks to begin with, sip_pvt transferer and current.chan1 (the pvt's owner)... 
++ *	\note this function assumes two locks to begin with, sip_pvt transferer and current.chan1 (the pvt's owner)...
+  *	2 additional locks are held at the beginning of the function, targetcall_pvt, and targetcall_pvt's owner
+  *	channel (which is stored in target.chan1).  These 2 locks _MUST_ be let go by the end of the function.  Do
+  *	not be confused into thinking a pvt's owner is the same thing as the channels locked at the beginning of
+@@ -26317,9 +26318,9 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
+ 	inform the target about the transferor
+ 
+ 	"Any REFER request has to be appropriately authenticated.".
+-	
++
+ 	We can't destroy dialogs, since we want the call to continue.
+-	
++
+ 	*/
+ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, uint32_t seqno, int *nounlock)
+ {
+@@ -26454,12 +26455,12 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, uint
+ 	- chan1, chan2: The call between the transferer and transferee (2 channels)
+ 	- target_channel, targetcall_pvt: The call between the transferer and the target (2 channels)
+ 	We want to bridge chan2 with targetcall_pvt!
+-	
++
+ 	The replaces call id in the refer message points
+ 	to the call leg between Asterisk and the transferer.
+ 	So we need to connect the target and the transferee channel
+ 	and hangup the two other channels silently
+-	
++
+ 	If the target is non-local, the call ID could be on a remote
+ 	machine and we need to send an INVITE with replaces to the
+ 	target. We basically handle this as a blind transfer
+@@ -26654,7 +26655,7 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, uint
+ 		*/
+ 		p->refer->status = REFER_FAILED;
+ 		transmit_notify_with_sipfrag(p, seqno, "503 Service Unavailable (can't handle one-legged xfers)", TRUE);
+-		ast_clear_flag(&p->flags[0], SIP_GOTREFER);	
++		ast_clear_flag(&p->flags[0], SIP_GOTREFER);
+ 		append_history(p, "Xfer", "Refer failed (only bridged calls).");
+ 		res = -1;
+ 		goto handle_refer_cleanup;
+@@ -29461,11 +29462,11 @@ int st_get_se(struct sip_pvt *p, int max)
+ 		}
+ 		p->stimer->st_cached_max_se = global_max_se;
+ 		return (p->stimer->st_cached_max_se);
+-	} 
++	}
+ 	/* Find Min SE timer */
+ 	if (p->stimer->st_cached_min_se) {
+ 		return p->stimer->st_cached_min_se;
+-	} 
++	}
+ 	if (p->relatedpeer) {
+ 		p->stimer->st_cached_min_se = p->relatedpeer->stimer.st_min_se;
+ 		return (p->stimer->st_cached_min_se);
+@@ -29491,15 +29492,15 @@ enum st_refresher st_get_refresher(struct sip_pvt *p)
+ 		p->stimer->st_cached_ref = (p->relatedpeer->stimer.st_ref == SESSION_TIMER_REFRESHER_PARAM_UAC) ? SESSION_TIMER_REFRESHER_THEM : SESSION_TIMER_REFRESHER_US;
+ 		return p->stimer->st_cached_ref;
+ 	}
+-	
++
+ 	p->stimer->st_cached_ref = (global_st_refresher == SESSION_TIMER_REFRESHER_PARAM_UAC) ? SESSION_TIMER_REFRESHER_THEM : SESSION_TIMER_REFRESHER_US;
+ 	return p->stimer->st_cached_ref;
+ }
+ 
+ 
+ /*!
+- * \brief Get the session-timer mode 
+- * \param p pointer to the SIP dialog 
++ * \brief Get the session-timer mode
++ * \param p pointer to the SIP dialog
+  * \param no_cached, set this to true in order to force a peername lookup on
+  *        the session timer mode.
+ */
+@@ -29630,13 +29631,13 @@ static int sip_poke_peer(struct sip_peer *peer, int force)
+ {
+ 	struct sip_pvt *p;
+ 	int xmitres = 0;
+-	
++
+ 	if ((!peer->maxms && !force) || ast_sockaddr_isnull(&peer->addr)) {
+ 		/* IF we have no IP, or this isn't to be monitored, return
+ 		  immediately after clearing things out */
+ 		AST_SCHED_DEL_UNREF(sched, peer->pokeexpire,
+ 				sip_unref_peer(peer, "removing poke peer ref"));
+-		
++
+ 		peer->lastms = 0;
+ 		if (peer->call) {
+ 			peer->call = dialog_unref(peer->call, "unref dialog peer->call");
+@@ -29687,7 +29688,7 @@ static int sip_poke_peer(struct sip_peer *peer, int force)
+ 
+ 	AST_SCHED_DEL_UNREF(sched, peer->pokeexpire,
+ 			sip_unref_peer(peer, "removing poke peer ref"));
+-	
++
+ 	if (p->relatedpeer)
+ 		p->relatedpeer = sip_unref_peer(p->relatedpeer,"unsetting the relatedpeer field in the dialog, before it is set to something else.");
+ 	p->relatedpeer = sip_ref_peer(peer, "setting the relatedpeer field in the dialog");
+@@ -29731,7 +29732,7 @@ static int sip_poke_peer(struct sip_peer *peer, int force)
+ 		- not registered			AST_DEVICE_UNAVAILABLE
+ 		- registered				AST_DEVICE_NOT_INUSE
+ 		- fixed IP (!dynamic)			AST_DEVICE_NOT_INUSE
+-	
++
+ 	Peers that does not have a known call and can't be reached by OPTIONS
+ 		- unreachable				AST_DEVICE_UNAVAILABLE
+ 
+@@ -30015,7 +30016,7 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
+ 
+ 	/* We have an extension to call, don't use the full contact here */
+ 	/* This to enable dialing registered peers with extension dialling,
+-	   like SIP/peername/extension 	
++	   like SIP/peername/extension
+ 	   SIP/peername will still use the full contact
+ 	 */
+ 	if (ext) {
+@@ -30154,19 +30155,6 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
+ 	} else if (!strcasecmp(v->name, "rpid_immediate")) {
+ 		ast_set_flag(&mask[1], SIP_PAGE2_RPID_IMMEDIATE);
+ 		ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_RPID_IMMEDIATE);
+-	} else if (!strcasecmp(v->name, "trust_id_outbound")) {
+-		ast_set_flag(&mask[1], SIP_PAGE2_TRUST_ID_OUTBOUND);
+-		ast_clear_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND);
+-		if (!strcasecmp(v->value, "legacy")) {
+-			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY);
+-		} else if (ast_true(v->value)) {
+-			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_YES);
+-		} else if (ast_false(v->value)) {
+-			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_NO);
+-		} else {
+-			ast_log(LOG_WARNING, "Unknown trust_id_outbound mode '%s' on line %d, using legacy\n", v->value, v->lineno);
+-			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY);
+-		}
+ 	} else if (!strcasecmp(v->name, "g726nonstandard")) {
+ 		ast_set_flag(&mask[0], SIP_G726_NONSTANDARD);
+ 		ast_set2_flag(&flags[0], ast_true(v->value), SIP_G726_NONSTANDARD);
+@@ -30220,7 +30208,7 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
+ 	} else if (!strcasecmp(v->name, "insecure")) {
+ 		ast_set_flag(&mask[0], SIP_INSECURE);
+ 		ast_clear_flag(&flags[0], SIP_INSECURE);
+-		set_insecure_flags(&flags[0], v->value, v->lineno);	
++		set_insecure_flags(&flags[0], v->value, v->lineno);
+ 	} else if (!strcasecmp(v->name, "progressinband")) {
+ 		ast_set_flag(&mask[0], SIP_PROG_INBAND);
+ 		ast_clear_flag(&flags[0], SIP_PROG_INBAND);
+@@ -30474,7 +30462,7 @@ static struct ast_variable *add_var(const char *buf, struct ast_variable *list)
+ {
+ 	struct ast_variable *tmpvar = NULL;
+ 	char *varname = ast_strdupa(buf), *varval = NULL;
+-	
++
+ 	if ((varval = strchr(varname, '='))) {
+ 		*varval++ = '\0';
+ 		if ((tmpvar = ast_variable_new(varname, varval, ""))) {
+@@ -30568,7 +30556,7 @@ static struct sip_peer *temp_peer(const char *name)
+ 		ao2_t_ref(peer, -1, "failed to string_field_init, drop peer");
+ 		return NULL;
+ 	}
+-	
++
+ 	if (!(peer->cc_params = ast_cc_config_params_init())) {
+ 		ao2_t_ref(peer, -1, "failed to allocate cc_params for peer");
+ 		return NULL;
+@@ -31297,26 +31285,21 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
+ 		peer->socket.port = htons(((peer->socket.type & SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT));
+ 	}
+ 
+-	if (realtime) {
+-		int enablepoke = 1;
+-
+-		if (!sip_cfg.ignore_regexpire && peer->host_dynamic) {
+-			time_t nowtime = time(NULL);
++	if (!sip_cfg.ignore_regexpire && peer->host_dynamic && realtime) {
++		time_t nowtime = time(NULL);
+ 
+-			if ((nowtime - regseconds) > 0) {
+-				destroy_association(peer);
+-				memset(&peer->addr, 0, sizeof(peer->addr));
+-				peer->lastms = -1;
+-				enablepoke = 0;
+-				ast_debug(1, "Bah, we're expired (%d/%d/%d)!\n", (int)(nowtime - regseconds), (int)regseconds, (int)nowtime);
+-			}
++		if ((nowtime - regseconds) > 0) {
++			destroy_association(peer);
++			memset(&peer->addr, 0, sizeof(peer->addr));
++			peer->lastms = -1;
++			ast_debug(1, "Bah, we're expired (%d/%d/%d)!\n", (int)(nowtime - regseconds), (int)regseconds, (int)nowtime);
+ 		}
++	}
+ 
+-		/* Startup regular pokes */
+-		if (!devstate_only && enablepoke) {
+-			sip_ref_peer(peer, "schedule qualify");
+-			sip_poke_peer(peer, 0);
+-		}
++	/* Startup regular pokes */
++	if (!devstate_only && realtime && peer->lastms > 0) {
++		sip_ref_peer(peer, "schedule qualify");
++		sip_poke_peer(peer, 0);
+ 	}
+ 
+ 	if (ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)) {
+@@ -31378,7 +31361,7 @@ static int peer_markall_autopeers_func(void *device, void *arg, int flags)
+ 
+ /*!
+  * \internal
+- * \brief If no default formats are set in config, these are used 
++ * \brief If no default formats are set in config, these are used
+  */
+ static void sip_set_default_format_capabilities(struct ast_format_cap *cap)
+ {
+@@ -32416,7 +32399,7 @@ static int reload_config(enum channelreloadreason reason)
+ 		struct ast_variable *gen;
+ 		int genhassip, genregistersip;
+ 		const char *hassip, *registersip;
+-		
++
+ 		genhassip = ast_true(ast_variable_retrieve(ucfg, "general", "hassip"));
+ 		genregistersip = ast_true(ast_variable_retrieve(ucfg, "general", "registersip"));
+ 		gen = ast_variable_browse(ucfg, "general");
+@@ -32434,7 +32417,7 @@ static int reload_config(enum channelreloadreason reason)
+ 						if ((peer->type & SIP_TYPE_PEER) && !ast_sockaddr_isnull(&peer->addr)) {
+ 							ao2_t_link(peers_by_ip, peer, "link peer into peers_by_ip table");
+ 						}
+-						
++
+ 						sip_unref_peer(peer, "sip_unref_peer: from reload_config");
+ 						peer_count++;
+ 					}
+@@ -32561,7 +32544,7 @@ static int reload_config(enum channelreloadreason reason)
+ 		if (!ast_strlen_zero(externhost)) {
+ 			add_sip_domain(externhost, SIP_DOMAIN_AUTO, NULL);
+ 		}
+-		
++
+ 		/* Our host name */
+ 		if (!gethostname(temp, sizeof(temp))) {
+ 			add_sip_domain(temp, SIP_DOMAIN_AUTO, NULL);
+@@ -32618,7 +32601,7 @@ static struct ast_udptl *sip_get_udptl_peer(struct ast_channel *chan)
+ {
+ 	struct sip_pvt *p;
+ 	struct ast_udptl *udptl = NULL;
+-	
++
+ 	p = ast_channel_tech_pvt(chan);
+ 	if (!p) {
+ 		return NULL;
+@@ -33051,7 +33034,7 @@ static int sip_addheader(struct ast_channel *chan, const char *data)
+ 	char varbuf[30];
+ 	const char *inbuf = data;
+ 	char *subbuf;
+-	
++
+ 	if (ast_strlen_zero(inbuf)) {
+ 		ast_log(LOG_WARNING, "This application requires the argument: Header\n");
+ 		return 0;
+@@ -33352,11 +33335,6 @@ static int process_crypto(struct sip_pvt *p, struct ast_rtp_instance *rtp, struc
+ 
+ 	ast_set_flag(*srtp, SRTP_CRYPTO_OFFER_OK);
+ 
+-	if ((dtls = ast_rtp_instance_get_dtls(rtp))) {
+-		dtls->stop(rtp);
+-		p->dtls_cfg.enabled = 0;
+-	}
+-
+ 	return TRUE;
+ }
+ 
+@@ -33817,7 +33795,7 @@ AST_TEST_DEFINE(test_sip_mwi_subscribe_parse)
+ 			ast_test_status_update(test, "sip_subscribe_mwi test 5 failed\n");
+ 		}
+ 	}
+-	
++
+ 	if (sip_subscribe_mwi(mwi6, 1)) {
+ 		res = AST_TEST_PASS;
+ 	} else {
+@@ -34798,7 +34776,7 @@ static int unload_module(void)
+ 	acl_change_event_unsubscribe();
+ 
+ 	ast_sched_dump(sched);
+-	
++
+ 	/* First, take us out of the channel type list */
+ 	ast_channel_unregister(&sip_tech);
+ 
+@@ -34841,7 +34819,7 @@ static int unload_module(void)
+ 	ast_manager_unregister("SIPshowregistry");
+ 	ast_manager_unregister("SIPnotify");
+ 	ast_manager_unregister("SIPpeerstatus");
+-	
++
+ 	/* Kill TCP/TLS server threads */
+ 	if (sip_tcp_desc.master) {
+ 		ast_tcptls_server_stop(&sip_tcp_desc);
+diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h
+index 91e6335..d59c420 100644
+--- a/include/asterisk/rtp_engine.h
++++ b/include/asterisk/rtp_engine.h
+@@ -375,7 +375,11 @@ enum ast_rtp_dtls_connection {
+ 
+ /*! \brief DTLS fingerprint hashes */
+ enum ast_rtp_dtls_hash {
++	AST_RTP_DTLS_HASH_NONE, /* Uninitialized */
+ 	AST_RTP_DTLS_HASH_SHA1, /*!< SHA-1 fingerprint hash */
++	/*SRTP_DTLS */
++	AST_RTP_DTLS_HASH_SHA256, /*!< SHA-256 fingerprint hash */
++	/*SRTP_DTLS */
+ };
+ 
+ /*! \brief DTLS configuration structure */
+@@ -411,7 +415,7 @@ struct ast_rtp_engine_dtls {
+ 	/*! Set the remote fingerprint */
+ 	void (*set_fingerprint)(struct ast_rtp_instance *instance, enum ast_rtp_dtls_hash hash, const char *fingerprint);
+ 	/*! Get the local fingerprint */
+-	const char *(*get_fingerprint)(struct ast_rtp_instance *instance, enum ast_rtp_dtls_hash hash);
++	const char *(*get_fingerprint)(struct ast_rtp_instance *instance, const struct ast_rtp_dtls_cfg *dtls_cfg, enum ast_rtp_dtls_hash hash);
+ };
+ 
+ /*! Structure that represents an RTP stack (engine) */
+diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
+index 4853a0f..56e4000 100644
+--- a/res/res_rtp_asterisk.c
++++ b/res/res_rtp_asterisk.c
+@@ -128,6 +128,8 @@ static int rtpend = DEFAULT_RTP_END;			/*!< Last port for RTP sessions (set in r
+ static int rtpdebug;			/*!< Are we debugging? */
+ static int rtcpdebug;			/*!< Are we debugging RTCP? */
+ static int rtcpstats;			/*!< Are we debugging RTCP? */
++/* SRTP_DTLS */
++static int dtlsdebug;
+ static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */
+ static struct ast_sockaddr rtpdebugaddr;	/*!< Debug packets to/from this host */
+ static struct ast_sockaddr rtcpdebugaddr;	/*!< Debug RTCP packets to/from this host */
+@@ -268,6 +270,13 @@ struct ast_rtp {
+ 	ast_cond_t cond;            /*!< Condition for signaling */
+ 	unsigned int passthrough:1; /*!< Bit to indicate that the received packet should be passed through */
+ 	unsigned int ice_port;      /*!< Port that ICE was started with if it was previously started */
++	/* SRTP_DTLS */
++	unsigned int icecomplete:1; /*!< Bit to indicate ICE connectivity checks have completed */
++	unsigned int icedone:1;     /*!< Bit to indicate ICE connectivity checks have completed (go on with RTP or DTLS) */
++	unsigned int dtlsinit:1;    /*!< Bit to indicate DTLS-SRTP setup has been started (whether to start DTLS or not) */
++	unsigned int dtlsdone:1;    /*!< Bit to indicate DTLS-SRTP setup has been completed (go on with RTP or DTLS) */
++	struct ast_rtp_instance *instance;
++	/* SRTP_DTLS */
+ 
+ 	char remote_ufrag[256];  /*!< The remote ICE username */
+ 	char remote_passwd[256]; /*!< The remote ICE password */
+@@ -290,7 +299,9 @@ struct ast_rtp {
+ 	enum ast_rtp_dtls_setup dtls_setup; /*!< Current setup state */
+ 	enum ast_srtp_suite suite;   /*!< SRTP crypto suite */
+ 	char local_fingerprint[160]; /*!< Fingerprint of our certificate */
++	enum ast_rtp_dtls_hash local_fingerprint_type; /*!< Local fingerprint type */
+ 	unsigned char remote_fingerprint[EVP_MAX_MD_SIZE]; /*!< Fingerprint of the peer certificate */
++	enum ast_rtp_dtls_hash remote_fingerprint_type; /*!< Remote fingerprint type */
+ 	enum ast_rtp_dtls_connection connection; /*!< Whether this is a new or existing connection */
+ 	unsigned int dtls_failure:1; /*!< Failure occurred during DTLS negotiation */
+ 	unsigned int rekey; /*!< Interval at which to renegotiate and rekey */
+@@ -358,6 +369,26 @@ struct ast_rtcp {
+ 	double normdevrtt;
+ 	double stdevrtt;
+ 	unsigned int rtt_count;
++	/* SRTP_DTLS */
++	unsigned int icecomplete:1; /*!< Bit to indicate ICE connectivity checks have completed */
++	unsigned int icedone:1; /*!< Bit to indicate ICE connectivity checks have completed (go on with RTCP or DTLS) */
++	unsigned int dtlsdone:1; /*!< Bit to indicate DTLS-SRTP setup has been completed (go on with RTCP or DTLS) */
++#ifdef HAVE_OPENSSL_SRTP
++	SSL_CTX *ssl_ctx; /*!< SSL context */
++	SSL *ssl;         /*!< SSL session */
++	BIO *read_bio;    /*!< Memory buffer for reading */
++	BIO *write_bio;   /*!< Memory buffer for writing */
++	enum ast_rtp_dtls_setup dtls_setup; /*!< Current setup state */
++	enum ast_srtp_suite suite;   /*!< SRTP crypto suite */
++	char local_fingerprint[160]; /*!< Fingerprint of our certificate */
++	unsigned char remote_fingerprint[EVP_MAX_MD_SIZE]; /*!< Fingerprint of the peer certificate */
++	enum ast_rtp_dtls_connection connection; /*!< Whether this is a new or existing connection */
++	unsigned int dtls_failure:1; /*!< Failure occurred during DTLS negotiation */
++	unsigned int rekey; /*!< Interval at which to renegotiate and rekey */
++	int rekeyid; /*!< Scheduled item id for rekeying */
++#endif
++	/* SRTP_DTLS */
++
+ };
+ 
+ struct rtp_red {
+@@ -406,6 +437,9 @@ static int ast_rtp_sendcng(struct ast_rtp_instance *instance, int level);
+ #ifdef HAVE_OPENSSL_SRTP
+ static int ast_rtp_activate(struct ast_rtp_instance *instance);
+ static void dtls_srtp_check_pending(struct ast_rtp_instance *instance, struct ast_rtp *rtp);
++/* SRTP_DTLS DTLS certificate verification callback */
++static int dtls_verify_callback(int preverify_ok, X509_STORE_CTX *ctx);
++/* SRTP_DTLS */
+ #endif
+ 
+ static int __rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp, int *ice, int use_srtp);
+@@ -791,6 +825,10 @@ static void dtls_info_callback(const SSL *ssl, int where, int ret)
+ 	if (!(where & SSL_CB_ALERT)) {
+ 		return;
+ 	}
++	/* SRTP_DTLS */
++	ast_verbose(VERBOSE_PREFIX_3 "dtls_info_callback: %s, where=%d, ret=%d\n", (where & SSL_CB_READ)?"read":"write", where, ret);
++	ast_verbose(VERBOSE_PREFIX_3 "  >> %s, %s, %s\n", SSL_state_string(ssl), SSL_alert_type_string(ret), SSL_alert_desc_string(ret));
++	/* SRTP_DTLS */
+ 
+ 	rtp->dtls_failure = 1;
+ }
+@@ -811,7 +849,9 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
+ 		return -1;
+ 	}
+ 
+-	SSL_CTX_set_verify(rtp->ssl_ctx, dtls_cfg->verify ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE, NULL);
++	/* SRTP_DTLS */
++	SSL_CTX_set_verify(rtp->ssl_ctx, dtls_cfg->verify ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE, dtls_verify_callback);
++	/* SRTP_DTLS */
+ 
+ 	if (dtls_cfg->suite == AST_AES_CM_128_HMAC_SHA1_80) {
+ 		SSL_CTX_set_tlsext_use_srtp(rtp->ssl_ctx, "SRTP_AES128_CM_SHA1_80");
+@@ -851,12 +891,14 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
+ 
+ 		if (!BIO_read_filename(certbio, dtls_cfg->certfile) ||
+ 		    !(cert = PEM_read_bio_X509(certbio, NULL, 0, NULL)) ||
+-		    !X509_digest(cert, EVP_sha1(), fingerprint, &size) ||
++		    !X509_digest(cert, EVP_sha256(), fingerprint, &size) ||
+ 		    !size) {
+ 			ast_log(LOG_ERROR, "Could not produce fingerprint from certificate '%s' for RTP instance '%p'\n",
+ 				dtls_cfg->certfile, instance);
+ 			BIO_free_all(certbio);
+ 			goto error;
++		} else {
++			rtp->local_fingerprint_type = AST_RTP_DTLS_HASH_SHA256;
+ 		}
+ 
+ 		for (i = 0; i < size; i++) {
+@@ -922,6 +964,111 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
+ 
+ 	rtp->connection = AST_RTP_DTLS_CONNECTION_NEW;
+ 
++	/* SRTP_DTLS: do the same with RTCP */
++	if (!(rtp->rtcp->ssl_ctx = SSL_CTX_new(DTLSv1_method()))) {
++			return -1;
++	}
++	SSL_CTX_set_verify(rtp->rtcp->ssl_ctx, dtls_cfg->verify ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE, NULL);
++	if (dtls_cfg->suite == AST_AES_CM_128_HMAC_SHA1_80) {
++		SSL_CTX_set_tlsext_use_srtp(rtp->rtcp->ssl_ctx, "SRTP_AES128_CM_SHA1_80");
++	} else if (dtls_cfg->suite == AST_AES_CM_128_HMAC_SHA1_32) {
++		SSL_CTX_set_tlsext_use_srtp(rtp->rtcp->ssl_ctx, "SRTP_AES128_CM_SHA1_32");
++	} else {
++		ast_log(LOG_ERROR, "Unsupported suite specified for DTLS-SRTP on RTCP instance '%p'\n", instance);
++		goto error;
++	}
++	if (!ast_strlen_zero(dtls_cfg->certfile)) {
++		char *private = ast_strlen_zero(dtls_cfg->pvtfile) ? dtls_cfg->certfile : dtls_cfg->pvtfile;
++		BIO *certbio;
++		X509 *cert;
++		unsigned int size, i;
++		unsigned char fingerprint[EVP_MAX_MD_SIZE];
++		char *local_fingerprint = rtp->rtcp->local_fingerprint;
++		if (!SSL_CTX_use_certificate_file(rtp->rtcp->ssl_ctx, dtls_cfg->certfile, SSL_FILETYPE_PEM)) {
++			ast_log(LOG_ERROR, "Specified certificate file '%s' for RTCP instance '%p' could not be used\n",
++				dtls_cfg->certfile, instance);
++			goto error;
++		}
++		if (!SSL_CTX_use_PrivateKey_file(rtp->rtcp->ssl_ctx, private, SSL_FILETYPE_PEM) ||
++		    !SSL_CTX_check_private_key(rtp->rtcp->ssl_ctx)) {
++				ast_log(LOG_ERROR, "Specified private key file '%s' for RTCP instance '%p' could not be used\n",
++					private, instance);
++			goto error;
++		}
++		if (!(certbio = BIO_new(BIO_s_file()))) {
++			ast_log(LOG_ERROR, "Failed to allocate memory for certificate fingerprinting on RTCP instance '%p'\n",
++				instance);
++			goto error;
++		}
++		if (!(certbio = BIO_new(BIO_s_file()))) {
++			ast_log(LOG_ERROR, "Failed to allocate memory for certificate fingerprinting on RTCP instance '%p'\n",
++				instance);
++			goto error;
++		}
++		if (!BIO_read_filename(certbio, dtls_cfg->certfile) ||
++			!(cert = PEM_read_bio_X509(certbio, NULL, 0, NULL)) ||
++			/* SRTP_DTLS: use SHA256 for DTLS-SRTP Fingerprint */
++			!X509_digest(cert, EVP_sha256(), fingerprint, &size) ||
++			!size) {
++			ast_log(LOG_ERROR, "Could not produce fingerprint from certificate '%s' for RTCP instance '%p'\n",
++				dtls_cfg->certfile, instance);
++			BIO_free_all(certbio);
++			goto error;
++		}
++		for (i = 0; i < size; i++) {
++			sprintf(local_fingerprint, "%.2X:", fingerprint[i]);
++			local_fingerprint += 3;
++		}
++		*(local_fingerprint-1) = 0;
++		BIO_free_all(certbio);
++	}
++
++	if (!ast_strlen_zero(dtls_cfg->cipher)) {
++		if (!SSL_CTX_set_cipher_list(rtp->rtcp->ssl_ctx, dtls_cfg->cipher)) {
++			ast_log(LOG_ERROR, "Invalid cipher specified in cipher list '%s' for RTCP instance '%p'\n",
++				dtls_cfg->cipher, instance);
++			goto error;
++		}
++	}
++	if (!ast_strlen_zero(dtls_cfg->cafile) || !ast_strlen_zero(dtls_cfg->capath)) {
++		if (!SSL_CTX_load_verify_locations(rtp->rtcp->ssl_ctx, S_OR(dtls_cfg->cafile, NULL), S_OR(dtls_cfg->capath, NULL))) {
++			ast_log(LOG_ERROR, "Invalid certificate authority file '%s' or path '%s' specified for RTCP instance '%p'\n",
++				S_OR(dtls_cfg->cafile, ""), S_OR(dtls_cfg->capath, ""), instance);
++			goto error;
++		}
++	}
++
++	rtp->rtcp->rekey = dtls_cfg->rekey;
++	rtp->rtcp->dtls_setup = dtls_cfg->default_setup;
++	rtp->rtcp->suite = dtls_cfg->suite;
++	if (!(rtp->rtcp->ssl = SSL_new(rtp->rtcp->ssl_ctx))) {
++		ast_log(LOG_ERROR, "Failed to allocate memory for SSL context on RTCP instance '%p'\n",
++			instance);
++		goto error;
++	}
++	SSL_set_ex_data(rtp->rtcp->ssl, 0, rtp);
++	SSL_set_info_callback(rtp->rtcp->ssl, dtls_info_callback);
++	if (!(rtp->rtcp->read_bio = BIO_new(BIO_s_mem()))) {
++		ast_log(LOG_ERROR, "Failed to allocate memory for inbound SSL traffic on RTCP instance '%p'\n",
++			instance);
++		goto error;
++	}
++	BIO_set_mem_eof_return(rtp->rtcp->read_bio, -1);
++	if (!(rtp->rtcp->write_bio = BIO_new(BIO_s_mem()))) {
++		ast_log(LOG_ERROR, "Failed to allocate memory for outbound SSL traffic on RTCP instance '%p'\n",
++			instance);
++		goto error;
++	}
++	BIO_set_mem_eof_return(rtp->rtcp->write_bio, -1);
++
++	SSL_set_bio(rtp->rtcp->ssl, rtp->rtcp->read_bio, rtp->rtcp->write_bio);
++	if (rtp->rtcp->dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) {
++		SSL_set_accept_state(rtp->rtcp->ssl);
++	} else {
++		SSL_set_connect_state(rtp->rtcp->ssl);
++	}
++	rtp->rtcp->connection = AST_RTP_DTLS_CONNECTION_NEW;
++
+ 	return 0;
+ 
+ error:
+@@ -943,13 +1090,28 @@ error:
+ 	SSL_CTX_free(rtp->ssl_ctx);
+ 	rtp->ssl_ctx = NULL;
+ 
++	/* SRTP_DTLS: do the same with RTCP */
++	if (rtp->rtcp->read_bio) {
++		BIO_free(rtp->rtcp->read_bio);
++		rtp->rtcp->read_bio = NULL;
++	}
++	if (rtp->rtcp->write_bio) {
++		BIO_free(rtp->rtcp->write_bio);
++		rtp->rtcp->write_bio = NULL;
++	}
++	if (rtp->rtcp->ssl) {
++		SSL_free(rtp->rtcp->ssl);
++		rtp->rtcp->ssl = NULL;
++	}
++	SSL_CTX_free(rtp->rtcp->ssl_ctx);
++	rtp->rtcp->ssl_ctx = NULL;
++
+ 	return -1;
+ }
+ 
+ static int ast_rtp_dtls_active(struct ast_rtp_instance *instance)
+ {
+ 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+-
+ 	return !rtp->ssl_ctx ? 0 : 1;
+ }
+ 
+@@ -957,6 +1119,8 @@ static void ast_rtp_dtls_stop(struct ast_rtp_instance *instance)
+ {
+ 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+ 
++	ast_verbose(VERBOSE_PREFIX_3 "Stopping DTLS...\n");
++
+ 	if (rtp->ssl_ctx) {
+ 		SSL_CTX_free(rtp->ssl_ctx);
+ 		rtp->ssl_ctx = NULL;
+@@ -966,6 +1130,18 @@ static void ast_rtp_dtls_stop(struct ast_rtp_instance *instance)
+ 		SSL_free(rtp->ssl);
+ 		rtp->ssl = NULL;
+ 	}
++
++
++	/* SRTP_DTLS: do the same with RTCP */
++	if (rtp->rtcp->ssl_ctx) {
++		SSL_CTX_free(rtp->rtcp->ssl_ctx);
++		rtp->rtcp->ssl_ctx = NULL;
++	}
++	if (rtp->rtcp->ssl) {
++		SSL_free(rtp->rtcp->ssl);
++		rtp->rtcp->ssl = NULL;
++	}
++
+ }
+ 
+ static void ast_rtp_dtls_reset(struct ast_rtp_instance *instance)
+@@ -979,6 +1155,13 @@ static void ast_rtp_dtls_reset(struct ast_rtp_instance *instance)
+ 
+ 	SSL_shutdown(rtp->ssl);
+ 	rtp->connection = AST_RTP_DTLS_CONNECTION_NEW;
++
++	/* SRTP_DTLS: do the same with RTCP */
++	if (!SSL_is_init_finished(rtp->rtcp->ssl)) {
++		return;
++	}
++	SSL_shutdown(rtp->rtcp->ssl);
++	rtp->rtcp->connection = AST_RTP_DTLS_CONNECTION_NEW;
+ }
+ 
+ static enum ast_rtp_dtls_connection ast_rtp_dtls_get_connection(struct ast_rtp_instance *instance)
+@@ -1038,6 +1221,16 @@ static void ast_rtp_dtls_set_setup(struct ast_rtp_instance *instance, enum ast_r
+ 	} else {
+ 		return;
+ 	}
++
++	/* SRTP_DTLS: do the same with RTCP */
++	rtp->rtcp->dtls_setup = rtp->dtls_setup;
++	if (rtp->rtcp->dtls_setup == AST_RTP_DTLS_SETUP_ACTIVE) {
++		SSL_set_connect_state(rtp->rtcp->ssl);
++	} else if (rtp->rtcp->dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) {
++		SSL_set_accept_state(rtp->rtcp->ssl);
++	} else {
++		return;
++	}
+ }
+ 
+ static void ast_rtp_dtls_set_fingerprint(struct ast_rtp_instance *instance, enum ast_rtp_dtls_hash hash, const char *fingerprint)
+@@ -1046,24 +1239,106 @@ static void ast_rtp_dtls_set_fingerprint(struct ast_rtp_instance *instance, enum
+ 	int pos = 0;
+ 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+ 
+-	if (hash != AST_RTP_DTLS_HASH_SHA1) {
++	if (hash == AST_RTP_DTLS_HASH_SHA1) {
++		rtp->remote_fingerprint_type = AST_RTP_DTLS_HASH_SHA1;
++	} else if(hash == AST_RTP_DTLS_HASH_SHA256) {
++		rtp->remote_fingerprint_type = AST_RTP_DTLS_HASH_SHA256;
++	} else {
+ 		return;
+ 	}
+ 
+ 	while ((value = strsep(&tmp, ":")) && (pos != (EVP_MAX_MD_SIZE - 1))) {
+ 		sscanf(value, "%02x", (unsigned int*)&rtp->remote_fingerprint[pos++]);
+ 	}
++
++	/* SRTP_DTLS: do the same with RTCP */
++	memcpy(rtp->rtcp->remote_fingerprint, rtp->remote_fingerprint, sizeof(rtp->remote_fingerprint));
+ }
+ 
+-static const char *ast_rtp_dtls_get_fingerprint(struct ast_rtp_instance *instance, enum ast_rtp_dtls_hash hash)
++static const char *ast_rtp_dtls_get_fingerprint(struct ast_rtp_instance *instance, const struct ast_rtp_dtls_cfg *dtls_cfg, enum ast_rtp_dtls_hash fingerprint_type)
+ {
+ 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+ 
+-	if (hash != AST_RTP_DTLS_HASH_SHA1) {
++	ast_debug(2, "SRTP_DTLS--Inside ast_rtp_dtls_get_fingerprint\n");
++
++	if  (rtp->remote_fingerprint_type == AST_RTP_DTLS_HASH_NONE) {
++	// no remote fingerprint yet, it means we are ones starting communication
++		if (dtlsdebug) {
++			ast_verbose(VERBOSE_PREFIX_3 "Returning local fingerprint of type %d: %s\n", fingerprint_type, rtp->local_fingerprint);
++		}
++		return rtp->local_fingerprint;
++	}
++
++	if (rtp->remote_fingerprint_type != fingerprint_type)
++	{
+ 		return NULL;
+ 	}
++	if (rtp->local_fingerprint_type == rtp->remote_fingerprint_type)
++	{
++		return rtp->local_fingerprint;
++	}
++	else
++	{
++		/* Remote fingerprint type is different from local fingerprint type
++		   recaclulate the local fingerprint */
++		if (dtls_cfg != NULL && dtls_cfg->certfile != NULL)
++		{
++			BIO *certbio;
++			unsigned char fingerprint[EVP_MAX_MD_SIZE];
++			char *local_fingerprint = rtp->local_fingerprint;
++			unsigned int size = 0;
++			unsigned int i = 0;
++			X509 *cert;
++			unsigned int failed = 0;
++			if (!(certbio = BIO_new(BIO_s_file()))) {
++				ast_log(LOG_ERROR, "Failed to allocate memory for certificate fingerprinting on RTP instance '%p'\n",
++				instance);
++				return NULL;
++			}
+ 
+-	return rtp->local_fingerprint;
++			if (rtp->remote_fingerprint_type == AST_RTP_DTLS_HASH_SHA256)
++			{
++				if (!BIO_read_filename(certbio, dtls_cfg->certfile) ||
++		                  !(cert = PEM_read_bio_X509(certbio, NULL, 0, NULL)) ||
++		                  !X509_digest(cert, EVP_sha256(), fingerprint, &size) ||
++		                  !size) {
++					failed = 1;
++					ast_log(LOG_ERROR, "Could not produce fingerprint from certificate '%s' for RTP instance '%p'\n",
++					        dtls_cfg->certfile, instance);
++				}
++			}
++			else if (rtp->remote_fingerprint_type == AST_RTP_DTLS_HASH_SHA1)
++			{
++				if (!BIO_read_filename(certbio, dtls_cfg->certfile) ||
++		                  !(cert = PEM_read_bio_X509(certbio, NULL, 0, NULL)) ||
++		                  !X509_digest(cert, EVP_sha1(), fingerprint, &size) ||
++		                  !size) {
++					failed = 1;
++					ast_log(LOG_ERROR, "Could not produce fingerprint from certificate '%s' for RTP instance '%p'\n",
++					        dtls_cfg->certfile, instance);
++				}
++			}
++			BIO_free_all(certbio);
++			if (!failed)
++			{
++				for (i = 0; i < size; i++) {
++					sprintf(local_fingerprint, "%.2X:", fingerprint[i]);
++					local_fingerprint += 3;
++				}
++				*(local_fingerprint-1) = 0;
++				rtp->local_fingerprint_type = rtp->remote_fingerprint_type;
++				return rtp->local_fingerprint;
++			}
++			else
++			{
++			    return NULL;
++			}
++		}
++		else
++		{
++			return NULL;
++		}
++	}
+ }
+ 
+ /* DTLS RTP Engine interface declaration */
+@@ -1120,18 +1395,11 @@ static struct ast_rtp_engine asterisk_rtp_engine = {
+ static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
+ 
+ #ifdef USE_PJPROJECT
+-static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
+-{
+-	struct ast_rtp *rtp = ice->user_data;
+-
+-	if (!strictrtp) {
+-		return;
+-	}
+-
+-	rtp->strict_rtp_state = STRICT_RTP_LEARN;
+-	rtp_learning_seq_init(&rtp->rtp_source_learn, (uint16_t)rtp->seqno);
+-}
+-
++/* SRTP_DTLS: callback to known when ICE is complete */
++#ifdef HAVE_OPENSSL_SRTP
++static void dtls_srtp_check_pending(struct ast_rtp_instance *instance, struct ast_rtp *rtp);
++#endif
++/*SRTP_DTLS */
+ static void ast_rtp_on_ice_rx_data(pj_ice_sess *ice, unsigned comp_id, unsigned transport_id, void *pkt, pj_size_t size, const pj_sockaddr_t *src_addr, unsigned src_addr_len)
+ {
+ 	struct ast_rtp *rtp = ice->user_data;
+@@ -1149,12 +1417,31 @@ static pj_status_t ast_rtp_on_ice_tx_pkt(pj_ice_sess *ice, unsigned comp_id, uns
+ 
+ 	if (transport_id == TRANSPORT_SOCKET_RTP) {
+ 		/* Traffic is destined to go right out the RTP socket we already have */
++		/* SRTP_DTLS : are we sending DTLS? */
++		if (dtlsdebug > 1)
++			ast_verbose(VERBOSE_PREFIX_3 "[RTP] ast_rtp_on_ice_tx_pkt (%zu)\n", size);
++
++		const char *out = pkt;
++		if ((*out >= 20) && (*out <= 64)) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP] Sending DTLS data (%zu)\n", size);
++		}
+ 		status = pj_sock_sendto(rtp->s, pkt, &_size, 0, dst_addr, dst_addr_len);
+ 		/* sendto on a connectionless socket should send all the data, or none at all */
+ 		ast_assert(_size == size || status != PJ_SUCCESS);
+ 	} else if (transport_id == TRANSPORT_SOCKET_RTCP) {
+ 		/* Traffic is destined to go right out the RTCP socket we already have */
+ 		if (rtp->rtcp) {
++			/* SRTP_DTLS: are we sending DTLS? */
++			if (dtlsdebug > 1)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP] ast_rtp_on_ice_tx_pkt (%zu)\n", size);
++
++			const char *out = pkt;
++			if ((*out >= 20) && (*out <= 64)) {
++				if (dtlsdebug)
++					ast_verbose(VERBOSE_PREFIX_3 "[RTCP] Sending DTLS data (%zu)\n", size);
++			}
++
+ 			status = pj_sock_sendto(rtp->rtcp->s, pkt, &_size, 0, dst_addr, dst_addr_len);
+ 			/* sendto on a connectionless socket should send all the data, or none at all */
+ 			ast_assert(_size == size || status != PJ_SUCCESS);
+@@ -1176,6 +1463,44 @@ static pj_status_t ast_rtp_on_ice_tx_pkt(pj_ice_sess *ice, unsigned comp_id, uns
+ 	return status;
+ }
+ 
++static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status) {
++	struct ast_rtp *rtp = ice->user_data;
++	ast_verbose(VERBOSE_PREFIX_3 "ICE is now complete\n");
++	rtp->icecomplete = 1;
++	/* SRTP_DTLS: do the same with RTCP (FIXME is this true??) */
++	rtp->rtcp->icecomplete = 1;
++	/* SRTP_DTLS: since ICE has been completed, we can do the DTLS handshake */
++	if(rtp->icecomplete) {
++		if (dtlsdebug)
++			ast_verbose(VERBOSE_PREFIX_3 "[RTP] ICE has been completed, yay!\n");
++
++		rtp->icecomplete = 0;
++		rtp->icedone = 1;
++		if (rtp->ssl) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]    >> Doing DTLS handshake as well...\n");
++
++			SSL_do_handshake(rtp->ssl);
++			dtls_srtp_check_pending(rtp->instance, rtp);
++		}
++	}
++	/* SRTP_DTLS: do the same with RTCP */
++	if(rtp->rtcp->icecomplete) {
++		if (dtlsdebug)
++			ast_verbose(VERBOSE_PREFIX_3 "[RTCP] ICE has been completed, yay!\n");
++
++		rtp->rtcp->icecomplete = 0;
++		rtp->rtcp->icedone = 1;
++		if (rtp->rtcp->ssl) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]   >> Doing DTLS handshake as well...\n");
++
++			SSL_do_handshake(rtp->rtcp->ssl);
++			dtls_srtp_check_pending(rtp->instance, rtp);
++		}
++	}
++}
++
+ /* ICE Session interface declaration */
+ static pj_ice_sess_cb ast_rtp_ice_sess_cb = {
+ 	.on_ice_complete = ast_rtp_on_ice_complete,
+@@ -1334,8 +1659,7 @@ static int dtls_srtp_handle_timeout(const void *data)
+ 	}
+ 
+ 	ast_mutex_lock(&rtp->dtls_timer_lock);
+-	if (rtp->dtlstimerid == -1)
+-	{
++	if (rtp->dtlstimerid == -1) {
+ 		ast_mutex_unlock(&rtp->dtls_timer_lock);
+ 		ao2_ref(instance, -1);
+ 		return 0;
+@@ -1348,6 +1672,11 @@ static int dtls_srtp_handle_timeout(const void *data)
+ 		DTLSv1_handle_timeout(rtp->ssl);
+ 	}
+ 
++	/*SRTP_DTLS: do the same with rtcp */
++	if (rtp->rtcp && rtp->rtcp->ssl) {
++		DTLSv1_handle_timeout(rtp->rtcp->ssl);
++	}
++
+ 	dtls_srtp_check_pending(instance, rtp);
+ 
+ 	ao2_ref(instance, -1);
+@@ -1355,6 +1684,13 @@ static int dtls_srtp_handle_timeout(const void *data)
+ 	return 0;
+ }
+ 
++/* SRTP_DTLS: DTLS certificate verification callback */
++static int dtls_verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
++	/* We just use the verify_callback to request a certificate from the client */
++	return 1;
++}
++/*SRTP_DTLS */
++
+ static void dtls_srtp_check_pending(struct ast_rtp_instance *instance, struct ast_rtp *rtp)
+ {
+ 	size_t pending = BIO_ctrl_pending(rtp->write_bio);
+@@ -1392,8 +1728,31 @@ static void dtls_srtp_check_pending(struct ast_rtp_instance *instance, struct as
+ 		}
+ 		ast_mutex_unlock(&rtp->dtls_timer_lock);
+ 
++		if (dtlsdebug)
++			ast_verbose(VERBOSE_PREFIX_3 "[RTP]   >> Going to send DTLS data: %zu bytes\n", pending);
++
+ 		__rtp_sendto(instance, outgoing, out, 0, &remote_address, 0, &ice, 0);
+ 	}
++
++	/* SRTP_DTLS: do the same with RTCP */
++	pending = BIO_ctrl_pending(rtp->rtcp->write_bio);
++	if (pending > 0) {
++		char outgoing[pending];
++		size_t out;
++		struct ast_sockaddr remote_address = { {0, } };
++		int ice;
++		//~ ast_rtp_instance_get_remote_address(instance, &remote_address);
++		if (ast_sockaddr_isnull(&rtp->rtcp->them)) {
++			return;
++		}
++		ast_sockaddr_copy(&remote_address, &rtp->rtcp->them);
++		if (ast_sockaddr_isnull(&remote_address)) {
++			return;
++		}
++		out = BIO_read(rtp->rtcp->write_bio, outgoing, sizeof(outgoing));
++		__rtp_sendto(instance, outgoing, out, 0, &remote_address, 1, &ice, 0);
++	}
++	/* SRTP_DTLS: */
+ }
+ 
+ static int dtls_srtp_renegotiate(const void *data)
+@@ -1403,6 +1762,9 @@ static int dtls_srtp_renegotiate(const void *data)
+ 
+ 	SSL_renegotiate(rtp->ssl);
+ 	SSL_do_handshake(rtp->ssl);
++	/* SRTP_DTLS: do the same with RTCP */
++	SSL_do_handshake(rtp->rtcp->ssl);
++	/*SRTP_DTLS */
+ 	dtls_srtp_check_pending(instance, rtp);
+ 
+ 	rtp->rekeyid = -1;
+@@ -1432,26 +1794,34 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as
+ 			unsigned char fingerprint[EVP_MAX_MD_SIZE];
+ 			unsigned int size;
+ 
+-			if (!X509_digest(certificate, EVP_sha1(), fingerprint, &size) ||
+-			    !size ||
+-			    memcmp(fingerprint, rtp->remote_fingerprint, size)) {
+-				X509_free(certificate);
+-				ast_log(LOG_WARNING, "Fingerprint provided by remote party does not match that of peer certificate on RTP instance '%p'\n",
++			if (rtp->remote_fingerprint_type == AST_RTP_DTLS_HASH_SHA1)
++			{
++				if (!X509_digest(certificate, EVP_sha1(), fingerprint, &size) ||
++					!size ||
++					memcmp(fingerprint, rtp->remote_fingerprint, size)) {
++					X509_free(certificate);
++					ast_log(LOG_WARNING, "Fingerprint provided by remote party does not match that of peer certificate on RTP instance '%p'\n",
+ 					instance);
+-				return -1;
++					return -1;
++				}
++			}
++			else if (rtp->remote_fingerprint_type == AST_RTP_DTLS_HASH_SHA256 )
++			{
++				if (!X509_digest(certificate, EVP_sha256(), fingerprint, &size) ||
++					!size ||
++					memcmp(fingerprint, rtp->remote_fingerprint, size)) {
++					X509_free(certificate);
++					ast_log(LOG_WARNING, "Fingerprint provided by remote party does not match that of peer certificate on RTP instance '%p'\n",
++					instance);
++				   return -1;
++
++				}
+ 			}
+ 		}
+ 
+ 		X509_free(certificate);
+ 	}
+ 
+-	/* Ensure that certificate verification was successful */
+-	if (SSL_get_verify_result(rtp->ssl) != X509_V_OK) {
+-		ast_log(LOG_WARNING, "Peer certificate on RTP instance '%p' failed verification test\n",
+-			instance);
+-		return -1;
+-	}
+-
+ 	/* Produce key information and set up SRTP */
+ 	if (!SSL_export_keying_material(rtp->ssl, material, SRTP_MASTER_LEN * 2, "EXTRACTOR-dtls_srtp", 19, NULL, 0, 0)) {
+ 		ast_log(LOG_WARNING, "Unable to extract SRTP keying material from DTLS-SRTP negotiation on RTP instance '%p'\n",
+@@ -1520,6 +1890,10 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as
+ 			goto error;
+ 		}
+ 	}
++	/* SRTP_DTLS: done with DTLS-SRTP */
++	ast_verbose(VERBOSE_PREFIX_3 "Looks like SRTP setup was completed...\n");
++	rtp->dtlsdone = 1;
++	/* SRTP_DTLS */
+ 
+ 	return 0;
+ 
+@@ -1551,6 +1925,10 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
+ 
+ 		/* If this is an SSL packet pass it to OpenSSL for processing */
+ 		if ((*in >= 20) && (*in <= 64)) {
++			/* SRTP_DTLS */
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP] Received a DTLS message\n");
++			/* SRTP_DTLS */
+ 			int res = 0;
+ 
+ 			/* If no SSL session actually exists terminate things */
+@@ -1568,10 +1946,23 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
+ 
+ 			dtls_srtp_check_pending(instance, rtp);
+ 
+-			BIO_write(rtp->read_bio, buf, len);
++			/* SRTP_DTLS */
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]   >> >> writing %d bytes on read_BIO (to have it read later)\n", len);
++
++			int written = BIO_write(rtp->read_bio, buf, len);
++
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]   >> >> >> actually wrote %d bytes (%s)\n", written, BIO_should_retry(rtp->read_bio) ? "should retry" : "should NOT retry");
++			/* SRTP_DTLS */
+ 
+ 			len = SSL_read(rtp->ssl, buf, len);
+ 
++			/* SRTP_DTLS */
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]  >> >> read %d bytes from SSL\n", len);
++			/* SRTP_DTLS */
++
+ 			dtls_srtp_check_pending(instance, rtp);
+ 
+ 			if (rtp->dtls_failure) {
+@@ -1582,6 +1973,7 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
+ 
+ 			if (SSL_is_init_finished(rtp->ssl)) {
+ 				/* Any further connections will be existing since this is now established */
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]   >> DTLS established, yay!\n");
+ 				rtp->connection = AST_RTP_DTLS_CONNECTION_EXISTING;
+ 
+ 				/* Use the keying material to set up key/salt information */
+@@ -1590,6 +1982,65 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
+ 
+ 			return res;
+ 		}
++	} /* SRTP_DTLS -- since we don't do RTCP mux, we need DTLS for RTCP as well */
++	else
++	{
++		char *in = buf;
++
++		dtls_srtp_check_pending(instance, rtp);
++
++		/* If this is an SSL packet pass it to OpenSSL for processing */
++		if ((*in >= 20) && (*in <= 64)) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP] Received a DTLS message\n");
++			int res = 0;
++
++			/* If no SSL session actually exists terminate things */
++			if (!rtp->rtcp->ssl) {
++				ast_log(LOG_ERROR, "Received SSL traffic on RTP instance '%p' without an SSL session\n",
++					instance);
++				return -1;
++			}
++
++			/* If we don't yet know if we are active or passive and we receive a packet... we are obviously passive */
++			if (rtp->rtcp->dtls_setup == AST_RTP_DTLS_SETUP_ACTPASS) {
++				rtp->rtcp->dtls_setup = AST_RTP_DTLS_SETUP_PASSIVE;
++				SSL_set_accept_state(rtp->rtcp->ssl);
++			}
++
++			dtls_srtp_check_pending(instance, rtp);
++
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]   >> >> writing %d bytes on read_BIO (to have it read later)\n", len);
++
++			int written = BIO_write(rtp->rtcp->read_bio, buf, len);
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]   >> >> >> actually wrote %d bytes (%s)\n", written, BIO_should_retry(rtp->rtcp->read_bio) ? "should retry" : "should NOT retry");
++
++			len = SSL_read(rtp->rtcp->ssl, buf, len);
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]  >> >> read %d bytes from SSL\n", len);
++
++			dtls_srtp_check_pending(instance, rtp);
++
++			if (rtp->rtcp->dtls_failure) {
++				ast_log(LOG_ERROR, "DTLS failure occurred on RTCP instance '%p', terminating\n",
++					instance);
++				return -1;
++			}
++
++			if (SSL_is_init_finished(rtp->rtcp->ssl)) {
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]   >> DTLS established, yay!\n");
++				/* Any further connections will be existing since this is now established */
++				rtp->rtcp->connection = AST_RTP_DTLS_CONNECTION_EXISTING;
++
++				/* Use the keying material to set up key/salt information */
++				//~ res = dtls_srtp_setup(rtp, srtp, instance);
++				rtp->rtcp->dtlsdone = 1;
++			}
++
++			return res;
++		}
+ 	}
+ #endif
+ 
+@@ -1667,11 +2118,40 @@ static int __rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t siz
+ 
+ static int rtcp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int *ice)
+ {
++	/* SRTP_DTLS: don't send RTCP until ICE completed (FIXME useless? pjnath already does this?) */
++	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
++	if(rtp->rtcp->ssl && !rtp->rtcp->dtlsdone) {
++		const char *out = buf;
++		if ((*out >= 20) && (*out <= 64)) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP] Sending DTLS data (%zu)\n", size);
++		} else if(rtp->rtcp->connection == AST_RTP_DTLS_CONNECTION_NEW) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTCP]   >> Still waiting for the DTLS handshake to complete, discarding packet (%zu)\n", size);
++			return 0;
++		}
++	}
++	/* SRTP_DTLS */
+ 	return __rtp_sendto(instance, buf, size, flags, sa, 1, ice, 1);
+ }
+ 
+ static int rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int *ice)
+ {
++	/*SRTP_DTLS */
++	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
++	/* don't send RTP until DTLS handshake has been completed */
++	if(rtp->ssl && !rtp->dtlsdone) {
++		const char *out = buf;
++		if ((*out >= 20) && (*out <= 64)) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP] Sending DTLS data (%zu)\n", size);
++		} else if(rtp->connection == AST_RTP_DTLS_CONNECTION_NEW) {
++			if (dtlsdebug)
++				ast_verbose(VERBOSE_PREFIX_3 "[RTP]   >> Still waiting for the DTLS handshake to complete, discarding packet (%zu)\n", size);
++			return 0;
++		}
++	}
++	/*SRTP_DTLS */
+ 	return __rtp_sendto(instance, buf, size, flags, sa, 0, ice, 1);
+ }
+ 
+@@ -1915,7 +2395,7 @@ static int ice_create(struct ast_rtp_instance *instance, struct ast_sockaddr *ad
+ 	passwd = pj_str(rtp->local_passwd);
+ 
+ 	/* Create an ICE session for ICE negotiation */
+-	if (pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2,
++	if (pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_CONTROLLING, 2,
+ 			&ast_rtp_ice_sess_cb, &ufrag, &passwd, &rtp->ice) == PJ_SUCCESS) {
+ 		/* Make this available for the callbacks */
+ 		rtp->ice->user_data = rtp;
+@@ -2028,7 +2508,13 @@ static int ast_rtp_new(struct ast_rtp_instance *instance,
+ #ifdef HAVE_OPENSSL_SRTP
+ 	rtp->rekeyid = -1;
+ 	rtp->dtlstimerid = -1;
++	rtp->local_fingerprint_type = AST_RTP_DTLS_HASH_NONE;
++	rtp->remote_fingerprint_type = AST_RTP_DTLS_HASH_NONE;
++
+ #endif
++	/* SRTP_DTLS: make rtp aware of instance as well... */
++	rtp->instance = instance;
++	/*SRTP_DTLS */
+ 
+ 	return 0;
+ }
+@@ -2658,7 +3144,7 @@ static int ast_rtcp_write(const void *data)
+ 	}
+ 
+ 	if (!res) {
+-		/* 
++		/*
+ 		 * Not being rescheduled.
+ 		 */
+ 		ao2_ref(instance, -1);
+@@ -4404,14 +4890,14 @@ static int ast_rtp_sendcng(struct ast_rtp_instance *instance, int level)
+ 	payload = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(instance), 0, NULL, AST_RTP_CN);
+ 
+ 	level = 127 - (level & 0x7f);
+-	
++
+ 	rtp->dtmfmute = ast_tvadd(ast_tvnow(), ast_tv(0, 500000));
+ 
+ 	/* Get a pointer to the header */
+ 	rtpheader = (unsigned int *)data;
+ 	rtpheader[0] = htonl((2 << 30) | (payload << 16) | (rtp->seqno));
+ 	rtpheader[1] = htonl(rtp->lastts);
+-	rtpheader[2] = htonl(rtp->ssrc); 
++	rtpheader[2] = htonl(rtp->ssrc);
+ 	data[12] = level;
+ 
+ 	res = rtp_sendto(instance, (void *) rtpheader, hdrlen + 1, 0, &remote_address, &ice);
+@@ -4446,9 +4932,15 @@ static int ast_rtp_activate(struct ast_rtp_instance *instance)
+ 		return 0;
+ 	}
+ 
+-	SSL_do_handshake(rtp->ssl);
+-
+-	dtls_srtp_check_pending(instance, rtp);
++	/* SRTP_DTLS: only do the DTLS handshake right now if there's no ICE or if it has completed */
++	if(!rtp->ice || rtp->icedone) {
++		ast_verbose(VERBOSE_PREFIX_3 "  >> Doing DTLS handshake as well...\n");
++		SSL_do_handshake(rtp->ssl);
++		/* Meetecho: do the same with RTCP */
++		SSL_do_handshake(rtp->rtcp->ssl);
++		ast_verbose(VERBOSE_PREFIX_3 "  >> [activate] check pending...\n");
++		dtls_srtp_check_pending(instance, rtp);
++	}
+ 
+ 	return 0;
+ }
+@@ -4581,10 +5073,49 @@ static char *handle_cli_rtcp_set_stats(struct ast_cli_entry *e, int cmd, struct
+ 	return CLI_SUCCESS;
+ }
+ 
++/* SRTP_DTLS: add DTLS debugging */
++static char *handle_cli_dtls_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
++{
++	switch (cmd) {
++	case CLI_INIT:
++		e->command = "dtls set debug";
++		e->usage =
++			"Usage: dtls set debug {status|none|normal|huge}\n"
++			"       Enable/Disable DTLS debugging: normal only debugs setup and errors, huge debugs every single packet\n";
++		return NULL;
++	case CLI_GENERATE:
++		return NULL;
++	}
++
++	if (a->argc != 4)
++		return CLI_SHOWUSAGE;
++
++	if (!strncasecmp(a->argv[a->argc-1], "status", 6)) {
++		ast_cli(a->fd, "DTLS debugging %s\n", dtlsdebug > 1 ? "huge" : dtlsdebug > 0 ? "normal" : "none");
++		return CLI_SUCCESS;
++	}
++	if (!strncasecmp(a->argv[a->argc-1], "huge", 4))
++		dtlsdebug = 2;
++	else if (!strncasecmp(a->argv[a->argc-1], "normal", 6))
++		dtlsdebug = 1;
++	else if (!strncasecmp(a->argv[a->argc-1], "none", 4))
++		dtlsdebug = 0;
++	else
++		return CLI_SHOWUSAGE;
++
++	ast_cli(a->fd, "DTLS debugging %s\n", dtlsdebug > 1 ? "huge" : dtlsdebug > 0 ? "normal" : "none");
++	return CLI_SUCCESS;
++}
++/*SRTP_DTLS */
++
++
+ static struct ast_cli_entry cli_rtp[] = {
+ 	AST_CLI_DEFINE(handle_cli_rtp_set_debug,  "Enable/Disable RTP debugging"),
+ 	AST_CLI_DEFINE(handle_cli_rtcp_set_debug, "Enable/Disable RTCP debugging"),
+ 	AST_CLI_DEFINE(handle_cli_rtcp_set_stats, "Enable/Disable RTCP stats"),
++	/* SRTP_DTLS: add DTLS debugging */
++	AST_CLI_DEFINE(handle_cli_dtls_set_debug, "Enable/Disable DTLS debugging"),
++	/*SRTP_DTLS */
+ };
+ 
+ static int rtp_reload(int reload)
+-- 
+2.0.0
+

From 275651c70168764025120574219a771e6d4ed219 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sun, 6 Jul 2014 17:36:01 -0700
Subject: [PATCH 025/261] small ebuild fix

---
 net-misc/asterisk/Manifest                | 1 +
 net-misc/asterisk/asterisk-11.10.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index cf3747a..0fa8058 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,4 +3,5 @@ DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17
 DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
 DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
+DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
 DIST gentoo-asterisk-patchset-3.9.tar.bz2 7857 SHA256 d41b2c47a56040e3eb55b9354f05df6857f6efc60b35c081b8cdf50a8f6eed50 SHA512 97c49fdfb874e89a07abc0b129c9db0113a77feecd6bb1fea9b00a1f82161a9799f7a280fd2f6fc11c5e1e6984fc8374354967307f8e1b2d3a9fa713d350453c WHIRLPOOL ce7367cca3e6516d0e1fdb758f3463670b1cc2dad5a82abb3c3b1b3dc25ef07bc917ac0184e58674a02e88ffc6ac0b770f217a6870011791758e6612febf09f6
diff --git a/net-misc/asterisk/asterisk-11.10.0.ebuild b/net-misc/asterisk/asterisk-11.10.0.ebuild
index 0eddd55..c23516d 100644
--- a/net-misc/asterisk/asterisk-11.10.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.10.0.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.9.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"

From 9faa6c6b8b805b1db8b88634b8edbaada645e328 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sun, 6 Jul 2014 18:27:27 -0700
Subject: [PATCH 026/261] added another asterisk ebuild of brnach 11.6 that has
 the webrtc fixes in it

---
 net-misc/asterisk/Manifest               |   2 +-
 net-misc/asterisk/asterisk-11.6.0.ebuild | 322 +++++++++++++++++++++++
 net-misc/asterisk/asterisk-11.8.1.ebuild |   2 +-
 3 files changed, 324 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/asterisk/asterisk-11.6.0.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 0fa8058..ed0f907 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,7 +1,7 @@
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
 DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
+DIST asterisk-11.6.0.tar.gz 24828582 SHA256 c128ce24416b236fd73c403ad1e2da33c3816cf6db1beb6f97509659f8b281a0 SHA512 6a14d92d6a263edac0da23b091961adf54be9d5ff042117c5f1255241744a3f9a10cd851d46326f58c18932d5dfe8bff38bd760b4ca63aeae15d4eed222d6612 WHIRLPOOL eed712b55af394a2c4a9873bc39e8dee23b022530f290030bb08f2feb735188a1b6789067d6f149bf8065976af457b5795960259790fae8339e059a6eda0f117
 DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
-DIST gentoo-asterisk-patchset-3.9.tar.bz2 7857 SHA256 d41b2c47a56040e3eb55b9354f05df6857f6efc60b35c081b8cdf50a8f6eed50 SHA512 97c49fdfb874e89a07abc0b129c9db0113a77feecd6bb1fea9b00a1f82161a9799f7a280fd2f6fc11c5e1e6984fc8374354967307f8e1b2d3a9fa713d350453c WHIRLPOOL ce7367cca3e6516d0e1fdb758f3463670b1cc2dad5a82abb3c3b1b3dc25ef07bc917ac0184e58674a02e88ffc6ac0b770f217a6870011791758e6612febf09f6
diff --git a/net-misc/asterisk/asterisk-11.6.0.ebuild b/net-misc/asterisk/asterisk-11.6.0.ebuild
new file mode 100644
index 0000000..9732c61
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.6.0.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset"
+)
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	jabber? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua )
+	meetme? ( net-misc/dahdi )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select meetme		app_meetme
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-11.8.1.ebuild b/net-misc/asterisk/asterisk-11.8.1.ebuild
index 3409eca..ab0f3ea 100644
--- a/net-misc/asterisk/asterisk-11.8.1.ebuild
+++ b/net-misc/asterisk/asterisk-11.8.1.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.9.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"

From 9c6bddc0d9a2cd7dad2443dc368e9c1a75e133c9 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 14 Jul 2014 19:38:13 -0700
Subject: [PATCH 027/261] added freeswitch-cyneric, with extra files from
 mirrors

---
 net-misc/asterisk/asterisk-1.4.39.1.ebuild    |    1 -
 net-misc/freeswitch-cyneric/Manifest          |    1 +
 .../freeswitch-cyneric/files/freeswitch.confd |   24 +
 .../freeswitch-cyneric/files/freeswitch.rc6   |   49 +
 .../freeswitch-cyneric-1.2.12.ebuild          | 1169 +++++++++++++++++
 5 files changed, 1243 insertions(+), 1 deletion(-)
 create mode 100644 net-misc/freeswitch-cyneric/Manifest
 create mode 100644 net-misc/freeswitch-cyneric/files/freeswitch.confd
 create mode 100755 net-misc/freeswitch-cyneric/files/freeswitch.rc6
 create mode 100644 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild

diff --git a/net-misc/asterisk/asterisk-1.4.39.1.ebuild b/net-misc/asterisk/asterisk-1.4.39.1.ebuild
index 83a593d..2ef0a84 100644
--- a/net-misc/asterisk/asterisk-1.4.39.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.4.39.1.ebuild
@@ -207,7 +207,6 @@ src_configure() {
 
 src_compile() {
 	ASTLDFLAGS="${LDFLAGS}" emake
-#	ASTLDFLAGS="${LDFLAGS}" emake USER_MAKEOPTS="${S}"/gentoo.makeopts || die "emake failed"
 }
 
 src_install() {
diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
new file mode 100644
index 0000000..b5a461d
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -0,0 +1 @@
+DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.confd b/net-misc/freeswitch-cyneric/files/freeswitch.confd
new file mode 100644
index 0000000..6f1f286
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.confd
@@ -0,0 +1,24 @@
+#
+# FreeSWITCH startup configuration
+#
+
+# freeswitch will be running with this userid
+FREESWITCH_USER="freeswitch"
+
+
+# optional: group the freeswitch process should be running with
+#
+# (note: without this option freeswitch will be using all groups
+#  the user in FREESWITCH_USER is a member of)
+#
+#FREESWITCH_GROUP="freeswitch"
+
+
+
+# optional: other options, e.g.
+#
+# -hp	Use realtime priority and protect freeswitch
+#       process from being swapped to disk
+#       (warning: dangerous on machines with little ram!)
+#
+#FREESWITCH_OPTS=""
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.rc6 b/net-misc/freeswitch-cyneric/files/freeswitch.rc6
new file mode 100755
index 0000000..99c1ea6
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.rc6
@@ -0,0 +1,49 @@
+!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+FREESWITCH_BIN="${FREESWITCH_BIN:-/opt/freeswitch/bin/freeswitch}"
+
+# get instance id
+INSTANCE="$( cut -d '.' -f 2 <<< "${SVCNAME}" )";
+
+
+depend() {
+        need net
+        use dahdi
+}
+
+
+start() {
+        local OPTS
+
+        [ -n "${FREESWITCH_USER}" ] && \
+                OPTS="${OPTS} -u ${FREESWITCH_USER}"
+
+        [ -n "${FREESWITCH_GROUP}" ] && \
+                OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+
+        [ -n "${FREESWITCH_OPTS}" ] && \
+                OPTS="${OPTS} ${FREESWITCH_OPTS}"
+
+
+        ebegin "Starting Freeswitch instance ${INSTANCE}"
+        cd /opt/freeswitch/scripts/
+        start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
+                --pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
+                -conf /opt/freeswitch/conf/${INSTANCE} \
+                -log /opt/freeswitch/log/${INSTANCE} \
+                -db /opt/freeswitch/db/${INSTANCE} \
+                -nc ${OPTS}
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Freeswitch instance ${INSTANCE}"
+        start-stop-daemon --stop \
+                --signal SIGILL \
+                --retry 5 --quiet \
+                --pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
new file mode 100644
index 0000000..a065352
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
@@ -0,0 +1,1169 @@
+#
+# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+# The automagic default "latest" only works for eautoreconf and friends,
+# so force these versions until we don't have to use (re)bootstrap.sh anymore.
+WANT_AUTOMAKE="1.11"
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils flag-o-matic python user
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~arm ~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+case ${PV} in
+9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+${PV%.*}.9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BRANCH="v${PV%.*}.stable"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+*_rc*)
+	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
+	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY}"
+	;;
+*)
+	SRC_URI="http://files.freeswitch.org/freeswitch-1.2.12.tar.bz2"
+	S="${WORKDIR}/freeswitch-1.2.12"
+	;;
+esac
+
+
+IUSE="esl nosamples odbc +resampler sctp zrtp"
+
+IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
+IUSE_FREETDM="libpri misdn"
+
+IUSE_MODULES="alsa amr amrwb avmd bv +cdr_csv cdr_pg_csv cdr_sqlite celt cepstral cidlookup +console curl
+	+db dialplan_directory dingaling distributor easyroute erlang_event
+	flite freetdm fsk +g723_1 g729 gsmopen h26x +hash +ilbc java lcr ldap +limit +local_stream +logfile +lua
+	managed memcache mp4v nibblebill opal osp perl pocketsphinx portaudio portaudio_stream python radius_cdr redis rtmp
+	shell_stream shout silk siren skinny skypopen snapshot +sndfile snom +sofia +spandsp +speex spidermonkey spy +syslog
+	+tone_stream tts_commandline unimrcp valet_parking vmd +voicemail
+	xml_cdr xml_curl xml_ldap xml_rpc
+"
+
+# mod_say_X
+IUSE_LINGUAS="de +en es fr he it nl ru zh"
+
+# inter-module dependencies
+INTER_MODULE_DEPENDS="
+	limit:db
+	limit:hash
+"
+
+# modules need these core functions
+CORE_MODULE_DEPENDS="
+	nibblebill:odbc
+	easyroute:odbc
+	lcr:odbc
+"
+
+# external dependencies of modules
+MODULES_RDEPEND="
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
+	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
+				   >=net-libs/ptlib-9999 )
+	freeswitch_modules_python? ( =dev-lang/python-2* )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
+	freeswitch_modules_easyroute? ( dev-db/unixODBC )
+	freeswitch_modules_lcr? ( dev-db/unixODBC )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
+	freeswitch_modules_freetdm? (
+		libpri? ( >=net-libs/libpri-1.4.0 )
+		misdn? ( >=net-dialup/misdnuser-2.0.0 )
+	)
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
+"
+#	freeswitch_modules_gsmopen? ( net-libs/libctb ... ) 
+
+# external core dependencies
+CORE_RDEPEND="
+	odbc? ( dev-db/unixODBC )
+	esl-lua? ( dev-lang/lua dev-lang/swig )
+	esl-php? ( dev-lang/php dev-lang/swig )
+	esl-perl? ( dev-lang/perl dev-lang/swig )
+	esl-ruby? ( dev-lang/ruby dev-lang/swig )
+	esl-python? ( dev-lang/python dev-lang/swig )
+"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	 ${CORE_RDEPEND}
+	 ${MODULES_RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
+
+PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
+	 >=net-misc/freeswitch-music-1.0.8"
+
+###
+# IUSE merging
+#
+for x in ${IUSE_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
+done
+
+IUSE="${IUSE} ${IUSE_ESL} ${IUSE_FREETDM}"
+
+
+###
+# pre-flight checks
+#
+pkg_setup() {
+	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
+
+	#
+	# 1. safety check
+	#
+	for mod in ${IUSE_MODULES}; do
+		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
+		eerror "This isn't a good idea, usually..."
+		eerror ""
+		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "FREESWITCH_MODULES empty / no modules selected for build"
+	fi
+
+	#
+	# 2. check prerequisites
+	#
+	if use freeswitch_modules_cepstral; then
+
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	if use freeswitch_modules_python ; then
+
+		if built_with_use --missing false dev-lang/python nothreads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
+			echo
+			(( error_cnt++ ))
+
+		elif ! built_with_use --missing true dev-lang/python threads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"threads\" useflag enabled"
+			echo
+			(( error_cnt++ ))
+		fi
+	fi
+
+	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
+		echo
+		eerror "perl: FreeSWITCH needs perl with threads support"
+		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
+		echo
+		eerror "ldap: OpenLDAP with sasl support is required"
+		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Build-time requirements not met!"
+		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Build-time requirements not met: ${error_cnt} errors"
+	fi
+
+	#
+	# 3. check inter-module dependencies
+	#
+	einfo "Checking inter-module dependencies..."
+	for x in ${INTER_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
+			# check if this module has an external dependency
+			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
+				eerror "Module \"${mod}\" requires module \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
+			fi
+		fi
+	done
+
+	#
+	# 4. check core dependencies
+	#
+	einfo "Checking core dependencies..."
+	for x in ${CORE_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
+			# check if this core option has an external dependency
+			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
+				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
+			fi
+		fi
+	done
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
+		eerror "external dependencies! This is for your own security, sorry..."
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Please read the error messages above and fix the listed issues"
+	fi
+
+	#
+	# 5. language checks
+	#
+	einfo "Checking selected languages..."
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		use linguas_${mod} && (( lang_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" ]; then
+		echo
+		ewarn "No languages selected, enabling \"en\" as a fallback"
+
+		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
+	fi
+
+	#
+	# 6. create user + group
+	#
+	enewgroup freeswitch
+	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
+
+	#
+	# 7. set active python version
+	#
+	python_set_active_version 2
+	python_pkg_setup
+
+	#
+	# DONE
+	#
+	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
+}
+
+
+###
+# ABI compat safety check functions
+#
+
+fs_abi_generate_symbols_array() {
+	local libfile="$1" syms
+
+	if [ ! -f "${libfile}" ]; then
+		eerror "Library ${libfile} does not exist"
+		return 1
+	fi
+
+	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
+	if [ -z "${syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	echo "${syms}"
+	return 0
+}
+
+fs_check_core_abi_compat() {
+	local libfreeswitch libfreeswitch_syms
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ -z "${REPLACING_VERSIONS}" ] && return 0
+
+	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate old libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check_abi.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$4
+            sym_len=\$2
+
+	    if (! sym in symbols)
+	        print sym
+
+	    if (symbols[sym] != sym_len)
+	        print sym
+	}
+	EOF
+
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate new libfreeswitch"
+		return 1
+	fi
+
+	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
+	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
+	if [ -n "${changed_syms}" ]; then
+		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
+	fi
+
+	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
+}
+
+fs_check_modules_api_compat() {
+	local x mod name libfreeswitch libfreeswitch_syms
+	local sym need_upgrade module_syms
+	local mod_warn_list="" mod_error_list=""
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
+
+	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
+	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
+	# (raw nm output)
+	#
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$2
+
+	    if (! sym in symbols)
+	        exit 1
+	}
+	EOF
+
+	einfo "Checking for incompatible modules..."
+	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
+		mod="$(basename "${x}")"
+		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
+		need_upgrade="no"
+
+		# no need to check modules that will be overwritten
+		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
+
+
+		# skip modules that are in our list but disabled (= will be uninstalled)
+		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
+			continue
+		fi
+
+		# check module
+		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
+		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
+			# needed symbol is not in the list of available ones, mark module broken
+			need_upgrade="yes"
+		else
+			# check if one of the used functions has been modified in the core,
+			# this may be an indication that the ABI has been changed too
+			# NOTE: This check isn't perfect...
+			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
+
+				if $(echo "${module_syms}" | grep -q "^${sym}"); then
+					# symbol is in the list of functions that _may_ have been changed in a
+					# ABI incompatible way, mark module broken
+					need_upgrade="maybe"
+					break
+				fi
+			done
+		fi
+
+		case "${need_upgrade}" in
+		maybe)
+			mod_warn_list="${mod_warn_list} ${mod}"
+			;;
+		yes)
+			mod_error_list="${mod_error_list} ${mod}"
+			;;
+		*)
+			;;
+		esac
+	done
+
+	if [ -n "${mod_warn_list}" ]; then
+		ewarn "The following modules use functions that have been changed since the last version,"
+		ewarn "you may need to upgrade:"
+		ewarn "  ${mod_warn_list}"
+		echo
+	fi
+
+	if [ -n "${mod_error_list}" ]; then
+		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
+		eerror "  ${mod_error_list}"
+		echo
+	fi
+
+	return 0
+}
+
+
+###
+# modules setup functions
+#
+
+fs_set_module() {
+	local config="build/modules.conf.in"
+	local mod="$2"
+
+	[ -f "modules.conf" ] && config="modules.conf"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		mod="mod_freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && die "unable to determine category for module \"${mod}\" (from: `pwd`)"
+
+	case $1 in
+	enable)
+		if grep -q "/${mod}$" ${config}
+		then
+			einfo "  ++ Enabling ${mod}"
+			sed -i -e "/\/${mod}$/s:.*:${category}/${mod}:" \
+				${config} || die "Failed to enable module \"${mod}\""
+		else
+			# module not in list, add it
+			einfo "  **  Adding ${mod}"
+			echo "${category}/${mod}" >> ${config}
+		fi
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		sed -i -e "/\/${mod}$/s:.*:#${category}/${mod}:" \
+			${config} || die "Failed to disable module \"${mod}\""
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod enablemod
+
+	einfo "Optional modules:"
+	for x in ${IUSE_MODULES}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use freeswitch_modules_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_${mod}" \
+			|| fs_set_module "disable" "mod_${mod}"
+	done
+
+	einfo "Language modules:"
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use linguas_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_say_${mod}" \
+			|| fs_set_module "disable" "mod_say_${mod}"
+	done
+}
+
+###
+# src_configure() helpers
+#
+
+fs_use() {
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		return 0
+	fi
+	return 1
+}
+
+fs_use_any_of() {
+	for x in $@ ; do
+		fs_use ${x} && return 0
+	done
+	return 1
+}
+
+fs_enable() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if fs_use $1; then
+		echo "--enable-${option}${value}"
+	else
+		echo "--disable-${option}"
+	fi
+}
+
+fs_with() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		echo "--with-${option}${value}"
+	else
+		echo "--without-${option}"
+	fi
+}
+
+###
+# other helpers
+#
+
+fs_is_upgrade() {
+	# svn install is always an upgrade
+	[ -n "${EGIT_REPO_URI}" ] && return 0
+
+	# regular up/-downgrade
+	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
+		return 0
+	fi
+
+	# not an up-/downgrade
+	return 1
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+###
+# Set file and directory permissions
+#
+fs_set_permissions() {
+	local prefix="$1"
+
+	[ -z "${prefix}" ] && {
+		die "Usage: set_permissions <prefix>"
+	}
+
+	einfo "Setting file and directory permissions..."
+
+	# sysconfdir
+	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
+
+	# prefix
+	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
+	# allow read access for things like building external modules
+	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
+	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
+
+	# directories owned by the fs user
+	for x in db run log cores storage recordings; do
+		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
+	done
+}
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+	#
+	# 1. custom user patches
+	#
+	epatch_user
+}
+
+src_prepare() {
+	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
+
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		BOOTSTRAP_CMD="${S}/bootstrap.sh"
+	elif [ -x "${S}/rebootstrap.sh" ]; then
+		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
+	fi
+
+	if [ -n "${BOOTSTRAP_CMD}" ]; then
+		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
+		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
+			einfo "Using parallel bootstrap..."
+			BOOTSTRAP_OPTS="-j"
+		}
+		einfo "Bootstrapping FreeSWITCH"
+		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
+
+		# Bootstrap FreeTDM
+		#if use freeswitch_modules_freetdm
+		#then
+		#	einfo "Bootstrapping FreeTDM"
+		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+		#fi
+	fi
+
+	#
+	# 1. enable / disable optional modules
+	#
+	setup_modules
+
+	#
+	# 2. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use esl-python; then
+		python_get_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 3. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	local java_opts ftdm_opts config_opts
+
+	#
+	# option handling
+	#
+	fs_use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+
+	# FreeTDM specific options
+	ftdm_opts="$(fs_with libpri) $(fs_with misdn)"
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. configure (can't use econf thanks to b0rked buildsystem)
+	#
+	einfo "Configuring FreeSWITCH..."
+	./configure -C \
+		--host=${CHOST} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CTARGET:+--target=${CTARGET}} \
+		--prefix=/opt/freeswitch \
+		--libdir=/opt/freeswitch/lib \
+		--sysconfdir=/opt/freeswitch/conf \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--enable-core-libedit-support \
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		$(fs_enable sctp) \
+		$(fs_enable zrtp) \
+		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(fs_enable resampler resample) \
+		$(fs_enable odbc core-odbc-support) \
+		${java_opts} ${ftdm_opts} ${config_opts} \
+		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
+
+	#
+	# 3. configure FreeTDM
+	#
+	#if use freeswitch_modules_freetdm
+	#then
+	#	cd "${S}/libs/freetdm"
+	#	einfo "Configuring FreeTDM..."
+	#	econf \
+	#		--prefix=/opt/freeswitch \
+	#		--libdir=/opt/freeswitch/lib \
+	#		--sysconfdir=/opt/freeswitch/conf \
+	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+	#		${config_opts} || die "failed to configure FreeTDM"
+	#fi
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# build FreeTDM
+	#
+	if use freeswitch_modules_freetdm
+	then
+		einfo "Building FreeTDM..."
+		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+
+	#
+	# 2. build everything
+	#
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+
+	#
+	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
+	#
+	if fs_use_any_of ${IUSE_ESL}; then
+		einfo "Running esl reswig..."
+		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
+	fi
+
+	#
+	# 4. build esl modules
+	#
+	for esl_lang in ${IUSE_ESL}; do
+		use ${esl_lang} || continue
+
+		esl_lang="${esl_lang#*-}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	if use esl; then
+		einfo "Building libesl..."
+		emake -j1 -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. Install core
+	#
+	einfo "Installing freeswitch core and modules..."
+	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+
+	#
+	# 2. Documentation, sample config files, ...
+	#
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto /opt/freeswitch/scripts/rss
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /opt/freeswitch/{htdocs,log,log/{xml_cdr,cdr-csv},db,grammar,cores,storage,scripts,recordings}
+
+	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	# save a copy of the default config
+	einfo "Saving a copy of the default configuration..."
+	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
+	while read fn; do
+		docinto "$(dirname "${fn}")"
+		dodoc   "${D}/opt/freeswitch/${fn}"
+	done
+
+	# remove sample configuration if the user wishes so,
+	# but only if this isn't a fresh installation
+	if use nosamples; then
+		if ! has_version "net-misc/freeswitch"; then
+			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
+		else
+			einfo "Removing sample configuration files..."
+			rm -r "${D}"/opt/freeswitch/conf/*
+		fi
+	fi
+
+	# move configuration to /etc/freeswitch and
+	# create symlink to /opt/freeswitch/conf
+	dodir /etc
+	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
+	dosym /etc/freeswitch /opt/freeswitch/conf
+
+	# keep managed subdir
+	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
+
+	# TODO: install contributed stuff
+
+	# mod_skypopen sample config & helper files
+	if fs_use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	#
+	# 3. Remove .a and .la files
+	#
+	prune_libtool_files --modules
+
+	#
+	# 4. install esl modules
+	#
+	if use esl-ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use esl-python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl-lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl-php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use esl-perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/opt/freeswitch/lib"
+		doins libs/esl/libesl.a
+	fi
+
+	#
+	# 5. Fix permissions
+	#
+	fs_set_permissions "${D}"
+}
+
+pkg_preinst() {
+	#
+	# 1. upgrade api check
+	#
+	if fs_is_upgrade; then
+		einfo "Performing core ABI compatibility check..."
+
+		# compare exported symbols of new and old libfreeswitch to make sure
+		# external modules will still work
+		fs_check_core_abi_compat
+
+		# check if external modules will still work after upgrade
+		# to new libfreeswitch
+		fs_check_modules_api_compat
+	fi
+
+	#
+	# 2. preserve existing config files
+	#
+	if use nosamples; then
+		if has_version "net-misc/freeswitch"; then
+			einfo "Preserving existing configuration..."
+			rm -r "${D}/etc/freeswitch"
+			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#
+	# 1. Info
+	#
+	echo
+	einfo "FreeSWITCH has been successfully emerged!"
+	echo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	echo
+
+	# skypopen setup guide
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		echo
+	fi
+
+	einfo "A copy of the default configuration has been saved to"
+	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
+	echo
+
+	echo
+	einfo "FreeSWITCH Cyneric Specific files"
+	echo
+
+	mkdir /var/tmp/portage/cyneric
+	curl http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/freeswitch-cyneric.tar.gz -o /var/tmp/portage/cyneric/freeswitch-cyneric.tar.gz
+	cd /var/tmp/portage/cyneric; tar -zxvf freeswitch-cyneric.tar.gz
+
+	echo
+	einfo "copying cyneric specific files"
+	echo
+
+	rm -rf /var/tmp/portage/cyneric/freeswitch-cyneric.tar.gz
+	cp -R /var/tmp/portage/cyneric/* /opt/freeswitch/
+	rm -rf /var/tmp/portage/cyneric/*
+
+	echo
+	einfo "copying configurations"
+	echo
+
+	curl http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/freeswitch-cyneric-cnf.tar.gz -o /var/tmp/portage/cyneric/freeswitch-cyneric-cnf.tar.gz
+	cd /var/tmp/portage/cyneric; tar -zxvf freeswitch-cyneric-cnf.tar.gz
+
+	rm -rf /opt/freeswitch/conf/*
+	rm -rf /var/tmp/portage/cyneric/freeswitch-cyneric-cnf.tar.gz
+	cp -R /var/tmp/portage/cyneric/* /opt/freeswitch/conf/
+
+	echo
+	einfo "completed Cyneric code"
+	echo
+
+
+}
+
+pkg_config() {
+	local answer="N"
+
+	[ "$(id -u)" != "0" ] && {
+		eerror "This action needs root privileges"
+		die "Can not run as non-root user"
+	}
+
+	einfo "Reset permissions to installation defaults (y/N)?"
+	read answer
+
+	if [ "${answer/y/Y}" = "Y" ]; then
+		#
+		# Fix permissions
+		#
+		fs_set_permissions "${EROOT:-/}"
+
+		einfo "Done"
+	else
+		ewarn "Aborted"
+	fi
+}

From 40865177bbd806842d772ec188af6fa4f94064b8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 3 Sep 2014 15:37:27 -0700
Subject: [PATCH 028/261] added xmlrpc support to opensips ebuild

---
 net-misc/opensips/opensips-1.8.0.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net-misc/opensips/opensips-1.8.0.ebuild b/net-misc/opensips/opensips-1.8.0.ebuild
index a3702e7..4f6c44c 100644
--- a/net-misc/opensips/opensips-1.8.0.ebuild
+++ b/net-misc/opensips/opensips-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc"
 
 RDEPEND="
 	mysql? ( >=dev-db/mariadb-4.1.20 )
@@ -24,6 +24,7 @@ RDEPEND="
 	cpl? ( dev-libs/libxml2 )
 	b2bua? ( dev-libs/libxml2 )
 	presence? ( dev-libs/libxml2 )
+	xmlrpc? ( dev-libs/xmlrpc-c[abyss] )
 	unixodbc? ( >=dev-db/unixODBC-2.3.0 )"
 
 inc_mod=""
@@ -54,6 +55,9 @@ pkg_setup() {
 	use unixodbc && \
 		inc_mod="${inc_mod} db_unixodbc"
 
+	use xmlrpc  && \
+                inc_mod="${inc_mod} mi_xmlrpc"
+
 	export inc_mod
 }
 

From 7da8f2290cd2db2469a5554a401c0e217bd5cd6f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 3 Sep 2014 15:44:55 -0700
Subject: [PATCH 029/261] had to fix ebuild to use new api

---
 net-misc/opensips/Manifest              | 6 ------
 net-misc/opensips/opensips-1.8.0.ebuild | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index a6b9dc4..ebe3d6b 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -1,8 +1,2 @@
-AUX Makefile-1.8.0.patch 653 SHA256 5f1323751bcbb6f32c665559a6d658b725d278308969127d879ecf2831138f56 SHA512 44fe13addc7f0cb1c241724f8865d2b673b55ed3379ef74976b7dbc6333fd997f130c5ab96e68f35380b380f8593cc712dcc119abeb4f8d644f664acfc6f9e53 WHIRLPOOL 1b3b429ca8bd254334c71f5011579a162a6f51850fd5dfa9167fad931cbb16dc1fed6fa8587fa404abe2b602741fe90030d46a7397c4077fd04521e17114b75b
-AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bdcb19746df47a038d SHA512 25fc5e61f6ffc2d9aa0ba28b2ff37cb7376c2917d9c3bf60bd1a73c9195b3f9b3b74a7f0cbb3f743db12efe5866c58cae1f3bc83ee0a27d5e4aea6172175412f WHIRLPOOL ddd46bd046751eff342ebd5ef965d684148e5d0a41aaf296764545d05518781065d981169ba9a6d5110efca7012b39b4654eeb33dc1500ce9726d780c51bbdf6
-AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d540466be30bc63 SHA512 a6bc407d96bfaca17e893ff8200e09703d4592e610dd5df66d2cccc635b134dac4b57a32ea5d9efd91a8f24d932616613115328bd561f34aabce84dff0c287e8 WHIRLPOOL aa67bce3127926b35e4c9bca24ec0f17490c41637645b58f37a24fa7f4a27ca5e99e115f1417e26d82a7a7b6c223074341e9bb24c5304d90a5f89e6305678cf6
-AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
-EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
-EBUILD opensips-1.8.0.ebuild 3192 SHA256 2da7c96cc162ddad235db82a210635a5ce05de6dc36bbe4c58b61b6144004ddf SHA512 5f28ef1fe37efd544e1f87148aa10cf8e3f6e680956fb6f3be3e21d0a88222daa85f19cd6a874b30a1a7860447696f638f5b2ed7b9fd850f30717ebe4a535cb4 WHIRLPOOL eb66199909f7a474da1803df9c109f53835c6d8c7e20d2374bea2a15b0c44fe299e25934ea70ac971cce278191ed649562d5442df371a117ff3bba3febb40e6b
diff --git a/net-misc/opensips/opensips-1.8.0.ebuild b/net-misc/opensips/opensips-1.8.0.ebuild
index 4f6c44c..7bbdfb7 100644
--- a/net-misc/opensips/opensips-1.8.0.ebuild
+++ b/net-misc/opensips/opensips-1.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
-
+EAPI="2"
 inherit eutils
 
 DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"

From ea44e663a182e90318eae6235c3ea5232927a215 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 8 Sep 2014 14:27:44 -0700
Subject: [PATCH 030/261] updated cyneric cron, init.d , and the tar file

---
 net-misc/asterisk/README.md                   |     9 -
 net-misc/asterisk/asterisk-1.8.26.1.ebuild    |   319 -
 net-misc/asterisk/files/.version.patch        |     5 -
 .../ADDONS/codecs/ilbc/FrameClassify.c        |   114 -
 .../ADDONS/codecs/ilbc/FrameClassify.h        |    27 -
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c   |   158 -
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h   |    52 -
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c   |   241 -
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h   |    28 -
 .../ADDONS/codecs/ilbc/StateConstructW.c      |    86 -
 .../ADDONS/codecs/ilbc/StateConstructW.h      |    31 -
 .../ADDONS/codecs/ilbc/StateSearchW.c         |   211 -
 .../ADDONS/codecs/ilbc/StateSearchW.h         |    52 -
 .../1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c   |    72 -
 .../1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h   |    30 -
 .../1.4.39.1/ADDONS/codecs/ilbc/constants.c   |   770 --
 .../1.4.39.1/ADDONS/codecs/ilbc/constants.h   |    80 -
 .../1.4.39.1/ADDONS/codecs/ilbc/createCB.c    |   231 -
 .../1.4.39.1/ADDONS/codecs/ilbc/createCB.h    |    58 -
 .../1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c      |   270 -
 .../1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h      |    29 -
 .../1.4.39.1/ADDONS/codecs/ilbc/enhancer.c    |   701 -
 .../1.4.39.1/ADDONS/codecs/ilbc/enhancer.h    |    36 -
 .../ADDONS/codecs/ilbc/extract-cfile.awk      |    24 -
 .../1.4.39.1/ADDONS/codecs/ilbc/filter.c      |   175 -
 .../1.4.39.1/ADDONS/codecs/ilbc/filter.h      |    80 -
 .../1.4.39.1/ADDONS/codecs/ilbc/gainquant.c   |   116 -
 .../1.4.39.1/ADDONS/codecs/ilbc/gainquant.h   |    30 -
 .../1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c    |   193 -
 .../1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h    |    25 -
 .../1.4.39.1/ADDONS/codecs/ilbc/helpfun.c     |   326 -
 .../1.4.39.1/ADDONS/codecs/ilbc/helpfun.h     |   106 -
 .../1.4.39.1/ADDONS/codecs/ilbc/hpInput.c     |    65 -
 .../1.4.39.1/ADDONS/codecs/ilbc/hpInput.h     |    24 -
 .../1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c    |    61 -
 .../1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h    |    24 -
 .../ADDONS/codecs/ilbc/iCBConstruct.c         |   112 -
 .../ADDONS/codecs/ilbc/iCBConstruct.h         |    40 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c   |   512 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h   |    37 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c |   652 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h |    42 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h |   217 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c |   543 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h |    39 -
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c   |   310 -
 .../files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c   |   283 -
 .../files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h   |    27 -
 .../1.4.39.1/ADDONS/codecs/ilbc/packing.c     |   182 -
 .../1.4.39.1/ADDONS/codecs/ilbc/packing.h     |    68 -
 .../1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt   | 10867 ----------------
 .../1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c  |    80 -
 .../1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h  |    24 -
 .../asterisk/files/1.4.39.1/asterisk.confd    |    95 -
 .../asterisk/files/1.4.39.1/asterisk.initd    |   295 -
 .../files/1.4.39.1/asterisk.logrotate         |     8 -
 net-misc/asterisk/files/1.4.39.1/dahdi.initd  |   229 -
 .../1.4.39.1/patches/apps_.moduleinfo.patch   |   281 -
 .../1.4.39.1/patches/apps_app_meetme.c.patch  |    13 -
 .../patches/apps_app_waitforsilence.c.patch   |    32 -
 .../build_tools_menuselect-deps.in.patch      |    10 -
 .../channels_.chan_dahdi.moduleinfo.patch     |     8 -
 .../patches/channels_.moduleinfo.patch        |    10 -
 .../patches/channels_chan_dahdi.c.patch       |  1909 ---
 .../patches/channels_chan_sip.c.patch         |    76 -
 .../files/1.4.39.1/patches/configure.ac.patch |    19 -
 .../contrib_scripts_get_ilbc_source.sh.patch  |    11 -
 .../patches/include_asterisk_channel.h.patch  |    39 -
 .../include_asterisk_dahdi_compat.h.patch     |    12 -
 .../1.4.39.1/patches/main_channel.c.patch     |    60 -
 .../1.4.39.1/patches/main_manager.c.patch     |    38 -
 .../files/1.4.39.1/patches/main_pbx.c.patch   |    44 -
 .../files/1.4.39.1/patches/main_utils.c.patch |    25 -
 .../files/1.4.39.1/patches/makeopts.in.patch  |    12 -
 .../1.4.39.1/patches/menuselect-tree.patch    |   292 -
 .../1.4.39.1/patches/res_res_features.c.patch |    10 -
 .../patches/res_res_musiconhold.c.patch       |   155 -
 net-misc/asterisk/files/1.6.0/asterisk.confd  |    98 -
 .../asterisk/files/1.6.2/asterisk.logrotate3  |    25 -
 net-misc/asterisk/files/1.6.2/call_data.txt   |    32 -
 .../asterisk/files/1.6.2/find_call_ids.sh     |    17 -
 .../files/1.6.2/find_call_sip_trace.sh        |    21 -
 net-misc/asterisk/files/1.6.2/sip_calc_auth   |    25 -
 net-misc/asterisk/files/1.8.0/asterisk.confd  |    95 -
 net-misc/asterisk/files/1.8.0/asterisk.initd4 |   273 -
 net-misc/asterisk/files/1.8.0/asterisk.initd5 |   295 -
 net-misc/asterisk/files/1.8.0/asterisk.initd6 |   345 -
 net-misc/asterisk/files/1.8.0/asterisk.initd7 |   347 -
 .../asterisk/files/1.8.0/find_call_ids.sh     |    68 -
 .../files/1.8.0/find_call_sip_trace.sh        |    76 -
 net-misc/asterisk/files/get_ilbc_source.sh    |    13 -
 .../freeswitch-cyneric/files/cyneric.cron     |    33 +
 .../freeswitch-cyneric/files/freeswitch.rc6   |    73 +-
 .../freeswitch-cyneric-1.2.12.ebuild          |    10 +-
 94 files changed, 85 insertions(+), 24338 deletions(-)
 delete mode 100644 net-misc/asterisk/README.md
 delete mode 100644 net-misc/asterisk/asterisk-1.8.26.1.ebuild
 delete mode 100644 net-misc/asterisk/files/.version.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/asterisk.confd
 delete mode 100755 net-misc/asterisk/files/1.4.39.1/asterisk.initd
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
 delete mode 100755 net-misc/asterisk/files/1.4.39.1/dahdi.initd
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
 delete mode 100644 net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
 delete mode 100644 net-misc/asterisk/files/1.6.0/asterisk.confd
 delete mode 100644 net-misc/asterisk/files/1.6.2/asterisk.logrotate3
 delete mode 100644 net-misc/asterisk/files/1.6.2/call_data.txt
 delete mode 100644 net-misc/asterisk/files/1.6.2/find_call_ids.sh
 delete mode 100644 net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
 delete mode 100644 net-misc/asterisk/files/1.6.2/sip_calc_auth
 delete mode 100644 net-misc/asterisk/files/1.8.0/asterisk.confd
 delete mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd4
 delete mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd5
 delete mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd6
 delete mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd7
 delete mode 100644 net-misc/asterisk/files/1.8.0/find_call_ids.sh
 delete mode 100644 net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
 delete mode 100644 net-misc/asterisk/files/get_ilbc_source.sh
 create mode 100644 net-misc/freeswitch-cyneric/files/cyneric.cron

diff --git a/net-misc/asterisk/README.md b/net-misc/asterisk/README.md
deleted file mode 100644
index 4f481df..0000000
--- a/net-misc/asterisk/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-this configures a special version of 1.4 with patches for vicidial, and allows it to compile and run on gentoo.
-
-
-since we use the hardened toolchain, for grsec, and pax, we have to disable the hardened profile in gcc temporarly during this build this is due to some bug that prevents sip from actually working.
-
-
-this also runs a special version of the ibc downloader. the one that comes stock with 1.4 links to a url that is no longer valid, we also want this process to be automated so it is.
-
-drewbeer
diff --git a/net-misc/asterisk/asterisk-1.8.26.1.ebuild b/net-misc/asterisk/asterisk-1.8.26.1.ebuild
deleted file mode 100644
index 0c2a188..0000000
--- a/net-misc/asterisk/asterisk-1.8.26.1.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.26.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-1.17.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex sqlite sqlite3 srtp static syslog vorbis ilbc"
-
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-
-REQUIRED_USE="
-	gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset"
-	   "${FILESDIR}/1.8.0/patches/vicidial.patch"
-)
-
-RDEPEND="dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	ais? ( sys-cluster/openais )
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	!net-libs/openh323
-	!net-libs/pjsip"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-
-        einfo "downloading ilbc source"
-        "${S}"/contrib/scripts/get_ilbc_source.sh
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select ais			res_ais
-	use_select alsa			chan_alsa
-	use_select bluetooth	chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_gtalk
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_jabber
-	use_select jingle		chan_jingle
-	use_select ilbc                 codec_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup	app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select sqlite		cdr_sqlite
-	use_select sqlite3		{cdr,cel}_sqlite3_custom
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bugs #300832 & #414585
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "1.6 -> 1.8 changes that you may care about:"
-	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
-	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/files/.version.patch b/net-misc/asterisk/files/.version.patch
deleted file mode 100644
index f867d72..0000000
--- a/net-misc/asterisk/files/.version.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- asterisk-1.4.39.1/.version	2011-01-17 10:57:55.000000000 -0800
-+++ asterisk-1.4.39.1-vici/.version	2011-02-08 18:17:17.000000000 -0800
-@@ -1 +1 @@
--1.4.39.1
-+1.4.39.1-vici
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
deleted file mode 100644
index 80d72d9..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
+++ /dev/null
@@ -1,114 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       FrameClassify.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*---------------------------------------------------------------*
-    *  Classification of subframes to localize start state
-    *--------------------------------------------------------------*/
-
-   int FrameClassify(      /* index to the max-energy sub-frame */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i/o) the encoder state structure */
-       float *residual     /* (i) lpc residual signal */
-   ) {
-       float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
-       int n, l, max_ssqEn_n;
-       const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
-           (float)1.0,(float)0.9,(float)0.8};
-       const float sampEn_win[5]={(float)1.0/(float)6.0,
-           (float)2.0/(float)6.0, (float)3.0/(float)6.0,
-           (float)4.0/(float)6.0, (float)5.0/(float)6.0};
-
-       /* init the front and back energies to zero */
-
-       memset(fssqEn, 0, NSUB_MAX*sizeof(float));
-       memset(bssqEn, 0, NSUB_MAX*sizeof(float));
-
-       /* Calculate front of first seqence */
-
-       n=0;
-       pp=residual;
-       for (l=0; l<5; l++) {
-           fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-           pp++;
-       }
-       for (l=5; l<SUBL; l++) {
-
-
-
-
-
-           fssqEn[n] += (*pp) * (*pp);
-           pp++;
-       }
-
-       /* Calculate front and back of all middle sequences */
-
-       for (n=1; n<iLBCenc_inst->nsub-1; n++) {
-           pp=residual+n*SUBL;
-           for (l=0; l<5; l++) {
-               fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-               bssqEn[n] += (*pp) * (*pp);
-               pp++;
-           }
-           for (l=5; l<SUBL-5; l++) {
-               fssqEn[n] += (*pp) * (*pp);
-               bssqEn[n] += (*pp) * (*pp);
-               pp++;
-           }
-           for (l=SUBL-5; l<SUBL; l++) {
-               fssqEn[n] += (*pp) * (*pp);
-               bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-               pp++;
-           }
-       }
-
-       /* Calculate back of last seqence */
-
-       n=iLBCenc_inst->nsub-1;
-       pp=residual+n*SUBL;
-       for (l=0; l<SUBL-5; l++) {
-           bssqEn[n] += (*pp) * (*pp);
-           pp++;
-       }
-       for (l=SUBL-5; l<SUBL; l++) {
-           bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-           pp++;
-       }
-
-       /* find the index to the weighted 80 sample with
-          most energy */
-
-       if (iLBCenc_inst->mode==20) l=1;
-       else                        l=0;
-
-       max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
-       max_ssqEn_n=1;
-       for (n=2; n<iLBCenc_inst->nsub; n++) {
-
-
-
-
-
-
-           l++;
-           if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
-               max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
-                               ssqEn_win[l];
-               max_ssqEn_n=n;
-           }
-       }
-
-       return max_ssqEn_n;
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
deleted file mode 100644
index 018ddbe..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       FrameClassify.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_FRAMECLASSIFY_H
-   #define __iLBC_FRAMECLASSIFY_H
-
-   int FrameClassify(      /* index to the max-energy sub-frame */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i/o) the encoder state structure */
-       float *residual     /* (i) lpc residual signal */
-   );
-
-
-
-
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
deleted file mode 100644
index 81bab90..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
+++ /dev/null
@@ -1,158 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPC_decode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "helpfun.h"
-   #include "lsf.h"
-   #include "iLBC_define.h"
-   #include "constants.h"
-
-   /*---------------------------------------------------------------*
-    *  interpolation of lsf coefficients for the decoder
-    *--------------------------------------------------------------*/
-
-   void LSFinterpolate2a_dec(
-       float *a,           /* (o) lpc coefficients for a sub-frame */
-       float *lsf1,    /* (i) first lsf coefficient vector */
-       float *lsf2,    /* (i) second lsf coefficient vector */
-       float coef,         /* (i) interpolation weight */
-       int length          /* (i) length of lsf vectors */
-   ){
-       float  lsftmp[LPC_FILTERORDER];
-
-       interpolate(lsftmp, lsf1, lsf2, coef, length);
-       lsf2a(a, lsftmp);
-   }
-
-   /*---------------------------------------------------------------*
-    *  obtain dequantized lsf coefficients from quantization index
-    *--------------------------------------------------------------*/
-
-   void SimplelsfDEQ(
-       float *lsfdeq,    /* (o) dequantized lsf coefficients */
-       int *index,         /* (i) quantization index */
-       int lpc_n           /* (i) number of LPCs */
-   ){
-       int i, j, pos, cb_pos;
-
-
-
-
-
-       /* decode first LSF */
-
-       pos = 0;
-       cb_pos = 0;
-       for (i = 0; i < LSF_NSPLIT; i++) {
-           for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-               lsfdeq[pos + j] = lsfCbTbl[cb_pos +
-                   (long)(index[i])*dim_lsfCbTbl[i] + j];
-           }
-           pos += dim_lsfCbTbl[i];
-           cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-       }
-
-       if (lpc_n>1) {
-
-           /* decode last LSF */
-
-           pos = 0;
-           cb_pos = 0;
-           for (i = 0; i < LSF_NSPLIT; i++) {
-               for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-                   lsfdeq[LPC_FILTERORDER + pos + j] =
-                       lsfCbTbl[cb_pos +
-                       (long)(index[LSF_NSPLIT + i])*
-                       dim_lsfCbTbl[i] + j];
-               }
-               pos += dim_lsfCbTbl[i];
-               cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  obtain synthesis and weighting filters form lsf coefficients
-    *---------------------------------------------------------------*/
-
-   void DecoderInterpolateLSF(
-       float *syntdenum, /* (o) synthesis filter coefficients */
-       float *weightdenum, /* (o) weighting denumerator
-                                  coefficients */
-       float *lsfdeq,       /* (i) dequantized lsf coefficients */
-       int length,         /* (i) length of lsf coefficient vector */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i) the decoder state structure */
-   ){
-       int    i, pos, lp_length;
-       float  lp[LPC_FILTERORDER + 1], *lsfdeq2;
-
-
-
-
-
-
-       lsfdeq2 = lsfdeq + length;
-       lp_length = length + 1;
-
-       if (iLBCdec_inst->mode==30) {
-           /* sub-frame 1: Interpolation between old and first */
-
-           LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq,
-               lsf_weightTbl_30ms[0], length);
-           memcpy(syntdenum,lp,lp_length*sizeof(float));
-           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM,
-               lp_length);
-
-           /* sub-frames 2 to 6: interpolation between first
-              and last LSF */
-
-           pos = lp_length;
-           for (i = 1; i < 6; i++) {
-               LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2,
-                   lsf_weightTbl_30ms[i], length);
-               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-               bwexpand(weightdenum + pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-       else {
-           pos = 0;
-           for (i = 0; i < iLBCdec_inst->nsub; i++) {
-               LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold,
-                   lsfdeq, lsf_weightTbl_20ms[i], length);
-               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-               bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM,
-                   lp_length);
-               pos += lp_length;
-           }
-       }
-
-       /* update memory */
-
-       if (iLBCdec_inst->mode==30)
-           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2,
-                       length*sizeof(float));
-       else
-           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq,
-                       length*sizeof(float));
-
-   }
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
deleted file mode 100644
index abe1d7b..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPC_decode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LPC_DECODE_H
-   #define __iLBC_LPC_DECODE_H
-
-   void LSFinterpolate2a_dec(
-       float *a,           /* (o) lpc coefficients for a sub-frame */
-       float *lsf1,    /* (i) first lsf coefficient vector */
-       float *lsf2,    /* (i) second lsf coefficient vector */
-       float coef,         /* (i) interpolation weight */
-       int length          /* (i) length of lsf vectors */
-   );
-
-   void SimplelsfDEQ(
-       float *lsfdeq,      /* (o) dequantized lsf coefficients */
-       int *index,         /* (i) quantization index */
-       int lpc_n           /* (i) number of LPCs */
-   );
-
-   void DecoderInterpolateLSF(
-       float *syntdenum,   /* (o) synthesis filter coefficients */
-       float *weightdenum, /* (o) weighting denumerator
-                                  coefficients */
-       float *lsfdeq,      /* (i) dequantized lsf coefficients */
-       int length,         /* (i) length of lsf coefficient vector */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i) the decoder state structure */
-   );
-
-   #endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
deleted file mode 100644
index 19695c0..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
+++ /dev/null
@@ -1,241 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPCencode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "helpfun.h"
-   #include "lsf.h"
-   #include "constants.h"
-
-
-
-
-
-   /*----------------------------------------------------------------*
-    *  lpc analysis (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimpleAnalysis(
-       float *lsf,         /* (o) lsf coefficients */
-       float *data,    /* (i) new data vector */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       int k, is;
-       float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
-       float lp2[LPC_FILTERORDER + 1];
-       float r[LPC_FILTERORDER + 1];
-
-       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-       memcpy(iLBCenc_inst->lpc_buffer+is,data,
-           iLBCenc_inst->blockl*sizeof(float));
-
-       /* No lookahead, last window is asymmetric */
-
-       for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
-
-           is = LPC_LOOKBACK;
-
-           if (k < (iLBCenc_inst->lpc_n - 1)) {
-               window(temp, lpc_winTbl,
-                   iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
-           } else {
-               window(temp, lpc_asymwinTbl,
-                   iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
-           }
-
-           autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
-           window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
-
-           levdurb(lp, temp, r, LPC_FILTERORDER);
-           bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
-
-           a2lsf(lsf + k*LPC_FILTERORDER, lp2);
-       }
-       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-       memmove(iLBCenc_inst->lpc_buffer,
-           iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is,
-           is*sizeof(float));
-   }
-
-   /*----------------------------------------------------------------*
-
-
-
-
-
-    *  lsf interpolator and conversion from lsf to a coefficients
-    *  (subrutine to SimpleInterpolateLSF)
-    *---------------------------------------------------------------*/
-
-   void LSFinterpolate2a_enc(
-       float *a,       /* (o) lpc coefficients */
-       float *lsf1,/* (i) first set of lsf coefficients */
-       float *lsf2,/* (i) second set of lsf coefficients */
-       float coef,     /* (i) weighting coefficient to use between
-                              lsf1 and lsf2 */
-       long length      /* (i) length of coefficient vectors */
-   ){
-       float  lsftmp[LPC_FILTERORDER];
-
-       interpolate(lsftmp, lsf1, lsf2, coef, length);
-       lsf2a(a, lsftmp);
-   }
-
-   /*----------------------------------------------------------------*
-    *  lsf interpolator (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimpleInterpolateLSF(
-       float *syntdenum,   /* (o) the synthesis filter denominator
-                                  resulting from the quantized
-                                  interpolated lsf */
-       float *weightdenum, /* (o) the weighting filter denominator
-                                  resulting from the unquantized
-                                  interpolated lsf */
-       float *lsf,         /* (i) the unquantized lsf coefficients */
-       float *lsfdeq,      /* (i) the dequantized lsf coefficients */
-       float *lsfold,      /* (i) the unquantized lsf coefficients of
-                                  the previous signal frame */
-       float *lsfdeqold, /* (i) the dequantized lsf coefficients of
-                                  the previous signal frame */
-       int length,         /* (i) should equate LPC_FILTERORDER */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       int    i, pos, lp_length;
-       float  lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
-
-       lsf2 = lsf + length;
-       lsfdeq2 = lsfdeq + length;
-       lp_length = length + 1;
-
-       if (iLBCenc_inst->mode==30) {
-           /* sub-frame 1: Interpolation between old and first
-
-
-
-
-
-              set of lsf coefficients */
-
-           LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
-               lsf_weightTbl_30ms[0], length);
-           memcpy(syntdenum,lp,lp_length*sizeof(float));
-           LSFinterpolate2a_enc(lp, lsfold, lsf,
-               lsf_weightTbl_30ms[0], length);
-           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
-
-           /* sub-frame 2 to 6: Interpolation between first
-              and second set of lsf coefficients */
-
-           pos = lp_length;
-           for (i = 1; i < iLBCenc_inst->nsub; i++) {
-               LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2,
-                   lsf_weightTbl_30ms[i], length);
-               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-
-               LSFinterpolate2a_enc(lp, lsf, lsf2,
-                   lsf_weightTbl_30ms[i], length);
-               bwexpand(weightdenum + pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-       else {
-           pos = 0;
-           for (i = 0; i < iLBCenc_inst->nsub; i++) {
-               LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
-                   lsf_weightTbl_20ms[i], length);
-               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-               LSFinterpolate2a_enc(lp, lsfold, lsf,
-                   lsf_weightTbl_20ms[i], length);
-               bwexpand(weightdenum+pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-
-       /* update memory */
-
-       if (iLBCenc_inst->mode==30) {
-           memcpy(lsfold, lsf2, length*sizeof(float));
-           memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
-       }
-       else {
-           memcpy(lsfold, lsf, length*sizeof(float));
-           memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
-
-
-
-
-
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lsf quantizer (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimplelsfQ(
-       float *lsfdeq,    /* (o) dequantized lsf coefficients
-                              (dimension FILTERORDER) */
-       int *index,     /* (o) quantization index */
-       float *lsf,      /* (i) the lsf coefficient vector to be
-                              quantized (dimension FILTERORDER ) */
-       int lpc_n     /* (i) number of lsf sets to quantize */
-   ){
-       /* Quantize first LSF with memoryless split VQ */
-       SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT,
-           dim_lsfCbTbl, size_lsfCbTbl);
-
-       if (lpc_n==2) {
-           /* Quantize second LSF with memoryless split VQ */
-           SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT,
-               lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT,
-               dim_lsfCbTbl, size_lsfCbTbl);
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lpc encoder
-    *---------------------------------------------------------------*/
-
-   void LPCencode(
-       float *syntdenum, /* (i/o) synthesis filter coefficients
-                                  before/after encoding */
-       float *weightdenum, /* (i/o) weighting denumerator
-                                  coefficients before/after
-                                  encoding */
-       int *lsf_index,     /* (o) lsf quantization index */
-       float *data,    /* (i) lsf coefficients to quantize */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       float lsf[LPC_FILTERORDER * LPC_N_MAX];
-       float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
-       int change=0;
-
-       SimpleAnalysis(lsf, data, iLBCenc_inst);
-       SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
-
-
-
-
-
-       change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
-       SimpleInterpolateLSF(syntdenum, weightdenum,
-           lsf, lsfdeq, iLBCenc_inst->lsfold,
-           iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
deleted file mode 100644
index 39a9b04..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPCencode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LPCENCOD_H
-   #define __iLBC_LPCENCOD_H
-
-   void LPCencode(
-       float *syntdenum,   /* (i/o) synthesis filter coefficients
-                                  before/after encoding */
-       float *weightdenum, /* (i/o) weighting denumerator coefficients
-                                  before/after encoding */
-       int *lsf_index,     /* (o) lsf quantization index */
-       float *data,    /* (i) lsf coefficients to quantize */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
deleted file mode 100644
index 1d3e65f..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
+++ /dev/null
@@ -1,86 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateConstructW.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    *  decoding of the start state
-    *---------------------------------------------------------------*/
-
-   void StateConstructW(
-       int idxForMax,      /* (i) 6-bit index for the quantization of
-                                  max amplitude */
-       int *idxVec,    /* (i) vector of quantization indexes */
-       float *syntDenum,   /* (i) synthesis filter denumerator */
-
-
-
-
-
-       float *out,         /* (o) the decoded state vector */
-       int len             /* (i) length of a state vector */
-   ){
-       float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp,
-           numerator[LPC_FILTERORDER+1];
-       float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
-       int k,tmpi;
-
-       /* decoding of the maximum value */
-
-       maxVal = state_frgqTbl[idxForMax];
-       maxVal = (float)pow(10,maxVal)/(float)4.5;
-
-       /* initialization of buffers and coefficients */
-
-       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-       for (k=0; k<LPC_FILTERORDER; k++) {
-           numerator[k]=syntDenum[LPC_FILTERORDER-k];
-       }
-       numerator[LPC_FILTERORDER]=syntDenum[0];
-       tmp = &tmpbuf[LPC_FILTERORDER];
-       fout = &foutbuf[LPC_FILTERORDER];
-
-       /* decoding of the sample values */
-
-       for (k=0; k<len; k++) {
-           tmpi = len-1-k;
-           /* maxVal = 1/scal */
-           tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
-       }
-
-       /* circular convolution with all-pass filter */
-
-       memset(tmp+len, 0, len*sizeof(float));
-       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
-           LPC_FILTERORDER, fout);
-       for (k=0;k<len;k++) {
-           out[k] = fout[len-1-k]+fout[2*len-1-k];
-       }
-   }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
deleted file mode 100644
index 08f93d2..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateConstructW.h
-
-
-
-
-
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_STATECONSTRUCTW_H
-   #define __iLBC_STATECONSTRUCTW_H
-
-   void StateConstructW(
-       int idxForMax,      /* (i) 6-bit index for the quantization of
-                                  max amplitude */
-       int *idxVec,    /* (i) vector of quantization indexes */
-       float *syntDenum,   /* (i) synthesis filter denumerator */
-       float *out,         /* (o) the decoded state vector */
-       int len             /* (i) length of a state vector */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
deleted file mode 100644
index 1eeee93..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
+++ /dev/null
@@ -1,211 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateSearchW.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-   #include "helpfun.h"
-
-   /*----------------------------------------------------------------*
-    *  predictive noise shaping encoding of scaled start state
-    *  (subrutine for StateSearchW)
-    *---------------------------------------------------------------*/
-
-   void AbsQuantW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *in,          /* (i) vector to encode */
-       float *syntDenum,   /* (i) denominator of synthesis filter */
-       float *weightDenum, /* (i) denominator of weighting filter */
-       int *out,           /* (o) vector of quantizer indexes */
-       int len,        /* (i) length of vector to encode and
-                                  vector of quantizer indexes */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   ){
-       float *syntOut;
-       float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
-       float toQ, xq;
-       int n;
-       int index;
-
-       /* initialization of buffer for filtering */
-
-       memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
-
-
-
-
-
-
-       /* initialization of pointer for filtering */
-
-       syntOut = &syntOutBuf[LPC_FILTERORDER];
-
-       /* synthesis and weighting filters on input */
-
-       if (state_first) {
-           AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
-       } else {
-           AllPoleFilter (in, weightDenum,
-               iLBCenc_inst->state_short_len-SUBL,
-               LPC_FILTERORDER);
-       }
-
-       /* encoding loop */
-
-       for (n=0; n<len; n++) {
-
-           /* time update of filter coefficients */
-
-           if ((state_first)&&(n==SUBL)){
-               syntDenum += (LPC_FILTERORDER+1);
-               weightDenum += (LPC_FILTERORDER+1);
-
-               /* synthesis and weighting filters on input */
-               AllPoleFilter (&in[n], weightDenum, len-n,
-                   LPC_FILTERORDER);
-
-           } else if ((state_first==0)&&
-               (n==(iLBCenc_inst->state_short_len-SUBL))) {
-               syntDenum += (LPC_FILTERORDER+1);
-               weightDenum += (LPC_FILTERORDER+1);
-
-               /* synthesis and weighting filters on input */
-               AllPoleFilter (&in[n], weightDenum, len-n,
-                   LPC_FILTERORDER);
-
-           }
-
-           /* prediction of synthesized and weighted input */
-
-           syntOut[n] = 0.0;
-           AllPoleFilter (&syntOut[n], weightDenum, 1,
-               LPC_FILTERORDER);
-
-           /* quantization */
-
-           toQ = in[n]-syntOut[n];
-
-
-
-
-
-           sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
-           out[n]=index;
-           syntOut[n] = state_sq3Tbl[out[n]];
-
-           /* update of the prediction filter */
-
-           AllPoleFilter(&syntOut[n], weightDenum, 1,
-               LPC_FILTERORDER);
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  encoding of start state
-    *---------------------------------------------------------------*/
-
-   void StateSearchW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *residual,/* (i) target residual vector */
-       float *syntDenum,   /* (i) lpc synthesis filter */
-       float *weightDenum, /* (i) weighting filter denuminator */
-       int *idxForMax,     /* (o) quantizer index for maximum
-                                  amplitude */
-       int *idxVec,    /* (o) vector of quantization indexes */
-       int len,        /* (i) length of all vectors */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   ){
-       float dtmp, maxVal;
-       float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
-       float *tmp, numerator[1+LPC_FILTERORDER];
-       float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
-       int k;
-       float qmax, scal;
-
-       /* initialization of buffers and filter coefficients */
-
-       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-       for (k=0; k<LPC_FILTERORDER; k++) {
-           numerator[k]=syntDenum[LPC_FILTERORDER-k];
-       }
-       numerator[LPC_FILTERORDER]=syntDenum[0];
-       tmp = &tmpbuf[LPC_FILTERORDER];
-       fout = &foutbuf[LPC_FILTERORDER];
-
-       /* circular convolution with the all-pass filter */
-
-
-
-
-
-
-       memcpy(tmp, residual, len*sizeof(float));
-       memset(tmp+len, 0, len*sizeof(float));
-       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
-           LPC_FILTERORDER, fout);
-       for (k=0; k<len; k++) {
-           fout[k] += fout[k+len];
-       }
-
-       /* identification of the maximum amplitude value */
-
-       maxVal = fout[0];
-       for (k=1; k<len; k++) {
-
-           if (fout[k]*fout[k] > maxVal*maxVal){
-               maxVal = fout[k];
-           }
-       }
-       maxVal=(float)fabs(maxVal);
-
-       /* encoding of the maximum amplitude value */
-
-       if (maxVal < 10.0) {
-           maxVal = 10.0;
-       }
-       maxVal = (float)log10(maxVal);
-       sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
-
-       /* decoding of the maximum amplitude representation value,
-          and corresponding scaling of start state */
-
-       maxVal=state_frgqTbl[*idxForMax];
-       qmax = (float)pow(10,maxVal);
-       scal = (float)(4.5)/qmax;
-       for (k=0; k<len; k++){
-           fout[k] *= scal;
-       }
-
-       /* predictive noise shaping encoding of scaled start state */
-
-       AbsQuantW(iLBCenc_inst, fout,syntDenum,
-           weightDenum,idxVec, len, state_first);
-   }
-
-
-
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
deleted file mode 100644
index 9036daa..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateSearchW.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_STATESEARCHW_H
-   #define __iLBC_STATESEARCHW_H
-
-   void AbsQuantW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *in,          /* (i) vector to encode */
-       float *syntDenum,   /* (i) denominator of synthesis filter */
-       float *weightDenum, /* (i) denominator of weighting filter */
-       int *out,           /* (o) vector of quantizer indexes */
-       int len,        /* (i) length of vector to encode and
-                                  vector of quantizer indexes */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   );
-
-   void StateSearchW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *residual,/* (i) target residual vector */
-       float *syntDenum,   /* (i) lpc synthesis filter */
-       float *weightDenum, /* (i) weighting filter denuminator */
-       int *idxForMax,     /* (o) quantizer index for maximum
-                                  amplitude */
-       int *idxVec,    /* (o) vector of quantization indexes */
-       int len,        /* (i) length of all vectors */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   );
-
-
-   #endif
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
deleted file mode 100644
index c161f98..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       anaFilter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  LP analysis filter.
-    *---------------------------------------------------------------*/
-
-   void anaFilter(
-       float *In,  /* (i) Signal to be filtered */
-       float *a,   /* (i) LP parameters */
-       int len,/* (i) Length of signal */
-       float *Out, /* (o) Filtered signal */
-       float *mem  /* (i/o) Filter state */
-   ){
-       int i, j;
-       float *po, *pi, *pm, *pa;
-
-       po = Out;
-
-       /* Filter first part using memory from past */
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           pi = &In[i];
-           pm = &mem[LPC_FILTERORDER-1];
-           pa = a;
-           *po=0.0;
-
-
-
-
-
-           for (j=0; j<=i; j++) {
-               *po+=(*pa++)*(*pi--);
-           }
-           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-
-               *po+=(*pa++)*(*pm--);
-           }
-           po++;
-       }
-
-       /* Filter last part where the state is entirely
-          in the input vector */
-
-       for (i=LPC_FILTERORDER; i<len; i++) {
-           pi = &In[i];
-           pa = a;
-           *po=0.0;
-           for (j=0; j<LPC_FILTERORDER+1; j++) {
-               *po+=(*pa++)*(*pi--);
-           }
-           po++;
-       }
-
-       /* Update state vector */
-
-       memcpy(mem, &In[len-LPC_FILTERORDER],
-           LPC_FILTERORDER*sizeof(float));
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
deleted file mode 100644
index 91367f9..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       anaFilter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ANAFILTER_H
-   #define __iLBC_ANAFILTER_H
-
-   void anaFilter(
-
-
-
-
-
-       float *In,  /* (i) Signal to be filtered */
-       float *a,   /* (i) LP parameters */
-       int len,/* (i) Length of signal */
-       float *Out, /* (o) Filtered signal */
-       float *mem  /* (i/o) Filter state */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
deleted file mode 100644
index d43dac4..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
+++ /dev/null
@@ -1,770 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       constants.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /* ULP bit allocation */
-
-       /* 20 ms frame */
-
-   const iLBC_ULP_Inst_t ULP_20msTbl = {
-       /* LSF */
-       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
-           {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-       /* Start state location, gain and samples */
-       {2,0,0,0,0},
-       {1,0,0,0,0},
-       {6,0,0,0,0},
-       {0,1,2,0,0},
-       /* extra CB index and extra CB gain */
-       {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-       {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-       /* CB index and CB gain */
-       {   {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-           {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
-       {   {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-           {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
-   };
-
-       /* 30 ms frame */
-
-   const iLBC_ULP_Inst_t ULP_30msTbl = {
-       /* LSF */
-
-
-
-
-
-       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
-           {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
-       /* Start state location, gain and samples */
-       {3,0,0,0,0},
-       {1,0,0,0,0},
-       {6,0,0,0,0},
-       {0,1,2,0,0},
-       /* extra CB index and extra CB gain */
-       {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-       {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-       /* CB index and CB gain */
-       {   {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
-       {   {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
-           {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
-           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
-   };
-
-   /* HP Filters */
-
-   float hpi_zero_coefsTbl[3] = {
-       (float)0.92727436, (float)-1.8544941, (float)0.92727436
-   };
-   float hpi_pole_coefsTbl[3] = {
-       (float)1.0, (float)-1.9059465, (float)0.9114024
-   };
-   float hpo_zero_coefsTbl[3] = {
-       (float)0.93980581, (float)-1.8795834, (float)0.93980581
-   };
-   float hpo_pole_coefsTbl[3] = {
-       (float)1.0, (float)-1.9330735, (float)0.93589199
-   };
-
-   /* LP Filter */
-
-   float lpFilt_coefsTbl[FILTERORDER_DS]={
-       (float)-0.066650, (float)0.125000, (float)0.316650,
-       (float)0.414063, (float)0.316650,
-       (float)0.125000, (float)-0.066650
-   };
-
-   /* State quantization tables */
-
-   float state_sq3Tbl[8] = {
-       (float)-3.719849, (float)-2.177490, (float)-1.130005,
-
-
-
-
-
-       (float)-0.309692, (float)0.444214, (float)1.329712,
-       (float)2.436279, (float)3.983887
-   };
-
-   float state_frgqTbl[64] = {
-       (float)1.000085, (float)1.071695, (float)1.140395,
-       (float)1.206868, (float)1.277188, (float)1.351503,
-       (float)1.429380, (float)1.500727, (float)1.569049,
-       (float)1.639599, (float)1.707071, (float)1.781531,
-       (float)1.840799, (float)1.901550, (float)1.956695,
-       (float)2.006750, (float)2.055474, (float)2.102787,
-       (float)2.142819, (float)2.183592, (float)2.217962,
-       (float)2.257177, (float)2.295739, (float)2.332967,
-       (float)2.369248, (float)2.402792, (float)2.435080,
-       (float)2.468598, (float)2.503394, (float)2.539284,
-       (float)2.572944, (float)2.605036, (float)2.636331,
-       (float)2.668939, (float)2.698780, (float)2.729101,
-       (float)2.759786, (float)2.789834, (float)2.818679,
-       (float)2.848074, (float)2.877470, (float)2.906899,
-       (float)2.936655, (float)2.967804, (float)3.000115,
-       (float)3.033367, (float)3.066355, (float)3.104231,
-       (float)3.141499, (float)3.183012, (float)3.222952,
-       (float)3.265433, (float)3.308441, (float)3.350823,
-       (float)3.395275, (float)3.442793, (float)3.490801,
-       (float)3.542514, (float)3.604064, (float)3.666050,
-       (float)3.740994, (float)3.830749, (float)3.938770,
-       (float)4.101764
-   };
-
-   /* CB tables */
-
-   int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44},
-               {108,108,108}, {108,108,108}, {108,108,108}};
-   int stMemLTbl=85;
-   int memLfTbl[NASUB_MAX]={147,147,147,147};
-
-   /* expansion filter(s) */
-
-   float cbfiltersTbl[CB_FILTERLEN]={
-       (float)-0.034180, (float)0.108887, (float)-0.184326,
-       (float)0.806152,  (float)0.713379, (float)-0.144043,
-       (float)0.083740,  (float)-0.033691
-   };
-
-   /* Gain Quantization */
-
-   float gain_sq3Tbl[8]={
-       (float)-1.000000,  (float)-0.659973,  (float)-0.330017,
-
-
-
-
-
-       (float)0.000000, (float)0.250000, (float)0.500000,
-       (float)0.750000, (float)1.00000};
-
-   float gain_sq4Tbl[16]={
-       (float)-1.049988, (float)-0.900024, (float)-0.750000,
-       (float)-0.599976, (float)-0.450012, (float)-0.299988,
-       (float)-0.150024, (float)0.000000, (float)0.150024,
-       (float)0.299988, (float)0.450012, (float)0.599976,
-       (float)0.750000, (float)0.900024, (float)1.049988,
-       (float)1.200012};
-
-   float gain_sq5Tbl[32]={
-       (float)0.037476, (float)0.075012, (float)0.112488,
-       (float)0.150024, (float)0.187500, (float)0.224976,
-       (float)0.262512, (float)0.299988, (float)0.337524,
-       (float)0.375000, (float)0.412476, (float)0.450012,
-       (float)0.487488, (float)0.525024, (float)0.562500,
-       (float)0.599976, (float)0.637512, (float)0.674988,
-       (float)0.712524, (float)0.750000, (float)0.787476,
-       (float)0.825012, (float)0.862488, (float)0.900024,
-       (float)0.937500, (float)0.974976, (float)1.012512,
-       (float)1.049988, (float)1.087524, (float)1.125000,
-       (float)1.162476, (float)1.200012};
-
-   /* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
-   float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={
-       (float)0.000000, (float)0.000000, (float)0.000000,
-   (float)1.000000,
-           (float)0.000000, (float)0.000000, (float)0.000000,
-       (float)0.015625, (float)-0.076904, (float)0.288330,
-   (float)0.862061,
-           (float)-0.106445, (float)0.018799, (float)-0.015625,
-       (float)0.023682, (float)-0.124268, (float)0.601563,
-   (float)0.601563,
-           (float)-0.124268, (float)0.023682, (float)-0.023682,
-       (float)0.018799, (float)-0.106445, (float)0.862061,
-   (float)0.288330,
-           (float)-0.076904, (float)0.015625, (float)-0.018799};
-
-   float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0,
-               (float)200.0, (float)280.0, (float)360.0,
-               (float)440.0, (float)520.0, (float)600.0};
-
-   /* LPC analysis and quantization */
-
-   int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
-   int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
-
-
-
-
-
-
-   float lsfmeanTbl[LPC_FILTERORDER] = {
-       (float)0.281738, (float)0.445801, (float)0.663330,
-       (float)0.962524, (float)1.251831, (float)1.533081,
-       (float)1.850586, (float)2.137817, (float)2.481445,
-       (float)2.777344};
-
-   float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
-   (float)(2.0/3.0),
-       (float)(1.0/3.0), (float)0.0, (float)0.0};
-
-   float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0),
-       (float)(1.0/4.0), (float)(0.0)};
-
-   /* Hanning LPC window */
-   float lpc_winTbl[BLOCKL_MAX]={
-       (float)0.000183, (float)0.000671, (float)0.001526,
-       (float)0.002716, (float)0.004242, (float)0.006104,
-       (float)0.008301, (float)0.010834, (float)0.013702,
-       (float)0.016907, (float)0.020416, (float)0.024261,
-       (float)0.028442, (float)0.032928, (float)0.037750,
-       (float)0.042877, (float)0.048309, (float)0.054047,
-       (float)0.060089, (float)0.066437, (float)0.073090,
-       (float)0.080017, (float)0.087219, (float)0.094727,
-       (float)0.102509, (float)0.110535, (float)0.118835,
-       (float)0.127411, (float)0.136230, (float)0.145294,
-       (float)0.154602, (float)0.164154, (float)0.173920,
-       (float)0.183899, (float)0.194122, (float)0.204529,
-       (float)0.215149, (float)0.225952, (float)0.236938,
-       (float)0.248108, (float)0.259460, (float)0.270966,
-       (float)0.282654, (float)0.294464, (float)0.306396,
-       (float)0.318481, (float)0.330688, (float)0.343018,
-       (float)0.355438, (float)0.367981, (float)0.380585,
-       (float)0.393280, (float)0.406067, (float)0.418884,
-       (float)0.431763, (float)0.444702, (float)0.457672,
-       (float)0.470673, (float)0.483704, (float)0.496735,
-       (float)0.509766, (float)0.522797, (float)0.535828,
-       (float)0.548798, (float)0.561768, (float)0.574677,
-       (float)0.587524, (float)0.600342, (float)0.613068,
-       (float)0.625732, (float)0.638306, (float)0.650787,
-       (float)0.663147, (float)0.675415, (float)0.687561,
-       (float)0.699585, (float)0.711487, (float)0.723206,
-       (float)0.734802, (float)0.746216, (float)0.757477,
-       (float)0.768585, (float)0.779480, (float)0.790192,
-       (float)0.800720, (float)0.811005, (float)0.821106,
-       (float)0.830994, (float)0.840668, (float)0.850067,
-       (float)0.859253, (float)0.868225, (float)0.876892,
-       (float)0.885345, (float)0.893524, (float)0.901428,
-       (float)0.909058, (float)0.916412, (float)0.923492,
-
-
-
-
-
-       (float)0.930267, (float)0.936768, (float)0.942963,
-       (float)0.948853, (float)0.954437, (float)0.959717,
-       (float)0.964691, (float)0.969360, (float)0.973694,
-       (float)0.977692, (float)0.981384, (float)0.984741,
-       (float)0.987762, (float)0.990479, (float)0.992828,
-       (float)0.994873, (float)0.996552, (float)0.997925,
-       (float)0.998932, (float)0.999603, (float)0.999969,
-       (float)0.999969, (float)0.999603, (float)0.998932,
-       (float)0.997925, (float)0.996552, (float)0.994873,
-       (float)0.992828, (float)0.990479, (float)0.987762,
-       (float)0.984741, (float)0.981384, (float)0.977692,
-       (float)0.973694, (float)0.969360, (float)0.964691,
-       (float)0.959717, (float)0.954437, (float)0.948853,
-       (float)0.942963, (float)0.936768, (float)0.930267,
-       (float)0.923492, (float)0.916412, (float)0.909058,
-       (float)0.901428, (float)0.893524, (float)0.885345,
-       (float)0.876892, (float)0.868225, (float)0.859253,
-       (float)0.850067, (float)0.840668, (float)0.830994,
-       (float)0.821106, (float)0.811005, (float)0.800720,
-       (float)0.790192, (float)0.779480, (float)0.768585,
-       (float)0.757477, (float)0.746216, (float)0.734802,
-       (float)0.723206, (float)0.711487, (float)0.699585,
-       (float)0.687561, (float)0.675415, (float)0.663147,
-       (float)0.650787, (float)0.638306, (float)0.625732,
-       (float)0.613068, (float)0.600342, (float)0.587524,
-       (float)0.574677, (float)0.561768, (float)0.548798,
-       (float)0.535828, (float)0.522797, (float)0.509766,
-       (float)0.496735, (float)0.483704, (float)0.470673,
-       (float)0.457672, (float)0.444702, (float)0.431763,
-       (float)0.418884, (float)0.406067, (float)0.393280,
-       (float)0.380585, (float)0.367981, (float)0.355438,
-       (float)0.343018, (float)0.330688, (float)0.318481,
-       (float)0.306396, (float)0.294464, (float)0.282654,
-       (float)0.270966, (float)0.259460, (float)0.248108,
-       (float)0.236938, (float)0.225952, (float)0.215149,
-       (float)0.204529, (float)0.194122, (float)0.183899,
-       (float)0.173920, (float)0.164154, (float)0.154602,
-       (float)0.145294, (float)0.136230, (float)0.127411,
-       (float)0.118835, (float)0.110535, (float)0.102509,
-       (float)0.094727, (float)0.087219, (float)0.080017,
-       (float)0.073090, (float)0.066437, (float)0.060089,
-       (float)0.054047, (float)0.048309, (float)0.042877,
-       (float)0.037750, (float)0.032928, (float)0.028442,
-       (float)0.024261, (float)0.020416, (float)0.016907,
-       (float)0.013702, (float)0.010834, (float)0.008301,
-       (float)0.006104, (float)0.004242, (float)0.002716,
-       (float)0.001526, (float)0.000671, (float)0.000183
-   };
-
-
-
-
-
-   /* Asymmetric LPC window */
-   float lpc_asymwinTbl[BLOCKL_MAX]={
-       (float)0.000061, (float)0.000214, (float)0.000458,
-       (float)0.000824, (float)0.001282, (float)0.001831,
-       (float)0.002472, (float)0.003235, (float)0.004120,
-       (float)0.005066, (float)0.006134, (float)0.007294,
-       (float)0.008545, (float)0.009918, (float)0.011383,
-       (float)0.012939, (float)0.014587, (float)0.016357,
-       (float)0.018219, (float)0.020172, (float)0.022217,
-       (float)0.024353, (float)0.026611, (float)0.028961,
-       (float)0.031372, (float)0.033905, (float)0.036530,
-       (float)0.039276, (float)0.042084, (float)0.044983,
-       (float)0.047974, (float)0.051086, (float)0.054260,
-       (float)0.057526, (float)0.060883, (float)0.064331,
-       (float)0.067871, (float)0.071503, (float)0.075226,
-       (float)0.079010, (float)0.082916, (float)0.086884,
-       (float)0.090942, (float)0.095062, (float)0.099304,
-       (float)0.103607, (float)0.107971, (float)0.112427,
-       (float)0.116974, (float)0.121582, (float)0.126282,
-       (float)0.131073, (float)0.135895, (float)0.140839,
-       (float)0.145813, (float)0.150879, (float)0.156006,
-       (float)0.161224, (float)0.166504, (float)0.171844,
-       (float)0.177246, (float)0.182709, (float)0.188263,
-       (float)0.193848, (float)0.199524, (float)0.205231,
-       (float)0.211029, (float)0.216858, (float)0.222778,
-       (float)0.228729, (float)0.234741, (float)0.240814,
-       (float)0.246918, (float)0.253082, (float)0.259308,
-       (float)0.265564, (float)0.271881, (float)0.278259,
-       (float)0.284668, (float)0.291107, (float)0.297607,
-       (float)0.304138, (float)0.310730, (float)0.317322,
-       (float)0.323975, (float)0.330658, (float)0.337372,
-       (float)0.344147, (float)0.350922, (float)0.357727,
-       (float)0.364594, (float)0.371460, (float)0.378357,
-       (float)0.385284, (float)0.392212, (float)0.399170,
-       (float)0.406158, (float)0.413177, (float)0.420197,
-       (float)0.427246, (float)0.434296, (float)0.441376,
-       (float)0.448456, (float)0.455536, (float)0.462646,
-       (float)0.469757, (float)0.476868, (float)0.483978,
-       (float)0.491089, (float)0.498230, (float)0.505341,
-       (float)0.512451, (float)0.519592, (float)0.526703,
-       (float)0.533813, (float)0.540924, (float)0.548004,
-       (float)0.555084, (float)0.562164, (float)0.569244,
-       (float)0.576294, (float)0.583313, (float)0.590332,
-       (float)0.597321, (float)0.604309, (float)0.611267,
-       (float)0.618195, (float)0.625092, (float)0.631989,
-       (float)0.638855, (float)0.645660, (float)0.652466,
-       (float)0.659241, (float)0.665985, (float)0.672668,
-       (float)0.679352, (float)0.685974, (float)0.692566,
-
-
-
-
-
-       (float)0.699127, (float)0.705658, (float)0.712128,
-       (float)0.718536, (float)0.724945, (float)0.731262,
-       (float)0.737549, (float)0.743805, (float)0.750000,
-       (float)0.756134, (float)0.762238, (float)0.768280,
-       (float)0.774261, (float)0.780182, (float)0.786072,
-       (float)0.791870, (float)0.797638, (float)0.803314,
-       (float)0.808960, (float)0.814514, (float)0.820038,
-       (float)0.825470, (float)0.830841, (float)0.836151,
-       (float)0.841400, (float)0.846558, (float)0.851654,
-       (float)0.856689, (float)0.861633, (float)0.866516,
-       (float)0.871338, (float)0.876068, (float)0.880737,
-       (float)0.885315, (float)0.889801, (float)0.894226,
-       (float)0.898560, (float)0.902832, (float)0.907013,
-       (float)0.911102, (float)0.915100, (float)0.919037,
-       (float)0.922882, (float)0.926636, (float)0.930328,
-       (float)0.933899, (float)0.937408, (float)0.940796,
-       (float)0.944122, (float)0.947357, (float)0.950470,
-       (float)0.953522, (float)0.956482, (float)0.959351,
-       (float)0.962097, (float)0.964783, (float)0.967377,
-       (float)0.969849, (float)0.972229, (float)0.974518,
-       (float)0.976715, (float)0.978821, (float)0.980835,
-       (float)0.982727, (float)0.984528, (float)0.986237,
-       (float)0.987854, (float)0.989380, (float)0.990784,
-       (float)0.992096, (float)0.993317, (float)0.994415,
-       (float)0.995422, (float)0.996338, (float)0.997162,
-       (float)0.997864, (float)0.998474, (float)0.998962,
-       (float)0.999390, (float)0.999695, (float)0.999878,
-       (float)0.999969, (float)0.999969, (float)0.996918,
-       (float)0.987701, (float)0.972382, (float)0.951050,
-       (float)0.923889, (float)0.891022, (float)0.852631,
-       (float)0.809021, (float)0.760406, (float)0.707092,
-       (float)0.649445, (float)0.587799, (float)0.522491,
-       (float)0.453979, (float)0.382690, (float)0.309021,
-       (float)0.233459, (float)0.156433, (float)0.078461
-   };
-
-   /* Lag window for LPC */
-   float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
-       (float)1.000100, (float)0.998890, (float)0.995569,
-           (float)0.990057, (float)0.982392,
-       (float)0.972623, (float)0.960816, (float)0.947047,
-           (float)0.931405, (float)0.913989, (float)0.894909};
-
-   /* LSF quantization*/
-   float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
-   (float)0.155396, (float)0.273193, (float)0.451172,
-   (float)0.390503, (float)0.648071, (float)1.002075,
-   (float)0.440186, (float)0.692261, (float)0.955688,
-
-
-
-
-
-   (float)0.343628, (float)0.642334, (float)1.071533,
-   (float)0.318359, (float)0.491577, (float)0.670532,
-   (float)0.193115, (float)0.375488, (float)0.725708,
-   (float)0.364136, (float)0.510376, (float)0.658691,
-   (float)0.297485, (float)0.527588, (float)0.842529,
-   (float)0.227173, (float)0.365967, (float)0.563110,
-   (float)0.244995, (float)0.396729, (float)0.636475,
-   (float)0.169434, (float)0.300171, (float)0.520264,
-   (float)0.312866, (float)0.464478, (float)0.643188,
-   (float)0.248535, (float)0.429932, (float)0.626099,
-   (float)0.236206, (float)0.491333, (float)0.817139,
-   (float)0.334961, (float)0.625122, (float)0.895752,
-   (float)0.343018, (float)0.518555, (float)0.698608,
-   (float)0.372803, (float)0.659790, (float)0.945435,
-   (float)0.176880, (float)0.316528, (float)0.581421,
-   (float)0.416382, (float)0.625977, (float)0.805176,
-   (float)0.303223, (float)0.568726, (float)0.915039,
-   (float)0.203613, (float)0.351440, (float)0.588135,
-   (float)0.221191, (float)0.375000, (float)0.614746,
-   (float)0.199951, (float)0.323364, (float)0.476074,
-   (float)0.300781, (float)0.433350, (float)0.566895,
-   (float)0.226196, (float)0.354004, (float)0.507568,
-   (float)0.300049, (float)0.508179, (float)0.711670,
-   (float)0.312012, (float)0.492676, (float)0.763428,
-   (float)0.329956, (float)0.541016, (float)0.795776,
-   (float)0.373779, (float)0.604614, (float)0.928833,
-   (float)0.210571, (float)0.452026, (float)0.755249,
-   (float)0.271118, (float)0.473267, (float)0.662476,
-   (float)0.285522, (float)0.436890, (float)0.634399,
-   (float)0.246704, (float)0.565552, (float)0.859009,
-   (float)0.270508, (float)0.406250, (float)0.553589,
-   (float)0.361450, (float)0.578491, (float)0.813843,
-   (float)0.342651, (float)0.482788, (float)0.622437,
-   (float)0.340332, (float)0.549438, (float)0.743164,
-   (float)0.200439, (float)0.336304, (float)0.540894,
-   (float)0.407837, (float)0.644775, (float)0.895142,
-   (float)0.294678, (float)0.454834, (float)0.699097,
-   (float)0.193115, (float)0.344482, (float)0.643188,
-   (float)0.275757, (float)0.420776, (float)0.598755,
-   (float)0.380493, (float)0.608643, (float)0.861084,
-   (float)0.222778, (float)0.426147, (float)0.676514,
-   (float)0.407471, (float)0.700195, (float)1.053101,
-   (float)0.218384, (float)0.377197, (float)0.669922,
-   (float)0.313232, (float)0.454102, (float)0.600952,
-   (float)0.347412, (float)0.571533, (float)0.874146,
-   (float)0.238037, (float)0.405396, (float)0.729492,
-   (float)0.223877, (float)0.412964, (float)0.822021,
-   (float)0.395264, (float)0.582153, (float)0.743896,
-
-
-
-
-
-   (float)0.247925, (float)0.485596, (float)0.720581,
-   (float)0.229126, (float)0.496582, (float)0.907715,
-   (float)0.260132, (float)0.566895, (float)1.012695,
-   (float)0.337402, (float)0.611572, (float)0.978149,
-   (float)0.267822, (float)0.447632, (float)0.769287,
-   (float)0.250610, (float)0.381714, (float)0.530029,
-   (float)0.430054, (float)0.805054, (float)1.221924,
-   (float)0.382568, (float)0.544067, (float)0.701660,
-   (float)0.383545, (float)0.710327, (float)1.149170,
-   (float)0.271362, (float)0.529053, (float)0.775513,
-   (float)0.246826, (float)0.393555, (float)0.588623,
-   (float)0.266846, (float)0.422119, (float)0.676758,
-   (float)0.311523, (float)0.580688, (float)0.838623,
-   (float)1.331177, (float)1.576782, (float)1.779541,
-   (float)1.160034, (float)1.401978, (float)1.768188,
-   (float)1.161865, (float)1.525146, (float)1.715332,
-   (float)0.759521, (float)0.913940, (float)1.119873,
-   (float)0.947144, (float)1.121338, (float)1.282471,
-   (float)1.015015, (float)1.557007, (float)1.804932,
-   (float)1.172974, (float)1.402100, (float)1.692627,
-   (float)1.087524, (float)1.474243, (float)1.665405,
-   (float)0.899536, (float)1.105225, (float)1.406250,
-   (float)1.148438, (float)1.484741, (float)1.796265,
-   (float)0.785645, (float)1.209839, (float)1.567749,
-   (float)0.867798, (float)1.166504, (float)1.450684,
-   (float)0.922485, (float)1.229858, (float)1.420898,
-   (float)0.791260, (float)1.123291, (float)1.409546,
-   (float)0.788940, (float)0.966064, (float)1.340332,
-   (float)1.051147, (float)1.272827, (float)1.556641,
-   (float)0.866821, (float)1.181152, (float)1.538818,
-   (float)0.906738, (float)1.373535, (float)1.607910,
-   (float)1.244751, (float)1.581421, (float)1.933838,
-   (float)0.913940, (float)1.337280, (float)1.539673,
-   (float)0.680542, (float)0.959229, (float)1.662720,
-   (float)0.887207, (float)1.430542, (float)1.800781,
-   (float)0.912598, (float)1.433594, (float)1.683960,
-   (float)0.860474, (float)1.060303, (float)1.455322,
-   (float)1.005127, (float)1.381104, (float)1.706909,
-   (float)0.800781, (float)1.363892, (float)1.829102,
-   (float)0.781860, (float)1.124390, (float)1.505981,
-   (float)1.003662, (float)1.471436, (float)1.684692,
-   (float)0.981323, (float)1.309570, (float)1.618042,
-   (float)1.228760, (float)1.554321, (float)1.756470,
-   (float)0.734375, (float)0.895752, (float)1.225586,
-   (float)0.841797, (float)1.055664, (float)1.249268,
-   (float)0.920166, (float)1.119385, (float)1.486206,
-   (float)0.894409, (float)1.539063, (float)1.828979,
-   (float)1.283691, (float)1.543335, (float)1.858276,
-
-
-
-
-
-   (float)0.676025, (float)0.933105, (float)1.490845,
-   (float)0.821289, (float)1.491821, (float)1.739868,
-   (float)0.923218, (float)1.144653, (float)1.580566,
-   (float)1.057251, (float)1.345581, (float)1.635864,
-   (float)0.888672, (float)1.074951, (float)1.353149,
-   (float)0.942749, (float)1.195435, (float)1.505493,
-   (float)1.492310, (float)1.788086, (float)2.039673,
-   (float)1.070313, (float)1.634399, (float)1.860962,
-   (float)1.253296, (float)1.488892, (float)1.686035,
-   (float)0.647095, (float)0.864014, (float)1.401855,
-   (float)0.866699, (float)1.254883, (float)1.453369,
-   (float)1.063965, (float)1.532593, (float)1.731323,
-   (float)1.167847, (float)1.521484, (float)1.884033,
-   (float)0.956055, (float)1.502075, (float)1.745605,
-   (float)0.928711, (float)1.288574, (float)1.479614,
-   (float)1.088013, (float)1.380737, (float)1.570801,
-   (float)0.905029, (float)1.186768, (float)1.371948,
-   (float)1.057861, (float)1.421021, (float)1.617432,
-   (float)1.108276, (float)1.312500, (float)1.501465,
-   (float)0.979492, (float)1.416992, (float)1.624268,
-   (float)1.276001, (float)1.661011, (float)2.007935,
-   (float)0.993042, (float)1.168579, (float)1.331665,
-   (float)0.778198, (float)0.944946, (float)1.235962,
-   (float)1.223755, (float)1.491333, (float)1.815674,
-   (float)0.852661, (float)1.350464, (float)1.722290,
-   (float)1.134766, (float)1.593140, (float)1.787354,
-   (float)1.051392, (float)1.339722, (float)1.531006,
-   (float)0.803589, (float)1.271240, (float)1.652100,
-   (float)0.755737, (float)1.143555, (float)1.639404,
-   (float)0.700928, (float)0.837280, (float)1.130371,
-   (float)0.942749, (float)1.197876, (float)1.669800,
-   (float)0.993286, (float)1.378296, (float)1.566528,
-   (float)0.801025, (float)1.095337, (float)1.298950,
-   (float)0.739990, (float)1.032959, (float)1.383667,
-   (float)0.845703, (float)1.072266, (float)1.543823,
-   (float)0.915649, (float)1.072266, (float)1.224487,
-   (float)1.021973, (float)1.226196, (float)1.481323,
-   (float)0.999878, (float)1.204102, (float)1.555908,
-   (float)0.722290, (float)0.913940, (float)1.340210,
-   (float)0.673340, (float)0.835938, (float)1.259521,
-   (float)0.832397, (float)1.208374, (float)1.394165,
-   (float)0.962158, (float)1.576172, (float)1.912842,
-   (float)1.166748, (float)1.370850, (float)1.556763,
-   (float)0.946289, (float)1.138550, (float)1.400391,
-   (float)1.035034, (float)1.218262, (float)1.386475,
-   (float)1.393799, (float)1.717773, (float)2.000244,
-   (float)0.972656, (float)1.260986, (float)1.760620,
-   (float)1.028198, (float)1.288452, (float)1.484619,
-
-
-
-
-
-   (float)0.773560, (float)1.258057, (float)1.756714,
-   (float)1.080322, (float)1.328003, (float)1.742676,
-   (float)0.823975, (float)1.450806, (float)1.917725,
-   (float)0.859009, (float)1.016602, (float)1.191895,
-   (float)0.843994, (float)1.131104, (float)1.645020,
-   (float)1.189697, (float)1.702759, (float)1.894409,
-   (float)1.346680, (float)1.763184, (float)2.066040,
-   (float)0.980469, (float)1.253784, (float)1.441650,
-   (float)1.338135, (float)1.641968, (float)1.932739,
-   (float)1.223267, (float)1.424194, (float)1.626465,
-   (float)0.765747, (float)1.004150, (float)1.579102,
-   (float)1.042847, (float)1.269165, (float)1.647461,
-   (float)0.968750, (float)1.257568, (float)1.555786,
-   (float)0.826294, (float)0.993408, (float)1.275146,
-   (float)0.742310, (float)0.950439, (float)1.430542,
-   (float)1.054321, (float)1.439819, (float)1.828003,
-   (float)1.072998, (float)1.261719, (float)1.441895,
-   (float)0.859375, (float)1.036377, (float)1.314819,
-   (float)0.895752, (float)1.267212, (float)1.605591,
-   (float)0.805420, (float)0.962891, (float)1.142334,
-   (float)0.795654, (float)1.005493, (float)1.468506,
-   (float)1.105347, (float)1.313843, (float)1.584839,
-   (float)0.792236, (float)1.221802, (float)1.465698,
-   (float)1.170532, (float)1.467651, (float)1.664063,
-   (float)0.838257, (float)1.153198, (float)1.342163,
-   (float)0.968018, (float)1.198242, (float)1.391235,
-   (float)1.250122, (float)1.623535, (float)1.823608,
-   (float)0.711670, (float)1.058350, (float)1.512085,
-   (float)1.204834, (float)1.454468, (float)1.739136,
-   (float)1.137451, (float)1.421753, (float)1.620117,
-   (float)0.820435, (float)1.322754, (float)1.578247,
-   (float)0.798706, (float)1.005005, (float)1.213867,
-   (float)0.980713, (float)1.324951, (float)1.512939,
-   (float)1.112305, (float)1.438843, (float)1.735596,
-   (float)1.135498, (float)1.356689, (float)1.635742,
-   (float)1.101318, (float)1.387451, (float)1.686523,
-   (float)0.849854, (float)1.276978, (float)1.523438,
-   (float)1.377930, (float)1.627563, (float)1.858154,
-   (float)0.884888, (float)1.095459, (float)1.287476,
-   (float)1.289795, (float)1.505859, (float)1.756592,
-   (float)0.817505, (float)1.384155, (float)1.650513,
-   (float)1.446655, (float)1.702148, (float)1.931885,
-   (float)0.835815, (float)1.023071, (float)1.385376,
-   (float)0.916626, (float)1.139038, (float)1.335327,
-   (float)0.980103, (float)1.174072, (float)1.453735,
-   (float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
-   (float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
-   (float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
-
-
-
-
-
-   (float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
-   (float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
-   (float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
-   (float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
-   (float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
-   (float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
-   (float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
-   (float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
-   (float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
-   (float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
-   (float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
-   (float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
-   (float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
-   (float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
-   (float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
-   (float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
-   (float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
-   (float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
-   (float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
-   (float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
-   (float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
-   (float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
-   (float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
-   (float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
-   (float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
-   (float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
-   (float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
-   (float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
-   (float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
-   (float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
-   (float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
-   (float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
-   (float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
-   (float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
-   (float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
-   (float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
-   (float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
-   (float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
-   (float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
-   (float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
-   (float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
-   (float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
-   (float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
-   (float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
-   (float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
-   (float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
-   (float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
-   (float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
-
-
-
-
-
-   (float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
-   (float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
-   (float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
-   (float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
-   (float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
-   (float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
-   (float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
-   (float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
-   (float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
-   (float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
-   (float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
-   (float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
-   (float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
-   (float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
-   (float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
-   (float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
-   (float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
-   (float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
-   (float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
-   (float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
-   (float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
-   (float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
-   (float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
-   (float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
-   (float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
-   (float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
-   (float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
-   (float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
-   (float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
-   (float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
-   (float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
-   (float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
-   (float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
-   (float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
-   (float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
-   (float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
-   (float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
-   (float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
-   (float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
-   (float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
-   (float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
-   (float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
-   (float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
-   (float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
-   (float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
-   (float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
-   (float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
-   (float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
-
-
-
-
-
-   (float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
-   (float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
-   (float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
-   (float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
-   (float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
-   (float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
-   (float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
-   (float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
-   (float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
-   (float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
-   (float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
-   (float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
-   (float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
-   (float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
-   (float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
-   (float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
-   (float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
-   (float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
-   (float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
-   (float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
-   (float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
-   (float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
-   (float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
-   (float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
-   (float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
-   (float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
-   (float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
-   (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
-   (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
-   };
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
deleted file mode 100644
index 3487d52..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       constants.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_CONSTANTS_H
-   #define __iLBC_CONSTANTS_H
-
-   #include "iLBC_define.h"
-
-
-   /* ULP bit allocation */
-
-
-
-
-
-
-   extern const iLBC_ULP_Inst_t ULP_20msTbl;
-   extern const iLBC_ULP_Inst_t ULP_30msTbl;
-
-   /* high pass filters */
-
-   extern float hpi_zero_coefsTbl[];
-   extern float hpi_pole_coefsTbl[];
-   extern float hpo_zero_coefsTbl[];
-   extern float hpo_pole_coefsTbl[];
-
-   /* low pass filters */
-   extern float lpFilt_coefsTbl[];
-
-   /* LPC analysis and quantization */
-
-   extern float lpc_winTbl[];
-   extern float lpc_asymwinTbl[];
-   extern float lpc_lagwinTbl[];
-   extern float lsfCbTbl[];
-   extern float lsfmeanTbl[];
-   extern int   dim_lsfCbTbl[];
-   extern int   size_lsfCbTbl[];
-   extern float lsf_weightTbl_30ms[];
-   extern float lsf_weightTbl_20ms[];
-
-   /* state quantization tables */
-
-   extern float state_sq3Tbl[];
-   extern float state_frgqTbl[];
-
-   /* gain quantization tables */
-
-   extern float gain_sq3Tbl[];
-   extern float gain_sq4Tbl[];
-   extern float gain_sq5Tbl[];
-
-   /* adaptive codebook definitions */
-
-   extern int search_rangeTbl[5][CB_NSTAGES];
-   extern int memLfTbl[];
-   extern int stMemLTbl;
-   extern float cbfiltersTbl[CB_FILTERLEN];
-
-   /* enhancer definitions */
-
-   extern float polyphaserTbl[];
-   extern float enh_plocsTbl[];
-
-
-
-
-
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
deleted file mode 100644
index aefacf2..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       createCB.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-
-
-
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include <string.h>
-   #include <math.h>
-
-   /*----------------------------------------------------------------*
-    *  Construct an additional codebook vector by filtering the
-    *  initial codebook buffer. This vector is then used to expand
-    *  the codebook with an additional section.
-    *---------------------------------------------------------------*/
-
-   void filteredCBvecs(
-       float *cbvectors,   /* (o) Codebook vectors for the
-                                  higher section */
-       float *mem,         /* (i) Buffer to create codebook
-                                  vector from */
-       int lMem        /* (i) Length of buffer */
-   ){
-       int j, k;
-       float *pp, *pp1;
-       float tempbuff2[CB_MEML+CB_FILTERLEN];
-       float *pos;
-
-       memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
-       memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
-       memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0,
-           (CB_HALFFILTERLEN+1)*sizeof(float));
-
-       /* Create codebook vector for higher section by filtering */
-
-       /* do filtering */
-       pos=cbvectors;
-       memset(pos, 0, lMem*sizeof(float));
-       for (k=0; k<lMem; k++) {
-           pp=&tempbuff2[k];
-           pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-           for (j=0;j<CB_FILTERLEN;j++) {
-               (*pos)+=(*pp++)*(*pp1--);
-           }
-           pos++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  Search the augmented part of the codebook to find the best
-    *  measure.
-    *----------------------------------------------------------------*/
-
-
-
-
-
-
-   void searchAugmentedCB(
-       int low,        /* (i) Start index for the search */
-       int high,           /* (i) End index for the search */
-       int stage,          /* (i) Current stage */
-       int startIndex,     /* (i) Codebook index for the first
-                                  aug vector */
-       float *target,      /* (i) Target vector for encoding */
-       float *buffer,      /* (i) Pointer to the end of the buffer for
-                                  augmented codebook construction */
-       float *max_measure, /* (i/o) Currently maximum measure */
-       int *best_index,/* (o) Currently the best index */
-       float *gain,    /* (o) Currently the best gain */
-       float *energy,      /* (o) Energy of augmented codebook
-                                  vectors */
-       float *invenergy/* (o) Inv energy of augmented codebook
-                                  vectors */
-   ) {
-       int icount, ilow, j, tmpIndex;
-       float *pp, *ppo, *ppi, *ppe, crossDot, alfa;
-       float weighted, measure, nrjRecursive;
-       float ftmp;
-
-       /* Compute the energy for the first (low-5)
-          noninterpolated samples */
-       nrjRecursive = (float) 0.0;
-       pp = buffer - low + 1;
-       for (j=0; j<(low-5); j++) {
-           nrjRecursive += ( (*pp)*(*pp) );
-           pp++;
-       }
-       ppe = buffer - low;
-
-
-       for (icount=low; icount<=high; icount++) {
-
-           /* Index of the codebook vector used for retrieving
-              energy values */
-           tmpIndex = startIndex+icount-20;
-
-           ilow = icount-4;
-
-           /* Update the energy recursively to save complexity */
-           nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
-           ppe--;
-           energy[tmpIndex] = nrjRecursive;
-
-           /* Compute cross dot product for the first (low-5)
-              samples */
-
-
-
-
-
-           crossDot = (float) 0.0;
-           pp = buffer-icount;
-           for (j=0; j<ilow; j++) {
-               crossDot += target[j]*(*pp++);
-           }
-
-           /* interpolation */
-           alfa = (float) 0.2;
-           ppo = buffer-4;
-           ppi = buffer-icount-4;
-           for (j=ilow; j<icount; j++) {
-               weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-               ppo++;
-               ppi++;
-               energy[tmpIndex] += weighted*weighted;
-               crossDot += target[j]*weighted;
-               alfa += (float)0.2;
-           }
-
-           /* Compute energy and cross dot product for the
-              remaining samples */
-           pp = buffer - icount;
-           for (j=icount; j<SUBL; j++) {
-               energy[tmpIndex] += (*pp)*(*pp);
-               crossDot += target[j]*(*pp++);
-           }
-
-           if (energy[tmpIndex]>0.0) {
-               invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
-           } else {
-               invenergy[tmpIndex] = (float) 0.0;
-           }
-
-           if (stage==0) {
-               measure = (float)-10000000.0;
-
-               if (crossDot > 0.0) {
-                   measure = crossDot*crossDot*invenergy[tmpIndex];
-               }
-           }
-           else {
-               measure = crossDot*crossDot*invenergy[tmpIndex];
-           }
-
-           /* check if measure is better */
-           ftmp = crossDot*invenergy[tmpIndex];
-
-           if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-
-
-
-
-
-               *best_index = tmpIndex;
-               *max_measure = measure;
-               *gain = ftmp;
-           }
-       }
-   }
-
-
-   /*----------------------------------------------------------------*
-    *  Recreate a specific codebook vector from the augmented part.
-    *
-    *----------------------------------------------------------------*/
-
-   void createAugmentedVec(
-       int index,      /* (i) Index for the augmented vector
-                              to be created */
-       float *buffer,  /* (i) Pointer to the end of the buffer for
-                              augmented codebook construction */
-       float *cbVec/* (o) The construced codebook vector */
-   ) {
-       int ilow, j;
-       float *pp, *ppo, *ppi, alfa, alfa1, weighted;
-
-       ilow = index-5;
-
-       /* copy the first noninterpolated part */
-
-       pp = buffer-index;
-       memcpy(cbVec,pp,sizeof(float)*index);
-
-       /* interpolation */
-
-       alfa1 = (float)0.2;
-       alfa = 0.0;
-       ppo = buffer-5;
-       ppi = buffer-index-5;
-       for (j=ilow; j<index; j++) {
-           weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-           ppo++;
-           ppi++;
-           cbVec[j] = weighted;
-           alfa += alfa1;
-       }
-
-       /* copy the second noninterpolated part */
-
-       pp = buffer - index;
-       memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
-
-
-
-
-
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
deleted file mode 100644
index eda547c..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       createCB.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_CREATECB_H
-   #define __iLBC_CREATECB_H
-
-   void filteredCBvecs(
-       float *cbvectors,   /* (o) Codebook vector for the
-                                  higher section */
-
-
-
-
-
-       float *mem,         /* (i) Buffer to create codebook
-                                  vectors from */
-       int lMem        /* (i) Length of buffer */
-   );
-
-   void searchAugmentedCB(
-       int low,        /* (i) Start index for the search */
-       int high,           /* (i) End index for the search */
-       int stage,          /* (i) Current stage */
-       int startIndex,     /* (i) CB index for the first
-                                  augmented vector */
-       float *target,      /* (i) Target vector for encoding */
-       float *buffer,      /* (i) Pointer to the end of the
-                                  buffer for augmented codebook
-                                  construction */
-       float *max_measure, /* (i/o) Currently maximum measure */
-       int *best_index,/* (o) Currently the best index */
-       float *gain,    /* (o) Currently the best gain */
-       float *energy,      /* (o) Energy of augmented
-                                  codebook vectors */
-       float *invenergy/* (o) Inv energy of aug codebook
-                                  vectors */
-   );
-
-   void createAugmentedVec(
-       int index,          /* (i) Index for the aug vector
-                                  to be created */
-       float *buffer,      /* (i) Pointer to the end of the
-                                  buffer for augmented codebook
-                                  construction */
-       float *cbVec    /* (o) The construced codebook vector */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
deleted file mode 100644
index adbfac7..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
+++ /dev/null
@@ -1,270 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       doCPLC.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-   #include <stdio.h>
-
-
-
-
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  Compute cross correlation and pitch gain for pitch prediction
-    *  of last subframe at given lag.
-    *---------------------------------------------------------------*/
-
-   void compCorr(
-       float *cc,      /* (o) cross correlation coefficient */
-       float *gc,      /* (o) gain */
-       float *pm,
-       float *buffer,  /* (i) signal buffer */
-       int lag,    /* (i) pitch lag */
-       int bLen,       /* (i) length of buffer */
-       int sRange      /* (i) correlation search length */
-   ){
-       int i;
-       float ftmp1, ftmp2, ftmp3;
-
-       /* Guard against getting outside buffer */
-       if ((bLen-sRange-lag)<0) {
-           sRange=bLen-lag;
-       }
-
-       ftmp1 = 0.0;
-       ftmp2 = 0.0;
-       ftmp3 = 0.0;
-       for (i=0; i<sRange; i++) {
-           ftmp1 += buffer[bLen-sRange+i] *
-               buffer[bLen-sRange+i-lag];
-           ftmp2 += buffer[bLen-sRange+i-lag] *
-                   buffer[bLen-sRange+i-lag];
-           ftmp3 += buffer[bLen-sRange+i] *
-                   buffer[bLen-sRange+i];
-       }
-
-       if (ftmp2 > 0.0) {
-           *cc = ftmp1*ftmp1/ftmp2;
-           *gc = (float)fabs(ftmp1/ftmp2);
-           *pm=(float)fabs(ftmp1)/
-               ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
-       }
-       else {
-           *cc = 0.0;
-           *gc = 0.0;
-           *pm=0.0;
-       }
-   }
-
-
-
-
-
-   /*----------------------------------------------------------------*
-    *  Packet loss concealment routine. Conceals a residual signal
-    *  and LP parameters. If no packet loss, update state.
-    *---------------------------------------------------------------*/
-
-   void doThePLC(
-       float *PLCresidual, /* (o) concealed residual */
-       float *PLClpc,      /* (o) concealed LP parameters */
-       int PLI,        /* (i) packet loss indicator
-                                  0 - no PL, 1 = PL */
-       float *decresidual, /* (i) decoded residual */
-       float *lpc,         /* (i) decoded LPC (only used for no PL) */
-       int inlag,          /* (i) pitch lag */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) decoder instance */
-   ){
-       int lag=20, randlag;
-       float gain, maxcc;
-       float use_gain;
-       float gain_comp, maxcc_comp, per, max_per;
-       int i, pick, use_lag;
-       float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
-
-       /* Packet Loss */
-
-       if (PLI == 1) {
-
-           iLBCdec_inst->consPLICount += 1;
-
-           /* if previous frame not lost,
-              determine pitch pred. gain */
-
-           if (iLBCdec_inst->prevPLI != 1) {
-
-               /* Search around the previous lag to find the
-                  best pitch period */
-
-               lag=inlag-3;
-               compCorr(&maxcc, &gain, &max_per,
-                   iLBCdec_inst->prevResidual,
-                   lag, iLBCdec_inst->blockl, 60);
-               for (i=inlag-2;i<=inlag+3;i++) {
-                   compCorr(&maxcc_comp, &gain_comp, &per,
-                       iLBCdec_inst->prevResidual,
-                       i, iLBCdec_inst->blockl, 60);
-
-                   if (maxcc_comp>maxcc) {
-                       maxcc=maxcc_comp;
-
-
-
-
-
-                       gain=gain_comp;
-                       lag=i;
-                       max_per=per;
-                   }
-               }
-
-           }
-
-           /* previous frame lost, use recorded lag and periodicity */
-
-           else {
-               lag=iLBCdec_inst->prevLag;
-               max_per=iLBCdec_inst->per;
-           }
-
-           /* downscaling */
-
-           use_gain=1.0;
-           if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
-               use_gain=(float)0.9;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>2*320)
-               use_gain=(float)0.7;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>3*320)
-               use_gain=(float)0.5;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>4*320)
-               use_gain=(float)0.0;
-
-           /* mix noise and pitch repeatition */
-           ftmp=(float)sqrt(max_per);
-           if (ftmp>(float)0.7)
-               pitchfact=(float)1.0;
-           else if (ftmp>(float)0.4)
-               pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
-           else
-               pitchfact=0.0;
-
-
-           /* avoid repetition of same pitch cycle */
-           use_lag=lag;
-           if (lag<80) {
-               use_lag=2*lag;
-           }
-
-           /* compute concealed residual */
-
-
-
-
-
-
-           energy = 0.0;
-           for (i=0; i<iLBCdec_inst->blockl; i++) {
-
-               /* noise component */
-
-               iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) &
-                   (0x80000000L-1);
-               randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
-               pick = i - randlag;
-
-               if (pick < 0) {
-                   randvec[i] =
-                       iLBCdec_inst->prevResidual[
-                                   iLBCdec_inst->blockl+pick];
-               } else {
-                   randvec[i] =  randvec[pick];
-               }
-
-               /* pitch repeatition component */
-               pick = i - use_lag;
-
-               if (pick < 0) {
-                   PLCresidual[i] =
-                       iLBCdec_inst->prevResidual[
-                                   iLBCdec_inst->blockl+pick];
-               } else {
-                   PLCresidual[i] = PLCresidual[pick];
-               }
-
-               /* mix random and periodicity component */
-
-               if (i<80)
-                   PLCresidual[i] = use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-               else if (i<160)
-                   PLCresidual[i] = (float)0.95*use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-               else
-                   PLCresidual[i] = (float)0.9*use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-
-               energy += PLCresidual[i] * PLCresidual[i];
-           }
-
-           /* less than 30 dB, use only noise */
-
-
-
-
-
-
-           if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) {
-               gain=0.0;
-               for (i=0; i<iLBCdec_inst->blockl; i++) {
-                   PLCresidual[i] = randvec[i];
-               }
-           }
-
-           /* use old LPC */
-
-           memcpy(PLClpc,iLBCdec_inst->prevLpc,
-               (LPC_FILTERORDER+1)*sizeof(float));
-
-       }
-
-       /* no packet loss, copy input */
-
-       else {
-           memcpy(PLCresidual, decresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-           memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
-           iLBCdec_inst->consPLICount = 0;
-       }
-
-       /* update state */
-
-       if (PLI) {
-           iLBCdec_inst->prevLag = lag;
-           iLBCdec_inst->per=max_per;
-       }
-
-       iLBCdec_inst->prevPLI = PLI;
-       memcpy(iLBCdec_inst->prevLpc, PLClpc,
-           (LPC_FILTERORDER+1)*sizeof(float));
-       memcpy(iLBCdec_inst->prevResidual, PLCresidual,
-           iLBCdec_inst->blockl*sizeof(float));
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
deleted file mode 100644
index 2bda7a1..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       doCPLC.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_DOLPC_H
-   #define __iLBC_DOLPC_H
-
-   void doThePLC(
-       float *PLCresidual, /* (o) concealed residual */
-       float *PLClpc,      /* (o) concealed LP parameters */
-       int PLI,        /* (i) packet loss indicator
-                                  0 - no PL, 1 = PL */
-       float *decresidual, /* (i) decoded residual */
-       float *lpc,         /* (i) decoded LPC (only used for no PL) */
-       int inlag,          /* (i) pitch lag */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) decoder instance */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
deleted file mode 100644
index 1770207..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
+++ /dev/null
@@ -1,701 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       enhancer.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    * Find index in array such that the array element with said
-    * index is the element of said array closest to "value"
-    * according to the squared-error criterion
-    *---------------------------------------------------------------*/
-
-   void NearestNeighbor(
-
-
-
-
-
-       int   *index,   /* (o) index of array element closest
-                              to value */
-       float *array,   /* (i) data array */
-       float value,/* (i) value */
-       int arlength/* (i) dimension of data array */
-   ){
-       int i;
-       float bestcrit,crit;
-
-       crit=array[0]-value;
-       bestcrit=crit*crit;
-       *index=0;
-       for (i=1; i<arlength; i++) {
-           crit=array[i]-value;
-           crit=crit*crit;
-
-           if (crit<bestcrit) {
-               bestcrit=crit;
-               *index=i;
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * compute cross correlation between sequences
-    *---------------------------------------------------------------*/
-
-   void mycorr1(
-       float* corr,    /* (o) correlation of seq1 and seq2 */
-       float* seq1,    /* (i) first sequence */
-       int dim1,           /* (i) dimension first seq1 */
-       const float *seq2,  /* (i) second sequence */
-       int dim2        /* (i) dimension seq2 */
-   ){
-       int i,j;
-
-       for (i=0; i<=dim1-dim2; i++) {
-           corr[i]=0.0;
-           for (j=0; j<dim2; j++) {
-               corr[i] += seq1[i+j] * seq2[j];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * upsample finite array assuming zeros outside bounds
-    *---------------------------------------------------------------*/
-
-
-
-
-
-
-   void enh_upsample(
-       float* useq1,   /* (o) upsampled output sequence */
-       float* seq1,/* (i) unupsampled sequence */
-       int dim1,       /* (i) dimension seq1 */
-       int hfl         /* (i) polyphase filter length=2*hfl+1 */
-   ){
-       float *pu,*ps;
-       int i,j,k,q,filterlength,hfl2;
-       const float *polyp[ENH_UPS0]; /* pointers to
-                                        polyphase columns */
-       const float *pp;
-
-       /* define pointers for filter */
-
-       filterlength=2*hfl+1;
-
-       if ( filterlength > dim1 ) {
-           hfl2=(int) (dim1/2);
-           for (j=0; j<ENH_UPS0; j++) {
-               polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
-           }
-           hfl=hfl2;
-           filterlength=2*hfl+1;
-       }
-       else {
-           for (j=0; j<ENH_UPS0; j++) {
-               polyp[j]=polyphaserTbl+j*filterlength;
-           }
-       }
-
-       /* filtering: filter overhangs left side of sequence */
-
-       pu=useq1;
-       for (i=hfl; i<filterlength; i++) {
-           for (j=0; j<ENH_UPS0; j++) {
-               *pu=0.0;
-               pp = polyp[j];
-               ps = seq1+i;
-               for (k=0; k<=i; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-
-       /* filtering: simple convolution=inner products */
-
-       for (i=filterlength; i<dim1; i++) {
-
-
-
-
-
-           for (j=0;j<ENH_UPS0; j++){
-               *pu=0.0;
-               pp = polyp[j];
-               ps = seq1+i;
-               for (k=0; k<filterlength; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-
-       /* filtering: filter overhangs right side of sequence */
-
-       for (q=1; q<=hfl; q++) {
-           for (j=0; j<ENH_UPS0; j++) {
-               *pu=0.0;
-               pp = polyp[j]+q;
-               ps = seq1+dim1-1;
-               for (k=0; k<filterlength-q; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-   }
-
-
-   /*----------------------------------------------------------------*
-    * find segment starting near idata+estSegPos that has highest
-    * correlation with idata+centerStartPos through
-    * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a
-    * resolution of ENH_UPSO times the original of the original
-    * sampling rate
-    *---------------------------------------------------------------*/
-
-   void refiner(
-       float *seg,         /* (o) segment array */
-       float *updStartPos, /* (o) updated start point */
-       float* idata,       /* (i) original data buffer */
-       int idatal,         /* (i) dimension of idata */
-       int centerStartPos, /* (i) beginning center segment */
-       float estSegPos,/* (i) estimated beginning other segment */
-       float period    /* (i) estimated pitch period */
-   ){
-       int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
-       int tloc,tloc2,i,st,en,fraction;
-       float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
-       float corrVecUps[ENH_CORRDIM*ENH_UPS0];
-
-
-
-
-
-       /* defining array bounds */
-
-       estSegPosRounded=(int)(estSegPos - 0.5);
-
-       searchSegStartPos=estSegPosRounded-ENH_SLOP;
-
-       if (searchSegStartPos<0) {
-           searchSegStartPos=0;
-       }
-       searchSegEndPos=estSegPosRounded+ENH_SLOP;
-
-       if (searchSegEndPos+ENH_BLOCKL >= idatal) {
-           searchSegEndPos=idatal-ENH_BLOCKL-1;
-       }
-       corrdim=searchSegEndPos-searchSegStartPos+1;
-
-       /* compute upsampled correlation (corr33) and find
-          location of max */
-
-       mycorr1(corrVec,idata+searchSegStartPos,
-           corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
-       enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
-       tloc=0; maxv=corrVecUps[0];
-       for (i=1; i<ENH_UPS0*corrdim; i++) {
-
-           if (corrVecUps[i]>maxv) {
-               tloc=i;
-               maxv=corrVecUps[i];
-           }
-       }
-
-       /* make vector can be upsampled without ever running outside
-          bounds */
-
-       *updStartPos= (float)searchSegStartPos +
-           (float)tloc/(float)ENH_UPS0+(float)1.0;
-       tloc2=(int)(tloc/ENH_UPS0);
-
-       if (tloc>tloc2*ENH_UPS0) {
-           tloc2++;
-       }
-       st=searchSegStartPos+tloc2-ENH_FL0;
-
-       if (st<0) {
-           memset(vect,0,-st*sizeof(float));
-           memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
-       }
-       else {
-
-
-
-
-
-           en=st+ENH_VECTL;
-
-           if (en>idatal) {
-               memcpy(vect, &idata[st],
-                   (ENH_VECTL-(en-idatal))*sizeof(float));
-               memset(&vect[ENH_VECTL-(en-idatal)], 0,
-                   (en-idatal)*sizeof(float));
-           }
-           else {
-               memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
-           }
-       }
-       fraction=tloc2*ENH_UPS0-tloc;
-
-       /* compute the segment (this is actually a convolution) */
-
-       mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
-           2*ENH_FL0+1);
-   }
-
-   /*----------------------------------------------------------------*
-    * find the smoothed output data
-    *---------------------------------------------------------------*/
-
-   void smath(
-       float *odata,   /* (o) smoothed output */
-       float *sseq,/* (i) said second sequence of waveforms */
-       int hl,         /* (i) 2*hl+1 is sseq dimension */
-       float alpha0/* (i) max smoothing energy fraction */
-   ){
-       int i,k;
-       float w00,w10,w11,A,B,C,*psseq,err,errs;
-       float surround[BLOCKL_MAX]; /* shape contributed by other than
-                                      current */
-       float wt[2*ENH_HL+1];       /* waveform weighting to get
-                                      surround shape */
-       float denom;
-
-       /* create shape of contribution from all waveforms except the
-          current one */
-
-       for (i=1; i<=2*hl+1; i++) {
-           wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2)));
-       }
-       wt[hl]=0.0; /* for clarity, not used */
-       for (i=0; i<ENH_BLOCKL; i++) {
-           surround[i]=sseq[i]*wt[0];
-       }
-
-
-
-
-
-       for (k=1; k<hl; k++) {
-           psseq=sseq+k*ENH_BLOCKL;
-           for(i=0;i<ENH_BLOCKL; i++) {
-               surround[i]+=psseq[i]*wt[k];
-           }
-       }
-       for (k=hl+1; k<=2*hl; k++) {
-           psseq=sseq+k*ENH_BLOCKL;
-           for(i=0;i<ENH_BLOCKL; i++) {
-               surround[i]+=psseq[i]*wt[k];
-           }
-       }
-
-       /* compute some inner products */
-
-       w00 = w10 = w11 = 0.0;
-       psseq=sseq+hl*ENH_BLOCKL; /* current block  */
-       for (i=0; i<ENH_BLOCKL;i++) {
-           w00+=psseq[i]*psseq[i];
-           w11+=surround[i]*surround[i];
-           w10+=surround[i]*psseq[i];
-       }
-
-       if (fabs(w11) < 1.0) {
-           w11=1.0;
-       }
-       C = (float)sqrt( w00/w11);
-
-       /* first try enhancement without power-constraint */
-
-       errs=0.0;
-       psseq=sseq+hl*ENH_BLOCKL;
-       for (i=0; i<ENH_BLOCKL; i++) {
-           odata[i]=C*surround[i];
-           err=psseq[i]-odata[i];
-           errs+=err*err;
-       }
-
-       /* if constraint violated by first try, add constraint */
-
-       if (errs > alpha0 * w00) {
-           if ( w00 < 1) {
-               w00=1;
-           }
-           denom = (w11*w00-w10*w10)/(w00*w00);
-
-           if (denom > 0.0001) { /* eliminates numerical problems
-                                    for if smooth */
-
-
-
-
-
-               A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
-               B = -alpha0/2 - A * w10/w00;
-               B = B+1;
-           }
-           else { /* essentially no difference between cycles;
-                     smoothing not needed */
-               A= 0.0;
-               B= 1.0;
-           }
-
-           /* create smoothed sequence */
-
-           psseq=sseq+hl*ENH_BLOCKL;
-           for (i=0; i<ENH_BLOCKL; i++) {
-               odata[i]=A*surround[i]+B*psseq[i];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * get the pitch-synchronous sample sequence
-    *---------------------------------------------------------------*/
-
-   void getsseq(
-       float *sseq,    /* (o) the pitch-synchronous sequence */
-       float *idata,       /* (i) original data */
-       int idatal,         /* (i) dimension of data */
-       int centerStartPos, /* (i) where current block starts */
-       float *period,      /* (i) rough-pitch-period array */
-       float *plocs,       /* (i) where periods of period array
-                                  are taken */
-       int periodl,    /* (i) dimension period array */
-       int hl              /* (i) 2*hl+1 is the number of sequences */
-   ){
-       int i,centerEndPos,q;
-       float blockStartPos[2*ENH_HL+1];
-       int lagBlock[2*ENH_HL+1];
-       float plocs2[ENH_PLOCSL];
-       float *psseq;
-
-       centerEndPos=centerStartPos+ENH_BLOCKL-1;
-
-       /* present */
-
-       NearestNeighbor(lagBlock+hl,plocs,
-           (float)0.5*(centerStartPos+centerEndPos),periodl);
-
-       blockStartPos[hl]=(float)centerStartPos;
-
-
-
-
-
-       psseq=sseq+ENH_BLOCKL*hl;
-       memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
-
-       /* past */
-
-       for (q=hl-1; q>=0; q--) {
-           blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
-           NearestNeighbor(lagBlock+q,plocs,
-               blockStartPos[q]+
-               ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
-
-
-           if (blockStartPos[q]-ENH_OVERHANG>=0) {
-               refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
-                   idatal, centerStartPos, blockStartPos[q],
-                   period[lagBlock[q+1]]);
-           } else {
-               psseq=sseq+q*ENH_BLOCKL;
-               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-           }
-       }
-
-       /* future */
-
-       for (i=0; i<periodl; i++) {
-           plocs2[i]=plocs[i]-period[i];
-       }
-       for (q=hl+1; q<=2*hl; q++) {
-           NearestNeighbor(lagBlock+q,plocs2,
-               blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
-
-           blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
-           if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
-               refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
-                   idatal, centerStartPos, blockStartPos[q],
-                   period[lagBlock[q]]);
-           }
-           else {
-               psseq=sseq+q*ENH_BLOCKL;
-               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * perform enhancement on idata+centerStartPos through
-    * idata+centerStartPos+ENH_BLOCKL-1
-    *---------------------------------------------------------------*/
-
-
-
-
-
-   void enhancer(
-       float *odata,       /* (o) smoothed block, dimension blockl */
-       float *idata,       /* (i) data buffer used for enhancing */
-       int idatal,         /* (i) dimension idata */
-       int centerStartPos, /* (i) first sample current block
-                                  within idata */
-       float alpha0,       /* (i) max correction-energy-fraction
-                                 (in [0,1]) */
-       float *period,      /* (i) pitch period array */
-       float *plocs,       /* (i) locations where period array
-                                  values valid */
-       int periodl         /* (i) dimension of period and plocs */
-   ){
-       float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
-
-       /* get said second sequence of segments */
-
-       getsseq(sseq,idata,idatal,centerStartPos,period,
-           plocs,periodl,ENH_HL);
-
-       /* compute the smoothed output from said second sequence */
-
-       smath(odata,sseq,ENH_HL,alpha0);
-
-   }
-
-   /*----------------------------------------------------------------*
-    * cross correlation
-    *---------------------------------------------------------------*/
-
-   float xCorrCoef(
-       float *target,      /* (i) first array */
-       float *regressor,   /* (i) second array */
-       int subl        /* (i) dimension arrays */
-   ){
-       int i;
-       float ftmp1, ftmp2;
-
-       ftmp1 = 0.0;
-       ftmp2 = 0.0;
-       for (i=0; i<subl; i++) {
-           ftmp1 += target[i]*regressor[i];
-           ftmp2 += regressor[i]*regressor[i];
-       }
-
-       if (ftmp1 > 0.0) {
-           return (float)(ftmp1*ftmp1/ftmp2);
-       }
-
-
-
-
-
-       else {
-           return (float)0.0;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * interface for enhancer
-    *---------------------------------------------------------------*/
-
-   int enhancerInterface(
-       float *out,                     /* (o) enhanced signal */
-       float *in,                      /* (i) unenhanced signal */
-       iLBC_Dec_Inst_t *iLBCdec_inst   /* (i) buffers etc */
-   ){
-       float *enh_buf, *enh_period;
-       int iblock, isample;
-       int lag=0, ilag, i, ioffset;
-       float cc, maxcc;
-       float ftmp1, ftmp2;
-       float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
-       float plc_pred[ENH_BLOCKL];
-
-       float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
-       int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
-       int start, plc_blockl, inlag;
-
-       enh_buf=iLBCdec_inst->enh_buf;
-       enh_period=iLBCdec_inst->enh_period;
-
-       memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
-           (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
-
-       memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
-           iLBCdec_inst->blockl*sizeof(float));
-
-       if (iLBCdec_inst->mode==30)
-           plc_blockl=ENH_BLOCKL;
-       else
-           plc_blockl=40;
-
-       /* when 20 ms frame, move processing one block */
-       ioffset=0;
-       if (iLBCdec_inst->mode==20) ioffset=1;
-
-       i=3-ioffset;
-       memmove(enh_period, &enh_period[i],
-           (ENH_NBLOCKS_TOT-i)*sizeof(float));
-
-
-
-
-
-
-       /* Set state information to the 6 samples right before
-          the samples to be downsampled. */
-
-       memcpy(lpState,
-           enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126,
-           6*sizeof(float));
-
-       /* Down sample a factor 2 to save computations */
-
-       DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
-                   lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
-                   lpState, downsampled);
-
-       /* Estimate the pitch in the down sampled domain. */
-       for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
-
-           lag = 10;
-           maxcc = xCorrCoef(downsampled+60+iblock*
-               ENH_BLOCKL_HALF, downsampled+60+iblock*
-               ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
-           for (ilag=11; ilag<60; ilag++) {
-               cc = xCorrCoef(downsampled+60+iblock*
-                   ENH_BLOCKL_HALF, downsampled+60+iblock*
-                   ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-
-           /* Store the estimated lag in the non-downsampled domain */
-           enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
-
-
-       }
-
-
-       /* PLC was performed on the previous packet */
-       if (iLBCdec_inst->prev_enh_pl==1) {
-
-           inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
-
-           lag = inlag-1;
-           maxcc = xCorrCoef(in, in+lag, plc_blockl);
-           for (ilag=inlag; ilag<=inlag+1; ilag++) {
-               cc = xCorrCoef(in, in+ilag, plc_blockl);
-
-
-
-
-
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-
-           enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
-
-           /* compute new concealed residual for the old lookahead,
-              mix the forward PLC with a backward PLC from
-              the new frame */
-
-           inPtr=&in[lag-1];
-
-           enh_bufPtr1=&plc_pred[plc_blockl-1];
-
-           if (lag>plc_blockl) {
-               start=plc_blockl;
-           } else {
-               start=lag;
-           }
-
-           for (isample = start; isample>0; isample--) {
-               *enh_bufPtr1-- = *inPtr--;
-           }
-
-           enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-           for (isample = (plc_blockl-1-lag); isample>=0; isample--) {
-               *enh_bufPtr1-- = *enh_bufPtr2--;
-           }
-
-           /* limit energy change */
-           ftmp2=0.0;
-           ftmp1=0.0;
-           for (i=0;i<plc_blockl;i++) {
-               ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
-                   enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
-               ftmp1+=plc_pred[i]*plc_pred[i];
-           }
-           ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
-           ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
-           if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
-               for (i=0;i<plc_blockl-10;i++) {
-                   plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
-               }
-               for (i=plc_blockl-10;i<plc_blockl;i++) {
-                   plc_pred[i]*=(float)(i-plc_blockl+10)*
-                       ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
-
-
-
-
-
-                       (float)2.0*ftmp2/ftmp1;
-               }
-           }
-
-           enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-           for (i=0; i<plc_blockl; i++) {
-               ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
-               *enh_bufPtr1 *= ftmp1;
-               *enh_bufPtr1 += ((float)1.0-ftmp1)*
-                                   plc_pred[plc_blockl-1-i];
-               enh_bufPtr1--;
-           }
-       }
-
-       if (iLBCdec_inst->mode==20) {
-           /* Enhancer with 40 samples delay */
-           for (iblock = 0; iblock<2; iblock++) {
-               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
-                   ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
-                   ENH_ALPHA0, enh_period, enh_plocsTbl,
-                       ENH_NBLOCKS_TOT);
-           }
-       } else if (iLBCdec_inst->mode==30) {
-           /* Enhancer with 80 samples delay */
-           for (iblock = 0; iblock<3; iblock++) {
-               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
-                   ENH_BUFL, (4+iblock)*ENH_BLOCKL,
-                   ENH_ALPHA0, enh_period, enh_plocsTbl,
-                       ENH_NBLOCKS_TOT);
-           }
-       }
-
-       return (lag*2);
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
deleted file mode 100644
index 8a081fb..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       enhancer.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-
-
-
-
-   ******************************************************************/
-
-   #ifndef __ENHANCER_H
-   #define __ENHANCER_H
-
-   #include "iLBC_define.h"
-
-   float xCorrCoef(
-       float *target,      /* (i) first array */
-       float *regressor,   /* (i) second array */
-       int subl        /* (i) dimension arrays */
-   );
-
-   int enhancerInterface(
-       float *out,         /* (o) the enhanced recidual signal */
-       float *in,          /* (i) the recidual signal to enhance */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) the decoder state structure */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
deleted file mode 100644
index e4b07bc..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
+++ /dev/null
@@ -1,24 +0,0 @@
-BEGIN { srcname = "nothing"; }
-{ if (/^A\.[0-9][0-9]*\.* *[a-zA-Z][a-zA-Z_0-9]*\.[ch]/) {
-    if (srcname != "nothing")
-      close(srcname);
-    srcname = $2;
-    printf("creating source file %s\n", srcname);
-  }else if (srcname != "nothing") {
-    if (/Andersen,* *et* *al\./) 
-      printf("skipping %s\n", $0);
-    else if (//)
-      printf("skipping2 %s\n", $0);
-    else if (/Internet Low Bit Rate Codec *December 2004/)
-      printf("skipping3 %s\n", $0);
-    else if (/Authors' *Addresses/){
-      close(srcname);
-      exit;}
-    else
-      print $0 >> srcname;
-  }
-}
-END {
-  printf("ending file %s\n", srcname);
-  close(srcname);
-}
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
deleted file mode 100644
index 6565c2b..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
+++ /dev/null
@@ -1,175 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       filter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  all-pole filter
-    *---------------------------------------------------------------*/
-
-   void AllPoleFilter(
-       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
-                              InOut[-1] contain the state of the
-                              filter (delayed samples). InOut[0] to
-                              InOut[lengthInOut-1] contain the filter
-                              input, on en exit InOut[-orderCoef] to
-                              InOut[-1] is unchanged and InOut[0] to
-                              InOut[lengthInOut-1] contain filtered
-                              samples */
-       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
-                              to be 1.0 */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef   /* (i) number of filter coefficients */
-   ){
-       int n,k;
-
-       for(n=0;n<lengthInOut;n++){
-           for(k=1;k<=orderCoef;k++){
-               *InOut -= Coef[k]*InOut[-k];
-
-
-
-
-
-           }
-           InOut++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  all-zero filter
-    *---------------------------------------------------------------*/
-
-   void AllZeroFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples */
-       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
-                              to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain the filter state, on exit Out[0]
-                              to Out[lengthInOut-1] contain filtered
-                              samples */
-   ){
-       int n,k;
-
-       for(n=0;n<lengthInOut;n++){
-           *Out = Coef[0]*In[0];
-           for(k=1;k<=orderCoef;k++){
-               *Out += Coef[k]*In[-k];
-           }
-           Out++;
-           In++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  pole-zero filter
-    *---------------------------------------------------------------*/
-
-   void ZeroPoleFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples In[-orderCoef] to
-                              In[-1] contain state of all-zero
-                              section */
-       float *ZeroCoef,/* (i) filter coefficients for all-zero
-                              section (ZeroCoef[0] is assumed to
-                              be 1.0) */
-       float *PoleCoef,/* (i) filter coefficients for all-pole section
-                              (ZeroCoef[0] is assumed to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-
-
-
-
-
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain state of all-pole section. On
-                              exit Out[0] to Out[lengthInOut-1]
-                              contain filtered samples */
-   ){
-       AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
-       AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
-   }
-
-   /*----------------------------------------------------------------*
-    * downsample (LP filter and decimation)
-    *---------------------------------------------------------------*/
-
-   void DownSample (
-       float  *In,     /* (i) input samples */
-       float  *Coef,   /* (i) filter coefficients */
-       int lengthIn,   /* (i) number of input samples */
-       float  *state,  /* (i) filter state */
-       float  *Out     /* (o) downsampled output */
-   ){
-       float   o;
-       float *Out_ptr = Out;
-       float *Coef_ptr, *In_ptr;
-       float *state_ptr;
-       int i, j, stop;
-
-       /* LP filter and decimate at the same time */
-
-       for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
-       {
-           Coef_ptr = &Coef[0];
-           In_ptr = &In[i];
-           state_ptr = &state[FILTERORDER_DS-2];
-
-           o = (float)0.0;
-
-           stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
-
-           for (j = 0; j < stop; j++)
-           {
-               o += *Coef_ptr++ * (*In_ptr--);
-           }
-           for (j = i + 1; j < FILTERORDER_DS; j++)
-           {
-               o += *Coef_ptr++ * (*state_ptr--);
-           }
-
-
-
-
-
-
-           *Out_ptr++ = o;
-       }
-
-       /* Get the last part (use zeros as input for the future) */
-
-       for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS);
-               i+=FACTOR_DS) {
-
-           o=(float)0.0;
-
-           if (i<lengthIn) {
-               Coef_ptr = &Coef[0];
-               In_ptr = &In[i];
-               for (j=0; j<FILTERORDER_DS; j++) {
-                       o += *Coef_ptr++ * (*Out_ptr--);
-               }
-           } else {
-               Coef_ptr = &Coef[i-lengthIn];
-               In_ptr = &In[lengthIn-1];
-               for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
-                       o += *Coef_ptr++ * (*In_ptr--);
-               }
-           }
-           *Out_ptr++ = o;
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
deleted file mode 100644
index 4c512cd..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       filter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-
-
-
-
-
-   #ifndef __iLBC_FILTER_H
-   #define __iLBC_FILTER_H
-
-   void AllPoleFilter(
-       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
-                              InOut[-1] contain the state of the
-                              filter (delayed samples). InOut[0] to
-                              InOut[lengthInOut-1] contain the filter
-                              input, on en exit InOut[-orderCoef] to
-                              InOut[-1] is unchanged and InOut[0] to
-                              InOut[lengthInOut-1] contain filtered
-                              samples */
-       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
-                              to be 1.0 */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef   /* (i) number of filter coefficients */
-   );
-
-   void AllZeroFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples */
-       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
-                              to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain the filter state, on exit Out[0]
-                              to Out[lengthInOut-1] contain filtered
-                              samples */
-   );
-
-   void ZeroPoleFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain filter
-                              input samples In[-orderCoef] to In[-1]
-                              contain state of all-zero section */
-       float *ZeroCoef,/* (i) filter coefficients for all-zero
-                              section (ZeroCoef[0] is assumed to
-                              be 1.0) */
-       float *PoleCoef,/* (i) filter coefficients for all-pole section
-                              (ZeroCoef[0] is assumed to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain state of all-pole section. On
-                              exit Out[0] to Out[lengthInOut-1]
-                              contain filtered samples */
-   );
-
-
-
-
-
-
-   void DownSample (
-       float  *In,     /* (i) input samples */
-       float  *Coef,   /* (i) filter coefficients */
-       int lengthIn,   /* (i) number of input samples */
-       float  *state,  /* (i) filter state */
-       float  *Out     /* (o) downsampled output */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
deleted file mode 100644
index 0e74ff8..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
+++ /dev/null
@@ -1,116 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-
-
-
-
-
-       gainquant.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-   #include <math.h>
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    *  quantizer for the gain in the gain-shape coding of residual
-    *---------------------------------------------------------------*/
-
-   float gainquant(/* (o) quantized gain value */
-       float in,       /* (i) gain value */
-       float maxIn,/* (i) maximum of gain value */
-       int cblen,      /* (i) number of quantization indices */
-       int *index      /* (o) quantization index */
-   ){
-       int i, tindex;
-       float minmeasure,measure, *cb, scale;
-
-       /* ensure a lower bound on the scaling factor */
-
-       scale=maxIn;
-
-       if (scale<0.1) {
-           scale=(float)0.1;
-       }
-
-       /* select the quantization table */
-
-       if (cblen == 8) {
-           cb = gain_sq3Tbl;
-       } else if (cblen == 16) {
-           cb = gain_sq4Tbl;
-       } else  {
-           cb = gain_sq5Tbl;
-       }
-
-       /* select the best index in the quantization table */
-
-       minmeasure=10000000.0;
-       tindex=0;
-       for (i=0; i<cblen; i++) {
-
-
-
-
-
-           measure=(in-scale*cb[i])*(in-scale*cb[i]);
-
-           if (measure<minmeasure) {
-               tindex=i;
-               minmeasure=measure;
-           }
-       }
-       *index=tindex;
-
-       /* return the quantized value */
-
-       return scale*cb[tindex];
-   }
-
-   /*----------------------------------------------------------------*
-    *  decoder for quantized gains in the gain-shape coding of
-    *  residual
-    *---------------------------------------------------------------*/
-
-   float gaindequant(  /* (o) quantized gain value */
-       int index,      /* (i) quantization index */
-       float maxIn,/* (i) maximum of unquantized gain */
-       int cblen       /* (i) number of quantization indices */
-   ){
-       float scale;
-
-       /* obtain correct scale factor */
-
-       scale=(float)fabs(maxIn);
-
-       if (scale<0.1) {
-           scale=(float)0.1;
-       }
-
-       /* select the quantization table and return the decoded value */
-
-       if (cblen==8) {
-           return scale*gain_sq3Tbl[index];
-       } else if (cblen==16) {
-           return scale*gain_sq4Tbl[index];
-       }
-       else if (cblen==32) {
-           return scale*gain_sq5Tbl[index];
-       }
-
-       return 0.0;
-   }
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
deleted file mode 100644
index 0d02424..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       gainquant.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_GAINQUANT_H
-   #define __iLBC_GAINQUANT_H
-
-   float gainquant(/* (o) quantized gain value */
-       float in,       /* (i) gain value */
-       float maxIn,/* (i) maximum of gain value */
-       int cblen,      /* (i) number of quantization indices */
-       int *index      /* (o) quantization index */
-   );
-
-   float gaindequant(  /* (o) quantized gain value */
-       int index,      /* (i) quantization index */
-       float maxIn,/* (i) maximum of unquantized gain */
-       int cblen       /* (i) number of quantization indices */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
deleted file mode 100644
index 4f2d291..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
+++ /dev/null
@@ -1,193 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       getCBvec.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include <string.h>
-
-   /*----------------------------------------------------------------*
-    *  Construct codebook vector for given index.
-    *---------------------------------------------------------------*/
-
-   void getCBvec(
-
-
-
-
-
-       float *cbvec,   /* (o) Constructed codebook vector */
-       float *mem,     /* (i) Codebook buffer */
-       int index,      /* (i) Codebook index */
-       int lMem,       /* (i) Length of codebook buffer */
-       int cbveclen/* (i) Codebook vector length */
-   ){
-       int j, k, n, memInd, sFilt;
-       float tmpbuf[CB_MEML];
-       int base_size;
-       int ilow, ihigh;
-       float alfa, alfa1;
-
-       /* Determine size of codebook sections */
-
-       base_size=lMem-cbveclen+1;
-
-       if (cbveclen==SUBL) {
-           base_size+=cbveclen/2;
-       }
-
-       /* No filter -> First codebook section */
-
-       if (index<lMem-cbveclen+1) {
-
-           /* first non-interpolated vectors */
-
-           k=index+cbveclen;
-           /* get vector */
-           memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
-
-       } else if (index < base_size) {
-
-           k=2*(index-(lMem-cbveclen+1))+cbveclen;
-
-           ihigh=k/2;
-           ilow=ihigh-5;
-
-           /* Copy first noninterpolated part */
-
-           memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
-
-           /* interpolation */
-
-           alfa1=(float)0.2;
-           alfa=0.0;
-           for (j=ilow; j<ihigh; j++) {
-               cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
-                   alfa*mem[lMem-k+j];
-
-
-
-
-
-               alfa+=alfa1;
-           }
-
-           /* Copy second noninterpolated part */
-
-           memcpy(cbvec+ihigh, mem+lMem-k+ihigh,
-               (cbveclen-ihigh)*sizeof(float));
-
-       }
-
-       /* Higher codebook section based on filtering */
-
-       else {
-
-           /* first non-interpolated vectors */
-
-           if (index-base_size<lMem-cbveclen+1) {
-               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-               float *pos;
-               float *pp, *pp1;
-
-               memset(tempbuff2, 0,
-                   CB_HALFFILTERLEN*sizeof(float));
-               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-                   lMem*sizeof(float));
-               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-                   (CB_HALFFILTERLEN+1)*sizeof(float));
-
-               k=index-base_size+cbveclen;
-               sFilt=lMem-k;
-               memInd=sFilt+1-CB_HALFFILTERLEN;
-
-               /* do filtering */
-               pos=cbvec;
-               memset(pos, 0, cbveclen*sizeof(float));
-               for (n=0; n<cbveclen; n++) {
-                   pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
-                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-                   for (j=0; j<CB_FILTERLEN; j++) {
-                       (*pos)+=(*pp++)*(*pp1--);
-                   }
-                   pos++;
-               }
-           }
-
-           /* interpolated vectors */
-
-           else {
-
-
-
-
-
-               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-
-               float *pos;
-               float *pp, *pp1;
-               int i;
-
-               memset(tempbuff2, 0,
-                   CB_HALFFILTERLEN*sizeof(float));
-               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-                   lMem*sizeof(float));
-               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-                   (CB_HALFFILTERLEN+1)*sizeof(float));
-
-               k=2*(index-base_size-
-                   (lMem-cbveclen+1))+cbveclen;
-               sFilt=lMem-k;
-               memInd=sFilt+1-CB_HALFFILTERLEN;
-
-               /* do filtering */
-               pos=&tmpbuf[sFilt];
-               memset(pos, 0, k*sizeof(float));
-               for (i=0; i<k; i++) {
-                   pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
-                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-                   for (j=0; j<CB_FILTERLEN; j++) {
-                       (*pos)+=(*pp++)*(*pp1--);
-                   }
-                   pos++;
-               }
-
-               ihigh=k/2;
-               ilow=ihigh-5;
-
-               /* Copy first noninterpolated part */
-
-               memcpy(cbvec, tmpbuf+lMem-k/2,
-                   ilow*sizeof(float));
-
-               /* interpolation */
-
-               alfa1=(float)0.2;
-               alfa=0.0;
-               for (j=ilow; j<ihigh; j++) {
-                   cbvec[j]=((float)1.0-alfa)*
-                       tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
-                   alfa+=alfa1;
-               }
-
-
-
-
-
-
-               /* Copy second noninterpolated part */
-
-               memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh,
-                   (cbveclen-ihigh)*sizeof(float));
-           }
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
deleted file mode 100644
index 0080907..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       getCBvec.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_GETCBVEC_H
-   #define __iLBC_GETCBVEC_H
-
-   void getCBvec(
-       float *cbvec,   /* (o) Constructed codebook vector */
-       float *mem,     /* (i) Codebook buffer */
-       int index,      /* (i) Codebook index */
-       int lMem,       /* (i) Length of codebook buffer */
-       int cbveclen/* (i) Codebook vector length */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
deleted file mode 100644
index 1aba657..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
+++ /dev/null
@@ -1,326 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       helpfun.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  calculation of auto correlation
-    *---------------------------------------------------------------*/
-
-   void autocorr(
-       float *r,       /* (o) autocorrelation vector */
-       const float *x, /* (i) data vector */
-       int N,          /* (i) length of data vector */
-       int order       /* largest lag for calculated
-                          autocorrelations */
-   ){
-       int     lag, n;
-       float   sum;
-
-       for (lag = 0; lag <= order; lag++) {
-           sum = 0;
-           for (n = 0; n < N - lag; n++) {
-               sum += x[n] * x[n+lag];
-           }
-           r[lag] = sum;
-       }
-
-
-
-
-
-   }
-
-   /*----------------------------------------------------------------*
-    *  window multiplication
-    *---------------------------------------------------------------*/
-
-   void window(
-       float *z,       /* (o) the windowed data */
-       const float *x, /* (i) the original data vector */
-       const float *y, /* (i) the window */
-       int N           /* (i) length of all vectors */
-   ){
-       int     i;
-
-       for (i = 0; i < N; i++) {
-           z[i] = x[i] * y[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  levinson-durbin solution for lpc coefficients
-    *---------------------------------------------------------------*/
-
-   void levdurb(
-       float *a,       /* (o) lpc coefficient vector starting
-                              with 1.0 */
-       float *k,       /* (o) reflection coefficients */
-       float *r,       /* (i) autocorrelation vector */
-       int order       /* (i) order of lpc filter */
-   ){
-       float  sum, alpha;
-       int     m, m_h, i;
-
-       a[0] = 1.0;
-
-       if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
-           for (i = 0; i < order; i++) {
-               k[i] = 0;
-               a[i+1] = 0;
-           }
-       } else {
-           a[1] = k[0] = -r[1]/r[0];
-           alpha = r[0] + r[1] * k[0];
-           for (m = 1; m < order; m++){
-               sum = r[m + 1];
-               for (i = 0; i < m; i++){
-                   sum += a[i+1] * r[m - i];
-               }
-
-
-
-
-
-               k[m] = -sum / alpha;
-               alpha += k[m] * sum;
-               m_h = (m + 1) >> 1;
-               for (i = 0; i < m_h; i++){
-                   sum = a[i+1] + k[m] * a[m - i];
-                   a[m - i] += k[m] * a[i+1];
-                   a[i+1] = sum;
-               }
-               a[m+1] = k[m];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  interpolation between vectors
-    *---------------------------------------------------------------*/
-
-   void interpolate(
-       float *out,      /* (o) the interpolated vector */
-       float *in1,     /* (i) the first vector for the
-                              interpolation */
-       float *in2,     /* (i) the second vector for the
-                              interpolation */
-       float coef,      /* (i) interpolation weights */
-       int length      /* (i) length of all vectors */
-   ){
-       int i;
-       float invcoef;
-
-       invcoef = (float)1.0 - coef;
-       for (i = 0; i < length; i++) {
-           out[i] = coef * in1[i] + invcoef * in2[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lpc bandwidth expansion
-    *---------------------------------------------------------------*/
-
-   void bwexpand(
-       float *out,      /* (o) the bandwidth expanded lpc
-                              coefficients */
-       float *in,      /* (i) the lpc coefficients before bandwidth
-                              expansion */
-       float coef,     /* (i) the bandwidth expansion factor */
-       int length      /* (i) the length of lpc coefficient vectors */
-   ){
-       int i;
-
-
-
-
-
-       float  chirp;
-
-       chirp = coef;
-
-       out[0] = in[0];
-       for (i = 1; i < length; i++) {
-           out[i] = chirp * in[i];
-           chirp *= coef;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  vector quantization
-    *---------------------------------------------------------------*/
-
-   void vq(
-       float *Xq,      /* (o) the quantized vector */
-       int *index,     /* (o) the quantization index */
-       const float *CB,/* (i) the vector quantization codebook */
-       float *X,       /* (i) the vector to quantize */
-       int n_cb,       /* (i) the number of vectors in the codebook */
-       int dim         /* (i) the dimension of all vectors */
-   ){
-       int     i, j;
-       int     pos, minindex;
-       float   dist, tmp, mindist;
-
-       pos = 0;
-       mindist = FLOAT_MAX;
-       minindex = 0;
-       for (j = 0; j < n_cb; j++) {
-           dist = X[0] - CB[pos];
-           dist *= dist;
-           for (i = 1; i < dim; i++) {
-               tmp = X[i] - CB[pos + i];
-               dist += tmp*tmp;
-           }
-
-           if (dist < mindist) {
-               mindist = dist;
-               minindex = j;
-           }
-           pos += dim;
-       }
-       for (i = 0; i < dim; i++) {
-           Xq[i] = CB[minindex*dim + i];
-       }
-       *index = minindex;
-
-
-
-
-
-   }
-
-   /*----------------------------------------------------------------*
-    *  split vector quantization
-    *---------------------------------------------------------------*/
-
-   void SplitVQ(
-       float *qX,      /* (o) the quantized vector */
-       int *index,     /* (o) a vector of indexes for all vector
-                              codebooks in the split */
-       float *X,       /* (i) the vector to quantize */
-       const float *CB,/* (i) the quantizer codebook */
-       int nsplit,     /* the number of vector splits */
-       const int *dim, /* the dimension of X and qX */
-       const int *cbsize /* the number of vectors in the codebook */
-   ){
-       int    cb_pos, X_pos, i;
-
-       cb_pos = 0;
-       X_pos= 0;
-       for (i = 0; i < nsplit; i++) {
-           vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos,
-               cbsize[i], dim[i]);
-           X_pos += dim[i];
-           cb_pos += dim[i] * cbsize[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  scalar quantization
-    *---------------------------------------------------------------*/
-
-   void sort_sq(
-       float *xq,      /* (o) the quantized value */
-       int *index,     /* (o) the quantization index */
-       float x,    /* (i) the value to quantize */
-       const float *cb,/* (i) the quantization codebook */
-       int cb_size      /* (i) the size of the quantization codebook */
-   ){
-       int i;
-
-       if (x <= cb[0]) {
-           *index = 0;
-           *xq = cb[0];
-       } else {
-           i = 0;
-           while ((x > cb[i]) && i < cb_size - 1) {
-               i++;
-
-
-
-
-
-           }
-
-           if (x > ((cb[i] + cb[i - 1])/2)) {
-               *index = i;
-               *xq = cb[i];
-           } else {
-               *index = i - 1;
-               *xq = cb[i - 1];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  check for stability of lsf coefficients
-    *---------------------------------------------------------------*/
-
-   int LSF_check(    /* (o) 1 for stable lsf vectors and 0 for
-                              nonstable ones */
-       float *lsf,     /* (i) a table of lsf vectors */
-       int dim,    /* (i) the dimension of each lsf vector */
-       int NoAn    /* (i) the number of lsf vectors in the
-                              table */
-   ){
-       int k,n,m, Nit=2, change=0,pos;
-       float tmp;
-       static float eps=(float)0.039; /* 50 Hz */
-       static float eps2=(float)0.0195;
-       static float maxlsf=(float)3.14; /* 4000 Hz */
-       static float minlsf=(float)0.01; /* 0 Hz */
-
-       /* LSF separation check*/
-
-       for (n=0; n<Nit; n++) { /* Run through a couple of times */
-           for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
-               for (k=0; k<(dim-1); k++) {
-                   pos=m*dim+k;
-
-                   if ((lsf[pos+1]-lsf[pos])<eps) {
-
-                       if (lsf[pos+1]<lsf[pos]) {
-                           tmp=lsf[pos+1];
-                           lsf[pos+1]= lsf[pos]+eps2;
-                           lsf[pos]= lsf[pos+1]-eps2;
-                       } else {
-                           lsf[pos]-=eps2;
-                           lsf[pos+1]+=eps2;
-                       }
-                       change=1;
-
-
-
-
-
-                   }
-
-                   if (lsf[pos]<minlsf) {
-                       lsf[pos]=minlsf;
-                       change=1;
-                   }
-
-                   if (lsf[pos]>maxlsf) {
-                       lsf[pos]=maxlsf;
-                       change=1;
-                   }
-               }
-           }
-       }
-
-       return change;
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
deleted file mode 100644
index 931ca68..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       helpfun.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HELPFUN_H
-   #define __iLBC_HELPFUN_H
-
-   void autocorr(
-       float *r,       /* (o) autocorrelation vector */
-       const float *x, /* (i) data vector */
-       int N,          /* (i) length of data vector */
-       int order       /* largest lag for calculated
-                          autocorrelations */
-   );
-
-   void window(
-       float *z,       /* (o) the windowed data */
-       const float *x, /* (i) the original data vector */
-       const float *y, /* (i) the window */
-       int N           /* (i) length of all vectors */
-   );
-
-   void levdurb(
-       float *a,       /* (o) lpc coefficient vector starting
-                              with 1.0 */
-       float *k,       /* (o) reflection coefficients */
-       float *r,       /* (i) autocorrelation vector */
-       int order       /* (i) order of lpc filter */
-   );
-
-   void interpolate(
-
-
-
-
-
-       float *out,     /* (o) the interpolated vector */
-       float *in1,     /* (i) the first vector for the
-                              interpolation */
-       float *in2,     /* (i) the second vector for the
-                              interpolation */
-       float coef,     /* (i) interpolation weights */
-       int length      /* (i) length of all vectors */
-   );
-
-   void bwexpand(
-       float *out,     /* (o) the bandwidth expanded lpc
-                              coefficients */
-       float *in,      /* (i) the lpc coefficients before bandwidth
-                              expansion */
-       float coef,     /* (i) the bandwidth expansion factor */
-       int length      /* (i) the length of lpc coefficient vectors */
-   );
-
-   void vq(
-       float *Xq,      /* (o) the quantized vector */
-       int *index,     /* (o) the quantization index */
-       const float *CB,/* (i) the vector quantization codebook */
-       float *X,       /* (i) the vector to quantize */
-       int n_cb,       /* (i) the number of vectors in the codebook */
-       int dim         /* (i) the dimension of all vectors */
-   );
-
-   void SplitVQ(
-       float *qX,      /* (o) the quantized vector */
-       int *index,     /* (o) a vector of indexes for all vector
-                              codebooks in the split */
-       float *X,       /* (i) the vector to quantize */
-       const float *CB,/* (i) the quantizer codebook */
-       int nsplit,     /* the number of vector splits */
-       const int *dim, /* the dimension of X and qX */
-       const int *cbsize /* the number of vectors in the codebook */
-   );
-
-
-   void sort_sq(
-       float *xq,      /* (o) the quantized value */
-       int *index,     /* (o) the quantization index */
-       float x,    /* (i) the value to quantize */
-       const float *cb,/* (i) the quantization codebook */
-       int cb_size     /* (i) the size of the quantization codebook */
-   );
-
-   int LSF_check(      /* (o) 1 for stable lsf vectors and 0 for
-
-
-
-
-
-                              nonstable ones */
-       float *lsf,     /* (i) a table of lsf vectors */
-       int dim,    /* (i) the dimension of each lsf vector */
-       int NoAn    /* (i) the number of lsf vectors in the
-                              table */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
deleted file mode 100644
index 7ceee09..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-
-
-
-
-       hpInput.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Input high-pass filter
-    *---------------------------------------------------------------*/
-
-   void hpInput(
-       float *In,  /* (i) vector to filter */
-       int len,    /* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   ){
-       int i;
-       float *pi, *po;
-
-       /* all-zero section*/
-
-       pi = &In[0];
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po = hpi_zero_coefsTbl[0] * (*pi);
-           *po += hpi_zero_coefsTbl[1] * mem[0];
-           *po += hpi_zero_coefsTbl[2] * mem[1];
-
-           mem[1] = mem[0];
-           mem[0] = *pi;
-           po++;
-           pi++;
-
-       }
-
-       /* all-pole section*/
-
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po -= hpi_pole_coefsTbl[1] * mem[2];
-           *po -= hpi_pole_coefsTbl[2] * mem[3];
-
-           mem[3] = mem[2];
-           mem[2] = *po;
-           po++;
-
-
-
-
-
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
deleted file mode 100644
index 3b020d1..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpInput.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HPINPUT_H
-   #define __iLBC_HPINPUT_H
-
-   void hpInput(
-       float *In,  /* (i) vector to filter */
-       int len,    /* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
deleted file mode 100644
index 756160a..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
+++ /dev/null
@@ -1,61 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpOutput.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Output high-pass filter
-    *---------------------------------------------------------------*/
-
-   void hpOutput(
-
-
-
-
-
-       float *In,  /* (i) vector to filter */
-       int len,/* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   ){
-       int i;
-       float *pi, *po;
-
-       /* all-zero section*/
-
-       pi = &In[0];
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po = hpo_zero_coefsTbl[0] * (*pi);
-           *po += hpo_zero_coefsTbl[1] * mem[0];
-           *po += hpo_zero_coefsTbl[2] * mem[1];
-
-           mem[1] = mem[0];
-           mem[0] = *pi;
-           po++;
-           pi++;
-
-       }
-
-       /* all-pole section*/
-
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po -= hpo_pole_coefsTbl[1] * mem[2];
-           *po -= hpo_pole_coefsTbl[2] * mem[3];
-
-           mem[3] = mem[2];
-           mem[2] = *po;
-           po++;
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
deleted file mode 100644
index b213a19..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpOutput.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HPOUTPUT_H
-   #define __iLBC_HPOUTPUT_H
-
-   void hpOutput(
-       float *In,  /* (i) vector to filter */
-       int len,/* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
deleted file mode 100644
index ee9a73c..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
+++ /dev/null
@@ -1,112 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBConstruct.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-   #include "gainquant.h"
-   #include "getCBvec.h"
-
-   /*----------------------------------------------------------------*
-    *  Convert the codebook indexes to make the search easier
-    *---------------------------------------------------------------*/
-
-
-
-
-
-
-   void index_conv_enc(
-       int *index          /* (i/o) Codebook indexes */
-   ){
-       int k;
-
-       for (k=1; k<CB_NSTAGES; k++) {
-
-           if ((index[k]>=108)&&(index[k]<172)) {
-               index[k]-=64;
-           } else if (index[k]>=236) {
-               index[k]-=128;
-           } else {
-               /* ERROR */
-           }
-       }
-   }
-
-   void index_conv_dec(
-       int *index          /* (i/o) Codebook indexes */
-   ){
-       int k;
-
-       for (k=1; k<CB_NSTAGES; k++) {
-
-           if ((index[k]>=44)&&(index[k]<108)) {
-               index[k]+=64;
-           } else if ((index[k]>=108)&&(index[k]<128)) {
-               index[k]+=128;
-           } else {
-               /* ERROR */
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  Construct decoded vector from codebook and gains.
-    *---------------------------------------------------------------*/
-
-   void iCBConstruct(
-       float *decvector,   /* (o) Decoded vector */
-       int *index,         /* (i) Codebook indices */
-       int *gain_index,/* (i) Gain quantization indices */
-       float *mem,         /* (i) Buffer for codevector construction */
-       int lMem,           /* (i) Length of buffer */
-       int veclen,         /* (i) Length of vector */
-       int nStages         /* (i) Number of codebook stages */
-   ){
-       int j,k;
-
-
-
-
-
-       float gain[CB_NSTAGES];
-       float cbvec[SUBL];
-
-       /* gain de-quantization */
-
-       gain[0] = gaindequant(gain_index[0], 1.0, 32);
-       if (nStages > 1) {
-           gain[1] = gaindequant(gain_index[1],
-               (float)fabs(gain[0]), 16);
-       }
-       if (nStages > 2) {
-           gain[2] = gaindequant(gain_index[2],
-               (float)fabs(gain[1]), 8);
-       }
-
-       /* codebook vector construction and construction of
-       total vector */
-
-       getCBvec(cbvec, mem, index[0], lMem, veclen);
-       for (j=0;j<veclen;j++){
-           decvector[j] = gain[0]*cbvec[j];
-       }
-       if (nStages > 1) {
-           for (k=1; k<nStages; k++) {
-               getCBvec(cbvec, mem, index[k], lMem, veclen);
-               for (j=0;j<veclen;j++) {
-                   decvector[j] += gain[k]*cbvec[j];
-               }
-           }
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
deleted file mode 100644
index 143501e..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBConstruct.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-
-
-
-
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ICBCONSTRUCT_H
-   #define __iLBC_ICBCONSTRUCT_H
-
-   void index_conv_enc(
-       int *index          /* (i/o) Codebook indexes */
-   );
-
-   void index_conv_dec(
-       int *index          /* (i/o) Codebook indexes */
-   );
-
-   void iCBConstruct(
-       float *decvector,   /* (o) Decoded vector */
-       int *index,         /* (i) Codebook indices */
-       int *gain_index,/* (i) Gain quantization indices */
-       float *mem,         /* (i) Buffer for codevector construction */
-       int lMem,           /* (i) Length of buffer */
-       int veclen,         /* (i) Length of vector */
-       int nStages         /* (i) Number of codebook stages */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
deleted file mode 100644
index 0f65e44..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
+++ /dev/null
@@ -1,512 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBSearch.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "gainquant.h"
-   #include "createCB.h"
-   #include "filter.h"
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Search routine for codebook encoding and gain quantization.
-    *---------------------------------------------------------------*/
-
-   void iCBSearch(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) the encoder state structure */
-       int *index,         /* (o) Codebook indices */
-       int *gain_index,/* (o) Gain quantization indices */
-
-
-
-
-
-       float *intarget,/* (i) Target vector for encoding */
-       float *mem,         /* (i) Buffer for codebook construction */
-       int lMem,           /* (i) Length of buffer */
-       int lTarget,    /* (i) Length of vector */
-       int nStages,    /* (i) Number of codebook stages */
-       float *weightDenum, /* (i) weighting filter coefficients */
-       float *weightState, /* (i) weighting filter state */
-       int block           /* (i) the sub-block number */
-   ){
-       int i, j, icount, stage, best_index, range, counter;
-       float max_measure, gain, measure, crossDot, ftmp;
-       float gains[CB_NSTAGES];
-       float target[SUBL];
-       int base_index, sInd, eInd, base_size;
-       int sIndAug=0, eIndAug=0;
-       float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
-       float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
-       float *pp, *ppi=0, *ppo=0, *ppe=0;
-       float cbvectors[CB_MEML];
-       float tene, cene, cvec[SUBL];
-       float aug_vec[SUBL];
-
-       memset(cvec,0,SUBL*sizeof(float));
-
-       /* Determine size of codebook sections */
-
-       base_size=lMem-lTarget+1;
-
-       if (lTarget==SUBL) {
-           base_size=lMem-lTarget+1+lTarget/2;
-       }
-
-       /* setup buffer for weighting */
-
-       memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
-       memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
-       memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
-
-       /* weighting */
-
-       AllPoleFilter(buf+LPC_FILTERORDER, weightDenum,
-           lMem+lTarget, LPC_FILTERORDER);
-
-       /* Construct the codebook and target needed */
-
-       memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
-
-       tene=0.0;
-
-
-
-
-
-       for (i=0; i<lTarget; i++) {
-           tene+=target[i]*target[i];
-       }
-
-       /* Prepare search over one more codebook section. This section
-          is created by filtering the original buffer with a filter. */
-
-       filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
-
-       /* The Main Loop over stages */
-
-       for (stage=0; stage<nStages; stage++) {
-
-           range = search_rangeTbl[block][stage];
-
-           /* initialize search measure */
-
-           max_measure = (float)-10000000.0;
-           gain = (float)0.0;
-           best_index = 0;
-
-           /* Compute cross dot product between the target
-              and the CB memory */
-
-           crossDot=0.0;
-           pp=buf+LPC_FILTERORDER+lMem-lTarget;
-           for (j=0; j<lTarget; j++) {
-               crossDot += target[j]*(*pp++);
-           }
-
-           if (stage==0) {
-
-               /* Calculate energy in the first block of
-                 'lTarget' samples. */
-               ppe = energy;
-               ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
-               ppo = buf+LPC_FILTERORDER+lMem-1;
-
-               *ppe=0.0;
-               pp=buf+LPC_FILTERORDER+lMem-lTarget;
-               for (j=0; j<lTarget; j++) {
-                   *ppe+=(*pp)*(*pp++);
-               }
-
-               if (*ppe>0.0) {
-                   invenergy[0] = (float) 1.0 / (*ppe + EPS);
-               } else {
-                   invenergy[0] = (float) 0.0;
-
-
-
-
-
-               }
-               ppe++;
-
-               measure=(float)-10000000.0;
-
-               if (crossDot > 0.0) {
-                      measure = crossDot*crossDot*invenergy[0];
-               }
-           }
-           else {
-               measure = crossDot*crossDot*invenergy[0];
-           }
-
-           /* check if measure is better */
-           ftmp = crossDot*invenergy[0];
-
-           if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-               best_index = 0;
-               max_measure = measure;
-               gain = ftmp;
-           }
-
-           /* loop over the main first codebook section,
-              full search */
-
-           for (icount=1; icount<range; icount++) {
-
-               /* calculate measure */
-
-               crossDot=0.0;
-               pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
-
-               for (j=0; j<lTarget; j++) {
-                   crossDot += target[j]*(*pp++);
-               }
-
-               if (stage==0) {
-                   *ppe++ = energy[icount-1] + (*ppi)*(*ppi) -
-                       (*ppo)*(*ppo);
-                   ppo--;
-                   ppi--;
-
-                   if (energy[icount]>0.0) {
-                       invenergy[icount] =
-                           (float)1.0/(energy[icount]+EPS);
-                   } else {
-                       invenergy[icount] = (float) 0.0;
-                   }
-
-
-
-
-
-                   measure=(float)-10000000.0;
-
-                   if (crossDot > 0.0) {
-                       measure = crossDot*crossDot*invenergy[icount];
-                   }
-               }
-               else {
-                   measure = crossDot*crossDot*invenergy[icount];
-               }
-
-               /* check if measure is better */
-               ftmp = crossDot*invenergy[icount];
-
-               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-                   best_index = icount;
-                   max_measure = measure;
-                   gain = ftmp;
-               }
-           }
-
-           /* Loop over augmented part in the first codebook
-            * section, full search.
-            * The vectors are interpolated.
-            */
-
-           if (lTarget==SUBL) {
-
-               /* Search for best possible cb vector and
-                  compute the CB-vectors' energy. */
-               searchAugmentedCB(20, 39, stage, base_size-lTarget/2,
-                   target, buf+LPC_FILTERORDER+lMem,
-                   &max_measure, &best_index, &gain, energy,
-                   invenergy);
-           }
-
-           /* set search range for following codebook sections */
-
-           base_index=best_index;
-
-           /* unrestricted search */
-
-           if (CB_RESRANGE == -1) {
-               sInd=0;
-               eInd=range-1;
-               sIndAug=20;
-               eIndAug=39;
-           }
-
-
-
-
-
-
-           /* restricted search around best index from first
-           codebook section */
-
-           else {
-               /* Initialize search indices */
-               sIndAug=0;
-               eIndAug=0;
-               sInd=base_index-CB_RESRANGE/2;
-               eInd=sInd+CB_RESRANGE;
-
-               if (lTarget==SUBL) {
-
-                   if (sInd<0) {
-
-                       sIndAug = 40 + sInd;
-                       eIndAug = 39;
-                       sInd=0;
-
-                   } else if ( base_index < (base_size-20) ) {
-
-                       if (eInd > range) {
-                           sInd -= (eInd-range);
-                           eInd = range;
-                       }
-                   } else { /* base_index >= (base_size-20) */
-
-                       if (sInd < (base_size-20)) {
-                           sIndAug = 20;
-                           sInd = 0;
-                           eInd = 0;
-                           eIndAug = 19 + CB_RESRANGE;
-
-                           if(eIndAug > 39) {
-                               eInd = eIndAug-39;
-                               eIndAug = 39;
-                           }
-                       } else {
-                           sIndAug = 20 + sInd - (base_size-20);
-                           eIndAug = 39;
-                           sInd = 0;
-                           eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
-                       }
-                   }
-
-               } else { /* lTarget = 22 or 23 */
-
-                   if (sInd < 0) {
-                       eInd -= sInd;
-
-
-
-
-
-                       sInd = 0;
-                   }
-
-                   if(eInd > range) {
-                       sInd -= (eInd - range);
-                       eInd = range;
-                   }
-               }
-           }
-
-           /* search of higher codebook section */
-
-           /* index search range */
-           counter = sInd;
-           sInd += base_size;
-           eInd += base_size;
-
-
-           if (stage==0) {
-               ppe = energy+base_size;
-               *ppe=0.0;
-
-               pp=cbvectors+lMem-lTarget;
-               for (j=0; j<lTarget; j++) {
-                   *ppe+=(*pp)*(*pp++);
-               }
-
-               ppi = cbvectors + lMem - 1 - lTarget;
-               ppo = cbvectors + lMem - 1;
-
-               for (j=0; j<(range-1); j++) {
-                   *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
-                   ppo--;
-                   ppi--;
-                   ppe++;
-               }
-           }
-
-           /* loop over search range */
-
-           for (icount=sInd; icount<eInd; icount++) {
-
-               /* calculate measure */
-
-               crossDot=0.0;
-               pp=cbvectors + lMem - (counter++) - lTarget;
-
-               for (j=0;j<lTarget;j++) {
-
-
-
-
-
-                   crossDot += target[j]*(*pp++);
-               }
-
-               if (energy[icount]>0.0) {
-                   invenergy[icount] =(float)1.0/(energy[icount]+EPS);
-               } else {
-                   invenergy[icount] =(float)0.0;
-               }
-
-               if (stage==0) {
-
-                   measure=(float)-10000000.0;
-
-                   if (crossDot > 0.0) {
-                       measure = crossDot*crossDot*
-                           invenergy[icount];
-                   }
-               }
-               else {
-                   measure = crossDot*crossDot*invenergy[icount];
-               }
-
-               /* check if measure is better */
-               ftmp = crossDot*invenergy[icount];
-
-               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-                   best_index = icount;
-                   max_measure = measure;
-                   gain = ftmp;
-               }
-           }
-
-           /* Search the augmented CB inside the limited range. */
-
-           if ((lTarget==SUBL)&&(sIndAug!=0)) {
-               searchAugmentedCB(sIndAug, eIndAug, stage,
-                   2*base_size-20, target, cbvectors+lMem,
-                   &max_measure, &best_index, &gain, energy,
-                   invenergy);
-           }
-
-           /* record best index */
-
-           index[stage] = best_index;
-
-           /* gain quantization */
-
-           if (stage==0){
-
-
-
-
-
-
-               if (gain<0.0){
-                   gain = 0.0;
-               }
-
-               if (gain>CB_MAXGAIN) {
-                   gain = (float)CB_MAXGAIN;
-               }
-               gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
-           }
-           else {
-               if (stage==1) {
-                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
-                       16, &gain_index[stage]);
-               } else {
-                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
-                       8, &gain_index[stage]);
-               }
-           }
-
-           /* Extract the best (according to measure)
-              codebook vector */
-
-           if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
-
-               if (index[stage]<base_size) {
-                   pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
-               } else {
-                   pp=cbvectors+lMem-lTarget-
-                       index[stage]+base_size;
-               }
-           } else {
-
-               if (index[stage]<base_size) {
-                   if (index[stage]<(base_size-20)) {
-                       pp=buf+LPC_FILTERORDER+lMem-
-                           lTarget-index[stage];
-                   } else {
-                       createAugmentedVec(index[stage]-base_size+40,
-                               buf+LPC_FILTERORDER+lMem,aug_vec);
-                       pp=aug_vec;
-                   }
-               } else {
-                   int filterno, position;
-
-                   filterno=index[stage]/base_size;
-                   position=index[stage]-filterno*base_size;
-
-
-
-
-
-
-
-                   if (position<(base_size-20)) {
-                       pp=cbvectors+filterno*lMem-lTarget-
-                           index[stage]+filterno*base_size;
-                   } else {
-                       createAugmentedVec(
-                           index[stage]-(filterno+1)*base_size+40,
-                           cbvectors+filterno*lMem,aug_vec);
-                       pp=aug_vec;
-                   }
-               }
-           }
-
-           /* Subtract the best codebook vector, according
-              to measure, from the target vector */
-
-           for (j=0;j<lTarget;j++) {
-               cvec[j] += gain*(*pp);
-               target[j] -= gain*(*pp++);
-           }
-
-           /* record quantized gain */
-
-           gains[stage]=gain;
-
-       }/* end of Main Loop. for (stage=0;... */
-
-       /* Gain adjustment for energy matching */
-       cene=0.0;
-       for (i=0; i<lTarget; i++) {
-           cene+=cvec[i]*cvec[i];
-       }
-       j=gain_index[0];
-
-       for (i=gain_index[0]; i<32; i++) {
-           ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
-
-           if ((ftmp<(tene*gains[0]*gains[0])) &&
-               (gain_sq5Tbl[j]<(2.0*gains[0]))) {
-               j=i;
-           }
-       }
-       gain_index[0]=j;
-   }
-
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
deleted file mode 100644
index a61db15..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBSearch.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ICBSEARCH_H
-   #define __iLBC_ICBSEARCH_H
-
-
-
-
-
-
-   void iCBSearch(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) the encoder state structure */
-       int *index,         /* (o) Codebook indices */
-       int *gain_index,/* (o) Gain quantization indices */
-       float *intarget,/* (i) Target vector for encoding */
-       float *mem,         /* (i) Buffer for codebook construction */
-       int lMem,           /* (i) Length of buffer */
-       int lTarget,    /* (i) Length of vector */
-       int nStages,    /* (i) Number of codebook stages */
-       float *weightDenum, /* (i) weighting filter coefficients */
-       float *weightState, /* (i) weighting filter state */
-       int block           /* (i) the sub-block number */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
deleted file mode 100644
index ae62bf4..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
+++ /dev/null
@@ -1,652 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_decode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-
-   #include "iLBC_define.h"
-   #include "StateConstructW.h"
-   #include "LPCdecode.h"
-   #include "iCBConstruct.h"
-   #include "doCPLC.h"
-   #include "helpfun.h"
-   #include "constants.h"
-   #include "packing.h"
-   #include "string.h"
-   #include "enhancer.h"
-   #include "hpOutput.h"
-   #include "syntFilter.h"
-
-   /*----------------------------------------------------------------*
-    *  Initiation of decoder instance.
-    *---------------------------------------------------------------*/
-
-   short initDecode(                   /* (o) Number of decoded
-                                              samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       int mode,                       /* (i) frame size mode */
-       int use_enhancer                /* (i) 1 to use enhancer
-                                              0 to run without
-                                                enhancer */
-   ){
-       int i;
-
-       iLBCdec_inst->mode = mode;
-
-
-
-
-
-       if (mode==30) {
-           iLBCdec_inst->blockl = BLOCKL_30MS;
-           iLBCdec_inst->nsub = NSUB_30MS;
-           iLBCdec_inst->nasub = NASUB_30MS;
-           iLBCdec_inst->lpc_n = LPC_N_30MS;
-           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
-           iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
-           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
-           /* ULP init */
-           iLBCdec_inst->ULP_inst=&ULP_30msTbl;
-       }
-       else if (mode==20) {
-           iLBCdec_inst->blockl = BLOCKL_20MS;
-           iLBCdec_inst->nsub = NSUB_20MS;
-           iLBCdec_inst->nasub = NASUB_20MS;
-           iLBCdec_inst->lpc_n = LPC_N_20MS;
-           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
-           iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
-           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
-           /* ULP init */
-           iLBCdec_inst->ULP_inst=&ULP_20msTbl;
-       }
-       else {
-           exit(2);
-       }
-
-       memset(iLBCdec_inst->syntMem, 0,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-
-       memset(iLBCdec_inst->old_syntdenum, 0,
-           ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
-       for (i=0; i<NSUB_MAX; i++)
-           iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
-
-       iLBCdec_inst->last_lag = 20;
-
-       iLBCdec_inst->prevLag = 120;
-       iLBCdec_inst->per = 0.0;
-       iLBCdec_inst->consPLICount = 0;
-       iLBCdec_inst->prevPLI = 0;
-       iLBCdec_inst->prevLpc[0] = 1.0;
-       memset(iLBCdec_inst->prevLpc+1,0,
-           LPC_FILTERORDER*sizeof(float));
-       memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
-       iLBCdec_inst->seed=777;
-
-
-
-
-
-
-       memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
-
-       iLBCdec_inst->use_enhancer = use_enhancer;
-       memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
-       for (i=0;i<ENH_NBLOCKS_TOT;i++)
-           iLBCdec_inst->enh_period[i]=(float)40.0;
-
-       iLBCdec_inst->prev_enh_pl = 0;
-
-       return (iLBCdec_inst->blockl);
-   }
-
-   /*----------------------------------------------------------------*
-    *  frame residual decoder function (subrutine to iLBC_decode)
-    *---------------------------------------------------------------*/
-
-   void Decode(
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       float *decresidual,             /* (o) decoded residual frame */
-       int start,                      /* (i) location of start
-                                              state */
-       int idxForMax,                  /* (i) codebook index for the
-                                              maximum value */
-       int *idxVec,                /* (i) codebook indexes for the
-                                              samples  in the start
-                                              state */
-       float *syntdenum,               /* (i) the decoded synthesis
-                                              filter coefficients */
-       int *cb_index,                  /* (i) the indexes for the
-                                              adaptive codebook */
-       int *gain_index,            /* (i) the indexes for the
-                                              corresponding gains */
-       int *extra_cb_index,        /* (i) the indexes for the
-                                              adaptive codebook part
-                                              of start state */
-       int *extra_gain_index,          /* (i) the indexes for the
-                                              corresponding gains */
-       int state_first                 /* (i) 1 if non adaptive part
-                                              of start state comes
-                                              first 0 if that part
-                                              comes last */
-   ){
-       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-       int k, meml_gotten, Nfor, Nback, i;
-       int diff, start_pos;
-       int subcount, subframe;
-
-
-
-
-
-
-       diff = STATE_LEN - iLBCdec_inst->state_short_len;
-
-       if (state_first == 1) {
-           start_pos = (start-1)*SUBL;
-       } else {
-           start_pos = (start-1)*SUBL + diff;
-       }
-
-       /* decode scalar part of start state */
-
-       StateConstructW(idxForMax, idxVec,
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &decresidual[start_pos], iLBCdec_inst->state_short_len);
-
-
-       if (state_first) { /* put adaptive part in the end */
-
-           /* setup memory */
-
-           memset(mem, 0,
-               (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
-           memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len,
-               decresidual+start_pos,
-               iLBCdec_inst->state_short_len*sizeof(float));
-
-           /* construct decoded vector */
-
-           iCBConstruct(
-               &decresidual[start_pos+iLBCdec_inst->state_short_len],
-               extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES);
-
-       }
-       else {/* put adaptive part in the beginning */
-
-           /* create reversed vectors for prediction */
-
-           for (k=0; k<diff; k++) {
-               reverseDecresidual[k] =
-                   decresidual[(start+1)*SUBL-1-
-                           (k+iLBCdec_inst->state_short_len)];
-           }
-
-           /* setup memory */
-
-           meml_gotten = iLBCdec_inst->state_short_len;
-           for (k=0; k<meml_gotten; k++){
-               mem[CB_MEML-1-k] = decresidual[start_pos + k];
-
-
-
-
-
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
-           /* construct decoded vector */
-
-           iCBConstruct(reverseDecresidual, extra_cb_index,
-               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES);
-
-           /* get decoded residual from reversed vector */
-
-           for (k=0; k<diff; k++) {
-               decresidual[start_pos-1-k] = reverseDecresidual[k];
-           }
-       }
-
-       /* counter for predicted sub-frames */
-
-       subcount=0;
-
-       /* forward prediction of sub-frames */
-
-       Nfor = iLBCdec_inst->nsub-start-1;
-
-       if ( Nfor > 0 ){
-
-           /* setup memory */
-
-           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
-               STATE_LEN*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nfor; subframe++) {
-
-               /* construct decoded vector */
-
-               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-
-
-
-
-
-                   &decresidual[(start+1+subframe)*SUBL],
-                   SUBL*sizeof(float));
-
-               subcount++;
-
-           }
-
-       }
-
-       /* backward prediction of sub-frames */
-
-       Nback = start-1;
-
-       if ( Nback > 0 ) {
-
-           /* setup memory */
-
-           meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
-
-           if ( meml_gotten > CB_MEML ) {
-               meml_gotten=CB_MEML;
-           }
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
-           /* loop over subframes to decode */
-
-           for (subframe=0; subframe<Nback; subframe++) {
-
-               /* construct decoded vector */
-
-               iCBConstruct(&reverseDecresidual[subframe*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount],
-                   SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
-
-               subcount++;
-           }
-
-
-
-
-
-           /* get decoded residual from reversed vector */
-
-           for (i=0; i<SUBL*Nback; i++)
-               decresidual[SUBL*Nback - i - 1] =
-               reverseDecresidual[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  main decoder function
-    *---------------------------------------------------------------*/
-
-   void iLBC_decode(
-       float *decblock,            /* (o) decoded signal block */
-       unsigned char *bytes,           /* (i) encoded signal bits */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       int mode                    /* (i) 0: bad packet, PLC,
-                                              1: normal */
-   ){
-       float data[BLOCKL_MAX];
-       float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
-       float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
-       float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
-       int k, i, start, idxForMax, pos, lastpart, ulp;
-       int lag, ilag;
-       float cc, maxcc;
-       int idxVec[STATE_LEN];
-       int check;
-       int gain_index[NASUB_MAX*CB_NSTAGES],
-           extra_gain_index[CB_NSTAGES];
-       int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
-       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-       int state_first;
-       int last_bit;
-       unsigned char *pbytes;
-       float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-       int order_plus_one;
-       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float decresidual[BLOCKL_MAX];
-
-       if (mode>0) { /* the data are good */
-
-           /* decode data */
-
-           pbytes=bytes;
-           pos=0;
-
-
-
-
-
-
-           /* Set everything to zero before decoding */
-
-           for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
-               lsf_i[k]=0;
-           }
-           start=0;
-           state_first=0;
-           idxForMax=0;
-           for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-               idxVec[k]=0;
-           }
-           for (k=0; k<CB_NSTAGES; k++) {
-               extra_cb_index[k]=0;
-           }
-           for (k=0; k<CB_NSTAGES; k++) {
-               extra_gain_index[k]=0;
-           }
-           for (i=0; i<iLBCdec_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   cb_index[i*CB_NSTAGES+k]=0;
-               }
-           }
-           for (i=0; i<iLBCdec_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   gain_index[i*CB_NSTAGES+k]=0;
-               }
-           }
-
-           /* loop over ULP classes */
-
-           for (ulp=0; ulp<3; ulp++) {
-
-               /* LSF */
-               for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-                   packcombine(&lsf_i[k], lastpart,
-                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
-               }
-
-               /* Start block info */
-
-               unpack( &pbytes, &lastpart,
-                   iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
-               packcombine(&start, lastpart,
-                   iLBCdec_inst->ULP_inst->start_bits[ulp]);
-
-               unpack( &pbytes, &lastpart,
-
-
-
-
-
-                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
-               packcombine(&state_first, lastpart,
-                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
-
-               unpack( &pbytes, &lastpart,
-                   iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
-               packcombine(&idxForMax, lastpart,
-                   iLBCdec_inst->ULP_inst->scale_bits[ulp]);
-
-               for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
-                   packcombine(idxVec+k, lastpart,
-                       iLBCdec_inst->ULP_inst->state_bits[ulp]);
-               }
-
-               /* 23/22 (20ms/30ms) sample block */
-
-               for (k=0; k<CB_NSTAGES; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp],
-                       &pos);
-                   packcombine(extra_cb_index+k, lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
-               }
-               for (k=0; k<CB_NSTAGES; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp],
-                       &pos);
-                   packcombine(extra_gain_index+k, lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
-               }
-
-               /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
-               for (i=0; i<iLBCdec_inst->nasub; i++) {
-                   for (k=0; k<CB_NSTAGES; k++) {
-                       unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp],
-                           &pos);
-                       packcombine(cb_index+i*CB_NSTAGES+k, lastpart,
-                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
-                   }
-               }
-
-               for (i=0; i<iLBCdec_inst->nasub; i++) {
-                   for (k=0; k<CB_NSTAGES; k++) {
-                       unpack( &pbytes, &lastpart,
-
-
-
-
-
-                       iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp],
-                           &pos);
-                       packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
-                           iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
-                   }
-               }
-           }
-           /* Extract last bit. If it is 1 this indicates an
-              empty/lost frame */
-           unpack( &pbytes, &last_bit, 1, &pos);
-
-           /* Check for bit errors or empty/lost frames */
-           if (start<1)
-               mode = 0;
-           if (iLBCdec_inst->mode==20 && start>3)
-               mode = 0;
-           if (iLBCdec_inst->mode==30 && start>5)
-               mode = 0;
-           if (last_bit==1)
-               mode = 0;
-
-           if (mode==1) { /* No bit errors was detected,
-                             continue decoding */
-
-               /* adjust index */
-               index_conv_dec(cb_index);
-
-               /* decode the lsf */
-
-               SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
-               check=LSF_check(lsfdeq, LPC_FILTERORDER,
-                   iLBCdec_inst->lpc_n);
-               DecoderInterpolateLSF(syntdenum, weightdenum,
-                   lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
-
-               Decode(iLBCdec_inst, decresidual, start, idxForMax,
-                   idxVec, syntdenum, cb_index, gain_index,
-                   extra_cb_index, extra_gain_index,
-                   state_first);
-
-               /* preparing the plc for a future loss! */
-
-               doThePLC(PLCresidual, PLClpc, 0, decresidual,
-                   syntdenum +
-                   (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
-                   (*iLBCdec_inst).last_lag, iLBCdec_inst);
-
-
-
-
-
-
-
-               memcpy(decresidual, PLCresidual,
-                   iLBCdec_inst->blockl*sizeof(float));
-           }
-
-       }
-
-       if (mode == 0) {
-           /* the data is bad (either a PLC call
-            * was made or a severe bit error was detected)
-            */
-
-           /* packet loss conceal */
-
-           memset(zeros, 0, BLOCKL_MAX*sizeof(float));
-
-           one[0] = 1;
-           memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
-
-           start=0;
-
-           doThePLC(PLCresidual, PLClpc, 1, zeros, one,
-               (*iLBCdec_inst).last_lag, iLBCdec_inst);
-           memcpy(decresidual, PLCresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-
-           order_plus_one = LPC_FILTERORDER + 1;
-           for (i = 0; i < iLBCdec_inst->nsub; i++) {
-               memcpy(syntdenum+(i*order_plus_one), PLClpc,
-                   order_plus_one*sizeof(float));
-           }
-       }
-
-       if (iLBCdec_inst->use_enhancer == 1) {
-
-           /* post filtering */
-
-           iLBCdec_inst->last_lag =
-               enhancerInterface(data, decresidual, iLBCdec_inst);
-
-           /* synthesis filtering */
-
-           if (iLBCdec_inst->mode==20) {
-               /* Enhancer has 40 samples delay */
-               i=0;
-               syntFilter(data + i*SUBL,
-                   iLBCdec_inst->old_syntdenum +
-                   (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1),
-                   SUBL, iLBCdec_inst->syntMem);
-
-
-
-
-
-               for (i=1; i < iLBCdec_inst->nsub; i++) {
-                   syntFilter(data + i*SUBL,
-                       syntdenum + (i-1)*(LPC_FILTERORDER+1),
-                       SUBL, iLBCdec_inst->syntMem);
-               }
-           } else if (iLBCdec_inst->mode==30) {
-               /* Enhancer has 80 samples delay */
-               for (i=0; i < 2; i++) {
-                   syntFilter(data + i*SUBL,
-                       iLBCdec_inst->old_syntdenum +
-                       (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
-                       SUBL, iLBCdec_inst->syntMem);
-               }
-               for (i=2; i < iLBCdec_inst->nsub; i++) {
-                   syntFilter(data + i*SUBL,
-                       syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
-                       iLBCdec_inst->syntMem);
-               }
-           }
-
-       } else {
-
-           /* Find last lag */
-           lag = 20;
-           maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
-               &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
-
-           for (ilag=21; ilag<120; ilag++) {
-               cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
-                   &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag],
-                   ENH_BLOCKL);
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-           iLBCdec_inst->last_lag = lag;
-
-           /* copy data and run synthesis filter */
-
-           memcpy(data, decresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-           for (i=0; i < iLBCdec_inst->nsub; i++) {
-               syntFilter(data + i*SUBL,
-                   syntdenum + i*(LPC_FILTERORDER+1), SUBL,
-                   iLBCdec_inst->syntMem);
-           }
-
-
-
-
-
-       }
-
-       /* high pass filtering on output if desired, otherwise
-          copy to out */
-
-       hpOutput(data, iLBCdec_inst->blockl,
-                   decblock,iLBCdec_inst->hpomem);
-
-       /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
-
-       memcpy(iLBCdec_inst->old_syntdenum, syntdenum,
-
-           iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
-
-       iLBCdec_inst->prev_enh_pl=0;
-
-       if (mode==0) { /* PLC was used */
-           iLBCdec_inst->prev_enh_pl=1;
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
deleted file mode 100644
index 5f4384d..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_decode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ILBCDECODE_H
-   #define __iLBC_ILBCDECODE_H
-
-   #include "iLBC_define.h"
-
-   short initDecode(                   /* (o) Number of decoded
-                                              samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       int mode,                       /* (i) frame size mode */
-       int use_enhancer                /* (i) 1 to use enhancer
-                                              0 to run without
-                                                enhancer */
-   );
-
-   void iLBC_decode(
-       float *decblock,            /* (o) decoded signal block */
-       unsigned char *bytes,           /* (i) encoded signal bits */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       int mode                    /* (i) 0: bad packet, PLC,
-                                              1: normal */
-
-
-
-
-
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
deleted file mode 100644
index 480c834..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
+++ /dev/null
@@ -1,217 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_define.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-   #include <string.h>
-
-   #ifndef __iLBC_ILBCDEFINE_H
-   #define __iLBC_ILBCDEFINE_H
-
-   /* general codec settings */
-
-   #define FS                      (float)8000.0
-   #define BLOCKL_20MS             160
-   #define BLOCKL_30MS             240
-   #define BLOCKL_MAX              240
-   #define NSUB_20MS               4
-   #define NSUB_30MS               6
-   #define NSUB_MAX            6
-   #define NASUB_20MS              2
-
-
-
-
-
-   #define NASUB_30MS              4
-   #define NASUB_MAX               4
-   #define SUBL                40
-   #define STATE_LEN               80
-   #define STATE_SHORT_LEN_30MS    58
-   #define STATE_SHORT_LEN_20MS    57
-
-   /* LPC settings */
-
-   #define LPC_FILTERORDER         10
-   #define LPC_CHIRP_SYNTDENUM     (float)0.9025
-   #define LPC_CHIRP_WEIGHTDENUM   (float)0.4222
-   #define LPC_LOOKBACK        60
-   #define LPC_N_20MS              1
-   #define LPC_N_30MS              2
-   #define LPC_N_MAX               2
-   #define LPC_ASYMDIFF        20
-   #define LPC_BW                  (float)60.0
-   #define LPC_WN                  (float)1.0001
-   #define LSF_NSPLIT              3
-   #define LSF_NUMBER_OF_STEPS     4
-   #define LPC_HALFORDER           (LPC_FILTERORDER/2)
-
-   /* cb settings */
-
-   #define CB_NSTAGES              3
-   #define CB_EXPAND               2
-   #define CB_MEML                 147
-   #define CB_FILTERLEN        2*4
-   #define CB_HALFFILTERLEN    4
-   #define CB_RESRANGE             34
-   #define CB_MAXGAIN              (float)1.3
-
-   /* enhancer */
-
-   #define ENH_BLOCKL              80  /* block length */
-   #define ENH_BLOCKL_HALF         (ENH_BLOCKL/2)
-   #define ENH_HL                  3   /* 2*ENH_HL+1 is number blocks
-                                          in said second sequence */
-   #define ENH_SLOP            2   /* max difference estimated and
-                                          correct pitch period */
-   #define ENH_PLOCSL              20  /* pitch-estimates and pitch-
-                                          locations buffer length */
-   #define ENH_OVERHANG        2
-   #define ENH_UPS0            4   /* upsampling rate */
-   #define ENH_FL0                 3   /* 2*FLO+1 is the length of
-                                          each filter */
-   #define ENH_VECTL               (ENH_BLOCKL+2*ENH_FL0)
-
-
-
-
-
-   #define ENH_CORRDIM             (2*ENH_SLOP+1)
-   #define ENH_NBLOCKS             (BLOCKL_MAX/ENH_BLOCKL)
-   #define ENH_NBLOCKS_EXTRA       5
-   #define ENH_NBLOCKS_TOT         8   /* ENH_NBLOCKS +
-                                          ENH_NBLOCKS_EXTRA */
-   #define ENH_BUFL            (ENH_NBLOCKS_TOT)*ENH_BLOCKL
-   #define ENH_ALPHA0              (float)0.05
-
-   /* Down sampling */
-
-   #define FILTERORDER_DS          7
-   #define DELAY_DS            3
-   #define FACTOR_DS               2
-
-   /* bit stream defs */
-
-   #define NO_OF_BYTES_20MS    38
-   #define NO_OF_BYTES_30MS    50
-   #define NO_OF_WORDS_20MS    19
-   #define NO_OF_WORDS_30MS    25
-   #define STATE_BITS              3
-   #define BYTE_LEN            8
-   #define ULP_CLASSES             3
-
-   /* help parameters */
-
-   #define FLOAT_MAX               (float)1.0e37
-   #define EPS                     (float)2.220446049250313e-016
-   #define PI                      (float)3.14159265358979323846
-   #define MIN_SAMPLE              -32768
-   #define MAX_SAMPLE              32767
-   #define TWO_PI                  (float)6.283185307
-   #define PI2                     (float)0.159154943
-
-   /* type definition encoder instance */
-   typedef struct iLBC_ULP_Inst_t_ {
-       int lsf_bits[6][ULP_CLASSES+2];
-       int start_bits[ULP_CLASSES+2];
-       int startfirst_bits[ULP_CLASSES+2];
-       int scale_bits[ULP_CLASSES+2];
-       int state_bits[ULP_CLASSES+2];
-       int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
-       int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
-       int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-       int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-   } iLBC_ULP_Inst_t;
-
-   /* type definition encoder instance */
-
-
-
-
-
-   typedef struct iLBC_Enc_Inst_t_ {
-
-       /* flag for frame size mode */
-       int mode;
-
-       /* basic parameters for different frame sizes */
-       int blockl;
-       int nsub;
-       int nasub;
-       int no_of_bytes, no_of_words;
-       int lpc_n;
-       int state_short_len;
-       const iLBC_ULP_Inst_t *ULP_inst;
-
-       /* analysis filter state */
-       float anaMem[LPC_FILTERORDER];
-
-       /* old lsf parameters for interpolation */
-       float lsfold[LPC_FILTERORDER];
-       float lsfdeqold[LPC_FILTERORDER];
-
-       /* signal buffer for LP analysis */
-       float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
-
-       /* state of input HP filter */
-       float hpimem[4];
-
-   } iLBC_Enc_Inst_t;
-
-   /* type definition decoder instance */
-   typedef struct iLBC_Dec_Inst_t_ {
-
-       /* flag for frame size mode */
-       int mode;
-
-       /* basic parameters for different frame sizes */
-       int blockl;
-       int nsub;
-       int nasub;
-       int no_of_bytes, no_of_words;
-       int lpc_n;
-       int state_short_len;
-       const iLBC_ULP_Inst_t *ULP_inst;
-
-       /* synthesis filter state */
-       float syntMem[LPC_FILTERORDER];
-
-       /* old LSF for interpolation */
-
-
-
-
-
-       float lsfdeqold[LPC_FILTERORDER];
-
-       /* pitch lag estimated in enhancer and used in PLC */
-       int last_lag;
-
-       /* PLC state information */
-       int prevLag, consPLICount, prevPLI, prev_enh_pl;
-       float prevLpc[LPC_FILTERORDER+1];
-       float prevResidual[NSUB_MAX*SUBL];
-       float per;
-       unsigned long seed;
-
-       /* previous synthesis filter parameters */
-       float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-
-       /* state of output HP filter */
-       float hpomem[4];
-
-       /* enhancer state information */
-       int use_enhancer;
-       float enh_buf[ENH_BUFL];
-       float enh_period[ENH_NBLOCKS_TOT];
-
-   } iLBC_Dec_Inst_t;
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
deleted file mode 100644
index 4636414..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
+++ /dev/null
@@ -1,543 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_encode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "LPCencode.h"
-   #include "FrameClassify.h"
-   #include "StateSearchW.h"
-   #include "StateConstructW.h"
-   #include "helpfun.h"
-   #include "constants.h"
-   #include "packing.h"
-   #include "iCBSearch.h"
-   #include "iCBConstruct.h"
-   #include "hpInput.h"
-   #include "anaFilter.h"
-   #include "syntFilter.h"
-
-   /*----------------------------------------------------------------*
-    *  Initiation of encoder instance.
-    *---------------------------------------------------------------*/
-
-   short initEncode(                   /* (o) Number of bytes
-                                              encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-       int mode                    /* (i) frame size mode */
-   ){
-       iLBCenc_inst->mode = mode;
-       if (mode==30) {
-           iLBCenc_inst->blockl = BLOCKL_30MS;
-           iLBCenc_inst->nsub = NSUB_30MS;
-           iLBCenc_inst->nasub = NASUB_30MS;
-           iLBCenc_inst->lpc_n = LPC_N_30MS;
-           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
-           iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
-
-
-
-
-
-           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
-           /* ULP init */
-           iLBCenc_inst->ULP_inst=&ULP_30msTbl;
-       }
-       else if (mode==20) {
-           iLBCenc_inst->blockl = BLOCKL_20MS;
-           iLBCenc_inst->nsub = NSUB_20MS;
-           iLBCenc_inst->nasub = NASUB_20MS;
-           iLBCenc_inst->lpc_n = LPC_N_20MS;
-           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
-           iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
-           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
-           /* ULP init */
-           iLBCenc_inst->ULP_inst=&ULP_20msTbl;
-       }
-       else {
-           exit(2);
-       }
-
-       memset((*iLBCenc_inst).anaMem, 0,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-       memset((*iLBCenc_inst).lpc_buffer, 0,
-           (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
-       memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
-
-       return (iLBCenc_inst->no_of_bytes);
-   }
-
-   /*----------------------------------------------------------------*
-    *  main encoder function
-    *---------------------------------------------------------------*/
-
-   void iLBC_encode(
-       unsigned char *bytes,           /* (o) encoded data bits iLBC */
-       float *block,                   /* (o) speech vector to
-                                              encode */
-       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
-                                              state */
-   ){
-
-       float data[BLOCKL_MAX];
-       float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
-
-       int start, idxForMax, idxVec[STATE_LEN];
-
-
-
-
-
-       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-       int n, k, meml_gotten, Nfor, Nback, i, pos;
-       int gain_index[CB_NSTAGES*NASUB_MAX],
-           extra_gain_index[CB_NSTAGES];
-       int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
-       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-       unsigned char *pbytes;
-       int diff, start_pos, state_first;
-       float en1, en2;
-       int index, ulp, firstpart;
-       int subcount, subframe;
-       float weightState[LPC_FILTERORDER];
-       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float decresidual[BLOCKL_MAX];
-
-       /* high pass filtering of input signal if such is not done
-              prior to calling this function */
-
-       hpInput(block, iLBCenc_inst->blockl,
-                   data, (*iLBCenc_inst).hpimem);
-
-       /* otherwise simply copy */
-
-       /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
-
-       /* LPC of hp filtered input data */
-
-       LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
-
-
-       /* inverse filter to get residual */
-
-       for (n=0; n<iLBCenc_inst->nsub; n++) {
-           anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)],
-               SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
-       }
-
-       /* find state location */
-
-       start = FrameClassify(iLBCenc_inst, residual);
-
-       /* check if state should be in first or last part of the
-       two subframes */
-
-       diff = STATE_LEN - iLBCenc_inst->state_short_len;
-       en1 = 0;
-       index = (start-1)*SUBL;
-
-
-
-
-
-       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-           en1 += residual[index+i]*residual[index+i];
-       }
-       en2 = 0;
-       index = (start-1)*SUBL+diff;
-       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-           en2 += residual[index+i]*residual[index+i];
-       }
-
-
-       if (en1 > en2) {
-           state_first = 1;
-           start_pos = (start-1)*SUBL;
-       } else {
-           state_first = 0;
-           start_pos = (start-1)*SUBL + diff;
-       }
-
-       /* scalar quantization of state */
-
-       StateSearchW(iLBCenc_inst, &residual[start_pos],
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax,
-           idxVec, iLBCenc_inst->state_short_len, state_first);
-
-       StateConstructW(idxForMax, idxVec,
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &decresidual[start_pos], iLBCenc_inst->state_short_len);
-
-       /* predictive quantization in state */
-
-       if (state_first) { /* put adaptive part in the end */
-
-           /* setup memory */
-
-           memset(mem, 0,
-               (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
-           memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len,
-               decresidual+start_pos,
-               iLBCenc_inst->state_short_len*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* encode sub-frames */
-
-           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
-               &residual[start_pos+iLBCenc_inst->state_short_len],
-               mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES,
-
-
-
-
-
-               &weightdenum[start*(LPC_FILTERORDER+1)],
-               weightState, 0);
-
-           /* construct decoded vector */
-
-           iCBConstruct(
-               &decresidual[start_pos+iLBCenc_inst->state_short_len],
-               extra_cb_index, extra_gain_index,
-               mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES);
-
-       }
-       else { /* put adaptive part in the beginning */
-
-           /* create reversed vectors for prediction */
-
-           for (k=0; k<diff; k++) {
-               reverseResidual[k] = residual[(start+1)*SUBL-1
-                   -(k+iLBCenc_inst->state_short_len)];
-           }
-
-           /* setup memory */
-
-           meml_gotten = iLBCenc_inst->state_short_len;
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[start_pos + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* encode sub-frames */
-
-           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
-               reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES,
-               &weightdenum[(start-1)*(LPC_FILTERORDER+1)],
-               weightState, 0);
-
-           /* construct decoded vector */
-
-           iCBConstruct(reverseDecresidual, extra_cb_index,
-               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES);
-
-           /* get decoded residual from reversed vector */
-
-           for (k=0; k<diff; k++) {
-               decresidual[start_pos-1-k] = reverseDecresidual[k];
-
-
-
-
-
-           }
-       }
-
-       /* counter for predicted sub-frames */
-
-       subcount=0;
-
-       /* forward prediction of sub-frames */
-
-       Nfor = iLBCenc_inst->nsub-start-1;
-
-
-       if ( Nfor > 0 ) {
-
-           /* setup memory */
-
-           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
-               STATE_LEN*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nfor; subframe++) {
-
-               /* encode sub-frame */
-
-               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   &residual[(start+1+subframe)*SUBL],
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES,
-                   &weightdenum[(start+1+subframe)*
-                               (LPC_FILTERORDER+1)],
-                   weightState, subcount+1);
-
-               /* construct decoded vector */
-
-               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-
-
-
-
-
-                   &decresidual[(start+1+subframe)*SUBL],
-                   SUBL*sizeof(float));
-               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-               subcount++;
-           }
-       }
-
-
-       /* backward prediction of sub-frames */
-
-       Nback = start-1;
-
-
-       if ( Nback > 0 ) {
-
-           /* create reverse order vectors */
-
-           for (n=0; n<Nback; n++) {
-               for (k=0; k<SUBL; k++) {
-                   reverseResidual[n*SUBL+k] =
-                       residual[(start-1)*SUBL-1-n*SUBL-k];
-                   reverseDecresidual[n*SUBL+k] =
-                       decresidual[(start-1)*SUBL-1-n*SUBL-k];
-               }
-           }
-
-           /* setup memory */
-
-           meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
-
-
-           if ( meml_gotten > CB_MEML ) {
-               meml_gotten=CB_MEML;
-           }
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nback; subframe++) {
-
-               /* encode sub-frame */
-
-               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-
-
-
-
-
-                   gain_index+subcount*CB_NSTAGES,
-                   &reverseResidual[subframe*SUBL],
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES,
-                   &weightdenum[(start-2-subframe)*
-                               (LPC_FILTERORDER+1)],
-                   weightState, subcount+1);
-
-               /* construct decoded vector */
-
-               iCBConstruct(&reverseDecresidual[subframe*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
-               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-               subcount++;
-
-           }
-
-           /* get decoded residual from reversed vector */
-
-           for (i=0; i<SUBL*Nback; i++) {
-               decresidual[SUBL*Nback - i - 1] =
-                   reverseDecresidual[i];
-           }
-       }
-       /* end encoding part */
-
-       /* adjust index */
-       index_conv_enc(cb_index);
-
-       /* pack bytes */
-
-       pbytes=bytes;
-       pos=0;
-
-       /* loop over the 3 ULP classes */
-
-       for (ulp=0; ulp<3; ulp++) {
-
-
-
-
-
-
-           /* LSF */
-           for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
-               packsplit(&lsf_i[k], &firstpart, &lsf_i[k],
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp],
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-           }
-
-           /* Start block info */
-
-           packsplit(&start, &firstpart, &start,
-               iLBCenc_inst->ULP_inst->start_bits[ulp],
-               iLBCenc_inst->ULP_inst->start_bits[ulp]+
-               iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
-
-           packsplit(&state_first, &firstpart, &state_first,
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp],
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
-
-           packsplit(&idxForMax, &firstpart, &idxForMax,
-               iLBCenc_inst->ULP_inst->scale_bits[ulp],
-               iLBCenc_inst->ULP_inst->scale_bits[ulp]+
-               iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
-
-           for (k=0; k<iLBCenc_inst->state_short_len; k++) {
-               packsplit(idxVec+k, &firstpart, idxVec+k,
-                   iLBCenc_inst->ULP_inst->state_bits[ulp],
-                   iLBCenc_inst->ULP_inst->state_bits[ulp]+
-                   iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
-                   iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
-           }
-
-
-
-
-
-
-           /* 23/22 (20ms/30ms) sample block */
-
-           for (k=0;k<CB_NSTAGES;k++) {
-               packsplit(extra_cb_index+k, &firstpart,
-                   extra_cb_index+k,
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
-                   &pos);
-           }
-
-           for (k=0;k<CB_NSTAGES;k++) {
-               packsplit(extra_gain_index+k, &firstpart,
-                   extra_gain_index+k,
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
-                   &pos);
-           }
-
-           /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
-           for (i=0; i<iLBCenc_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   packsplit(cb_index+i*CB_NSTAGES+k, &firstpart,
-                       cb_index+i*CB_NSTAGES+k,
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
-                   dopack( &pbytes, firstpart,
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
-                       &pos);
-               }
-           }
-
-           for (i=0; i<iLBCenc_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   packsplit(gain_index+i*CB_NSTAGES+k, &firstpart,
-                       gain_index+i*CB_NSTAGES+k,
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
-
-
-
-
-
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
-                   dopack( &pbytes, firstpart,
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
-                       &pos);
-               }
-           }
-       }
-
-       /* set the last bit to zero (otherwise the decoder
-          will treat it as a lost frame) */
-       dopack( &pbytes, 0, 1, &pos);
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
deleted file mode 100644
index a3ab55f..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_encode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ILBCENCODE_H
-   #define __iLBC_ILBCENCODE_H
-
-   #include "iLBC_define.h"
-
-   short initEncode(                   /* (o) Number of bytes
-                                              encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-       int mode                    /* (i) frame size mode */
-   );
-
-   void iLBC_encode(
-
-       unsigned char *bytes,           /* (o) encoded data bits iLBC */
-       float *block,                   /* (o) speech vector to
-                                              encode */
-       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
-                                              state */
-   );
-
-   #endif
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
deleted file mode 100644
index 473cc7b..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
+++ /dev/null
@@ -1,310 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_test.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-   #include <stdio.h>
-   #include <string.h>
-   #include "iLBC_define.h"
-   #include "iLBC_encode.h"
-   #include "iLBC_decode.h"
-
-   /* Runtime statistics */
-   #include <time.h>
-
-   #define ILBCNOOFWORDS_MAX   (NO_OF_BYTES_30MS/2)
-
-   /*----------------------------------------------------------------*
-    *  Encoder interface function
-
-
-
-
-
-    *---------------------------------------------------------------*/
-
-   short encode(   /* (o) Number of bytes encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                                   /* (i/o) Encoder instance */
-       short *encoded_data,    /* (o) The encoded bytes */
-       short *data                 /* (i) The signal block to encode*/
-   ){
-       float block[BLOCKL_MAX];
-       int k;
-
-       /* convert signal to float */
-
-       for (k=0; k<iLBCenc_inst->blockl; k++)
-           block[k] = (float)data[k];
-
-       /* do the actual encoding */
-
-       iLBC_encode((unsigned char *)encoded_data, block, iLBCenc_inst);
-
-
-       return (iLBCenc_inst->no_of_bytes);
-   }
-
-   /*----------------------------------------------------------------*
-    *  Decoder interface function
-    *---------------------------------------------------------------*/
-
-   short decode(       /* (o) Number of decoded samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       short *decoded_data,        /* (o) Decoded signal block*/
-       short *encoded_data,        /* (i) Encoded bytes */
-       short mode                       /* (i) 0=PL, 1=Normal */
-   ){
-       int k;
-       float decblock[BLOCKL_MAX], dtmp;
-
-       /* check if mode is valid */
-
-       if (mode<0 || mode>1) {
-           printf("\nERROR - Wrong mode - 0, 1 allowed\n"); exit(3);}
-
-       /* do actual decoding of block */
-
-       iLBC_decode(decblock, (unsigned char *)encoded_data,
-           iLBCdec_inst, mode);
-
-       /* convert to short */
-
-
-
-
-
-       for (k=0; k<iLBCdec_inst->blockl; k++){
-           dtmp=decblock[k];
-
-           if (dtmp<MIN_SAMPLE)
-               dtmp=MIN_SAMPLE;
-           else if (dtmp>MAX_SAMPLE)
-               dtmp=MAX_SAMPLE;
-           decoded_data[k] = (short) dtmp;
-       }
-
-       return (iLBCdec_inst->blockl);
-   }
-
-   /*---------------------------------------------------------------*
-    *  Main program to test iLBC encoding and decoding
-    *
-    *  Usage:
-    *    exefile_name.exe <infile> <bytefile> <outfile> <channel>
-    *
-    *    <infile>   : Input file, speech for encoder (16-bit pcm file)
-    *    <bytefile> : Bit stream output from the encoder
-    *    <outfile>  : Output file, decoded speech (16-bit pcm file)
-    *    <channel>  : Bit error file, optional (16-bit)
-    *                     1 - Packet received correctly
-    *                     0 - Packet Lost
-    *
-    *--------------------------------------------------------------*/
-
-   int main(int argc, char* argv[])
-   {
-
-       /* Runtime statistics */
-
-       float starttime;
-       float runtime;
-       float outtime;
-
-       FILE *ifileid,*efileid,*ofileid, *cfileid;
-       short data[BLOCKL_MAX];
-       short encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
-       int len;
-       short pli, mode;
-       int blockcount = 0;
-       int packetlosscount = 0;
-
-       /* Create structs */
-       iLBC_Enc_Inst_t Enc_Inst;
-       iLBC_Dec_Inst_t Dec_Inst;
-
-
-
-
-
-       /* get arguments and open files */
-
-       if ((argc!=5) && (argc!=6)) {
-           fprintf(stderr,
-           "\n*-----------------------------------------------*\n");
-           fprintf(stderr,
-           "   %s <20,30> input encoded decoded (channel)\n\n",
-               argv[0]);
-           fprintf(stderr,
-           "   mode    : Frame size for the encoding/decoding\n");
-           fprintf(stderr,
-           "                 20 - 20 ms\n");
-           fprintf(stderr,
-           "                 30 - 30 ms\n");
-           fprintf(stderr,
-           "   input   : Speech for encoder (16-bit pcm file)\n");
-           fprintf(stderr,
-           "   encoded : Encoded bit stream\n");
-           fprintf(stderr,
-           "   decoded : Decoded speech (16-bit pcm file)\n");
-           fprintf(stderr,
-           "   channel : Packet loss pattern, optional (16-bit)\n");
-           fprintf(stderr,
-           "                  1 - Packet received correctly\n");
-           fprintf(stderr,
-           "                  0 - Packet Lost\n");
-           fprintf(stderr,
-           "*-----------------------------------------------*\n\n");
-           exit(1);
-       }
-       mode=atoi(argv[1]);
-       if (mode != 20 && mode != 30) {
-           fprintf(stderr,"Wrong mode %s, must be 20, or 30\n",
-               argv[1]);
-           exit(2);
-       }
-       if ( (ifileid=fopen(argv[2],"rb")) == NULL) {
-           fprintf(stderr,"Cannot open input file %s\n", argv[2]);
-           exit(2);}
-       if ( (efileid=fopen(argv[3],"wb")) == NULL) {
-           fprintf(stderr, "Cannot open encoded file %s\n",
-               argv[3]); exit(1);}
-       if ( (ofileid=fopen(argv[4],"wb")) == NULL) {
-           fprintf(stderr, "Cannot open decoded file %s\n",
-               argv[4]); exit(1);}
-       if (argc==6) {
-           if( (cfileid=fopen(argv[5],"rb")) == NULL) {
-               fprintf(stderr, "Cannot open channel file %s\n",
-
-
-
-
-
-                   argv[5]);
-               exit(1);
-           }
-       } else {
-           cfileid=NULL;
-       }
-
-       /* print info */
-
-       fprintf(stderr, "\n");
-       fprintf(stderr,
-           "*---------------------------------------------------*\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*      iLBC test program                            *\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*---------------------------------------------------*\n");
-       fprintf(stderr,"\nMode           : %2d ms\n", mode);
-       fprintf(stderr,"Input file     : %s\n", argv[2]);
-       fprintf(stderr,"Encoded file   : %s\n", argv[3]);
-       fprintf(stderr,"Output file    : %s\n", argv[4]);
-       if (argc==6) {
-           fprintf(stderr,"Channel file   : %s\n", argv[5]);
-       }
-       fprintf(stderr,"\n");
-
-       /* Initialization */
-
-       initEncode(&Enc_Inst, mode);
-       initDecode(&Dec_Inst, mode, 1);
-
-       /* Runtime statistics */
-
-       starttime=clock()/(float)CLOCKS_PER_SEC;
-
-       /* loop over input blocks */
-
-       while (fread(data,sizeof(short),Enc_Inst.blockl,ifileid)==
-               Enc_Inst.blockl) {
-
-           blockcount++;
-
-           /* encoding */
-
-
-
-
-
-           fprintf(stderr, "--- Encoding block %i --- ",blockcount);
-           len=encode(&Enc_Inst, encoded_data, data);
-           fprintf(stderr, "\r");
-
-           /* write byte file */
-
-           fwrite(encoded_data, sizeof(unsigned char), len, efileid);
-
-           /* get channel data if provided */
-           if (argc==6) {
-               if (fread(&pli, sizeof(short), 1, cfileid)) {
-                   if ((pli!=0)&&(pli!=1)) {
-                       fprintf(stderr, "Error in channel file\n");
-                       exit(0);
-                   }
-                   if (pli==0) {
-                       /* Packet loss -> remove info from frame */
-                       memset(encoded_data, 0,
-                           sizeof(short)*ILBCNOOFWORDS_MAX);
-                       packetlosscount++;
-                   }
-               } else {
-                   fprintf(stderr, "Error. Channel file too short\n");
-                   exit(0);
-               }
-           } else {
-               pli=1;
-           }
-
-           /* decoding */
-
-           fprintf(stderr, "--- Decoding block %i --- ",blockcount);
-
-           len=decode(&Dec_Inst, decoded_data, encoded_data, pli);
-           fprintf(stderr, "\r");
-
-           /* write output file */
-
-           fwrite(decoded_data,sizeof(short),len,ofileid);
-       }
-
-       /* Runtime statistics */
-
-       runtime = (float)(clock()/(float)CLOCKS_PER_SEC-starttime);
-       outtime = (float)((float)blockcount*(float)mode/1000.0);
-       printf("\n\nLength of speech file: %.1f s\n", outtime);
-       printf("Packet loss          : %.1f%%\n",
-           100.0*(float)packetlosscount/(float)blockcount);
-
-
-
-
-
-       printf("Time to run iLBC     :");
-       printf(" %.1f s (%.1f %% of realtime)\n\n", runtime,
-           (100*runtime/outtime));
-
-       /* close files */
-
-       fclose(ifileid);  fclose(efileid); fclose(ofileid);
-       if (argc==6) {
-           fclose(cfileid);
-       }
-       return(0);
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
deleted file mode 100644
index b4fe0ed..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
+++ /dev/null
@@ -1,283 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       lsf.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-
-
-
-
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  conversion from lpc coefficients to lsf coefficients
-    *---------------------------------------------------------------*/
-
-   void a2lsf(
-       float *freq,/* (o) lsf coefficients */
-       float *a    /* (i) lpc coefficients */
-   ){
-       float steps[LSF_NUMBER_OF_STEPS] =
-           {(float)0.00635, (float)0.003175, (float)0.0015875,
-           (float)0.00079375};
-       float step;
-       int step_idx;
-       int lsp_index;
-       float p[LPC_HALFORDER];
-       float q[LPC_HALFORDER];
-       float p_pre[LPC_HALFORDER];
-       float q_pre[LPC_HALFORDER];
-       float old_p, old_q, *old;
-       float *pq_coef;
-       float omega, old_omega;
-       int i;
-       float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
-
-       for (i=0; i<LPC_HALFORDER; i++) {
-           p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
-           q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
-       }
-
-       p_pre[0] = (float)-1.0 - p[0];
-       p_pre[1] = - p_pre[0] - p[1];
-       p_pre[2] = - p_pre[1] - p[2];
-       p_pre[3] = - p_pre[2] - p[3];
-       p_pre[4] = - p_pre[3] - p[4];
-       p_pre[4] = p_pre[4] / 2;
-
-       q_pre[0] = (float)1.0 - q[0];
-       q_pre[1] = q_pre[0] - q[1];
-       q_pre[2] = q_pre[1] - q[2];
-       q_pre[3] = q_pre[2] - q[3];
-       q_pre[4] = q_pre[3] - q[4];
-       q_pre[4] = q_pre[4] / 2;
-
-       omega = 0.0;
-
-
-
-
-
-       old_omega = 0.0;
-
-       old_p = FLOAT_MAX;
-       old_q = FLOAT_MAX;
-
-       /* Here we loop through lsp_index to find all the
-          LPC_FILTERORDER roots for omega. */
-
-       for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
-
-           /* Depending on lsp_index being even or odd, we
-           alternatively solve the roots for the two LSP equations. */
-
-
-           if ((lsp_index & 0x1) == 0) {
-               pq_coef = p_pre;
-               old = &old_p;
-           } else {
-               pq_coef = q_pre;
-               old = &old_q;
-           }
-
-           /* Start with low resolution grid */
-
-           for (step_idx = 0, step = steps[step_idx];
-               step_idx < LSF_NUMBER_OF_STEPS;){
-
-               /*  cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) +
-               pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
-
-               hlp = (float)cos(omega * TWO_PI);
-               hlp1 = (float)2.0 * hlp + pq_coef[0];
-               hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 +
-                   pq_coef[1];
-               hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
-               hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
-               hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
-
-
-               if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
-
-                   if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
-
-                       if (fabs(hlp5) >= fabs(*old)) {
-                           freq[lsp_index] = omega - step;
-                       } else {
-                           freq[lsp_index] = omega;
-                       }
-
-
-
-
-
-
-
-                       if ((*old) >= 0.0){
-                           *old = (float)-1.0 * FLOAT_MAX;
-                       } else {
-                           *old = FLOAT_MAX;
-                       }
-
-                       omega = old_omega;
-                       step_idx = 0;
-
-                       step_idx = LSF_NUMBER_OF_STEPS;
-                   } else {
-
-                       if (step_idx == 0) {
-                           old_omega = omega;
-                       }
-
-                       step_idx++;
-                       omega -= steps[step_idx];
-
-                       /* Go back one grid step */
-
-                       step = steps[step_idx];
-                   }
-               } else {
-
-               /* increment omega until they are of different sign,
-               and we know there is at least one root between omega
-               and old_omega */
-                   *old = hlp5;
-                   omega += step;
-               }
-           }
-       }
-
-       for (i = 0; i<LPC_FILTERORDER; i++) {
-           freq[i] = freq[i] * TWO_PI;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  conversion from lsf coefficients to lpc coefficients
-    *---------------------------------------------------------------*/
-
-   void lsf2a(
-       float *a_coef,  /* (o) lpc coefficients */
-       float *freq     /* (i) lsf coefficients */
-
-
-
-
-
-   ){
-       int i, j;
-       float hlp;
-       float p[LPC_HALFORDER], q[LPC_HALFORDER];
-       float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
-           a2[LPC_HALFORDER];
-       float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER],
-           b2[LPC_HALFORDER];
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           freq[i] = freq[i] * PI2;
-       }
-
-       /* Check input for ill-conditioned cases.  This part is not
-       found in the TIA standard.  It involves the following 2 IF
-       blocks.  If "freq" is judged ill-conditioned, then we first
-       modify freq[0] and freq[LPC_HALFORDER-1] (normally
-       LPC_HALFORDER = 10 for LPC applications), then we adjust
-       the other "freq" values slightly */
-
-
-       if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
-
-
-           if (freq[0] <= 0.0) {
-               freq[0] = (float)0.022;
-           }
-
-
-           if (freq[LPC_FILTERORDER - 1] >= 0.5) {
-               freq[LPC_FILTERORDER - 1] = (float)0.499;
-           }
-
-           hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) /
-               (float) (LPC_FILTERORDER - 1);
-
-           for (i=1; i<LPC_FILTERORDER; i++) {
-               freq[i] = freq[i - 1] + hlp;
-           }
-       }
-
-       memset(a1, 0, LPC_HALFORDER*sizeof(float));
-       memset(a2, 0, LPC_HALFORDER*sizeof(float));
-       memset(b1, 0, LPC_HALFORDER*sizeof(float));
-       memset(b2, 0, LPC_HALFORDER*sizeof(float));
-       memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
-       memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
-
-
-
-
-
-
-       /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and
-       cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.
-       Note that for this code p[i] specifies the coefficients
-       used in .Q_A(z) while q[i] specifies the coefficients used
-       in .P_A(z) */
-
-       for (i=0; i<LPC_HALFORDER; i++) {
-           p[i] = (float)cos(TWO_PI * freq[2 * i]);
-           q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
-       }
-
-       a[0] = 0.25;
-       b[0] = 0.25;
-
-       for (i= 0; i<LPC_HALFORDER; i++) {
-           a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-           b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-           a2[i] = a1[i];
-           a1[i] = a[i];
-           b2[i] = b1[i];
-           b1[i] = b[i];
-       }
-
-       for (j=0; j<LPC_FILTERORDER; j++) {
-
-           if (j == 0) {
-               a[0] = 0.25;
-               b[0] = -0.25;
-           } else {
-               a[0] = b[0] = 0.0;
-           }
-
-           for (i=0; i<LPC_HALFORDER; i++) {
-               a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-               b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-               a2[i] = a1[i];
-               a1[i] = a[i];
-               b2[i] = b1[i];
-               b1[i] = b[i];
-           }
-
-           a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
-       }
-
-       a_coef[0] = 1.0;
-   }
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
deleted file mode 100644
index caff77e..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       lsf.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LSF_H
-   #define __iLBC_LSF_H
-
-   void a2lsf(
-       float *freq,/* (o) lsf coefficients */
-       float *a    /* (i) lpc coefficients */
-   );
-
-   void lsf2a(
-       float *a_coef,  /* (o) lpc coefficients */
-       float *freq     /* (i) lsf coefficients */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
deleted file mode 100644
index b7496a4..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
+++ /dev/null
@@ -1,182 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       packing.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "helpfun.h"
-   #include "string.h"
-
-   /*----------------------------------------------------------------*
-    *  splitting an integer into first most significant bits and
-    *  remaining least significant bits
-    *---------------------------------------------------------------*/
-
-   void packsplit(
-       int *index,                 /* (i) the value to split */
-       int *firstpart,             /* (o) the value specified by most
-                                          significant bits */
-       int *rest,                  /* (o) the value specified by least
-                                          significant bits */
-
-
-
-
-
-       int bitno_firstpart,    /* (i) number of bits in most
-                                          significant part */
-       int bitno_total             /* (i) number of bits in full range
-                                          of value */
-   ){
-       int bitno_rest = bitno_total-bitno_firstpart;
-
-       *firstpart = *index>>(bitno_rest);
-       *rest = *index-(*firstpart<<(bitno_rest));
-   }
-
-   /*----------------------------------------------------------------*
-    *  combining a value corresponding to msb's with a value
-    *  corresponding to lsb's
-    *---------------------------------------------------------------*/
-
-   void packcombine(
-       int *index,                 /* (i/o) the msb value in the
-                                          combined value out */
-       int rest,                   /* (i) the lsb value */
-       int bitno_rest              /* (i) the number of bits in the
-                                          lsb part */
-   ){
-       *index = *index<<bitno_rest;
-       *index += rest;
-   }
-
-   /*----------------------------------------------------------------*
-    *  packing of bits into bitstream, i.e., vector of bytes
-    *---------------------------------------------------------------*/
-
-   void dopack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to pack
-                                          new data, on exit pointer
-                                          to place in bitstream to
-                                          pack future data */
-       int index,                  /* (i) the value to pack */
-       int bitno,                  /* (i) the number of bits that the
-                                          value will fit within */
-       int *pos                /* (i/o) write position in the
-                                          current byte */
-   ){
-       int posLeft;
-
-       /* Clear the bits before starting in a new byte */
-
-       if ((*pos)==0) {
-
-
-
-
-
-           **bitstream=0;
-       }
-
-       while (bitno>0) {
-
-           /* Jump to the next byte if end of this byte is reached*/
-
-           if (*pos==8) {
-               *pos=0;
-               (*bitstream)++;
-               **bitstream=0;
-           }
-
-           posLeft=8-(*pos);
-
-           /* Insert index into the bitstream */
-
-           if (bitno <= posLeft) {
-               **bitstream |= (unsigned char)(index<<(posLeft-bitno));
-               *pos+=bitno;
-               bitno=0;
-           } else {
-               **bitstream |= (unsigned char)(index>>(bitno-posLeft));
-
-               *pos=8;
-               index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
-
-               bitno-=posLeft;
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  unpacking of bits from bitstream, i.e., vector of bytes
-    *---------------------------------------------------------------*/
-
-   void unpack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to
-                                          unpack new data from, on
-                                          exit pointer to place in
-                                          bitstream to unpack future
-                                          data from */
-       int *index,                 /* (o) resulting value */
-       int bitno,                  /* (i) number of bits used to
-                                          represent the value */
-       int *pos                /* (i/o) read position in the
-                                          current byte */
-
-
-
-
-
-   ){
-       int BitsLeft;
-
-       *index=0;
-
-       while (bitno>0) {
-
-           /* move forward in bitstream when the end of the
-              byte is reached */
-
-           if (*pos==8) {
-               *pos=0;
-               (*bitstream)++;
-           }
-
-           BitsLeft=8-(*pos);
-
-           /* Extract bits to index */
-
-           if (BitsLeft>=bitno) {
-               *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
-
-               *pos+=bitno;
-               bitno=0;
-           } else {
-
-               if ((8-bitno)>0) {
-                   *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
-                       (8-bitno));
-                   *pos=8;
-               } else {
-                   *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
-                       (bitno-8));
-                   *pos=8;
-               }
-               bitno-=BitsLeft;
-           }
-       }
-   }
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
deleted file mode 100644
index cbb9f82..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       packing.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __PACKING_H
-   #define __PACKING_H
-
-   void packsplit(
-       int *index,                 /* (i) the value to split */
-       int *firstpart,             /* (o) the value specified by most
-                                          significant bits */
-       int *rest,                  /* (o) the value specified by least
-                                          significant bits */
-       int bitno_firstpart,    /* (i) number of bits in most
-                                          significant part */
-       int bitno_total             /* (i) number of bits in full range
-                                          of value */
-   );
-
-   void packcombine(
-       int *index,                 /* (i/o) the msb value in the
-                                          combined value out */
-       int rest,                   /* (i) the lsb value */
-       int bitno_rest              /* (i) the number of bits in the
-                                          lsb part */
-   );
-
-   void dopack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to pack
-                                          new data, on exit pointer
-                                          to place in bitstream to
-                                          pack future data */
-       int index,                  /* (i) the value to pack */
-       int bitno,                  /* (i) the number of bits that the
-                                          value will fit within */
-       int *pos                /* (i/o) write position in the
-                                          current byte */
-   );
-
-
-
-
-
-   void unpack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to
-                                          unpack new data from, on
-                                          exit pointer to place in
-                                          bitstream to unpack future
-                                          data from */
-       int *index,                 /* (o) resulting value */
-       int bitno,                  /* (i) number of bits used to
-                                          represent the value */
-       int *pos                /* (i/o) read position in the
-                                          current byte */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
deleted file mode 100644
index d4fba08..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
+++ /dev/null
@@ -1,10867 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                        S. Andersen
-Request for Comments: 3951                            Aalborg University
-Category: Experimental                                          A. Duric
-                                                                   Telio
-                                                               H. Astrom
-                                                                R. Hagen
-                                                               W. Kleijn
-                                                               J. Linden
-                                                         Global IP Sound
-                                                           December 2004
-
-
-                   Internet Low Bit Rate Codec (iLBC)
-
-Status of this Memo
-
-   This memo defines an Experimental Protocol for the Internet
-   community.  It does not specify an Internet standard of any kind.
-   Discussion and suggestions for improvement are requested.
-   Distribution of this memo is unlimited.
-
-Copyright Notice
-
-   Copyright (C) The Internet Society (2004).
-
-Abstract
-
-   This document specifies a speech codec suitable for robust voice
-   communication over IP.  The codec is developed by Global IP Sound
-   (GIPS).  It is designed for narrow band speech and results in a
-   payload bit rate of 13.33 kbit/s for 30 ms frames and 15.20 kbit/s
-   for 20 ms frames.  The codec enables graceful speech quality
-   degradation in the case of lost frames, which occurs in connection
-   with lost or delayed IP packets.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                      [Page 1]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-Table of Contents
-
-   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4
-   2.  Outline of the Codec . . . . . . . . . . . . . . . . . . . . .  5
-       2.1.  Encoder. . . . . . . . . . . . . . . . . . . . . . . . .  5
-       2.2.  Decoder. . . . . . . . . . . . . . . . . . . . . . . . .  7
-   3.  Encoder Principles . . . . . . . . . . . . . . . . . . . . . .  7
-       3.1.  Pre-processing . . . . . . . . . . . . . . . . . . . . .  9
-       3.2.  LPC Analysis and Quantization. . . . . . . . . . . . . .  9
-             3.2.1.  Computation of Autocorrelation Coefficients. . . 10
-             3.2.2.  Computation of LPC Coefficients. . . . . . . . . 11
-             3.2.3.  Computation of LSF Coefficients from LPC
-                     Coefficients . . . . . . . . . . . . . . . . . . 11
-             3.2.4.  Quantization of LSF Coefficients . . . . . . . . 12
-             3.2.5.  Stability Check of LSF Coefficients. . . . . . . 13
-             3.2.6.  Interpolation of LSF Coefficients. . . . . . . . 13
-             3.2.7.  LPC Analysis and Quantization for 20 ms Frames . 14
-       3.3.  Calculation of the Residual. . . . . . . . . . . . . . . 15
-       3.4.  Perceptual Weighting Filter. . . . . . . . . . . . . . . 15
-       3.5.  Start State Encoder. . . . . . . . . . . . . . . . . . . 15
-             3.5.1.  Start State Estimation . . . . . . . . . . . . . 16
-             3.5.2.  All-Pass Filtering and Scale Quantization. . . . 17
-             3.5.3.  Scalar Quantization. . . . . . . . . . . . . . . 18
-       3.6.  Encoding the Remaining Samples . . . . . . . . . . . . . 19
-             3.6.1.  Codebook Memory. . . . . . . . . . . . . . . . . 20
-             3.6.2.  Perceptual Weighting of Codebook Memory
-                     and Target . . . . . . . . . . . . . . . . . . . 22
-             3.6.3.  Codebook Creation. . . . . . . . . . . . . . . . 23
-                     3.6.3.1. Creation of a Base Codebook . . . . . . 23
-                     3.6.3.2. Codebook Expansion. . . . . . . . . . . 24
-                     3.6.3.3. Codebook Augmentation . . . . . . . . . 24
-             3.6.4.  Codebook Search. . . . . . . . . . . . . . . . . 26
-                     3.6.4.1. Codebook Search at Each Stage . . . . . 26
-                     3.6.4.2. Gain Quantization at Each Stage . . . . 27
-                     3.6.4.3. Preparation of Target for Next Stage. . 28
-       3.7.  Gain Correction Encoding . . . . . . . . . . . . . . . . 28
-       3.8.  Bitstream Definition . . . . . . . . . . . . . . . . . . 29
-   4.  Decoder Principles . . . . . . . . . . . . . . . . . . . . . . 32
-       4.1.  LPC Filter Reconstruction. . . . . . . . . . . . . . . . 33
-       4.2.  Start State Reconstruction . . . . . . . . . . . . . . . 33
-       4.3.  Excitation Decoding Loop . . . . . . . . . . . . . . . . 34
-       4.4.  Multistage Adaptive Codebook Decoding. . . . . . . . . . 35
-             4.4.1.  Construction of the Decoded Excitation Signal. . 35
-       4.5.  Packet Loss Concealment. . . . . . . . . . . . . . . . . 35
-             4.5.1.  Block Received Correctly and Previous Block
-                     Also Received. . . . . . . . . . . . . . . . . . 35
-             4.5.2.  Block Not Received . . . . . . . . . . . . . . . 36
-
-
-
-
-Andersen, et al.              Experimental                      [Page 2]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-             4.5.3.  Block Received Correctly When Previous Block
-                     Not Received . . . . . . . . . . . . . . . . . . 36
-       4.6.  Enhancement. . . . . . . . . . . . . . . . . . . . . . . 37
-             4.6.1.  Estimating the Pitch . . . . . . . . . . . . . . 39
-             4.6.2.  Determination of the Pitch-Synchronous
-                     Sequences. . . . . . . . . . . . . . . . . . . . 39
-             4.6.3.  Calculation of the Smoothed Excitation . . . . . 41
-             4.6.4.  Enhancer Criterion . . . . . . . . . . . . . . . 41
-             4.6.5.  Enhancing the Excitation . . . . . . . . . . . . 42
-       4.7.  Synthesis Filtering. . . . . . . . . . . . . . . . . . . 43
-       4.8.  Post Filtering . . . . . . . . . . . . . . . . . . . . . 43
-   5.  Security Considerations. . . . . . . . . . . . . . . . . . . . 43
-   6.  Evaluation of the iLBC Implementations . . . . . . . . . . . . 43
-   7.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 43
-       7.1.  Normative References . . . . . . . . . . . . . . . . . . 43
-       7.2.  Informative References . . . . . . . . . . . . . . . . . 44
-   8.  ACKNOWLEDGEMENTS . . . . . . . . . . . . . . . . . . . . . . . 44
-   APPENDIX A: Reference Implementation . . . . . . . . . . . . . . . 45
-       A.1.  iLBC_test.c. . . . . . . . . . . . . . . . . . . . . . . 46
-       A.2   iLBC_encode.h. . . . . . . . . . . . . . . . . . . . . . 52
-       A.3.  iLBC_encode.c. . . . . . . . . . . . . . . . . . . . . . 53
-       A.4.  iLBC_decode.h. . . . . . . . . . . . . . . . . . . . . . 63
-       A.5.  iLBC_decode.c. . . . . . . . . . . . . . . . . . . . . . 64
-       A.6.  iLBC_define.h. . . . . . . . . . . . . . . . . . . . . . 76
-       A.7.  constants.h. . . . . . . . . . . . . . . . . . . . . . . 80
-       A.8.  constants.c. . . . . . . . . . . . . . . . . . . . . . . 82
-       A.9.  anaFilter.h. . . . . . . . . . . . . . . . . . . . . . . 96
-       A.10. anaFilter.c. . . . . . . . . . . . . . . . . . . . . . . 97
-       A.11. createCB.h . . . . . . . . . . . . . . . . . . . . . . . 98
-       A.12. createCB.c . . . . . . . . . . . . . . . . . . . . . . . 99
-       A.13. doCPLC.h . . . . . . . . . . . . . . . . . . . . . . . .104
-       A.14. doCPLC.c . . . . . . . . . . . . . . . . . . . . . . . .104
-       A.15. enhancer.h . . . . . . . . . . . . . . . . . . . . . . .109
-       A.16. enhancer.c . . . . . . . . . . . . . . . . . . . . . . .110
-       A.17. filter.h . . . . . . . . . . . . . . . . . . . . . . . .123
-       A.18. filter.c . . . . . . . . . . . . . . . . . . . . . . . .125
-       A.19. FrameClassify.h. . . . . . . . . . . . . . . . . . . . .128
-       A.20. FrameClassify.c. . . . . . . . . . . . . . . . . . . . .129
-       A.21. gainquant.h. . . . . . . . . . . . . . . . . . . . . . .131
-       A.22. gainquant.c. . . . . . . . . . . . . . . . . . . . . . .131
-       A.23. getCBvec.h . . . . . . . . . . . . . . . . . . . . . . .134
-       A.24. getCBvec.c . . . . . . . . . . . . . . . . . . . . . . .134
-       A.25. helpfun.h. . . . . . . . . . . . . . . . . . . . . . . .138
-       A.26. helpfun.c. . . . . . . . . . . . . . . . . . . . . . . .140
-       A.27. hpInput.h. . . . . . . . . . . . . . . . . . . . . . . .146
-       A.28. hpInput.c. . . . . . . . . . . . . . . . . . . . . . . .146
-       A.29. hpOutput.h . . . . . . . . . . . . . . . . . . . . . . .148
-       A.30. hpOutput.c . . . . . . . . . . . . . . . . . . . . . . .148
-
-
-
-Andersen, et al.              Experimental                      [Page 3]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       A.31. iCBConstruct.h . . . . . . . . . . . . . . . . . . . . .149
-       A.32. iCBConstruct.c . . . . . . . . . . . . . . . . . . . . .150
-       A.33. iCBSearch.h. . . . . . . . . . . . . . . . . . . . . . .152
-       A.34. iCBSearch.c. . . . . . . . . . . . . . . . . . . . . . .153
-       A.35. LPCdecode.h. . . . . . . . . . . . . . . . . . . . . . .163
-       A.36. LPCdecode.c. . . . . . . . . . . . . . . . . . . . . . .164
-       A.37. LPCencode.h. . . . . . . . . . . . . . . . . . . . . . .167
-       A.38. LPCencode.c. . . . . . . . . . . . . . . . . . . . . . .167
-       A.39. lsf.h. . . . . . . . . . . . . . . . . . . . . . . . . .172
-       A.40. lsf.c. . . . . . . . . . . . . . . . . . . . . . . . . .172
-       A.41. packing.h. . . . . . . . . . . . . . . . . . . . . . . .178
-       A.42. packing.c. . . . . . . . . . . . . . . . . . . . . . . .179
-       A.43. StateConstructW.h. . . . . . . . . . . . . . . . . . . .182
-       A.44. StateConstructW.c. . . . . . . . . . . . . . . . . . . .183
-       A.45. StateSearchW.h . . . . . . . . . . . . . . . . . . . . .185
-       A.46. StateSearchW.c . . . . . . . . . . . . . . . . . . . . .186
-       A.47. syntFilter.h . . . . . . . . . . . . . . . . . . . . . .190
-       A.48. syntFilter.c . . . . . . . . . . . . . . . . . . . . . .190
-   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . .192
-   Full Copyright Statement . . . . . . . . . . . . . . . . . . . . .194
-
-1.  Introduction
-
-   This document contains the description of an algorithm for the coding
-   of speech signals sampled at 8 kHz.  The algorithm, called iLBC, uses
-   a block-independent linear-predictive coding (LPC) algorithm and has
-   support for two basic frame lengths: 20 ms at 15.2 kbit/s and 30 ms
-   at 13.33 kbit/s.  When the codec operates at block lengths of 20 ms,
-   it produces 304 bits per block, which SHOULD be packetized as in [1].
-   Similarly, for block lengths of 30 ms it produces 400 bits per block,
-   which SHOULD be packetized as in [1].  The two modes for the
-   different frame sizes operate in a very similar way.  When they
-   differ it is explicitly stated in the text, usually with the notation
-   x/y, where x refers to the 20 ms mode and y refers to the 30 ms mode.
-
-   The described algorithm results in a speech coding system with a
-   controlled response to packet losses similar to what is known from
-   pulse code modulation (PCM) with packet loss concealment (PLC), such
-   as the ITU-T G.711 standard [4], which operates at a fixed bit rate
-   of 64 kbit/s.  At the same time, the described algorithm enables
-   fixed bit rate coding with a quality-versus-bit rate tradeoff close
-   to state-of-the-art.  A suitable RTP payload format for the iLBC
-   codec is specified in [1].
-
-   Some of the applications for which this coder is suitable are real
-   time communications such as telephony and videoconferencing,
-   streaming audio, archival, and messaging.
-
-
-
-
-Andersen, et al.              Experimental                      [Page 4]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   Cable Television Laboratories (CableLabs(R)) has adopted iLBC as a
-   mandatory PacketCable(TM) audio codec standard for VoIP over Cable
-   applications [3].
-
-   This document is organized as follows.  Section 2 gives a brief
-   outline of the codec.  The specific encoder and decoder algorithms
-   are explained in sections 3 and 4, respectively.  Appendix A provides
-   a c-code reference implementation.
-
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-   document are to be interpreted as described in BCP 14, RFC 2119 [2].
-
-2.  Outline of the Codec
-
-   The codec consists of an encoder and a decoder as described in
-   sections 2.1 and 2.2, respectively.
-
-   The essence of the codec is LPC and block-based coding of the LPC
-   residual signal.  For each 160/240 (20 ms/30 ms) sample block, the
-   following major steps are performed: A set of LPC filters are
-   computed, and the speech signal is filtered through them to produce
-   the residual signal.  The codec uses scalar quantization of the
-   dominant part, in terms of energy, of the residual signal for the
-   block.  The dominant state is of length 57/58 (20 ms/30 ms) samples
-   and forms a start state for dynamic codebooks constructed from the
-   already coded parts of the residual signal.  These dynamic codebooks
-   are used to code the remaining parts of the residual signal.  By this
-   method, coding independence between blocks is achieved, resulting in
-   elimination of propagation of perceptual degradations due to packet
-   loss.  The method facilitates high-quality packet loss concealment
-   (PLC).
-
-2.1.  Encoder
-
-   The input to the encoder SHOULD be 16 bit uniform PCM sampled at 8
-   kHz.  It SHOULD be partitioned into blocks of BLOCKL=160/240 samples
-   for the 20/30 ms frame size.  Each block is divided into NSUB=4/6
-   consecutive sub-blocks of SUBL=40 samples each.  For 30 ms frame
-   size, the encoder performs two LPC_FILTERORDER=10 linear-predictive
-   coding (LPC) analyses.  The first analysis applies a smooth window
-   centered over the second sub-block and extending to the middle of the
-   fifth sub-block.  The second LPC analysis applies a smooth asymmetric
-   window centered over the fifth sub-block and extending to the end of
-   the sixth sub-block.  For 20 ms frame size, one LPC_FILTERORDER=10
-   linear-predictive coding (LPC) analysis is performed with a smooth
-   window centered over the third sub-frame.
-
-
-
-
-Andersen, et al.              Experimental                      [Page 5]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   For each of the LPC analyses, a set of line-spectral frequencies
-   (LSFs) are obtained, quantized, and interpolated to obtain LSF
-   coefficients for each sub-block.  Subsequently, the LPC residual is
-   computed by using the quantized and interpolated LPC analysis
-   filters.
-
-   The two consecutive sub-blocks of the residual exhibiting the maximal
-   weighted energy are identified.  Within these two sub-blocks, the
-   start state (segment) is selected from two choices: the first 57/58
-   samples or the last 57/58 samples of the two consecutive sub-blocks.
-   The selected segment is the one of higher energy.  The start state is
-   encoded with scalar quantization.
-
-   A dynamic codebook encoding procedure is used to encode 1) the 23/22
-   (20 ms/30 ms) remaining samples in the two sub-blocks containing the
-   start state; 2) the sub-blocks after the start state in time; and 3)
-   the sub-blocks before the start state in time.  Thus, the encoding
-   target can be either the 23/22 samples remaining of the two sub-
-   blocks containing the start state or a 40-sample sub-block.  This
-   target can consist of samples indexed forward in time or backward in
-   time, depending on the location of the start state.
-
-   The codebook coding is based on an adaptive codebook built from a
-   codebook memory that contains decoded LPC excitation samples from the
-   already encoded part of the block.  These samples are indexed in the
-   same time direction as the target vector, ending at the sample
-   instant prior to the first sample instant represented in the target
-   vector.  The codebook is used in CB_NSTAGES=3 stages in a successive
-   refinement approach, and the resulting three code vector gains are
-   encoded with 5-, 4-, and 3-bit scalar quantization, respectively.
-
-   The codebook search method employs noise shaping derived from the LPC
-   filters, and the main decision criterion is to minimize the squared
-   error between the target vector and the code vectors.  Each code
-   vector in this codebook comes from one of CB_EXPAND=2 codebook
-   sections.  The first section is filled with delayed, already encoded
-   residual vectors.  The code vectors of the second codebook section
-   are constructed by predefined linear combinations of vectors in the
-   first section of the codebook.
-
-   As codebook encoding with squared-error matching is known to produce
-   a coded signal of less power than does the scalar quantized start
-   state signal, a gain re-scaling method is implemented by a refined
-   search for a better set of codebook gains in terms of power matching
-   after encoding.  This is done by searching for a higher value of the
-   gain factor for the first stage codebook, as the subsequent stage
-   codebook gains are scaled by the first stage gain.
-
-
-
-
-Andersen, et al.              Experimental                      [Page 6]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-2.2.  Decoder
-
-   Typically for packet communications, a jitter buffer placed at the
-   receiving end decides whether the packet containing an encoded signal
-   block has been received or lost.  This logic is not part of the codec
-   described here.  For each encoded signal block received the decoder
-   performs a decoding.  For each lost signal block, the decoder
-   performs a PLC operation.
-
-   The decoding for each block starts by decoding and interpolating the
-   LPC coefficients.  Subsequently the start state is decoded.
-
-   For codebook-encoded segments, each segment is decoded by
-   constructing the three code vectors given by the received codebook
-   indices in the same way that the code vectors were constructed in the
-   encoder.  The three gain factors are also decoded and the resulting
-   decoded signal is given by the sum of the three codebook vectors
-   scaled with respective gain.
-
-   An enhancement algorithm is applied to the reconstructed excitation
-   signal.  This enhancement augments the periodicity of voiced speech
-   regions.  The enhancement is optimized under the constraint that the
-   modification signal (defined as the difference between the enhanced
-   excitation and the excitation signal prior to enhancement) has a
-   short-time energy that does not exceed a preset fraction of the
-   short-time energy of the excitation signal prior to enhancement.
-
-   A packet loss concealment (PLC) operation is easily embedded in the
-   decoder.  The PLC operation can, e.g., be based on repeating LPC
-   filters and obtaining the LPC residual signal by using a long-term
-   prediction estimate from previous residual blocks.
-
-3.  Encoder Principles
-
-   The following block diagram is an overview of all the components of
-   the iLBC encoding procedure.  The description of the blocks contains
-   references to the section where that particular procedure is further
-   described.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                      [Page 7]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-             +-----------+    +---------+    +---------+
-   speech -> | 1. Pre P  | -> | 2. LPC  | -> | 3. Ana  | ->
-             +-----------+    +---------+    +---------+
-
-             +---------------+   +--------------+
-          -> | 4. Start Sel  | ->| 5. Scalar Qu | ->
-             +---------------+   +--------------+
-
-             +--------------+    +---------------+
-          -> |6. CB Search  | -> | 7. Packetize  | -> payload
-          |  +--------------+ |  +---------------+
-          ----<---------<------
-       sub-frame 0..2/4 (20 ms/30 ms)
-
-   Figure 3.1. Flow chart of the iLBC encoder
-
-   1. Pre-process speech with a HP filter, if needed (section 3.1).
-
-   2. Compute LPC parameters, quantize, and interpolate (section 3.2).
-
-   3. Use analysis filters on speech to compute residual (section 3.3).
-
-   4. Select position of 57/58-sample start state (section 3.5).
-
-   5. Quantize the 57/58-sample start state with scalar quantization
-      (section 3.5).
-
-   6. Search the codebook for each sub-frame.  Start with 23/22 sample
-      block, then encode sub-blocks forward in time, and then encode
-      sub-blocks backward in time.  For each block, the steps in Figure
-      3.4 are performed (section 3.6).
-
-   7. Packetize the bits into the payload specified in Table 3.2.
-
-   The input to the encoder SHOULD be 16-bit uniform PCM sampled at 8
-   kHz.  Also it SHOULD be partitioned into blocks of BLOCKL=160/240
-   samples.  Each block input to the encoder is divided into NSUB=4/6
-   consecutive sub-blocks of SUBL=40 samples each.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                      [Page 8]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-             0        39        79       119       159
-             +---------------------------------------+
-             |    1    |    2    |    3    |    4    |
-             +---------------------------------------+
-                            20 ms frame
-
-   0        39        79       119       159       199       239
-   +-----------------------------------------------------------+
-   |    1    |    2    |    3    |    4    |    5    |    6    |
-   +-----------------------------------------------------------+
-                                  30 ms frame
-   Figure 3.2. One input block to the encoder for 20 ms (with four sub-
-   frames) and 30 ms (with six sub-frames).
-
-3.1.  Pre-processing
-
-   In some applications, the recorded speech signal contains DC level
-   and/or 50/60 Hz noise.  If these components have not been removed
-   prior to the encoder call, they should be removed by a high-pass
-   filter.  A reference implementation of this, using a filter with a
-   cutoff frequency of 90 Hz, can be found in Appendix A.28.
-
-3.2.  LPC Analysis and Quantization
-
-   The input to the LPC analysis module is a possibly high-pass filtered
-   speech buffer, speech_hp, that contains 240/300 (LPC_LOOKBACK +
-   BLOCKL = 80/60 + 160/240 = 240/300) speech samples, where samples 0
-   through 79/59 are from the previous block and samples 80/60 through
-   239/299 are from the current block.  No look-ahead into the next
-   block is used.  For the very first block processed, the look-back
-   samples are assumed to be zeros.
-
-   For each input block, the LPC analysis calculates one/two set(s) of
-   LPC_FILTERORDER=10 LPC filter coefficients using the autocorrelation
-   method and the Levinson-Durbin recursion.  These coefficients are
-   converted to the Line Spectrum Frequency representation.  In the 20
-   ms case, the single lsf set represents the spectral characteristics
-   as measured at the center of the third sub-block.  For 30 ms frames,
-   the first set, lsf1, represents the spectral properties of the input
-   signal at the center of the second sub-block, and the other set,
-   lsf2, represents the spectral characteristics as measured at the
-   center of the fifth sub-block.  The details of the computation for 30
-   ms frames are described in sections 3.2.1 through 3.2.6.  Section
-   3.2.7 explains how the LPC Analysis and Quantization differs for 20
-   ms frames.
-
-
-
-
-
-
-Andersen, et al.              Experimental                      [Page 9]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-3.2.1.  Computation of Autocorrelation Coefficients
-
-   The first step in the LPC analysis procedure is to calculate
-   autocorrelation coefficients by using windowed speech samples.  This
-   windowing is the only difference in the LPC analysis procedure for
-   the two sets of coefficients.  For the first set, a 240-sample-long
-   standard symmetric Hanning window is applied to samples 0 through 239
-   of the input data.  The first window, lpc_winTbl, is defined as
-
-      lpc_winTbl[i]= 0.5 * (1.0 - cos((2*PI*(i+1))/(BLOCKL+1)));
-               i=0,...,119
-      lpc_winTbl[i] = winTbl[BLOCKL - i - 1]; i=120,...,239
-
-   The windowed speech speech_hp_win1 is then obtained by multiplying
-   the first 240 samples of the input speech buffer with the window
-   coefficients:
-
-      speech_hp_win1[i] = speech_hp[i] * lpc_winTbl[i];
-               i=0,...,BLOCKL-1
-
-   From these 240 windowed speech samples, 11 (LPC_FILTERORDER + 1)
-   autocorrelation coefficients, acf1, are calculated:
-
-      acf1[lag] += speech_hp_win1[n] * speech_hp_win1[n + lag];
-               lag=0,...,LPC_FILTERORDER; n=0,...,BLOCKL-lag-1
-
-   In order to make the analysis more robust against numerical precision
-   problems, a spectral smoothing procedure is applied by windowing the
-   autocorrelation coefficients before the LPC coefficients are
-   computed.  Also, a white noise floor is added to the autocorrelation
-   function by multiplying coefficient zero by 1.0001 (40dB below the
-   energy of the windowed speech signal).  These two steps are
-   implemented by multiplying the autocorrelation coefficients with the
-   following window:
-
-      lpc_lagwinTbl[0] = 1.0001;
-      lpc_lagwinTbl[i] = exp(-0.5 * ((2 * PI * 60.0 * i) /FS)^2);
-               i=1,...,LPC_FILTERORDER
-               where FS=8000 is the sampling frequency
-
-   Then, the windowed acf function acf1_win is obtained by
-
-      acf1_win[i] = acf1[i] * lpc_lagwinTbl[i];
-               i=0,...,LPC_FILTERORDER
-
-   The second set of autocorrelation coefficients, acf2_win, are
-   obtained in a similar manner.  The window, lpc_asymwinTbl, is applied
-   to samples 60 through 299, i.e., the entire current block.  The
-
-
-
-Andersen, et al.              Experimental                     [Page 10]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   window consists of two segments, the first (samples 0 to 219) being
-   half a Hanning window with length 440 and the second a quarter of a
-   cycle of a cosine wave.  By using this asymmetric window, an LPC
-   analysis centered in the fifth sub-block is obtained without the need
-   for any look-ahead, which would add delay.  The asymmetric window is
-   defined as
-
-      lpc_asymwinTbl[i] = (sin(PI * (i + 1) / 441))^2; i=0,...,219
-
-      lpc_asymwinTbl[i] = cos((i - 220) * PI / 40); i=220,...,239
-
-   and the windowed speech is computed by
-
-      speech_hp_win2[i] = speech_hp[i + LPC_LOOKBACK] *
-               lpc_asymwinTbl[i];  i=0,....BLOCKL-1
-
-   The windowed autocorrelation coefficients are then obtained in
-   exactly the same way as for the first analysis instance.
-
-   The generation of the windows lpc_winTbl, lpc_asymwinTbl, and
-   lpc_lagwinTbl are typically done in advance, and the arrays are
-   stored in ROM rather than repeating the calculation for every block.
-
-3.2.2.  Computation of LPC Coefficients
-
-   From the 2 x 11 smoothed autocorrelation coefficients, acf1_win and
-   acf2_win, the 2 x 11 LPC coefficients, lp1 and lp2, are calculated
-   in the same way for both analysis locations by using the well known
-   Levinson-Durbin recursion.  The first LPC coefficient is always 1.0,
-   resulting in ten unique coefficients.
-
-   After determining the LPC coefficients, a bandwidth expansion
-   procedure is applied to smooth the spectral peaks in the
-   short-term spectrum.  The bandwidth addition is obtained by the
-   following modification of the LPC coefficients:
-
-      lp1_bw[i] = lp1[i] * chirp^i; i=0,...,LPC_FILTERORDER
-      lp2_bw[i] = lp2[i] * chirp^i; i=0,...,LPC_FILTERORDER
-
-   where "chirp" is a real number between 0 and 1.  It is RECOMMENDED to
-   use a value of 0.9.
-
-3.2.3.  Computation of LSF Coefficients from LPC Coefficients
-
-   Thus far, two sets of LPC coefficients that represent the short-term
-   spectral characteristics of the speech signal for two different time
-   locations within the current block have been determined.  These
-   coefficients SHOULD be quantized and interpolated.  Before this is
-
-
-
-Andersen, et al.              Experimental                     [Page 11]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   done, it is advantageous to convert the LPC parameters into another
-   type of representation called Line Spectral Frequencies (LSF).  The
-   LSF parameters are used because they are better suited for
-   quantization and interpolation than the regular LPC coefficients.
-   Many computationally efficient methods for calculating the LSFs from
-   the LPC coefficients have been proposed in the literature.  The
-   detailed implementation of one applicable method can be found in
-   Appendix A.26.  The two arrays of LSF coefficients obtained, lsf1 and
-   lsf2, are of dimension 10 (LPC_FILTERORDER).
-
-3.2.4.  Quantization of LSF Coefficients
-
-   Because the LPC filters defined by the two sets of LSFs are also
-   needed in the decoder, the LSF parameters need to be quantized and
-   transmitted as side information.  The total number of bits required
-   to represent the quantization of the two LSF representations for one
-   block of speech is 40, with 20 bits used for each of lsf1 and lsf2.
-
-   For computational and storage reasons, the LSF vectors are quantized
-   using three-split vector quantization (VQ).  That is, the LSF vectors
-   are split into three sub-vectors that are each quantized with a
-   regular VQ.  The quantized versions of lsf1 and lsf2, qlsf1 and
-   qlsf2, are obtained by using the same memoryless split VQ.  The
-   length of each of these two LSF vectors is 10, and they are split
-   into three sub-vectors containing 3, 3, and 4 values, respectively.
-
-   For each of the sub-vectors, a separate codebook of quantized values
-   has been designed with a standard VQ training method for a large
-   database containing speech from a large number of speakers recorded
-   under various conditions.  The size of each of the three codebooks
-   associated with the split definitions above is
-
-      int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
-
-   The actual values of the vector quantization codebook that must be
-   used can be found in the reference code of Appendix A.  Both sets of
-   LSF coefficients, lsf1 and lsf2, are quantized with a standard
-   memoryless split vector quantization (VQ) structure using the squared
-   error criterion in the LSF domain.  The split VQ quantization
-   consists of the following steps:
-
-   1) Quantize the first three LSF coefficients (1 - 3) with a VQ
-      codebook of size 64.
-   2) Quantize the next three LSF coefficients 4 - 6 with VQ a codebook
-      of size 128.
-   3) Quantize the last four LSF coefficients (7 - 10) with a VQ
-      codebook of size 128.
-
-
-
-
-Andersen, et al.              Experimental                     [Page 12]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   This procedure, repeated for lsf1 and lsf2, gives six quantization
-   indices and the quantized sets of LSF coefficients qlsf1 and qlsf2.
-   Each set of three indices is encoded with 6 + 7 + 7 = 20 bits.  The
-   total number of bits used for LSF quantization in a block is thus 40
-   bits.
-
-3.2.5.  Stability Check of LSF Coefficients
-
-   The LSF representation of the LPC filter has the convenient property
-   that the coefficients are ordered by increasing value, i.e., lsf(n-1)
-   < lsf(n), 0 < n < 10, if the corresponding synthesis filter is
-   stable.  As we are employing a split VQ scheme, it is possible that
-   at the split boundaries the LSF coefficients are not ordered
-   correctly and hence that the corresponding LP filter is unstable.  To
-   ensure that the filter used is stable, a stability check is performed
-   for the quantized LSF vectors.  If it turns out that the coefficients
-   are not ordered appropriately (with a safety margin of 50 Hz to
-   ensure that formant peaks are not too narrow), they will be moved
-   apart.  The detailed method for this can be found in Appendix A.40.
-   The same procedure is performed in the decoder.  This ensures that
-   exactly the same LSF representations are used in both encoder and
-   decoder.
-
-3.2.6.  Interpolation of LSF Coefficients
-
-   From the two sets of LSF coefficients that are computed for each
-   block of speech, different LSFs are obtained for each sub-block by
-   means of interpolation.  This procedure is performed for the original
-   LSFs (lsf1 and lsf2), as well as the quantized versions qlsf1 and
-   qlsf2, as both versions are used in the encoder.  Here follows a
-   brief summary of the interpolation scheme; the details are found in
-   the c-code of Appendix A.  In the first sub-block, the average of the
-   second LSF vector from the previous block and the first LSF vector in
-   the current block is used.  For sub-blocks two through five, the LSFs
-   used are obtained by linear interpolation from lsf1 (and qlsf1) to
-   lsf2 (and qlsf2), with lsf1 used in sub-block two and lsf2 in sub-
-   block five.  In the last sub-block, lsf2 is used.  For the very first
-   block it is assumed that the last LSF vector of the previous block is
-   equal to a predefined vector, lsfmeanTbl, obtained by calculating the
-   mean LSF vector of the LSF design database.
-
-   lsfmeanTbl[LPC_FILTERORDER] = {0.281738, 0.445801, 0.663330,
-                  0.962524, 1.251831, 1.533081, 1.850586, 2.137817,
-                  2.481445, 2.777344}
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 13]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   The interpolation method is standard linear interpolation in the LSF
-   domain.  The interpolated LSF values are converted to LPC
-   coefficients for each sub-block.  The unquantized and quantized LPC
-   coefficients form two sets of filters respectively.  The unquantized
-   analysis filter for sub-block k is defined as follows
-
-                ___
-                \
-      Ak(z)= 1 + > ak(i)*z^(-i)
-                /__
-             i=1...LPC_FILTERORDER
-
-   The quantized analysis filter for sub-block k is defined as follows
-                 ___
-                 \
-      A~k(z)= 1 + > a~k(i)*z^(-i)
-                 /__
-             i=1...LPC_FILTERORDER
-
-   A reference implementation of the lsf encoding is given in Appendix
-   A.38.  A reference implementation of the corresponding decoding can
-   be found in Appendix A.36.
-
-3.2.7.  LPC Analysis and Quantization for 20 ms Frames
-
-   As previously stated, the codec only calculates one set of LPC
-   parameters for the 20 ms frame size as opposed to two sets for 30 ms
-   frames.  A single set of autocorrelation coefficients is calculated
-   on the LPC_LOOKBACK + BLOCKL = 80 + 160 = 240 samples.  These samples
-   are windowed with the asymmetric window lpc_asymwinTbl, centered over
-   the third sub-frame, to form speech_hp_win.  Autocorrelation
-   coefficients, acf, are calculated on the 240 samples in speech_hp_win
-   and then windowed exactly as in section 3.2.1 (resulting in
-   acf_win).
-
-   This single set of windowed autocorrelation coefficients is used to
-   calculate LPC coefficients, LSF coefficients, and quantized LSF
-   coefficients in exactly the same manner as in sections 3.2.3 through
-   3.2.4.  As for the 30 ms frame size, the ten LSF coefficients are
-   divided into three sub-vectors of size 3, 3, and 4 and quantized by
-   using the same scheme and codebook as in section 3.2.4 to finally get
-   3 quantization indices.  The quantized LSF coefficients are
-   stabilized with the algorithm described in section 3.2.5.
-
-   From the set of LSF coefficients computed for this block and those
-   from the previous block, different LSFs are obtained for each sub-
-   block by means of interpolation.  The interpolation is done linearly
-   in the LSF domain over the four sub-blocks, so that the n-th sub-
-
-
-
-Andersen, et al.              Experimental                     [Page 14]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   frame uses the weight (4-n)/4 for the LSF from old frame and the
-   weight n/4 of the LSF from the current frame.  For the very first
-   block the mean LSF, lsfmeanTbl, is used as the LSF from the previous
-   block.  Similarly as seen in section 3.2.6, both unquantized, A(z),
-   and quantized, A~(z), analysis filters are calculated for each of the
-   four sub-blocks.
-
-3.3.  Calculation of the Residual
-
-   The block of speech samples is filtered by the quantized and
-   interpolated LPC analysis filters to yield the residual signal.  In
-   particular, the corresponding LPC analysis filter for each 40 sample
-   sub-block is used to filter the speech samples for the same sub-
-   block.  The filter memory at the end of each sub-block is carried
-   over to the LPC filter of the next sub-block.  The signal at the
-   output of each LP analysis filter constitutes the residual signal for
-   the corresponding sub-block.
-
-   A reference implementation of the LPC analysis filters is given in
-   Appendix A.10.
-
-3.4.  Perceptual Weighting Filter
-
-   In principle any good design of a perceptual weighting filter can be
-   applied in the encoder without compromising this codec definition.
-   However, it is RECOMMENDED to use the perceptual weighting filter Wk
-   for sub-block k specified below:
-
-      Wk(z)=1/Ak(z/LPC_CHIRP_WEIGHTDENUM), where
-                               LPC_CHIRP_WEIGHTDENUM = 0.4222
-
-   This is a simple design with low complexity that is applied in the
-   LPC residual domain.  Here Ak(z) is the filter obtained for sub-block
-   k from unquantized but interpolated LSF coefficients.
-
-3.5.  Start State Encoder
-
-   The start state is quantized by using a common 6-bit scalar quantizer
-   for the block and a 3-bit scalar quantizer operating on scaled
-   samples in the weighted speech domain.  In the following we describe
-   the state encoding in greater detail.
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 15]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-3.5.1.  Start State Estimation
-
-   The two sub-blocks containing the start state are determined by
-   finding the two consecutive sub-blocks in the block having the
-   highest power.  Advantageously, down-weighting is used in the
-   beginning and end of the sub-frames, i.e., the following measure is
-   computed (NSUB=4/6 for 20/30 ms frame size):
-
-      nsub=1,...,NSUB-1
-      ssqn[nsub] = 0.0;
-      for (i=(nsub-1)*SUBL; i<(nsub-1)*SUBL+5; i++)
-               ssqn[nsub] += sampEn_win[i-(nsub-1)*SUBL]*
-                                 residual[i]*residual[i];
-      for (i=(nsub-1)*SUBL+5; i<(nsub+1)*SUBL-5; i++)
-               ssqn[nsub] += residual[i]*residual[i];
-      for (i=(nsub+1)*SUBL-5; i<(nsub+1)*SUBL; i++)
-               ssqn[nsub] += sampEn_win[(nsub+1)*SUBL-i-1]*
-                                 residual[i]*residual[i];
-
-   where sampEn_win[5]={1/6, 2/6, 3/6, 4/6, 5/6}; MAY be used.  The
-   sub-frame number corresponding to the maximum value of
-   ssqEn_win[nsub-1]*ssqn[nsub] is selected as the start state
-   indicator.  A weighting of ssqEn_win[]={0.8,0.9,1.0,0.9,0.8} for 30
-   ms frames and ssqEn_win[]={0.9,1.0,0.9} for 20 ms frames; MAY
-   advantageously be used to bias the start state towards the middle of
-   the frame.
-
-   For 20 ms frames there are three possible positions for the two-sub-
-   block length maximum power segment; the start state position is
-   encoded with 2 bits.  The start state position, start, MUST be
-   encoded as
-
-      start=1: start state in sub-frame 0 and 1
-      start=2: start state in sub-frame 1 and 2
-      start=3: start state in sub-frame 2 and 3
-
-   For 30 ms frames there are five possible positions of the two-sub-
-   block length maximum power segment, the start state position is
-   encoded with 3 bits.  The start state position, start, MUST be
-   encoded as
-
-      start=1: start state in sub-frame 0 and 1
-      start=2: start state in sub-frame 1 and 2
-      start=3: start state in sub-frame 2 and 3
-      start=4: start state in sub-frame 3 and 4
-      start=5: start state in sub-frame 4 and 5
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 16]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   Hence, in both cases, index 0 is not used.  In order to shorten the
-   start state for bit rate efficiency, the start state is brought down
-   to STATE_SHORT_LEN=57 samples for 20 ms frames and STATE_SHORT_LEN=58
-   samples for 30 ms frames.  The power of the first 23/22 and last
-   23/22 samples of the two sub-frame blocks identified above is
-   computed as the sum of the squared signal sample values, and the
-   23/22-sample segment with the lowest power is excluded from the start
-   state.  One bit is transmitted to indicate which of the two possible
-   57/58 sample segments is used.  The start state position within the
-   two sub-frames determined above, state_first, MUST be encoded as
-
-      state_first=1: start state is first STATE_SHORT_LEN samples
-      state_first=0: start state is last STATE_SHORT_LEN samples
-
-3.5.2.  All-Pass Filtering and Scale Quantization
-
-   The block of residual samples in the start state is first filtered by
-   an all-pass filter with the quantized LPC coefficients as denominator
-   and reversed quantized LPC coefficients as numerator.  The purpose of
-   this phase-dispersion filter is to get a more even distribution of
-   the sample values in the residual signal.  The filtering is performed
-   by circular convolution, where the initial filter memory is set to
-   zero.
-
-      res(0..(STATE_SHORT_LEN-1))   = uncoded start state residual
-      res((STATE_SHORT_LEN)..(2*STATE_SHORT_LEN-1)) = 0
-
-      Pk(z) = A~rk(z)/A~k(z), where
-                                   ___
-                                   \
-      A~rk(z)= z^(-LPC_FILTERORDER)+>a~k(i+1)*z^(i-(LPC_FILTERORDER-1))
-                                   /__
-                               i=0...(LPC_FILTERORDER-1)
-
-      and A~k(z) is taken from the block where the start state begins
-
-      res -> Pk(z) -> filtered
-
-      ccres(k) = filtered(k) + filtered(k+STATE_SHORT_LEN),
-                                        k=0..(STATE_SHORT_LEN-1)
-
-   The all-pass filtered block is searched for its largest magnitude
-   sample.  The 10-logarithm of this magnitude is quantized with a 6-bit
-   quantizer, state_frgqTbl, by finding the nearest representation.
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 17]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   This results in an index, idxForMax, corresponding to a quantized
-   value, qmax.  The all-pass filtered residual samples in the block are
-   then multiplied with a scaling factor scal=4.5/(10^qmax) to yield
-   normalized samples.
-
-   state_frgqTbl[64] = {1.000085, 1.071695, 1.140395, 1.206868,
-                  1.277188, 1.351503, 1.429380, 1.500727, 1.569049,
-                  1.639599, 1.707071, 1.781531, 1.840799, 1.901550,
-                  1.956695, 2.006750, 2.055474, 2.102787, 2.142819,
-                  2.183592, 2.217962, 2.257177, 2.295739, 2.332967,
-                  2.369248, 2.402792, 2.435080, 2.468598, 2.503394,
-                  2.539284, 2.572944, 2.605036, 2.636331, 2.668939,
-                  2.698780, 2.729101, 2.759786, 2.789834, 2.818679,
-                  2.848074, 2.877470, 2.906899, 2.936655, 2.967804,
-                  3.000115, 3.033367, 3.066355, 3.104231, 3.141499,
-                  3.183012, 3.222952, 3.265433, 3.308441, 3.350823,
-                  3.395275, 3.442793, 3.490801, 3.542514, 3.604064,
-                  3.666050, 3.740994, 3.830749, 3.938770, 4.101764}
-
-3.5.3.  Scalar Quantization
-
-   The normalized samples are quantized in the perceptually weighted
-   speech domain by a sample-by-sample scalar DPCM quantization as
-   depicted in Figure 3.3.  Each sample in the block is filtered by a
-   weighting filter Wk(z), specified in section 3.4, to form a weighted
-   speech sample x[n].  The target sample d[n] is formed by subtracting
-   a predicted sample y[n], where the prediction filter is given by
-
-           Pk(z) = 1 - 1 / Wk(z).
-
-               +-------+  x[n] +    d[n] +-----------+ u[n]
-   residual -->| Wk(z) |-------->(+)---->| Quantizer |------> quantized
-               +-------+       - /|\     +-----------+    |   residual
-                                  |                      \|/
-                             y[n] +--------------------->(+)
-                                  |                       |
-                                  |        +------+       |
-                                  +--------| Pk(z)|<------+
-                                           +------+
-
-   Figure 3.3.  Quantization of start state samples by DPCM in weighted
-   speech domain.
-
-   The coded state sample u[n] is obtained by quantizing d[n] with a 3-
-   bit quantizer with quantization table state_sq3Tbl.
-
-   state_sq3Tbl[8] = {-3.719849, -2.177490, -1.130005, -0.309692,
-                  0.444214, 1.329712, 2.436279, 3.983887}
-
-
-
-Andersen, et al.              Experimental                     [Page 18]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   The quantized samples are transformed back to the residual domain by
-   1) scaling with 1/scal; 2) time-reversing the scaled samples; 3)
-   filtering the time-reversed samples by the same all-pass filter, as
-   in section 3.5.2, by using circular convolution; and 4) time-
-   reversing the filtered samples.  (More detail is in section 4.2.)
-
-   A reference implementation of the start-state encoding can be found
-   in Appendix A.46.
-
-3.6.  Encoding the Remaining Samples
-
-   A dynamic codebook is used to encode 1) the 23/22 remaining samples
-   in the two sub-blocks containing the start state; 2) the sub-blocks
-   after the start state in time; and 3) the sub-blocks before the start
-   state in time.  Thus, the encoding target can be either the 23/22
-   samples remaining of the 2 sub-blocks containing the start state, or
-   a 40-sample sub-block.  This target can consist of samples that are
-   indexed forward in time or backward in time, depending on the
-   location of the start state.  The length of the target is denoted by
-   lTarget.
-
-   The coding is based on an adaptive codebook that is built from a
-   codebook memory that contains decoded LPC excitation samples from the
-   already encoded part of the block.  These samples are indexed in the
-   same time direction as is the target vector and end at the sample
-   instant prior to the first sample instant represented in the target
-   vector.  The codebook memory has length lMem, which is equal to
-   CB_MEML=147 for the two/four 40-sample sub-blocks and 85 for the
-   23/22-sample sub-block.
-
-   The following figure shows an overview of the encoding procedure.
-
-         +------------+    +---------------+    +-------------+
-      -> | 1. Decode  | -> | 2. Mem setup  | -> | 3. Perc. W. | ->
-         +------------+    +---------------+    +-------------+
-
-         +------------+    +-----------------+
-      -> | 4. Search  | -> | 5. Upd. Target  | ------------------>
-       | +------------+    +------------------ |
-       ----<-------------<-----------<----------
-                     stage=0..2
-
-         +----------------+
-      -> | 6. Recalc G[0] | ---------------> gains and CB indices
-         +----------------+
-
-   Figure 3.4.  Flow chart of the codebook search in the iLBC encoder.
-
-
-
-
-Andersen, et al.              Experimental                     [Page 19]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   1. Decode the part of the residual that has been encoded so far,
-      using the codebook without perceptual weighting.
-
-   2. Set up the memory by taking data from the decoded residual.  This
-      memory is used to construct codebooks.  For blocks preceding the
-      start state, both the decoded residual and the target are time
-      reversed (section 3.6.1).
-   3. Filter the memory + target with the perceptual weighting filter
-      (section 3.6.2).
-
-   4. Search for the best match between the target and the codebook
-      vector.  Compute the optimal gain for this match and quantize that
-      gain (section 3.6.4).
-
-   5. Update the perceptually weighted target by subtracting the
-      contribution from the selected codebook vector from the
-      perceptually weighted memory (quantized gain times selected
-      vector).  Repeat 4 and 5 for the two additional stages.
-
-   6. Calculate the energy loss due to encoding of the residual.  If
-      needed, compensate for this loss by an upscaling and
-      requantization of the gain for the first stage (section 3.7).
-
-   The following sections provide an in-depth description of the
-   different blocks of Figure 3.4.
-
-3.6.1.  Codebook Memory
-
-   The codebook memory is based on the already encoded sub-blocks, so
-   the available data for encoding increases for each new sub-block that
-   has been encoded.  Until enough sub-blocks have been encoded to fill
-   the codebook memory with data, it is padded with zeros.  The
-   following figure shows an example of the order in which the sub-
-   blocks are encoded for the 30 ms frame size if the start state is
-   located in the last 58 samples of sub-block 2 and 3.
-
-   +-----------------------------------------------------+
-   |  5     | 1  |///|////////|    2   |    3   |    4   |
-   +-----------------------------------------------------+
-
-   Figure 3.5.  The order from 1 to 5 in which the sub-blocks are
-   encoded.  The slashed area is the start state.
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 20]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   The first target sub-block to be encoded is number 1, and the
-   corresponding codebook memory is shown in the following figure.  As
-   the target vector comes before the start state in time, the codebook
-   memory and target vector are time reversed; thus, after the block has
-   been time reversed the search algorithm can be reused.  As only the
-   start state has been encoded so far, the last samples of the codebook
-   memory are padded with zeros.
-
-   +-------------------------
-   |zeros|\\\\\\\\|\\\\|  1 |
-   +-------------------------
-
-   Figure 3.6.  The codebook memory, length lMem=85 samples, and the
-   target vector 1, length 22 samples.
-
-   The next step is to encode sub-block 2 by using the memory that now
-   has increased since sub-block 1 has been encoded.  The following
-   figure shows the codebook memory for encoding of sub-block 2.
-
-   +-----------------------------------
-   | zeros | 1  |///|////////|    2   |
-   +-----------------------------------
-
-   Figure 3.7.  The codebook memory, length lMem=147 samples, and the
-   target vector 2, length 40 samples.
-
-   The next step is to encode sub-block 3 by using the memory which has
-   been increased yet again since sub-blocks 1 and 2 have been encoded,
-   but the sub-block still has to be padded with a few zeros.  The
-   following figure shows the codebook memory for encoding of sub-block
-   3.
-
-   +------------------------------------------
-   |zeros| 1  |///|////////|    2   |   3    |
-   +------------------------------------------
-
-   Figure 3.8.  The codebook memory, length lMem=147 samples, and the
-   target vector 3, length 40 samples.
-
-   The next step is to encode sub-block 4 by using the memory which now
-   has increased yet again since sub-blocks 1, 2, and 3 have been
-   encoded.  This time, the memory does not have to be padded with
-   zeros.  The following figure shows the codebook memory for encoding
-   of sub-block 4.
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 21]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   +------------------------------------------
-   |1|///|////////|    2   |   3    |   4    |
-   +------------------------------------------
-
-   Figure 3.9.  The codebook memory, length lMem=147 samples, and the
-   target vector 4, length 40 samples.
-
-   The final target sub-block to be encoded is number 5, and the
-   following figure shows the corresponding codebook memory.  As the
-   target vector comes before the start state in time, the codebook
-   memory and target vector are time reversed.
-
-   +-------------------------------------------
-   |  3  |   2    |\\\\\\\\|\\\\|  1 |   5    |
-   +-------------------------------------------
-
-   Figure 3.10.  The codebook memory, length lMem=147 samples, and the
-   target vector 5, length 40 samples.
-
-   For the case of 20 ms frames, the encoding procedure looks almost
-   exactly the same.  The only difference is that the size of the start
-   state is 57 samples and that there are only three sub-blocks to be
-   encoded.  The encoding order is the same as above, starting with the
-   23-sample target and then encoding the two remaining 40-sample sub-
-   blocks, first going forward in time and then going backward in time
-   relative to the start state.
-
-3.6.2.  Perceptual Weighting of Codebook Memory and Target
-
-   To provide a perceptual weighting of the coding error, a
-   concatenation of the codebook memory and the target to be coded is
-   all-pole filtered with the perceptual weighting filter specified in
-   section 3.4.  The filter state of the weighting filter is set to
-   zero.
-
-      in(0..(lMem-1))            = unweighted codebook memory
-      in(lMem..(lMem+lTarget-1)) = unweighted target signal
-
-
-      in -> Wk(z) -> filtered,
-          where Wk(z) is taken from the sub-block of the target
-
-      weighted codebook memory = filtered(0..(lMem-1))
-      weighted target signal = filtered(lMem..(lMem+lTarget-1))
-
-   The codebook search is done with the weighted codebook memory and the
-   weighted target, whereas the decoding and the codebook memory update
-   uses the unweighted codebook memory.
-
-
-
-Andersen, et al.              Experimental                     [Page 22]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-3.6.3.  Codebook Creation
-
-   The codebook for the search is created from the perceptually weighted
-   codebook memory.  It consists of two sections, where the first is
-   referred to as the base codebook and the second as the expanded
-   codebook, as it is created by linear combinations of the first.  Each
-   of these two sections also has a subsection referred to as the
-   augmented codebook.  The augmented codebook is only created and used
-   for the coding of the 40-sample sub-blocks and not for the 23/22-
-   sample sub-block case.  The codebook size used for the different
-   sub-blocks and different stages are summarized in the table below.
-
-                              Stage
-                        1               2 & 3
-           --------------------------------------------
-                22     128  (64+0)*2     128 (64+0)*2
-   Sub-    1:st 40     256  (108+20)*2   128 (44+20)*2
-   Blocks  2:nd 40     256  (108+20)*2   256 (108+20)*2
-           3:rd 40     256  (108+20)*2   256 (108+20)*2
-           4:th 40     256  (108+20)*2   256 (108+20)*2
-
-   Table 3.1.  Codebook sizes for the 30 ms mode.
-
-   Table 3.1 shows the codebook size for the different sub-blocks and
-   stages for 30 ms frames.  Inside the parentheses it shows how the
-   number of codebook vectors is distributed, within the two sections,
-   between the base/expanded codebook and the augmented base/expanded
-   codebook.  It should be interpreted in the following way:
-   (base/expanded cb + augmented base/expanded cb).  The total number of
-   codebook vectors for a specific sub-block and stage is given by the
-   following formula:
-
-   Tot. cb vectors = base cb + aug. base cb + exp. cb + aug. exp. cb
-
-   The corresponding values to Figure 3.1 for 20 ms frames are only
-   slightly modified.  The short sub-block is 23 instead of 22 samples,
-   and the 3:rd and 4:th sub-frame are not present.
-
-3.6.3.1.  Creation of a Base Codebook
-
-   The base codebook is given by the perceptually weighted codebook
-   memory that is mentioned in section 3.5.3.  The different codebook
-   vectors are given by sliding a window of length 23/22 or 40, given by
-   variable lTarget, over the lMem-long perceptually weighted codebook
-   memory.  The indices are ordered so that the codebook vector
-   containing sample (lMem-lTarget-n) to (lMem-n-1) of the codebook
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 23]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   memory vector has index n, where n=0..lMem-lTarget.  Thus the total
-   number of base codebook vectors is lMem-lTarget+1, and the indices
-   are ordered from sample delay lTarget (23/22 or 40) to lMem+1 (86 or
-   148).
-
-3.6.3.2.  Codebook Expansion
-
-   The base codebook is expanded by a factor of 2, creating an
-   additional section in the codebook.  This new section is obtained by
-   filtering the base codebook, base_cb, with a FIR filter with filter
-   length CB_FILTERLEN=8.  The construction of the expanded codebook
-   compensates for the delay of four samples introduced by the FIR
-   filter.
-
-   cbfiltersTbl[CB_FILTERLEN]={-0.033691, 0.083740, -0.144043,
-                  0.713379, 0.806152, -0.184326,
-                  0.108887, -0.034180};
-
-                   ___
-                   \
-      exp_cb(k)=  + > cbfiltersTbl(i)*x(k-i+4)
-                   /__
-             i=0...(LPC_FILTERORDER-1)
-
-      where x(j) = base_cb(j) for j=0..lMem-1 and 0 otherwise
-
-   The individual codebook vectors of the new filtered codebook, exp_cb,
-   and their indices are obtained in the same fashion as described above
-   for the base codebook.
-
-3.6.3.3.  Codebook Augmentation
-
-   For cases where encoding entire sub-blocks, i.e., cbveclen=40, the
-   base and expanded codebooks are augmented to increase codebook
-   richness.  The codebooks are augmented by vectors produced by
-   interpolation of segments.  The base and expanded codebook,
-   constructed above, consists of vectors corresponding to sample delays
-   in the range from cbveclen to lMem.  The codebook augmentation
-   attempts to augment these codebooks with vectors corresponding to
-   sample delays from 20 to 39.  However, not all of these samples are
-   present in the base codebook and expanded codebook, respectively.
-   Therefore, the augmentation vectors are constructed as linear
-   combinations between samples corresponding to sample delays in the
-   range 20 to 39.  The general idea of this procedure is presented in
-   the following figures and text.  The procedure is performed for both
-   the base codebook and the expanded codebook.
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 24]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       - - ------------------------|
-    codebook memory                |
-       - - ------------------------|
-                  |-5-|---15---|-5-|
-                  pi  pp       po
-
-                      |        |                       Codebook vector
-                      |---15---|-5-|-----20-----|   <- corresponding to
-                          i     ii      iii            sample delay 20
-
-   Figure 3.11.  Generation of the first augmented codebook.
-
-   Figure 3.11 shows the codebook memory with pointers pi, pp, and po,
-   where pi points to sample 25, pp to sample 20, and po to sample 5.
-   Below the codebook memory, the augmented codebook vector
-   corresponding to sample delay 20 is drawn.  Segment i consists of
-   fifteen samples from pointer pp and forward in time.  Segment ii
-   consists of five interpolated samples from pi and forward and from po
-   and forward.  The samples are linearly interpolated with weights
-   [0.0, 0.2, 0.4, 0.6, 0.8] for pi and weights [1.0, 0.8, 0.6, 0.4,
-   0.2] for po.  Segment iii consists of twenty samples from pp and
-   forward.  The augmented codebook vector corresponding to sample delay
-   21 is produced by moving pointers pp and pi one sample backward in
-   time.  This gives us the following figure.
-
-       - - ------------------------|
-    codebook memory                |
-       - - ------------------------|
-                  |-5-|---16---|-5-|
-                  pi  pp       po
-
-                      |        |                       Codebook vector
-                      |---16---|-5-|-----19-----|   <- corresponding to
-                          i     ii      iii            sample delay 21
-
-   Figure 3.12.  Generation of the second augmented codebook.
-
-   Figure 3.12 shows the codebook memory with pointers pi, pp and po
-   where pi points to sample 26, pp to sample 21, and po to sample 5.
-   Below the codebook memory, the augmented codebook vector
-   corresponding to sample delay 21 is drawn.  Segment i now consists of
-   sixteen samples from pp and forward.  Segment ii consists of five
-   interpolated samples from pi and forward and from po and forward, and
-   the interpolation weights are the same throughout the procedure.
-   Segment iii consists of nineteen samples from pp and forward.  The
-   same procedure of moving the two pointers is continued until the last
-   augmented vector corresponding to sample delay 39 has been created.
-   This gives a total of twenty new codebook vectors to each of the two
-
-
-
-Andersen, et al.              Experimental                     [Page 25]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   sections.  Thus the total number of codebook vectors for each of the
-   two sections, when including the augmented codebook, becomes lMem-
-   SUBL+1+SUBL/2.  This is provided that augmentation is evoked, i.e.,
-   that lTarget=SUBL.
-
-3.6.4.  Codebook Search
-
-   The codebook search uses the codebooks described in the sections
-   above to find the best match of the perceptually weighted target, see
-   section 3.6.2.  The search method is a multi-stage gain-shape
-   matching performed as follows.  At each stage the best shape vector
-   is identified, then the gain is calculated and quantized, and finally
-   the target is updated in preparation for the next codebook search
-   stage.  The number of stages is CB_NSTAGES=3.
-
-   If the target is the 23/22-sample vector the codebooks are indexed so
-   that the base codebook is followed by the expanded codebook.  If the
-   target is 40 samples the order is as follows: base codebook,
-   augmented base codebook, expanded codebook, and augmented expanded
-   codebook.  The size of each codebook section and its corresponding
-   augmented section is given by Table 3.1 in section 3.6.3.
-
-   For example, when the second 40-sample sub-block is coded, indices 0
-   - 107 correspond to the base codebook, 108 - 127 correspond to the
-   augmented base codebook, 128 - 235 correspond to the expanded
-   codebook, and indices 236 - 255 correspond to the augmented expanded
-   codebook.  The indices are divided in the same fashion for all stages
-   in the example.  Only in the case of coding the first 40-sample sub-
-   block is there a difference between stages (see Table 3.1).
-
-3.6.4.1.  Codebook Search at Each Stage
-
-   The codebooks are searched to find the best match to the target at
-   each stage.  When the best match is found, the target is updated and
-   the next-stage search is started.  The three chosen codebook vectors
-   and their corresponding gains constitute the encoded sub-block.  The
-   best match is decided by the following three criteria:
-
-   1. Compute the measure
-
-      (target*cbvec)^2 / ||cbvec||^2
-
-   for all codebook vectors, cbvec, and choose the codebook vector
-   maximizing the measure.  The expression (target*cbvec) is the dot
-   product between the target vector to be coded and the codebook vector
-   for which we compute the measure.  The norm, ||x||, is defined as the
-   square root of (x*x).
-
-
-
-
-Andersen, et al.              Experimental                     [Page 26]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   2. The absolute value of the gain, corresponding to the chosen
-      codebook vector, cbvec, must be smaller than a fixed limit,
-      CB_MAXGAIN=1.3:
-
-            |gain| < CB_MAXGAIN
-
-      where the gain is computed in the following way:
-
-            gain = (target*cbvec) / ||cbvec||^2
-
-   3. For the first stage, the dot product of the chosen codebook vector
-      and target must be positive:
-
-      target*cbvec > 0
-
-   In practice the above criteria are used in a sequential search
-   through all codebook vectors.  The best match is found by registering
-   a new max measure and index whenever the previously registered max
-   measure is surpassed and all other criteria are fulfilled.  If none
-   of the codebook vectors fulfill (2) and (3), the first codebook
-   vector is selected.
-
-3.6.4.2.  Gain Quantization at Each Stage
-
-   The gain follows as a result of the computation
-
-      gain = (target*cbvec) / ||cbvec||^2
-
-   for the optimal codebook vector found by the procedure in section
-   3.6.4.1.
-
-   The three stages quantize the gain, using 5, 4, and 3 bits,
-   respectively.  In the first stage, the gain is limited to positive
-   values.  This gain is quantized by finding the nearest value in the
-   quantization table gain_sq5Tbl.
-
-   gain_sq5Tbl[32]={0.037476, 0.075012, 0.112488, 0.150024, 0.187500,
-                  0.224976, 0.262512, 0.299988, 0.337524, 0.375000,
-                  0.412476, 0.450012, 0.487488, 0.525024, 0.562500,
-                  0.599976, 0.637512, 0.674988, 0.712524, 0.750000,
-                  0.787476, 0.825012, 0.862488, 0.900024, 0.937500,
-                  0.974976, 1.012512, 1.049988, 1.087524, 1.125000,
-                  1.162476, 1.200012}
-
-   The gains of the subsequent two stages can be either positive or
-   negative.  The gains are quantized by using a quantization table
-   times a scale factor.  The second stage uses the table gain_sq4Tbl,
-   and the third stage uses gain_sq3Tbl.  The scale factor equates 0.1
-
-
-
-Andersen, et al.              Experimental                     [Page 27]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   or the absolute value of the quantized gain representation value
-   obtained in the previous stage, whichever is larger.  Again, the
-   resulting gain index is the index to the nearest value of the
-   quantization table times the scale factor.
-
-        gainQ = scaleFact * gain_sqXTbl[index]
-
-   gain_sq4Tbl[16]={-1.049988, -0.900024, -0.750000, -0.599976,
-                  -0.450012, -0.299988, -0.150024, 0.000000, 0.150024,
-                  0.299988, 0.450012, 0.599976, 0.750000, 0.900024,
-                  1.049988, 1.200012}
-
-   gain_sq3Tbl[8]={-1.000000, -0.659973, -0.330017,0.000000,
-                  0.250000, 0.500000, 0.750000, 1.00000}
-
-3.6.4.3.  Preparation of Target for Next Stage
-
-   Before performing the search for the next stage, the perceptually
-   weighted target vector is updated by subtracting from it the selected
-   codebook vector (from the perceptually weighted codebook) times the
-   corresponding quantized gain.
-
-      target[i] = target[i] - gainQ * selected_vec[i];
-
-   A reference implementation of the codebook encoding is found in
-   Appendix A.34.
-
-3.7.  Gain Correction Encoding
-
-   The start state is quantized in a relatively model independent manner
-   using 3 bits per sample.  In contrast, the remaining parts of the
-   block are encoded by using an adaptive codebook.  This codebook will
-   produce high matching accuracy whenever there is a high correlation
-   between the target and the best codebook vector.  For unvoiced speech
-   segments and background noises, this is not necessarily so, which,
-   due to the nature of the squared error criterion, results in a coded
-   signal with less power than the target signal.  As the coded start
-   state has good power matching to the target, the result is a power
-   fluctuation within the encoded frame.  Perceptually, the main problem
-   with this is that the time envelope of the signal energy becomes
-   unsteady.  To overcome this problem, the gains for the codebooks are
-   re-scaled after the codebook encoding by searching for a new gain
-   factor for the first stage codebook that provides better power
-   matching.
-
-   First, the energy for the target signal, tene, is computed along with
-   the energy for the coded signal, cene, given by the addition of the
-   three gain scaled codebook vectors.  Because the gains of the second
-
-
-
-Andersen, et al.              Experimental                     [Page 28]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   and third stage scale with the gain of the first stage, when the
-   first stage gain is changed from gain[0] to gain_sq5Tbl[i] the energy
-   of the coded signal changes from cene to
-
-      cene*(gain_sq5Tbl[i]*gain_sq5Tbl[i])/(gain[0]*gain[0])
-
-   where gain[0] is the gain for the first stage found in the original
-   codebook search.  A refined search is performed by testing the gain
-   indices i=0 to 31, and as long as the new codebook energy as given
-   above is less than tene, the gain index for stage 1 is increased.  A
-   restriction is applied so that the new gain value for stage 1 cannot
-   be more than two times higher than the original value found in the
-   codebook search.  Note that by using this method we do not change the
-   shape of the encoded vector, only the gain or amplitude.
-
-3.8.  Bitstream Definition
-
-   The total number of bits used to describe one frame of 20 ms speech
-   is 304, which fits in 38 bytes and results in a bit rate of 15.20
-   kbit/s.  For the case of a frame length of 30 ms speech, the total
-   number of bits used is 400, which fits in 50 bytes and results in a
-   bit rate of 13.33 kbit/s.  In the bitstream definition, the bits are
-   distributed into three classes according to their bit error or loss
-   sensitivity.  The most sensitive bits (class 1) are placed first in
-   the bitstream for each frame.  The less sensitive bits (class 2) are
-   placed after the class 1 bits.  The least sensitive bits (class 3)
-   are placed at the end of the bitstream for each frame.
-
-   In the 20/30 ms frame length cases for each class, the following hold
-   true: The class 1 bits occupy a total of 6/8 bytes (48/64 bits), the
-   class 2 bits occupy 8/12 bytes (64/96 bits), and the class 3 bits
-   occupy 24/30 bytes (191/239 bits).  This distribution of the bits
-   enables the use of uneven level protection (ULP) as is exploited in
-   the payload format definition for iLBC [1].  The detailed bit
-   allocation is shown in the table below.  When a quantization index is
-   distributed between more classes, the more significant bits belong to
-   the lowest class.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 29]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   Bitstream structure:
-
-   ------------------------------------------------------------------+
-   Parameter                         |       Bits Class <1,2,3>      |
-                                     |  20 ms frame  |  30 ms frame  |
-   ----------------------------------+---------------+---------------+
-                            Split 1  |   6 <6,0,0>   |   6 <6,0,0>   |
-                   LSF 1    Split 2  |   7 <7,0,0>   |   7 <7,0,0>   |
-   LSF                      Split 3  |   7 <7,0,0>   |   7 <7,0,0>   |
-                   ------------------+---------------+---------------+
-                            Split 1  | NA (Not Appl.)|   6 <6,0,0>   |
-                   LSF 2    Split 2  |      NA       |   7 <7,0,0>   |
-                            Split 3  |      NA       |   7 <7,0,0>   |
-                   ------------------+---------------+---------------+
-                   Sum               |  20 <20,0,0>  |  40 <40,0,0>  |
-   ----------------------------------+---------------+---------------+
-   Block Class                       |   2 <2,0,0>   |   3 <3,0,0>   |
-   ----------------------------------+---------------+---------------+
-   Position 22 sample segment        |   1 <1,0,0>   |   1 <1,0,0>   |
-   ----------------------------------+---------------+---------------+
-   Scale Factor State Coder          |   6 <6,0,0>   |   6 <6,0,0>   |
-   ----------------------------------+---------------+---------------+
-                   Sample 0          |   3 <0,1,2>   |   3 <0,1,2>   |
-   Quantized       Sample 1          |   3 <0,1,2>   |   3 <0,1,2>   |
-   Residual           :              |   :    :      |   :    :      |
-   State              :              |   :    :      |   :    :      |
-   Samples            :              |   :    :      |   :    :      |
-                   Sample 56         |   3 <0,1,2>   |   3 <0,1,2>   |
-                   Sample 57         |      NA       |   3 <0,1,2>   |
-                   ------------------+---------------+---------------+
-                   Sum               | 171 <0,57,114>| 174 <0,58,116>|
-   ----------------------------------+---------------+---------------+
-                            Stage 1  |   7 <6,0,1>   |   7 <4,2,1>   |
-   CB for 22/23             Stage 2  |   7 <0,0,7>   |   7 <0,0,7>   |
-   sample block             Stage 3  |   7 <0,0,7>   |   7 <0,0,7>   |
-                   ------------------+---------------+---------------+
-                   Sum               |  21 <6,0,15>  |  21 <4,2,15>  |
-   ----------------------------------+---------------+---------------+
-                            Stage 1  |   5 <2,0,3>   |   5 <1,1,3>   |
-   Gain for 22/23           Stage 2  |   4 <1,1,2>   |   4 <1,1,2>   |
-   sample block             Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
-                   ------------------+---------------+---------------+
-                   Sum               |  12 <3,1,8>   |  12 <2,2,8>   |
-   ----------------------------------+---------------+---------------+
-                            Stage 1  |   8 <7,0,1>   |   8 <6,1,1>   |
-               sub-block 1  Stage 2  |   7 <0,0,7>   |   7 <0,0,7>   |
-                            Stage 3  |   7 <0,0,7>   |   7 <0,0,7>   |
-                   ------------------+---------------+---------------+
-
-
-
-Andersen, et al.              Experimental                     [Page 30]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                            Stage 1  |   8 <0,0,8>   |   8 <0,7,1>   |
-               sub-block 2  Stage 2  |   8 <0,0,8>   |   8 <0,0,8>   |
-   Indices                  Stage 3  |   8 <0,0,8>   |   8 <0,0,8>   |
-   for CB          ------------------+---------------+---------------+
-   sub-blocks               Stage 1  |      NA       |   8 <0,7,1>   |
-               sub-block 3  Stage 2  |      NA       |   8 <0,0,8>   |
-                            Stage 3  |      NA       |   8 <0,0,8>   |
-                   ------------------+---------------+---------------+
-                            Stage 1  |      NA       |   8 <0,7,1>   |
-               sub-block 4  Stage 2  |      NA       |   8 <0,0,8>   |
-                            Stage 3  |      NA       |   8 <0,0,8>   |
-                   ------------------+---------------+---------------+
-                   Sum               |  46 <7,0,39>  |  94 <6,22,66> |
-   ----------------------------------+---------------+---------------+
-                            Stage 1  |   5 <1,2,2>   |   5 <1,2,2>   |
-               sub-block 1  Stage 2  |   4 <1,1,2>   |   4 <1,2,1>   |
-                            Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
-                   ------------------+---------------+---------------+
-                            Stage 1  |   5 <1,1,3>   |   5 <0,2,3>   |
-               sub-block 2  Stage 2  |   4 <0,2,2>   |   4 <0,2,2>   |
-                            Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
-   Gains for       ------------------+---------------+---------------+
-   sub-blocks               Stage 1  |      NA       |   5 <0,1,4>   |
-               sub-block 3  Stage 2  |      NA       |   4 <0,1,3>   |
-                            Stage 3  |      NA       |   3 <0,0,3>   |
-                   ------------------+---------------+---------------+
-                            Stage 1  |      NA       |   5 <0,1,4>   |
-               sub-block 4  Stage 2  |      NA       |   4 <0,1,3>   |
-                            Stage 3  |      NA       |   3 <0,0,3>   |
-                   ------------------+---------------+---------------+
-                   Sum               |  24 <3,6,15>  |  48 <2,12,34> |
-   ----------------------------------+---------------+---------------+
-   Empty frame indicator             |   1 <0,0,1>   |   1 <0,0,1>   |
-   -------------------------------------------------------------------
-   SUM                                 304 <48,64,192> 400 <64,96,240>
-
-   Table 3.2.  The bitstream definition for iLBC for both the 20 ms
-   frame size mode and the 30 ms frame size mode.
-
-   When packetized into the payload, the bits MUST be sorted as follows:
-   All the class 1 bits in the order (from top to bottom) as specified
-   in the table, all the class 2 bits (from top to bottom), and all the
-   class 3 bits in the same sequential order.  The last bit, the empty
-   frame indicator, SHOULD be set to zero by the encoder.  If this bit
-   is set to 1 the decoder SHOULD treat the data as a lost frame.  For
-   example, this bit can be set to 1 to indicate lost frame for file
-   storage format, as in [1].
-
-
-
-
-Andersen, et al.              Experimental                     [Page 31]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.  Decoder Principles
-
-   This section describes the principles of each component of the
-   decoder algorithm.
-
-              +-------------+    +--------+    +---------------+
-   payload -> | 1. Get para | -> | 2. LPC | -> | 3. Sc Dequant | ->
-              +-------------+    +--------+    +---------------+
-
-              +-------------+    +------------------+
-           -> | 4. Mem setup| -> | 5. Construct res |------->
-           |  +-------------+    +-------------------   |
-           ---------<-----------<-----------<------------
-                     Sub-frame 0...2/4 (20 ms/30 ms)
-
-              +----------------+    +----------+
-           -> | 6. Enhance res | -> | 7. Synth | ------------>
-              +----------------+    +----------+
-
-              +-----------------+
-           -> | 8. Post Process | ----------------> decoded speech
-              +-----------------+
-
-   Figure 4.1.  Flow chart of the iLBC decoder.  If a frame was lost,
-   steps 1 to 5 SHOULD be replaced by a PLC algorithm.
-
-   1. Extract the parameters from the bitstream.
-
-   2. Decode the LPC and interpolate (section 4.1).
-
-   3. Construct the 57/58-sample start state (section 4.2).
-
-   4. Set up the memory by using data from the decoded residual.  This
-      memory is used for codebook construction.  For blocks preceding
-      the start state, both the decoded residual and the target are time
-      reversed.  Sub-frames are decoded in the same order as they were
-      encoded.
-
-   5. Construct the residuals of this sub-frame (gain[0]*cbvec[0] +
-      gain[1]*cbvec[1] + gain[2]*cbvec[2]).  Repeat 4 and 5 until the
-      residual of all sub-blocks has been constructed.
-
-   6. Enhance the residual with the post filter (section 4.6).
-
-   7. Synthesis of the residual (section 4.7).
-
-   8. Post process with HP filter, if desired (section 4.8).
-
-
-
-
-Andersen, et al.              Experimental                     [Page 32]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.1.  LPC Filter Reconstruction
-
-   The decoding of the LP filter parameters is very straightforward.
-   For a set of three/six indices, the corresponding LSF vector(s) are
-   found by simple table lookup.  For each of the LSF vectors, the three
-   split vectors are concatenated to obtain qlsf1 and qlsf2,
-   respectively (in the 20 ms mode only one LSF vector, qlsf, is
-   constructed).  The next step is the stability check described in
-   section 3.2.5 followed by the interpolation scheme described in
-   section 3.2.6 (3.2.7 for 20 ms frames).  The only difference is that
-   only the quantized LSFs are known at the decoder, and hence the
-   unquantized LSFs are not processed.
-
-   A reference implementation of the LPC filter reconstruction is given
-   in Appendix A.36.
-
-4.2.  Start State Reconstruction
-
-   The scalar encoded STATE_SHORT_LEN=58 (STATE_SHORT_LEN=57 in the 20
-   ms mode) state samples are reconstructed by 1) forming a set of
-   samples (by table lookup) from the index stream idxVec[n], 2)
-   multiplying the set with 1/scal=(10^qmax)/4.5, 3) time reversing the
-   57/58 samples, 4) filtering the time reversed block with the
-   dispersion (all-pass) filter used in the encoder (as described in
-   section 3.5.2); this compensates for the phase distortion of the
-   earlier filter operation, and 5 reversing the 57/58 samples from the
-   previous step.
-
-   in(0..(STATE_SHORT_LEN-1)) = time reversed samples from table
-                                look-up,
-                                idxVecDec((STATE_SHORT_LEN-1)..0)
-
-   in(STATE_SHORT_LEN..(2*STATE_SHORT_LEN-1)) = 0
-
-   Pk(z) = A~rk(z)/A~k(z), where
-                                  ___
-                                  \
-   A~rk(z)= z^(-LPC_FILTERORDER) + > a~ki*z^(i-(LPC_FILTERORDER-1))
-                                  /__
-                              i=0...(LPC_FILTERORDER-1)
-
-   and A~k(z) is taken from the block where the start state begins
-
-   in -> Pk(z) -> filtered
-
-   out(k) = filtered(STATE_SHORT_LEN-1-k) +
-                           filtered(2*STATE_SHORT_LEN-1-k),
-                                         k=0..(STATE_SHORT_LEN-1)
-
-
-
-Andersen, et al.              Experimental                     [Page 33]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   The remaining 23/22 samples in the state are reconstructed by the
-   same adaptive codebook technique described in section 4.3.  The
-   location bit determines whether these are the first or the last 23/22
-   samples of the 80-sample state vector.  If the remaining 23/22
-   samples are the first samples, then the scalar encoded
-   STATE_SHORT_LEN state samples are time-reversed before initialization
-   of the adaptive codebook memory vector.
-
-   A reference implementation of the start state reconstruction is given
-   in Appendix A.44.
-
-4.3.  Excitation Decoding Loop
-
-   The decoding of the LPC excitation vector proceeds in the same order
-   in which the residual was encoded at the encoder.  That is, after the
-   decoding of the entire 80-sample state vector, the forward sub-blocks
-   (corresponding to samples occurring after the state vector samples)
-   are decoded, and then the backward sub-blocks (corresponding to
-   samples occurring before the state vector) are decoded, resulting in
-   a fully decoded block of excitation signal samples.
-
-   In particular, each sub-block is decoded by using the multistage
-   adaptive codebook decoding module described in section 4.4.  This
-   module relies upon an adaptive codebook memory constructed before
-   each run of the adaptive codebook decoding.  The construction of the
-   adaptive codebook memory in the decoder is identical to the method
-   outlined in section 3.6.3, except that it is done on the codebook
-   memory without perceptual weighting.
-
-   For the initial forward sub-block, the last STATE_LEN=80 samples of
-   the length CB_LMEM=147 adaptive codebook memory are filled with the
-   samples of the state vector.  For subsequent forward sub-blocks, the
-   first SUBL=40 samples of the adaptive codebook memory are discarded,
-   the remaining samples are shifted by SUBL samples toward the
-   beginning of the vector, and the newly decoded SUBL=40 samples are
-   placed at the end of the adaptive codebook memory.  For backward
-   sub-blocks, the construction is similar, except that every vector of
-   samples involved is first time reversed.
-
-   A reference implementation of the excitation decoding loop is found
-   in Appendix A.5.
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 34]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.4.  Multistage Adaptive Codebook Decoding
-
-   The Multistage Adaptive Codebook Decoding module is used at both the
-   sender (encoder) and the receiver (decoder) ends to produce a
-   synthetic signal in the residual domain that is eventually used to
-   produce synthetic speech.  The module takes the index values used to
-   construct vectors that are scaled and summed together to produce a
-   synthetic signal that is the output of the module.
-
-4.4.1.  Construction of the Decoded Excitation Signal
-
-   The unpacked index values provided at the input to the module are
-   references to extended codebooks, which are constructed as described
-   in section 3.6.3, except that they are based on the codebook memory
-   without the perceptual weighting.  The unpacked three indices are
-   used to look up three codebook vectors.  The unpacked three gain
-   indices are used to decode the corresponding 3 gains.  In this
-   decoding, the successive rescaling, as described in section 3.6.4.2,
-   is applied.
-
-   A reference implementation of the adaptive codebook decoding is
-   listed in Appendix A.32.
-
-4.5.  Packet Loss Concealment
-
-   If packet loss occurs, the decoder receives a signal saying that
-   information regarding a block is lost.  For such blocks it is
-   RECOMMENDED to use a Packet Loss Concealment (PLC) unit to create a
-   decoded signal that masks the effect of that packet loss.  In the
-   following we will describe an example of a PLC unit that can be used
-   with the iLBC codec.  As the PLC unit is used only at the decoder,
-   the PLC unit does not affect interoperability between
-   implementations.  Other PLC implementations MAY therefore be used.
-
-   The PLC described operates on the LP filters and the excitation
-   signals and is based on the following principles:
-
-4.5.1.  Block Received Correctly and Previous Block Also Received
-
-   If the block is received correctly, the PLC only records state
-   information of the current block that can be used in case the next
-   block is lost.  The LP filter coefficients for each sub-block and the
-   entire decoded excitation signal are all saved in the decoder state
-   structure.  All of this information will be needed if the following
-   block is lost.
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 35]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.5.2.  Block Not Received
-
-   If the block is not received, the block substitution is based on a
-   pitch-synchronous repetition of the excitation signal, which is
-   filtered by the last LP filter of the previous block.  The previous
-   block's information is stored in the decoder state structure.
-
-   A correlation analysis is performed on the previous block's
-   excitation signal in order to detect the amount of pitch periodicity
-   and a pitch value.  The correlation measure is also used to decide on
-   the voicing level (the degree to which the previous block's
-   excitation was a voiced or roughly periodic signal).  The excitation
-   in the previous block is used to create an excitation for the block
-   to be substituted, such that the pitch of the previous block is
-   maintained.  Therefore, the new excitation is constructed in a
-   pitch-synchronous manner.  In order to avoid a buzzy-sounding
-   substituted block, a random excitation is mixed with the new pitch
-   periodic excitation, and the relative use of the two components is
-   computed from the correlation measure (voicing level).
-
-   For the block to be substituted, the newly constructed excitation
-   signal is then passed through the LP filter to produce the speech
-   that will be substituted for the lost block.
-
-   For several consecutive lost blocks, the packet loss concealment
-   continues in a similar manner.  The correlation measure of the last
-   block received is still used along with the same pitch value.  The LP
-   filters of the last block received are also used again.  The energy
-   of the substituted excitation for consecutive lost blocks is
-   decreased, leading to a dampened excitation, and therefore to
-   dampened speech.
-
-4.5.3.  Block Received Correctly When Previous Block Not Received
-
-   For the case in which a block is received correctly when the previous
-   block was not, the correctly received block's directly decoded speech
-   (based solely on the received block) is not used as the actual
-   output.  The reason for this is that the directly decoded speech does
-   not necessarily smoothly merge into the synthetic speech generated
-   for the previous lost block.  If the two signals are not smoothly
-   merged, an audible discontinuity is accidentally produced.
-   Therefore, a correlation analysis between the two blocks of
-   excitation signal (the excitation of the previous concealed block and
-   that of the current received block) is performed to find the best
-   phase match.  Then a simple overlap-add procedure is performed to
-   merge the previous excitation smoothly into the current block's
-   excitation.
-
-
-
-
-Andersen, et al.              Experimental                     [Page 36]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   The exact implementation of the packet loss concealment does not
-   influence interoperability of the codec.
-
-   A reference implementation of the packet loss concealment is
-   suggested in Appendix A.14.  Exact compliance with this suggested
-   algorithm is not needed for a reference implementation to be fully
-   compatible with the overall codec specification.
-
-4.6.  Enhancement
-
-   The decoder contains an enhancement unit that operates on the
-   reconstructed excitation signal.  The enhancement unit increases the
-   perceptual quality of the reconstructed signal by reducing the
-   speech-correlated noise in the voiced speech segments.  Compared to
-   traditional postfilters, the enhancer has an advantage in that it can
-   only modify the excitation signal slightly.  This means that there is
-   no risk of over enhancement.  The enhancer works very similarly for
-   both the 20 ms frame size mode and the 30 ms frame size mode.
-
-   For the mode with 20 ms frame size, the enhancer uses a memory of six
-   80-sample excitation blocks prior in time plus the two new 80-sample
-   excitation blocks.  For each block of 160 new unenhanced excitation
-   samples, 160 enhanced excitation samples are produced.  The enhanced
-   excitation is 40-sample delayed compared to the unenhanced
-   excitation, as the enhancer algorithm uses lookahead.
-
-   For the mode with 30 ms frame size, the enhancer uses a memory of
-   five 80-sample excitation blocks prior in time plus the three new
-   80-sample excitation blocks.  For each block of 240 new unenhanced
-   excitation samples, 240 enhanced excitation samples are produced.
-   The enhanced excitation is 80-sample delayed compared to the
-   unenhanced excitation, as the enhancer algorithm uses lookahead.
-
-   Outline of Enhancer
-
-   The speech enhancement unit operates on sub-blocks of 80 samples,
-   which means that there are two/three 80 sample sub-blocks per frame.
-   Each of these two/three sub-blocks is enhanced separately, but in an
-   analogous manner.
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 37]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   unenhanced residual
-           |
-           |   +---------------+    +--------------+
-           +-> | 1. Pitch Est  | -> | 2. Find PSSQ | -------->
-               +---------------+  | +--------------+
-                                  +-----<-------<------<--+
-               +------------+         enh block 0..1/2    |
-            -> | 3. Smooth  |                             |
-               +------------+                             |
-                 \                                        |
-                 /\                                       |
-                /  \   Already                            |
-               / 4. \----------->----------->-----------+ |
-               \Crit/ Fulfilled                         | |
-                \? /                                    v |
-                 \/                                     | |
-                  \  +-----------------+    +---------+ | |
-              Not +->| 5. Use Constr.  | -> | 6. Mix  | ----->
-           Fulfilled +-----------------+    +---------+
-
-            ---------------> enhanced residual
-
-   Figure 4.2.  Flow chart of the enhancer.
-
-   1. Pitch estimation of each of the two/three new 80-sample blocks.
-
-   2. Find the pitch-period-synchronous sequence n (for block k) by a
-      search around the estimated pitch value.  Do this for n=1,2,3,
-      -1,-2,-3.
-
-   3. Calculate the smoothed residual generated by the six pitch-
-      period-synchronous sequences from prior step.
-
-   4. Check if the smoothed residual satisfies the criterion (section
-      4.6.4).
-
-   5. Use constraint to calculate mixing factor (section 4.6.5).
-
-   6. Mix smoothed signal with unenhanced residual (pssq(n) n=0).
-
-   The main idea of the enhancer is to find three 80 sample blocks
-   before and three 80-sample blocks after the analyzed unenhanced sub-
-   block and to use these to improve the quality of the excitation in
-   that sub-block.  The six blocks are chosen so that they have the
-   highest possible correlation with the unenhanced sub-block that is
-   being enhanced.  In other words, the six blocks are pitch-period-
-   synchronous sequences to the unenhanced sub-block.
-
-
-
-
-Andersen, et al.              Experimental                     [Page 38]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   A linear combination of the six pitch-period-synchronous sequences is
-   calculated that approximates the sub-block.  If the squared error
-   between the approximation and the unenhanced sub-block is small
-   enough, the enhanced residual is set equal to this approximation.
-   For the cases when the squared error criterion is not fulfilled, a
-   linear combination of the approximation and the unenhanced residual
-   forms the enhanced residual.
-
-4.6.1.  Estimating the Pitch
-
-   Pitch estimates are needed to determine the locations of the pitch-
-   period-synchronous sequences in a complexity-efficient way.  For each
-   of the new two/three sub-blocks, a pitch estimate is calculated by
-   finding the maximum correlation in the range from lag 20 to lag 120.
-   These pitch estimates are used to narrow down the search for the best
-   possible pitch-period-synchronous sequences.
-
-4.6.2.  Determination of the Pitch-Synchronous Sequences
-
-   Upon receiving the pitch estimates from the prior step, the enhancer
-   analyzes and enhances one 80-sample sub-block at a time.  The pitch-
-   period-synchronous-sequences pssq(n) can be viewed as vectors of
-   length 80 samples each shifted n*lag samples from the current sub-
-   block.  The six pitch-period-synchronous-sequences, pssq(-3) to
-   pssq(-1) and pssq(1) to pssq(3), are found one at a time by the steps
-   below:
-
-   1) Calculate the estimate of the position of the pssq(n).  For
-      pssq(n) in front of pssq(0) (n > 0), the location of the pssq(n)
-      is estimated by moving one pitch estimate forward in time from the
-      exact location of pssq(n-1).  Similarly, pssq(n) behind pssq(0) (n
-      < 0) is estimated by moving one pitch estimate backward in time
-      from the exact location of pssq(n+1).  If the estimated pssq(n)
-      vector location is totally within the enhancer memory (Figure
-      4.3), steps 2, 3, and 4 are performed, otherwise the pssq(n) is
-      set to zeros.
-
-   2) Compute the correlation between the unenhanced excitation and
-      vectors around the estimated location interval of pssq(n).  The
-      correlation is calculated in the interval estimated location +/- 2
-      samples.  This results in five correlation values.
-
-   3) The five correlation values are upsampled by a factor of 4, by
-      using four simple upsampling filters (MA filters with coefficients
-      upsFilter1.. upsFilter4).  Within these the maximum value is
-      found, which specifies the best pitch-period with a resolution of
-      a quarter of a sample.
-
-
-
-
-Andersen, et al.              Experimental                     [Page 39]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-      upsFilter1[7]={0.000000 0.000000 0.000000 1.000000
-             0.000000 0.000000 0.000000}
-      upsFilter2[7]={0.015625 -0.076904 0.288330 0.862061
-            -0.106445 0.018799 -0.015625}
-      upsFilter3[7]={0.023682 -0.124268 0.601563 0.601563
-            -0.124268 0.023682 -0.023682}
-      upsFilter4[7]={0.018799 -0.106445 0.862061 0.288330
-            -0.076904 0.015625 -0.018799}
-
-   4) Generate the pssq(n) vector by upsampling of the excitation memory
-      and extracting the sequence that corresponds to the lag delay that
-      was calculated in prior step.
-
-   With the steps above, all the pssq(n) can be found in an iterative
-   manner, first moving backward in time from pssq(0) and then forward
-   in time from pssq(0).
-
-
-   0              159             319             479             639
-   +---------------------------------------------------------------+
-   |  -5   |  -4   |  -3   |  -2   |  -1   |   0   |   1   |   2   |
-   +---------------------------------------------------------------+
-                                               |pssq 0 |
-                                          |pssq -1| |pssq 1 |
-                                       |pssq -2|       |pssq 2 |
-                                    |pssq -3|             |pssq 3 |
-
-   Figure 4.3.  Enhancement for 20 ms frame size.
-
-   Figure 4.3 depicts pitch-period-synchronous sequences in the
-   enhancement of the first 80 sample block in the 20 ms frame size
-   mode.  The unenhanced signal input is stored in the last two sub-
-   blocks (1 - 2), and the six other sub-blocks contain unenhanced
-   residual prior-in-time.  We perform the enhancement algorithm on two
-   blocks of 80 samples, where the first of the two blocks consists of
-   the last 40 samples of sub-block 0 and the first 40 samples of sub-
-   block 1.  The second 80-sample block consists of the last 40 samples
-   of sub-block 1 and the first 40 samples of sub-block 2.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 40]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   0              159             319             479             639
-   +---------------------------------------------------------------+
-   |  -4   |  -3   |  -2   |  -1   |   0   |   1   |   2   |   3   |
-   +---------------------------------------------------------------+
-                                   |pssq 0 |
-                              |pssq -1| |pssq 1 |
-                           |pssq -2|       |pssq 2 |
-                        |pssq -3|             |pssq 3 |
-
-   Figure 4.4.  Enhancement for 30 ms frame size.
-
-   Figure 4.4 depicts pitch-period-synchronous sequences in the
-   enhancement of the first 80-sample block in the 30 ms frame size
-   mode.  The unenhanced signal input is stored in the last three sub-
-   blocks (1 - 3).  The five other sub-blocks contain unenhanced
-   residual prior-in-time.  The enhancement algorithm is performed on
-   the three 80 sample sub-blocks 0, 1, and 2.
-
-4.6.3.  Calculation of the Smoothed Excitation
-
-   A linear combination of the six pssq(n) (n!=0) form a smoothed
-   approximation, z, of pssq(0).  Most of the weight is put on the
-   sequences that are close to pssq(0), as these are likely to be most
-   similar to pssq(0).  The smoothed vector is also rescaled so that the
-   energy of z is the same as the energy of pssq(0).
-
-      ___
-      \
-   y = > pssq(i) * pssq_weight(i)
-      /__
-   i=-3,-2,-1,1,2,3
-
-   pssq_weight(i) = 0.5*(1-cos(2*pi*(i+4)/(2*3+2)))
-
-   z = C * y, where C = ||pssq(0)||/||y||
-
-4.6.4.  Enhancer Criterion
-
-   The criterion of the enhancer is that the enhanced excitation is not
-   allowed to differ much from the unenhanced excitation.  This
-   criterion is checked for each 80-sample sub-block.
-
-   e < (b * ||pssq(0)||^2), where b=0.05 and   (Constraint 1)
-
-   e = (pssq(0)-z)*(pssq(0)-z), and "*" means the dot product
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 41]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.6.5.  Enhancing the excitation
-
-   From the criterion in the previous section, it is clear that the
-   excitation is not allowed to change much.  The purpose of this
-   constraint is to prevent the creation of an enhanced signal
-   significantly different from the original signal.  This also means
-   that the constraint limits the numerical size of the errors that the
-   enhancement procedure can make.  That is especially important in
-   unvoiced segments and background noise segments for which increased
-   periodicity could lead to lower perceived quality.
-
-   When the constraint in the prior section is not met, the enhanced
-   residual is instead calculated through a constrained optimization by
-   using the Lagrange multiplier technique.  The new constraint is that
-
-      e = (b * ||pssq(0)||^2)                     (Constraint 2)
-
-   We distinguish two solution regions for the optimization: 1) the
-   region where the first constraint is fulfilled and 2) the region
-   where the first constraint is not fulfilled and the second constraint
-   must be used.
-
-   In the first case, where the second constraint is not needed, the
-   optimized re-estimated vector is simply z, the energy-scaled version
-   of y.
-
-   In the second case, where the second constraint is activated and
-   becomes an equality constraint, we have
-
-      z= A*y + B*pssq(0)
-
-   where
-
-      A = sqrt((b-b^2/4)*(w00*w00)/ (w11*w00 + w10*w10)) and
-
-      w11 = pssq(0)*pssq(0)
-      w00 = y*y
-      w10 = y*pssq(0)    (* symbolizes the dot product)
-
-   and
-
-      B = 1 - b/2 - A * w10/w00
-
-   Appendix A.16 contains a listing of a reference implementation for
-   the enhancement method.
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 42]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-4.7.  Synthesis Filtering
-
-   Upon decoding or PLC of the LP excitation block, the decoded speech
-   block is obtained by running the decoded LP synthesis filter,
-   1/A~k(z), over the block.  The synthesis filters have to be shifted
-   to compensate for the delay in the enhancer.  For 20 ms frame size
-   mode, they SHOULD be shifted one 40-sample sub-block, and for 30 ms
-   frame size mode, they SHOULD be shifted two 40-sample sub-blocks.
-   The LP coefficients SHOULD be changed at the first sample of every
-   sub-block while keeping the filter state.  For PLC blocks, one
-   solution is to apply the last LP coefficients of the last decoded
-   speech block for all sub-blocks.
-
-   The reference implementation for the synthesis filtering can be found
-   in Appendix A.48.
-
-4.8.  Post Filtering
-
-   If desired, the decoded block can be filtered by a high-pass filter.
-   This removes the low frequencies of the decoded signal.  A reference
-   implementation of this, with cutoff at 65 Hz, is shown in Appendix
-   A.30.
-
-5.  Security Considerations
-
-   This algorithm for the coding of speech signals is not subject to any
-   known security consideration; however, its RTP payload format [1] is
-   subject to several considerations, which are addressed there.
-   Confidentiality of the media streams is achieved by encryption;
-   therefore external mechanisms, such as SRTP [5], MAY be used for that
-   purpose.
-
-6.  Evaluation of the iLBC Implementations
-
-   It is possible and suggested to evaluate certain iLBC implementation
-   by utilizing methodology and tools available at
-   http://www.ilbcfreeware.org/evaluation.html
-
-7.  References
-
-7.1.  Normative References
-
-   [1] Duric, A. and S. Andersen, "Real-time Transport Protocol (RTP)
-       Payload Format for internet Low Bit Rate Codec (iLBC) Speech",
-       RFC 3952, December 2004.
-
-   [2] Bradner, S., "Key words for use in RFCs to Indicate Requirement
-       Levels", BCP 14, RFC 2119, March 1997.
-
-
-
-Andersen, et al.              Experimental                     [Page 43]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   [3] PacketCable(TM) Audio/Video Codecs Specification, Cable
-       Television Laboratories, Inc.
-
-7.2.  Informative References
-
-   [4] ITU-T Recommendation G.711, available online from the ITU
-       bookstore at http://www.itu.int.
-
-   [5] Baugher, M., McGrew, D., Naslund, M., Carrara, E., and K. Norman,
-       "The Secure Real Time Transport Protocol (SRTP)", RFC 3711, March
-       2004.
-
-8.  Acknowledgements
-
-   This extensive work, besides listed authors, has the following
-   authors, who could not have been listed among "official" authors (due
-   to IESG restrictions in the number of authors who can be listed):
-
-      Manohar N. Murthi (Department of Electrical and Computer
-      Engineering, University of Miami), Fredrik Galschiodt, Julian
-      Spittka, and Jan Skoglund (Global IP Sound).
-
-   The authors are deeply indebted to the following people and thank
-   them sincerely:
-
-      Henry Sinnreich, Patrik Faltstrom, Alan Johnston, and Jean-
-      Francois Mule for great support of the iLBC initiative and for
-      valuable feedback and comments.
-
-      Peter Vary, Frank Mertz, and Christoph Erdmann (RWTH Aachen);
-      Vladimir Cuperman (Niftybox LLC); Thomas Eriksson (Chalmers Univ
-      of Tech), and Gernot Kubin (TU Graz), for thorough review of the
-      iLBC document and their valuable feedback and remarks.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 44]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-APPENDIX A.  Reference Implementation
-
-   This appendix contains the complete c-code for a reference
-   implementation of encoder and decoder for the specified codec.
-
-   The c-code consists of the following files with highest-level
-   functions:
-
-         iLBC_test.c: main function for evaluation purpose
-         iLBC_encode.h: encoder header
-         iLBC_encode.c: encoder function
-         iLBC_decode.h: decoder header
-         iLBC_decode.c: decoder function
-
-   The following files contain global defines and constants:
-
-         iLBC_define.h: global defines
-         constants.h: global constants header
-         constants.c: global constants memory allocations
-
-   The following files contain subroutines:
-
-         anaFilter.h: lpc analysis filter header
-         anaFilter.c: lpc analysis filter function
-         createCB.h: codebook construction header
-         createCB.c: codebook construction function
-         doCPLC.h: packet loss concealment header
-         doCPLC.c: packet loss concealment function
-         enhancer.h: signal enhancement header
-         enhancer.c: signal enhancement function
-         filter.h: general filter header
-         filter.c: general filter functions
-         FrameClassify.h: start state classification header
-         FrameClassify.c: start state classification function
-         gainquant.h: gain quantization header
-         gainquant.c: gain quantization function
-         getCBvec.h: codebook vector construction header
-         getCBvec.c: codebook vector construction function
-         helpfun.h: general purpose header
-         helpfun.c: general purpose functions
-         hpInput.h: input high pass filter header
-         hpInput.c: input high pass filter function
-         hpOutput.h: output high pass filter header
-         hpOutput.c: output high pass filter function
-         iCBConstruct.h: excitation decoding header
-         iCBConstruct.c: excitation decoding function
-         iCBSearch.h: excitation encoding header
-         iCBSearch.c: excitation encoding function
-
-
-
-Andersen, et al.              Experimental                     [Page 45]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-         LPCdecode.h: lpc decoding header
-         LPCdecode.c: lpc decoding function
-         LPCencode.h: lpc encoding header
-         LPCencode.c: lpc encoding function
-         lsf.h: line spectral frequencies header
-         lsf.c: line spectral frequencies functions
-         packing.h: bitstream packetization header
-         packing.c: bitstream packetization functions
-         StateConstructW.h: state decoding header
-         StateConstructW.c: state decoding functions
-         StateSearchW.h: state encoding header
-         StateSearchW.c: state encoding function
-         syntFilter.h: lpc synthesis filter header
-         syntFilter.c: lpc synthesis filter function
-
-   The implementation is portable and should work on many different
-   platforms.  However, it is not difficult to optimize the
-   implementation on particular platforms, an exercise left to the
-   reader.
-
-A.1.  iLBC_test.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_test.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-   #include <stdio.h>
-   #include <string.h>
-   #include "iLBC_define.h"
-   #include "iLBC_encode.h"
-   #include "iLBC_decode.h"
-
-   /* Runtime statistics */
-   #include <time.h>
-
-   #define ILBCNOOFWORDS_MAX   (NO_OF_BYTES_30MS/2)
-
-   /*----------------------------------------------------------------*
-    *  Encoder interface function
-
-
-
-Andersen, et al.              Experimental                     [Page 46]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-    *---------------------------------------------------------------*/
-
-   short encode(   /* (o) Number of bytes encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                                   /* (i/o) Encoder instance */
-       short *encoded_data,    /* (o) The encoded bytes */
-       short *data                 /* (i) The signal block to encode*/
-   ){
-       float block[BLOCKL_MAX];
-       int k;
-
-       /* convert signal to float */
-
-       for (k=0; k<iLBCenc_inst->blockl; k++)
-           block[k] = (float)data[k];
-
-       /* do the actual encoding */
-
-       iLBC_encode((unsigned char *)encoded_data, block, iLBCenc_inst);
-
-
-       return (iLBCenc_inst->no_of_bytes);
-   }
-
-   /*----------------------------------------------------------------*
-    *  Decoder interface function
-    *---------------------------------------------------------------*/
-
-   short decode(       /* (o) Number of decoded samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       short *decoded_data,        /* (o) Decoded signal block*/
-       short *encoded_data,        /* (i) Encoded bytes */
-       short mode                       /* (i) 0=PL, 1=Normal */
-   ){
-       int k;
-       float decblock[BLOCKL_MAX], dtmp;
-
-       /* check if mode is valid */
-
-       if (mode<0 || mode>1) {
-           printf("\nERROR - Wrong mode - 0, 1 allowed\n"); exit(3);}
-
-       /* do actual decoding of block */
-
-       iLBC_decode(decblock, (unsigned char *)encoded_data,
-           iLBCdec_inst, mode);
-
-       /* convert to short */
-
-
-
-Andersen, et al.              Experimental                     [Page 47]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       for (k=0; k<iLBCdec_inst->blockl; k++){
-           dtmp=decblock[k];
-
-           if (dtmp<MIN_SAMPLE)
-               dtmp=MIN_SAMPLE;
-           else if (dtmp>MAX_SAMPLE)
-               dtmp=MAX_SAMPLE;
-           decoded_data[k] = (short) dtmp;
-       }
-
-       return (iLBCdec_inst->blockl);
-   }
-
-   /*---------------------------------------------------------------*
-    *  Main program to test iLBC encoding and decoding
-    *
-    *  Usage:
-    *    exefile_name.exe <infile> <bytefile> <outfile> <channel>
-    *
-    *    <infile>   : Input file, speech for encoder (16-bit pcm file)
-    *    <bytefile> : Bit stream output from the encoder
-    *    <outfile>  : Output file, decoded speech (16-bit pcm file)
-    *    <channel>  : Bit error file, optional (16-bit)
-    *                     1 - Packet received correctly
-    *                     0 - Packet Lost
-    *
-    *--------------------------------------------------------------*/
-
-   int main(int argc, char* argv[])
-   {
-
-       /* Runtime statistics */
-
-       float starttime;
-       float runtime;
-       float outtime;
-
-       FILE *ifileid,*efileid,*ofileid, *cfileid;
-       short data[BLOCKL_MAX];
-       short encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
-       int len;
-       short pli, mode;
-       int blockcount = 0;
-       int packetlosscount = 0;
-
-       /* Create structs */
-       iLBC_Enc_Inst_t Enc_Inst;
-       iLBC_Dec_Inst_t Dec_Inst;
-
-
-
-Andersen, et al.              Experimental                     [Page 48]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* get arguments and open files */
-
-       if ((argc!=5) && (argc!=6)) {
-           fprintf(stderr,
-           "\n*-----------------------------------------------*\n");
-           fprintf(stderr,
-           "   %s <20,30> input encoded decoded (channel)\n\n",
-               argv[0]);
-           fprintf(stderr,
-           "   mode    : Frame size for the encoding/decoding\n");
-           fprintf(stderr,
-           "                 20 - 20 ms\n");
-           fprintf(stderr,
-           "                 30 - 30 ms\n");
-           fprintf(stderr,
-           "   input   : Speech for encoder (16-bit pcm file)\n");
-           fprintf(stderr,
-           "   encoded : Encoded bit stream\n");
-           fprintf(stderr,
-           "   decoded : Decoded speech (16-bit pcm file)\n");
-           fprintf(stderr,
-           "   channel : Packet loss pattern, optional (16-bit)\n");
-           fprintf(stderr,
-           "                  1 - Packet received correctly\n");
-           fprintf(stderr,
-           "                  0 - Packet Lost\n");
-           fprintf(stderr,
-           "*-----------------------------------------------*\n\n");
-           exit(1);
-       }
-       mode=atoi(argv[1]);
-       if (mode != 20 && mode != 30) {
-           fprintf(stderr,"Wrong mode %s, must be 20, or 30\n",
-               argv[1]);
-           exit(2);
-       }
-       if ( (ifileid=fopen(argv[2],"rb")) == NULL) {
-           fprintf(stderr,"Cannot open input file %s\n", argv[2]);
-           exit(2);}
-       if ( (efileid=fopen(argv[3],"wb")) == NULL) {
-           fprintf(stderr, "Cannot open encoded file %s\n",
-               argv[3]); exit(1);}
-       if ( (ofileid=fopen(argv[4],"wb")) == NULL) {
-           fprintf(stderr, "Cannot open decoded file %s\n",
-               argv[4]); exit(1);}
-       if (argc==6) {
-           if( (cfileid=fopen(argv[5],"rb")) == NULL) {
-               fprintf(stderr, "Cannot open channel file %s\n",
-
-
-
-Andersen, et al.              Experimental                     [Page 49]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   argv[5]);
-               exit(1);
-           }
-       } else {
-           cfileid=NULL;
-       }
-
-       /* print info */
-
-       fprintf(stderr, "\n");
-       fprintf(stderr,
-           "*---------------------------------------------------*\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*      iLBC test program                            *\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*                                                   *\n");
-       fprintf(stderr,
-           "*---------------------------------------------------*\n");
-       fprintf(stderr,"\nMode           : %2d ms\n", mode);
-       fprintf(stderr,"Input file     : %s\n", argv[2]);
-       fprintf(stderr,"Encoded file   : %s\n", argv[3]);
-       fprintf(stderr,"Output file    : %s\n", argv[4]);
-       if (argc==6) {
-           fprintf(stderr,"Channel file   : %s\n", argv[5]);
-       }
-       fprintf(stderr,"\n");
-
-       /* Initialization */
-
-       initEncode(&Enc_Inst, mode);
-       initDecode(&Dec_Inst, mode, 1);
-
-       /* Runtime statistics */
-
-       starttime=clock()/(float)CLOCKS_PER_SEC;
-
-       /* loop over input blocks */
-
-       while (fread(data,sizeof(short),Enc_Inst.blockl,ifileid)==
-               Enc_Inst.blockl) {
-
-           blockcount++;
-
-           /* encoding */
-
-
-
-Andersen, et al.              Experimental                     [Page 50]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           fprintf(stderr, "--- Encoding block %i --- ",blockcount);
-           len=encode(&Enc_Inst, encoded_data, data);
-           fprintf(stderr, "\r");
-
-           /* write byte file */
-
-           fwrite(encoded_data, sizeof(unsigned char), len, efileid);
-
-           /* get channel data if provided */
-           if (argc==6) {
-               if (fread(&pli, sizeof(short), 1, cfileid)) {
-                   if ((pli!=0)&&(pli!=1)) {
-                       fprintf(stderr, "Error in channel file\n");
-                       exit(0);
-                   }
-                   if (pli==0) {
-                       /* Packet loss -> remove info from frame */
-                       memset(encoded_data, 0,
-                           sizeof(short)*ILBCNOOFWORDS_MAX);
-                       packetlosscount++;
-                   }
-               } else {
-                   fprintf(stderr, "Error. Channel file too short\n");
-                   exit(0);
-               }
-           } else {
-               pli=1;
-           }
-
-           /* decoding */
-
-           fprintf(stderr, "--- Decoding block %i --- ",blockcount);
-
-           len=decode(&Dec_Inst, decoded_data, encoded_data, pli);
-           fprintf(stderr, "\r");
-
-           /* write output file */
-
-           fwrite(decoded_data,sizeof(short),len,ofileid);
-       }
-
-       /* Runtime statistics */
-
-       runtime = (float)(clock()/(float)CLOCKS_PER_SEC-starttime);
-       outtime = (float)((float)blockcount*(float)mode/1000.0);
-       printf("\n\nLength of speech file: %.1f s\n", outtime);
-       printf("Packet loss          : %.1f%%\n",
-           100.0*(float)packetlosscount/(float)blockcount);
-
-
-
-Andersen, et al.              Experimental                     [Page 51]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       printf("Time to run iLBC     :");
-       printf(" %.1f s (%.1f %% of realtime)\n\n", runtime,
-           (100*runtime/outtime));
-
-       /* close files */
-
-       fclose(ifileid);  fclose(efileid); fclose(ofileid);
-       if (argc==6) {
-           fclose(cfileid);
-       }
-       return(0);
-   }
-
-A.2.  iLBC_encode.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_encode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ILBCENCODE_H
-   #define __iLBC_ILBCENCODE_H
-
-   #include "iLBC_define.h"
-
-   short initEncode(                   /* (o) Number of bytes
-                                              encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-       int mode                    /* (i) frame size mode */
-   );
-
-   void iLBC_encode(
-
-       unsigned char *bytes,           /* (o) encoded data bits iLBC */
-       float *block,                   /* (o) speech vector to
-                                              encode */
-       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
-                                              state */
-   );
-
-   #endif
-
-
-
-
-Andersen, et al.              Experimental                     [Page 52]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.3.  iLBC_encode.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_encode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "LPCencode.h"
-   #include "FrameClassify.h"
-   #include "StateSearchW.h"
-   #include "StateConstructW.h"
-   #include "helpfun.h"
-   #include "constants.h"
-   #include "packing.h"
-   #include "iCBSearch.h"
-   #include "iCBConstruct.h"
-   #include "hpInput.h"
-   #include "anaFilter.h"
-   #include "syntFilter.h"
-
-   /*----------------------------------------------------------------*
-    *  Initiation of encoder instance.
-    *---------------------------------------------------------------*/
-
-   short initEncode(                   /* (o) Number of bytes
-                                              encoded */
-       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-       int mode                    /* (i) frame size mode */
-   ){
-       iLBCenc_inst->mode = mode;
-       if (mode==30) {
-           iLBCenc_inst->blockl = BLOCKL_30MS;
-           iLBCenc_inst->nsub = NSUB_30MS;
-           iLBCenc_inst->nasub = NASUB_30MS;
-           iLBCenc_inst->lpc_n = LPC_N_30MS;
-           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
-           iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
-
-
-
-Andersen, et al.              Experimental                     [Page 53]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
-           /* ULP init */
-           iLBCenc_inst->ULP_inst=&ULP_30msTbl;
-       }
-       else if (mode==20) {
-           iLBCenc_inst->blockl = BLOCKL_20MS;
-           iLBCenc_inst->nsub = NSUB_20MS;
-           iLBCenc_inst->nasub = NASUB_20MS;
-           iLBCenc_inst->lpc_n = LPC_N_20MS;
-           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
-           iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
-           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
-           /* ULP init */
-           iLBCenc_inst->ULP_inst=&ULP_20msTbl;
-       }
-       else {
-           exit(2);
-       }
-
-       memset((*iLBCenc_inst).anaMem, 0,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-       memset((*iLBCenc_inst).lpc_buffer, 0,
-           (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
-       memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
-
-       return (iLBCenc_inst->no_of_bytes);
-   }
-
-   /*----------------------------------------------------------------*
-    *  main encoder function
-    *---------------------------------------------------------------*/
-
-   void iLBC_encode(
-       unsigned char *bytes,           /* (o) encoded data bits iLBC */
-       float *block,                   /* (o) speech vector to
-                                              encode */
-       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
-                                              state */
-   ){
-
-       float data[BLOCKL_MAX];
-       float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
-
-       int start, idxForMax, idxVec[STATE_LEN];
-
-
-
-Andersen, et al.              Experimental                     [Page 54]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-       int n, k, meml_gotten, Nfor, Nback, i, pos;
-       int gain_index[CB_NSTAGES*NASUB_MAX],
-           extra_gain_index[CB_NSTAGES];
-       int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
-       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-       unsigned char *pbytes;
-       int diff, start_pos, state_first;
-       float en1, en2;
-       int index, ulp, firstpart;
-       int subcount, subframe;
-       float weightState[LPC_FILTERORDER];
-       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float decresidual[BLOCKL_MAX];
-
-       /* high pass filtering of input signal if such is not done
-              prior to calling this function */
-
-       hpInput(block, iLBCenc_inst->blockl,
-                   data, (*iLBCenc_inst).hpimem);
-
-       /* otherwise simply copy */
-
-       /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
-
-       /* LPC of hp filtered input data */
-
-       LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
-
-
-       /* inverse filter to get residual */
-
-       for (n=0; n<iLBCenc_inst->nsub; n++) {
-           anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)],
-               SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
-       }
-
-       /* find state location */
-
-       start = FrameClassify(iLBCenc_inst, residual);
-
-       /* check if state should be in first or last part of the
-       two subframes */
-
-       diff = STATE_LEN - iLBCenc_inst->state_short_len;
-       en1 = 0;
-       index = (start-1)*SUBL;
-
-
-
-Andersen, et al.              Experimental                     [Page 55]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-           en1 += residual[index+i]*residual[index+i];
-       }
-       en2 = 0;
-       index = (start-1)*SUBL+diff;
-       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-           en2 += residual[index+i]*residual[index+i];
-       }
-
-
-       if (en1 > en2) {
-           state_first = 1;
-           start_pos = (start-1)*SUBL;
-       } else {
-           state_first = 0;
-           start_pos = (start-1)*SUBL + diff;
-       }
-
-       /* scalar quantization of state */
-
-       StateSearchW(iLBCenc_inst, &residual[start_pos],
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax,
-           idxVec, iLBCenc_inst->state_short_len, state_first);
-
-       StateConstructW(idxForMax, idxVec,
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &decresidual[start_pos], iLBCenc_inst->state_short_len);
-
-       /* predictive quantization in state */
-
-       if (state_first) { /* put adaptive part in the end */
-
-           /* setup memory */
-
-           memset(mem, 0,
-               (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
-           memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len,
-               decresidual+start_pos,
-               iLBCenc_inst->state_short_len*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* encode sub-frames */
-
-           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
-               &residual[start_pos+iLBCenc_inst->state_short_len],
-               mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES,
-
-
-
-Andersen, et al.              Experimental                     [Page 56]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               &weightdenum[start*(LPC_FILTERORDER+1)],
-               weightState, 0);
-
-           /* construct decoded vector */
-
-           iCBConstruct(
-               &decresidual[start_pos+iLBCenc_inst->state_short_len],
-               extra_cb_index, extra_gain_index,
-               mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES);
-
-       }
-       else { /* put adaptive part in the beginning */
-
-           /* create reversed vectors for prediction */
-
-           for (k=0; k<diff; k++) {
-               reverseResidual[k] = residual[(start+1)*SUBL-1
-                   -(k+iLBCenc_inst->state_short_len)];
-           }
-
-           /* setup memory */
-
-           meml_gotten = iLBCenc_inst->state_short_len;
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[start_pos + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* encode sub-frames */
-
-           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
-               reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES,
-               &weightdenum[(start-1)*(LPC_FILTERORDER+1)],
-               weightState, 0);
-
-           /* construct decoded vector */
-
-           iCBConstruct(reverseDecresidual, extra_cb_index,
-               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES);
-
-           /* get decoded residual from reversed vector */
-
-           for (k=0; k<diff; k++) {
-               decresidual[start_pos-1-k] = reverseDecresidual[k];
-
-
-
-Andersen, et al.              Experimental                     [Page 57]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           }
-       }
-
-       /* counter for predicted sub-frames */
-
-       subcount=0;
-
-       /* forward prediction of sub-frames */
-
-       Nfor = iLBCenc_inst->nsub-start-1;
-
-
-       if ( Nfor > 0 ) {
-
-           /* setup memory */
-
-           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
-               STATE_LEN*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nfor; subframe++) {
-
-               /* encode sub-frame */
-
-               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   &residual[(start+1+subframe)*SUBL],
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES,
-                   &weightdenum[(start+1+subframe)*
-                               (LPC_FILTERORDER+1)],
-                   weightState, subcount+1);
-
-               /* construct decoded vector */
-
-               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-
-
-
-Andersen, et al.              Experimental                     [Page 58]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   &decresidual[(start+1+subframe)*SUBL],
-                   SUBL*sizeof(float));
-               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-               subcount++;
-           }
-       }
-
-
-       /* backward prediction of sub-frames */
-
-       Nback = start-1;
-
-
-       if ( Nback > 0 ) {
-
-           /* create reverse order vectors */
-
-           for (n=0; n<Nback; n++) {
-               for (k=0; k<SUBL; k++) {
-                   reverseResidual[n*SUBL+k] =
-                       residual[(start-1)*SUBL-1-n*SUBL-k];
-                   reverseDecresidual[n*SUBL+k] =
-                       decresidual[(start-1)*SUBL-1-n*SUBL-k];
-               }
-           }
-
-           /* setup memory */
-
-           meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
-
-
-           if ( meml_gotten > CB_MEML ) {
-               meml_gotten=CB_MEML;
-           }
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nback; subframe++) {
-
-               /* encode sub-frame */
-
-               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-
-
-
-Andersen, et al.              Experimental                     [Page 59]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   gain_index+subcount*CB_NSTAGES,
-                   &reverseResidual[subframe*SUBL],
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES,
-                   &weightdenum[(start-2-subframe)*
-                               (LPC_FILTERORDER+1)],
-                   weightState, subcount+1);
-
-               /* construct decoded vector */
-
-               iCBConstruct(&reverseDecresidual[subframe*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
-               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
-               subcount++;
-
-           }
-
-           /* get decoded residual from reversed vector */
-
-           for (i=0; i<SUBL*Nback; i++) {
-               decresidual[SUBL*Nback - i - 1] =
-                   reverseDecresidual[i];
-           }
-       }
-       /* end encoding part */
-
-       /* adjust index */
-       index_conv_enc(cb_index);
-
-       /* pack bytes */
-
-       pbytes=bytes;
-       pos=0;
-
-       /* loop over the 3 ULP classes */
-
-       for (ulp=0; ulp<3; ulp++) {
-
-
-
-Andersen, et al.              Experimental                     [Page 60]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-
-           /* LSF */
-           for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
-               packsplit(&lsf_i[k], &firstpart, &lsf_i[k],
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp],
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-           }
-
-           /* Start block info */
-
-           packsplit(&start, &firstpart, &start,
-               iLBCenc_inst->ULP_inst->start_bits[ulp],
-               iLBCenc_inst->ULP_inst->start_bits[ulp]+
-               iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
-
-           packsplit(&state_first, &firstpart, &state_first,
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp],
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
-
-           packsplit(&idxForMax, &firstpart, &idxForMax,
-               iLBCenc_inst->ULP_inst->scale_bits[ulp],
-               iLBCenc_inst->ULP_inst->scale_bits[ulp]+
-               iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
-               iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
-           dopack( &pbytes, firstpart,
-               iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
-
-           for (k=0; k<iLBCenc_inst->state_short_len; k++) {
-               packsplit(idxVec+k, &firstpart, idxVec+k,
-                   iLBCenc_inst->ULP_inst->state_bits[ulp],
-                   iLBCenc_inst->ULP_inst->state_bits[ulp]+
-                   iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
-                   iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
-           }
-
-
-
-
-Andersen, et al.              Experimental                     [Page 61]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           /* 23/22 (20ms/30ms) sample block */
-
-           for (k=0;k<CB_NSTAGES;k++) {
-               packsplit(extra_cb_index+k, &firstpart,
-                   extra_cb_index+k,
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
-                   &pos);
-           }
-
-           for (k=0;k<CB_NSTAGES;k++) {
-               packsplit(extra_gain_index+k, &firstpart,
-                   extra_gain_index+k,
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
-               dopack( &pbytes, firstpart,
-                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
-                   &pos);
-           }
-
-           /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
-           for (i=0; i<iLBCenc_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   packsplit(cb_index+i*CB_NSTAGES+k, &firstpart,
-                       cb_index+i*CB_NSTAGES+k,
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
-                   dopack( &pbytes, firstpart,
-                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
-                       &pos);
-               }
-           }
-
-           for (i=0; i<iLBCenc_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   packsplit(gain_index+i*CB_NSTAGES+k, &firstpart,
-                       gain_index+i*CB_NSTAGES+k,
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
-
-
-
-Andersen, et al.              Experimental                     [Page 62]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
-                   dopack( &pbytes, firstpart,
-                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
-                       &pos);
-               }
-           }
-       }
-
-       /* set the last bit to zero (otherwise the decoder
-          will treat it as a lost frame) */
-       dopack( &pbytes, 0, 1, &pos);
-   }
-
-A.4.  iLBC_decode.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_decode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ILBCDECODE_H
-   #define __iLBC_ILBCDECODE_H
-
-   #include "iLBC_define.h"
-
-   short initDecode(                   /* (o) Number of decoded
-                                              samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       int mode,                       /* (i) frame size mode */
-       int use_enhancer                /* (i) 1 to use enhancer
-                                              0 to run without
-                                                enhancer */
-   );
-
-   void iLBC_decode(
-       float *decblock,            /* (o) decoded signal block */
-       unsigned char *bytes,           /* (i) encoded signal bits */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       int mode                    /* (i) 0: bad packet, PLC,
-                                              1: normal */
-
-
-
-Andersen, et al.              Experimental                     [Page 63]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   );
-
-   #endif
-
-A.5.  iLBC_decode.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_decode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-
-   #include "iLBC_define.h"
-   #include "StateConstructW.h"
-   #include "LPCdecode.h"
-   #include "iCBConstruct.h"
-   #include "doCPLC.h"
-   #include "helpfun.h"
-   #include "constants.h"
-   #include "packing.h"
-   #include "string.h"
-   #include "enhancer.h"
-   #include "hpOutput.h"
-   #include "syntFilter.h"
-
-   /*----------------------------------------------------------------*
-    *  Initiation of decoder instance.
-    *---------------------------------------------------------------*/
-
-   short initDecode(                   /* (o) Number of decoded
-                                              samples */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-       int mode,                       /* (i) frame size mode */
-       int use_enhancer                /* (i) 1 to use enhancer
-                                              0 to run without
-                                                enhancer */
-   ){
-       int i;
-
-       iLBCdec_inst->mode = mode;
-
-
-
-Andersen, et al.              Experimental                     [Page 64]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       if (mode==30) {
-           iLBCdec_inst->blockl = BLOCKL_30MS;
-           iLBCdec_inst->nsub = NSUB_30MS;
-           iLBCdec_inst->nasub = NASUB_30MS;
-           iLBCdec_inst->lpc_n = LPC_N_30MS;
-           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
-           iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
-           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
-           /* ULP init */
-           iLBCdec_inst->ULP_inst=&ULP_30msTbl;
-       }
-       else if (mode==20) {
-           iLBCdec_inst->blockl = BLOCKL_20MS;
-           iLBCdec_inst->nsub = NSUB_20MS;
-           iLBCdec_inst->nasub = NASUB_20MS;
-           iLBCdec_inst->lpc_n = LPC_N_20MS;
-           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
-           iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
-           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
-           /* ULP init */
-           iLBCdec_inst->ULP_inst=&ULP_20msTbl;
-       }
-       else {
-           exit(2);
-       }
-
-       memset(iLBCdec_inst->syntMem, 0,
-           LPC_FILTERORDER*sizeof(float));
-       memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl,
-           LPC_FILTERORDER*sizeof(float));
-
-       memset(iLBCdec_inst->old_syntdenum, 0,
-           ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
-       for (i=0; i<NSUB_MAX; i++)
-           iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
-
-       iLBCdec_inst->last_lag = 20;
-
-       iLBCdec_inst->prevLag = 120;
-       iLBCdec_inst->per = 0.0;
-       iLBCdec_inst->consPLICount = 0;
-       iLBCdec_inst->prevPLI = 0;
-       iLBCdec_inst->prevLpc[0] = 1.0;
-       memset(iLBCdec_inst->prevLpc+1,0,
-           LPC_FILTERORDER*sizeof(float));
-       memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
-       iLBCdec_inst->seed=777;
-
-
-
-
-Andersen, et al.              Experimental                     [Page 65]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
-
-       iLBCdec_inst->use_enhancer = use_enhancer;
-       memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
-       for (i=0;i<ENH_NBLOCKS_TOT;i++)
-           iLBCdec_inst->enh_period[i]=(float)40.0;
-
-       iLBCdec_inst->prev_enh_pl = 0;
-
-       return (iLBCdec_inst->blockl);
-   }
-
-   /*----------------------------------------------------------------*
-    *  frame residual decoder function (subrutine to iLBC_decode)
-    *---------------------------------------------------------------*/
-
-   void Decode(
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       float *decresidual,             /* (o) decoded residual frame */
-       int start,                      /* (i) location of start
-                                              state */
-       int idxForMax,                  /* (i) codebook index for the
-                                              maximum value */
-       int *idxVec,                /* (i) codebook indexes for the
-                                              samples  in the start
-                                              state */
-       float *syntdenum,               /* (i) the decoded synthesis
-                                              filter coefficients */
-       int *cb_index,                  /* (i) the indexes for the
-                                              adaptive codebook */
-       int *gain_index,            /* (i) the indexes for the
-                                              corresponding gains */
-       int *extra_cb_index,        /* (i) the indexes for the
-                                              adaptive codebook part
-                                              of start state */
-       int *extra_gain_index,          /* (i) the indexes for the
-                                              corresponding gains */
-       int state_first                 /* (i) 1 if non adaptive part
-                                              of start state comes
-                                              first 0 if that part
-                                              comes last */
-   ){
-       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-       int k, meml_gotten, Nfor, Nback, i;
-       int diff, start_pos;
-       int subcount, subframe;
-
-
-
-
-Andersen, et al.              Experimental                     [Page 66]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       diff = STATE_LEN - iLBCdec_inst->state_short_len;
-
-       if (state_first == 1) {
-           start_pos = (start-1)*SUBL;
-       } else {
-           start_pos = (start-1)*SUBL + diff;
-       }
-
-       /* decode scalar part of start state */
-
-       StateConstructW(idxForMax, idxVec,
-           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
-           &decresidual[start_pos], iLBCdec_inst->state_short_len);
-
-
-       if (state_first) { /* put adaptive part in the end */
-
-           /* setup memory */
-
-           memset(mem, 0,
-               (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
-           memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len,
-               decresidual+start_pos,
-               iLBCdec_inst->state_short_len*sizeof(float));
-
-           /* construct decoded vector */
-
-           iCBConstruct(
-               &decresidual[start_pos+iLBCdec_inst->state_short_len],
-               extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
-               stMemLTbl, diff, CB_NSTAGES);
-
-       }
-       else {/* put adaptive part in the beginning */
-
-           /* create reversed vectors for prediction */
-
-           for (k=0; k<diff; k++) {
-               reverseDecresidual[k] =
-                   decresidual[(start+1)*SUBL-1-
-                           (k+iLBCdec_inst->state_short_len)];
-           }
-
-           /* setup memory */
-
-           meml_gotten = iLBCdec_inst->state_short_len;
-           for (k=0; k<meml_gotten; k++){
-               mem[CB_MEML-1-k] = decresidual[start_pos + k];
-
-
-
-Andersen, et al.              Experimental                     [Page 67]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
-           /* construct decoded vector */
-
-           iCBConstruct(reverseDecresidual, extra_cb_index,
-               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
-               diff, CB_NSTAGES);
-
-           /* get decoded residual from reversed vector */
-
-           for (k=0; k<diff; k++) {
-               decresidual[start_pos-1-k] = reverseDecresidual[k];
-           }
-       }
-
-       /* counter for predicted sub-frames */
-
-       subcount=0;
-
-       /* forward prediction of sub-frames */
-
-       Nfor = iLBCdec_inst->nsub-start-1;
-
-       if ( Nfor > 0 ){
-
-           /* setup memory */
-
-           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
-               STATE_LEN*sizeof(float));
-
-           /* loop over sub-frames to encode */
-
-           for (subframe=0; subframe<Nfor; subframe++) {
-
-               /* construct decoded vector */
-
-               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount],
-                   memLfTbl[subcount], SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-
-
-
-Andersen, et al.              Experimental                     [Page 68]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   &decresidual[(start+1+subframe)*SUBL],
-                   SUBL*sizeof(float));
-
-               subcount++;
-
-           }
-
-       }
-
-       /* backward prediction of sub-frames */
-
-       Nback = start-1;
-
-       if ( Nback > 0 ) {
-
-           /* setup memory */
-
-           meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
-
-           if ( meml_gotten > CB_MEML ) {
-               meml_gotten=CB_MEML;
-           }
-           for (k=0; k<meml_gotten; k++) {
-               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-           }
-           memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
-           /* loop over subframes to decode */
-
-           for (subframe=0; subframe<Nback; subframe++) {
-
-               /* construct decoded vector */
-
-               iCBConstruct(&reverseDecresidual[subframe*SUBL],
-                   cb_index+subcount*CB_NSTAGES,
-                   gain_index+subcount*CB_NSTAGES,
-                   mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount],
-                   SUBL, CB_NSTAGES);
-
-               /* update memory */
-
-               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-               memcpy(mem+CB_MEML-SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
-
-               subcount++;
-           }
-
-
-
-Andersen, et al.              Experimental                     [Page 69]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           /* get decoded residual from reversed vector */
-
-           for (i=0; i<SUBL*Nback; i++)
-               decresidual[SUBL*Nback - i - 1] =
-               reverseDecresidual[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  main decoder function
-    *---------------------------------------------------------------*/
-
-   void iLBC_decode(
-       float *decblock,            /* (o) decoded signal block */
-       unsigned char *bytes,           /* (i) encoded signal bits */
-       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
-                                                structure */
-       int mode                    /* (i) 0: bad packet, PLC,
-                                              1: normal */
-   ){
-       float data[BLOCKL_MAX];
-       float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
-       float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
-       float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
-       int k, i, start, idxForMax, pos, lastpart, ulp;
-       int lag, ilag;
-       float cc, maxcc;
-       int idxVec[STATE_LEN];
-       int check;
-       int gain_index[NASUB_MAX*CB_NSTAGES],
-           extra_gain_index[CB_NSTAGES];
-       int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
-       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-       int state_first;
-       int last_bit;
-       unsigned char *pbytes;
-       float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-       int order_plus_one;
-       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
-       float decresidual[BLOCKL_MAX];
-
-       if (mode>0) { /* the data are good */
-
-           /* decode data */
-
-           pbytes=bytes;
-           pos=0;
-
-
-
-
-Andersen, et al.              Experimental                     [Page 70]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           /* Set everything to zero before decoding */
-
-           for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
-               lsf_i[k]=0;
-           }
-           start=0;
-           state_first=0;
-           idxForMax=0;
-           for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-               idxVec[k]=0;
-           }
-           for (k=0; k<CB_NSTAGES; k++) {
-               extra_cb_index[k]=0;
-           }
-           for (k=0; k<CB_NSTAGES; k++) {
-               extra_gain_index[k]=0;
-           }
-           for (i=0; i<iLBCdec_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   cb_index[i*CB_NSTAGES+k]=0;
-               }
-           }
-           for (i=0; i<iLBCdec_inst->nasub; i++) {
-               for (k=0; k<CB_NSTAGES; k++) {
-                   gain_index[i*CB_NSTAGES+k]=0;
-               }
-           }
-
-           /* loop over ULP classes */
-
-           for (ulp=0; ulp<3; ulp++) {
-
-               /* LSF */
-               for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-                   packcombine(&lsf_i[k], lastpart,
-                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
-               }
-
-               /* Start block info */
-
-               unpack( &pbytes, &lastpart,
-                   iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
-               packcombine(&start, lastpart,
-                   iLBCdec_inst->ULP_inst->start_bits[ulp]);
-
-               unpack( &pbytes, &lastpart,
-
-
-
-Andersen, et al.              Experimental                     [Page 71]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
-               packcombine(&state_first, lastpart,
-                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
-
-               unpack( &pbytes, &lastpart,
-                   iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
-               packcombine(&idxForMax, lastpart,
-                   iLBCdec_inst->ULP_inst->scale_bits[ulp]);
-
-               for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
-                   packcombine(idxVec+k, lastpart,
-                       iLBCdec_inst->ULP_inst->state_bits[ulp]);
-               }
-
-               /* 23/22 (20ms/30ms) sample block */
-
-               for (k=0; k<CB_NSTAGES; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp],
-                       &pos);
-                   packcombine(extra_cb_index+k, lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
-               }
-               for (k=0; k<CB_NSTAGES; k++) {
-                   unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp],
-                       &pos);
-                   packcombine(extra_gain_index+k, lastpart,
-                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
-               }
-
-               /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
-               for (i=0; i<iLBCdec_inst->nasub; i++) {
-                   for (k=0; k<CB_NSTAGES; k++) {
-                       unpack( &pbytes, &lastpart,
-                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp],
-                           &pos);
-                       packcombine(cb_index+i*CB_NSTAGES+k, lastpart,
-                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
-                   }
-               }
-
-               for (i=0; i<iLBCdec_inst->nasub; i++) {
-                   for (k=0; k<CB_NSTAGES; k++) {
-                       unpack( &pbytes, &lastpart,
-
-
-
-Andersen, et al.              Experimental                     [Page 72]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                       iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp],
-                           &pos);
-                       packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
-                           iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
-                   }
-               }
-           }
-           /* Extract last bit. If it is 1 this indicates an
-              empty/lost frame */
-           unpack( &pbytes, &last_bit, 1, &pos);
-
-           /* Check for bit errors or empty/lost frames */
-           if (start<1)
-               mode = 0;
-           if (iLBCdec_inst->mode==20 && start>3)
-               mode = 0;
-           if (iLBCdec_inst->mode==30 && start>5)
-               mode = 0;
-           if (last_bit==1)
-               mode = 0;
-
-           if (mode==1) { /* No bit errors was detected,
-                             continue decoding */
-
-               /* adjust index */
-               index_conv_dec(cb_index);
-
-               /* decode the lsf */
-
-               SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
-               check=LSF_check(lsfdeq, LPC_FILTERORDER,
-                   iLBCdec_inst->lpc_n);
-               DecoderInterpolateLSF(syntdenum, weightdenum,
-                   lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
-
-               Decode(iLBCdec_inst, decresidual, start, idxForMax,
-                   idxVec, syntdenum, cb_index, gain_index,
-                   extra_cb_index, extra_gain_index,
-                   state_first);
-
-               /* preparing the plc for a future loss! */
-
-               doThePLC(PLCresidual, PLClpc, 0, decresidual,
-                   syntdenum +
-                   (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
-                   (*iLBCdec_inst).last_lag, iLBCdec_inst);
-
-
-
-
-
-Andersen, et al.              Experimental                     [Page 73]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               memcpy(decresidual, PLCresidual,
-                   iLBCdec_inst->blockl*sizeof(float));
-           }
-
-       }
-
-       if (mode == 0) {
-           /* the data is bad (either a PLC call
-            * was made or a severe bit error was detected)
-            */
-
-           /* packet loss conceal */
-
-           memset(zeros, 0, BLOCKL_MAX*sizeof(float));
-
-           one[0] = 1;
-           memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
-
-           start=0;
-
-           doThePLC(PLCresidual, PLClpc, 1, zeros, one,
-               (*iLBCdec_inst).last_lag, iLBCdec_inst);
-           memcpy(decresidual, PLCresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-
-           order_plus_one = LPC_FILTERORDER + 1;
-           for (i = 0; i < iLBCdec_inst->nsub; i++) {
-               memcpy(syntdenum+(i*order_plus_one), PLClpc,
-                   order_plus_one*sizeof(float));
-           }
-       }
-
-       if (iLBCdec_inst->use_enhancer == 1) {
-
-           /* post filtering */
-
-           iLBCdec_inst->last_lag =
-               enhancerInterface(data, decresidual, iLBCdec_inst);
-
-           /* synthesis filtering */
-
-           if (iLBCdec_inst->mode==20) {
-               /* Enhancer has 40 samples delay */
-               i=0;
-               syntFilter(data + i*SUBL,
-                   iLBCdec_inst->old_syntdenum +
-                   (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1),
-                   SUBL, iLBCdec_inst->syntMem);
-
-
-
-Andersen, et al.              Experimental                     [Page 74]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               for (i=1; i < iLBCdec_inst->nsub; i++) {
-                   syntFilter(data + i*SUBL,
-                       syntdenum + (i-1)*(LPC_FILTERORDER+1),
-                       SUBL, iLBCdec_inst->syntMem);
-               }
-           } else if (iLBCdec_inst->mode==30) {
-               /* Enhancer has 80 samples delay */
-               for (i=0; i < 2; i++) {
-                   syntFilter(data + i*SUBL,
-                       iLBCdec_inst->old_syntdenum +
-                       (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
-                       SUBL, iLBCdec_inst->syntMem);
-               }
-               for (i=2; i < iLBCdec_inst->nsub; i++) {
-                   syntFilter(data + i*SUBL,
-                       syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
-                       iLBCdec_inst->syntMem);
-               }
-           }
-
-       } else {
-
-           /* Find last lag */
-           lag = 20;
-           maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
-               &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
-
-           for (ilag=21; ilag<120; ilag++) {
-               cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
-                   &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag],
-                   ENH_BLOCKL);
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-           iLBCdec_inst->last_lag = lag;
-
-           /* copy data and run synthesis filter */
-
-           memcpy(data, decresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-           for (i=0; i < iLBCdec_inst->nsub; i++) {
-               syntFilter(data + i*SUBL,
-                   syntdenum + i*(LPC_FILTERORDER+1), SUBL,
-                   iLBCdec_inst->syntMem);
-           }
-
-
-
-Andersen, et al.              Experimental                     [Page 75]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       }
-
-       /* high pass filtering on output if desired, otherwise
-          copy to out */
-
-       hpOutput(data, iLBCdec_inst->blockl,
-                   decblock,iLBCdec_inst->hpomem);
-
-       /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
-
-       memcpy(iLBCdec_inst->old_syntdenum, syntdenum,
-
-           iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
-
-       iLBCdec_inst->prev_enh_pl=0;
-
-       if (mode==0) { /* PLC was used */
-           iLBCdec_inst->prev_enh_pl=1;
-       }
-   }
-
-A.6.  iLBC_define.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iLBC_define.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-   #include <string.h>
-
-   #ifndef __iLBC_ILBCDEFINE_H
-   #define __iLBC_ILBCDEFINE_H
-
-   /* general codec settings */
-
-   #define FS                      (float)8000.0
-   #define BLOCKL_20MS             160
-   #define BLOCKL_30MS             240
-   #define BLOCKL_MAX              240
-   #define NSUB_20MS               4
-   #define NSUB_30MS               6
-   #define NSUB_MAX            6
-   #define NASUB_20MS              2
-
-
-
-Andersen, et al.              Experimental                     [Page 76]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #define NASUB_30MS              4
-   #define NASUB_MAX               4
-   #define SUBL                40
-   #define STATE_LEN               80
-   #define STATE_SHORT_LEN_30MS    58
-   #define STATE_SHORT_LEN_20MS    57
-
-   /* LPC settings */
-
-   #define LPC_FILTERORDER         10
-   #define LPC_CHIRP_SYNTDENUM     (float)0.9025
-   #define LPC_CHIRP_WEIGHTDENUM   (float)0.4222
-   #define LPC_LOOKBACK        60
-   #define LPC_N_20MS              1
-   #define LPC_N_30MS              2
-   #define LPC_N_MAX               2
-   #define LPC_ASYMDIFF        20
-   #define LPC_BW                  (float)60.0
-   #define LPC_WN                  (float)1.0001
-   #define LSF_NSPLIT              3
-   #define LSF_NUMBER_OF_STEPS     4
-   #define LPC_HALFORDER           (LPC_FILTERORDER/2)
-
-   /* cb settings */
-
-   #define CB_NSTAGES              3
-   #define CB_EXPAND               2
-   #define CB_MEML                 147
-   #define CB_FILTERLEN        2*4
-   #define CB_HALFFILTERLEN    4
-   #define CB_RESRANGE             34
-   #define CB_MAXGAIN              (float)1.3
-
-   /* enhancer */
-
-   #define ENH_BLOCKL              80  /* block length */
-   #define ENH_BLOCKL_HALF         (ENH_BLOCKL/2)
-   #define ENH_HL                  3   /* 2*ENH_HL+1 is number blocks
-                                          in said second sequence */
-   #define ENH_SLOP            2   /* max difference estimated and
-                                          correct pitch period */
-   #define ENH_PLOCSL              20  /* pitch-estimates and pitch-
-                                          locations buffer length */
-   #define ENH_OVERHANG        2
-   #define ENH_UPS0            4   /* upsampling rate */
-   #define ENH_FL0                 3   /* 2*FLO+1 is the length of
-                                          each filter */
-   #define ENH_VECTL               (ENH_BLOCKL+2*ENH_FL0)
-
-
-
-Andersen, et al.              Experimental                     [Page 77]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #define ENH_CORRDIM             (2*ENH_SLOP+1)
-   #define ENH_NBLOCKS             (BLOCKL_MAX/ENH_BLOCKL)
-   #define ENH_NBLOCKS_EXTRA       5
-   #define ENH_NBLOCKS_TOT         8   /* ENH_NBLOCKS +
-                                          ENH_NBLOCKS_EXTRA */
-   #define ENH_BUFL            (ENH_NBLOCKS_TOT)*ENH_BLOCKL
-   #define ENH_ALPHA0              (float)0.05
-
-   /* Down sampling */
-
-   #define FILTERORDER_DS          7
-   #define DELAY_DS            3
-   #define FACTOR_DS               2
-
-   /* bit stream defs */
-
-   #define NO_OF_BYTES_20MS    38
-   #define NO_OF_BYTES_30MS    50
-   #define NO_OF_WORDS_20MS    19
-   #define NO_OF_WORDS_30MS    25
-   #define STATE_BITS              3
-   #define BYTE_LEN            8
-   #define ULP_CLASSES             3
-
-   /* help parameters */
-
-   #define FLOAT_MAX               (float)1.0e37
-   #define EPS                     (float)2.220446049250313e-016
-   #define PI                      (float)3.14159265358979323846
-   #define MIN_SAMPLE              -32768
-   #define MAX_SAMPLE              32767
-   #define TWO_PI                  (float)6.283185307
-   #define PI2                     (float)0.159154943
-
-   /* type definition encoder instance */
-   typedef struct iLBC_ULP_Inst_t_ {
-       int lsf_bits[6][ULP_CLASSES+2];
-       int start_bits[ULP_CLASSES+2];
-       int startfirst_bits[ULP_CLASSES+2];
-       int scale_bits[ULP_CLASSES+2];
-       int state_bits[ULP_CLASSES+2];
-       int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
-       int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
-       int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-       int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-   } iLBC_ULP_Inst_t;
-
-   /* type definition encoder instance */
-
-
-
-Andersen, et al.              Experimental                     [Page 78]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   typedef struct iLBC_Enc_Inst_t_ {
-
-       /* flag for frame size mode */
-       int mode;
-
-       /* basic parameters for different frame sizes */
-       int blockl;
-       int nsub;
-       int nasub;
-       int no_of_bytes, no_of_words;
-       int lpc_n;
-       int state_short_len;
-       const iLBC_ULP_Inst_t *ULP_inst;
-
-       /* analysis filter state */
-       float anaMem[LPC_FILTERORDER];
-
-       /* old lsf parameters for interpolation */
-       float lsfold[LPC_FILTERORDER];
-       float lsfdeqold[LPC_FILTERORDER];
-
-       /* signal buffer for LP analysis */
-       float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
-
-       /* state of input HP filter */
-       float hpimem[4];
-
-   } iLBC_Enc_Inst_t;
-
-   /* type definition decoder instance */
-   typedef struct iLBC_Dec_Inst_t_ {
-
-       /* flag for frame size mode */
-       int mode;
-
-       /* basic parameters for different frame sizes */
-       int blockl;
-       int nsub;
-       int nasub;
-       int no_of_bytes, no_of_words;
-       int lpc_n;
-       int state_short_len;
-       const iLBC_ULP_Inst_t *ULP_inst;
-
-       /* synthesis filter state */
-       float syntMem[LPC_FILTERORDER];
-
-       /* old LSF for interpolation */
-
-
-
-Andersen, et al.              Experimental                     [Page 79]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float lsfdeqold[LPC_FILTERORDER];
-
-       /* pitch lag estimated in enhancer and used in PLC */
-       int last_lag;
-
-       /* PLC state information */
-       int prevLag, consPLICount, prevPLI, prev_enh_pl;
-       float prevLpc[LPC_FILTERORDER+1];
-       float prevResidual[NSUB_MAX*SUBL];
-       float per;
-       unsigned long seed;
-
-       /* previous synthesis filter parameters */
-       float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-
-       /* state of output HP filter */
-       float hpomem[4];
-
-       /* enhancer state information */
-       int use_enhancer;
-       float enh_buf[ENH_BUFL];
-       float enh_period[ENH_NBLOCKS_TOT];
-
-   } iLBC_Dec_Inst_t;
-
-   #endif
-
-A.7.  constants.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       constants.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_CONSTANTS_H
-   #define __iLBC_CONSTANTS_H
-
-   #include "iLBC_define.h"
-
-
-   /* ULP bit allocation */
-
-
-
-
-Andersen, et al.              Experimental                     [Page 80]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   extern const iLBC_ULP_Inst_t ULP_20msTbl;
-   extern const iLBC_ULP_Inst_t ULP_30msTbl;
-
-   /* high pass filters */
-
-   extern float hpi_zero_coefsTbl[];
-   extern float hpi_pole_coefsTbl[];
-   extern float hpo_zero_coefsTbl[];
-   extern float hpo_pole_coefsTbl[];
-
-   /* low pass filters */
-   extern float lpFilt_coefsTbl[];
-
-   /* LPC analysis and quantization */
-
-   extern float lpc_winTbl[];
-   extern float lpc_asymwinTbl[];
-   extern float lpc_lagwinTbl[];
-   extern float lsfCbTbl[];
-   extern float lsfmeanTbl[];
-   extern int   dim_lsfCbTbl[];
-   extern int   size_lsfCbTbl[];
-   extern float lsf_weightTbl_30ms[];
-   extern float lsf_weightTbl_20ms[];
-
-   /* state quantization tables */
-
-   extern float state_sq3Tbl[];
-   extern float state_frgqTbl[];
-
-   /* gain quantization tables */
-
-   extern float gain_sq3Tbl[];
-   extern float gain_sq4Tbl[];
-   extern float gain_sq5Tbl[];
-
-   /* adaptive codebook definitions */
-
-   extern int search_rangeTbl[5][CB_NSTAGES];
-   extern int memLfTbl[];
-   extern int stMemLTbl;
-   extern float cbfiltersTbl[CB_FILTERLEN];
-
-   /* enhancer definitions */
-
-   extern float polyphaserTbl[];
-   extern float enh_plocsTbl[];
-
-
-
-
-Andersen, et al.              Experimental                     [Page 81]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #endif
-
-A.8.  constants.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       constants.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /* ULP bit allocation */
-
-       /* 20 ms frame */
-
-   const iLBC_ULP_Inst_t ULP_20msTbl = {
-       /* LSF */
-       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
-           {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-       /* Start state location, gain and samples */
-       {2,0,0,0,0},
-       {1,0,0,0,0},
-       {6,0,0,0,0},
-       {0,1,2,0,0},
-       /* extra CB index and extra CB gain */
-       {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-       {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-       /* CB index and CB gain */
-       {   {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-           {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
-       {   {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-           {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
-   };
-
-       /* 30 ms frame */
-
-   const iLBC_ULP_Inst_t ULP_30msTbl = {
-       /* LSF */
-
-
-
-Andersen, et al.              Experimental                     [Page 82]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
-           {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
-       /* Start state location, gain and samples */
-       {3,0,0,0,0},
-       {1,0,0,0,0},
-       {6,0,0,0,0},
-       {0,1,2,0,0},
-       /* extra CB index and extra CB gain */
-       {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-       {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-       /* CB index and CB gain */
-       {   {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
-       {   {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
-           {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
-           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
-   };
-
-   /* HP Filters */
-
-   float hpi_zero_coefsTbl[3] = {
-       (float)0.92727436, (float)-1.8544941, (float)0.92727436
-   };
-   float hpi_pole_coefsTbl[3] = {
-       (float)1.0, (float)-1.9059465, (float)0.9114024
-   };
-   float hpo_zero_coefsTbl[3] = {
-       (float)0.93980581, (float)-1.8795834, (float)0.93980581
-   };
-   float hpo_pole_coefsTbl[3] = {
-       (float)1.0, (float)-1.9330735, (float)0.93589199
-   };
-
-   /* LP Filter */
-
-   float lpFilt_coefsTbl[FILTERORDER_DS]={
-       (float)-0.066650, (float)0.125000, (float)0.316650,
-       (float)0.414063, (float)0.316650,
-       (float)0.125000, (float)-0.066650
-   };
-
-   /* State quantization tables */
-
-   float state_sq3Tbl[8] = {
-       (float)-3.719849, (float)-2.177490, (float)-1.130005,
-
-
-
-Andersen, et al.              Experimental                     [Page 83]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       (float)-0.309692, (float)0.444214, (float)1.329712,
-       (float)2.436279, (float)3.983887
-   };
-
-   float state_frgqTbl[64] = {
-       (float)1.000085, (float)1.071695, (float)1.140395,
-       (float)1.206868, (float)1.277188, (float)1.351503,
-       (float)1.429380, (float)1.500727, (float)1.569049,
-       (float)1.639599, (float)1.707071, (float)1.781531,
-       (float)1.840799, (float)1.901550, (float)1.956695,
-       (float)2.006750, (float)2.055474, (float)2.102787,
-       (float)2.142819, (float)2.183592, (float)2.217962,
-       (float)2.257177, (float)2.295739, (float)2.332967,
-       (float)2.369248, (float)2.402792, (float)2.435080,
-       (float)2.468598, (float)2.503394, (float)2.539284,
-       (float)2.572944, (float)2.605036, (float)2.636331,
-       (float)2.668939, (float)2.698780, (float)2.729101,
-       (float)2.759786, (float)2.789834, (float)2.818679,
-       (float)2.848074, (float)2.877470, (float)2.906899,
-       (float)2.936655, (float)2.967804, (float)3.000115,
-       (float)3.033367, (float)3.066355, (float)3.104231,
-       (float)3.141499, (float)3.183012, (float)3.222952,
-       (float)3.265433, (float)3.308441, (float)3.350823,
-       (float)3.395275, (float)3.442793, (float)3.490801,
-       (float)3.542514, (float)3.604064, (float)3.666050,
-       (float)3.740994, (float)3.830749, (float)3.938770,
-       (float)4.101764
-   };
-
-   /* CB tables */
-
-   int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44},
-               {108,108,108}, {108,108,108}, {108,108,108}};
-   int stMemLTbl=85;
-   int memLfTbl[NASUB_MAX]={147,147,147,147};
-
-   /* expansion filter(s) */
-
-   float cbfiltersTbl[CB_FILTERLEN]={
-       (float)-0.034180, (float)0.108887, (float)-0.184326,
-       (float)0.806152,  (float)0.713379, (float)-0.144043,
-       (float)0.083740,  (float)-0.033691
-   };
-
-   /* Gain Quantization */
-
-   float gain_sq3Tbl[8]={
-       (float)-1.000000,  (float)-0.659973,  (float)-0.330017,
-
-
-
-Andersen, et al.              Experimental                     [Page 84]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       (float)0.000000, (float)0.250000, (float)0.500000,
-       (float)0.750000, (float)1.00000};
-
-   float gain_sq4Tbl[16]={
-       (float)-1.049988, (float)-0.900024, (float)-0.750000,
-       (float)-0.599976, (float)-0.450012, (float)-0.299988,
-       (float)-0.150024, (float)0.000000, (float)0.150024,
-       (float)0.299988, (float)0.450012, (float)0.599976,
-       (float)0.750000, (float)0.900024, (float)1.049988,
-       (float)1.200012};
-
-   float gain_sq5Tbl[32]={
-       (float)0.037476, (float)0.075012, (float)0.112488,
-       (float)0.150024, (float)0.187500, (float)0.224976,
-       (float)0.262512, (float)0.299988, (float)0.337524,
-       (float)0.375000, (float)0.412476, (float)0.450012,
-       (float)0.487488, (float)0.525024, (float)0.562500,
-       (float)0.599976, (float)0.637512, (float)0.674988,
-       (float)0.712524, (float)0.750000, (float)0.787476,
-       (float)0.825012, (float)0.862488, (float)0.900024,
-       (float)0.937500, (float)0.974976, (float)1.012512,
-       (float)1.049988, (float)1.087524, (float)1.125000,
-       (float)1.162476, (float)1.200012};
-
-   /* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
-   float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={
-       (float)0.000000, (float)0.000000, (float)0.000000,
-   (float)1.000000,
-           (float)0.000000, (float)0.000000, (float)0.000000,
-       (float)0.015625, (float)-0.076904, (float)0.288330,
-   (float)0.862061,
-           (float)-0.106445, (float)0.018799, (float)-0.015625,
-       (float)0.023682, (float)-0.124268, (float)0.601563,
-   (float)0.601563,
-           (float)-0.124268, (float)0.023682, (float)-0.023682,
-       (float)0.018799, (float)-0.106445, (float)0.862061,
-   (float)0.288330,
-           (float)-0.076904, (float)0.015625, (float)-0.018799};
-
-   float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0,
-               (float)200.0, (float)280.0, (float)360.0,
-               (float)440.0, (float)520.0, (float)600.0};
-
-   /* LPC analysis and quantization */
-
-   int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
-   int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
-
-
-
-
-Andersen, et al.              Experimental                     [Page 85]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   float lsfmeanTbl[LPC_FILTERORDER] = {
-       (float)0.281738, (float)0.445801, (float)0.663330,
-       (float)0.962524, (float)1.251831, (float)1.533081,
-       (float)1.850586, (float)2.137817, (float)2.481445,
-       (float)2.777344};
-
-   float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
-   (float)(2.0/3.0),
-       (float)(1.0/3.0), (float)0.0, (float)0.0};
-
-   float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0),
-       (float)(1.0/4.0), (float)(0.0)};
-
-   /* Hanning LPC window */
-   float lpc_winTbl[BLOCKL_MAX]={
-       (float)0.000183, (float)0.000671, (float)0.001526,
-       (float)0.002716, (float)0.004242, (float)0.006104,
-       (float)0.008301, (float)0.010834, (float)0.013702,
-       (float)0.016907, (float)0.020416, (float)0.024261,
-       (float)0.028442, (float)0.032928, (float)0.037750,
-       (float)0.042877, (float)0.048309, (float)0.054047,
-       (float)0.060089, (float)0.066437, (float)0.073090,
-       (float)0.080017, (float)0.087219, (float)0.094727,
-       (float)0.102509, (float)0.110535, (float)0.118835,
-       (float)0.127411, (float)0.136230, (float)0.145294,
-       (float)0.154602, (float)0.164154, (float)0.173920,
-       (float)0.183899, (float)0.194122, (float)0.204529,
-       (float)0.215149, (float)0.225952, (float)0.236938,
-       (float)0.248108, (float)0.259460, (float)0.270966,
-       (float)0.282654, (float)0.294464, (float)0.306396,
-       (float)0.318481, (float)0.330688, (float)0.343018,
-       (float)0.355438, (float)0.367981, (float)0.380585,
-       (float)0.393280, (float)0.406067, (float)0.418884,
-       (float)0.431763, (float)0.444702, (float)0.457672,
-       (float)0.470673, (float)0.483704, (float)0.496735,
-       (float)0.509766, (float)0.522797, (float)0.535828,
-       (float)0.548798, (float)0.561768, (float)0.574677,
-       (float)0.587524, (float)0.600342, (float)0.613068,
-       (float)0.625732, (float)0.638306, (float)0.650787,
-       (float)0.663147, (float)0.675415, (float)0.687561,
-       (float)0.699585, (float)0.711487, (float)0.723206,
-       (float)0.734802, (float)0.746216, (float)0.757477,
-       (float)0.768585, (float)0.779480, (float)0.790192,
-       (float)0.800720, (float)0.811005, (float)0.821106,
-       (float)0.830994, (float)0.840668, (float)0.850067,
-       (float)0.859253, (float)0.868225, (float)0.876892,
-       (float)0.885345, (float)0.893524, (float)0.901428,
-       (float)0.909058, (float)0.916412, (float)0.923492,
-
-
-
-Andersen, et al.              Experimental                     [Page 86]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       (float)0.930267, (float)0.936768, (float)0.942963,
-       (float)0.948853, (float)0.954437, (float)0.959717,
-       (float)0.964691, (float)0.969360, (float)0.973694,
-       (float)0.977692, (float)0.981384, (float)0.984741,
-       (float)0.987762, (float)0.990479, (float)0.992828,
-       (float)0.994873, (float)0.996552, (float)0.997925,
-       (float)0.998932, (float)0.999603, (float)0.999969,
-       (float)0.999969, (float)0.999603, (float)0.998932,
-       (float)0.997925, (float)0.996552, (float)0.994873,
-       (float)0.992828, (float)0.990479, (float)0.987762,
-       (float)0.984741, (float)0.981384, (float)0.977692,
-       (float)0.973694, (float)0.969360, (float)0.964691,
-       (float)0.959717, (float)0.954437, (float)0.948853,
-       (float)0.942963, (float)0.936768, (float)0.930267,
-       (float)0.923492, (float)0.916412, (float)0.909058,
-       (float)0.901428, (float)0.893524, (float)0.885345,
-       (float)0.876892, (float)0.868225, (float)0.859253,
-       (float)0.850067, (float)0.840668, (float)0.830994,
-       (float)0.821106, (float)0.811005, (float)0.800720,
-       (float)0.790192, (float)0.779480, (float)0.768585,
-       (float)0.757477, (float)0.746216, (float)0.734802,
-       (float)0.723206, (float)0.711487, (float)0.699585,
-       (float)0.687561, (float)0.675415, (float)0.663147,
-       (float)0.650787, (float)0.638306, (float)0.625732,
-       (float)0.613068, (float)0.600342, (float)0.587524,
-       (float)0.574677, (float)0.561768, (float)0.548798,
-       (float)0.535828, (float)0.522797, (float)0.509766,
-       (float)0.496735, (float)0.483704, (float)0.470673,
-       (float)0.457672, (float)0.444702, (float)0.431763,
-       (float)0.418884, (float)0.406067, (float)0.393280,
-       (float)0.380585, (float)0.367981, (float)0.355438,
-       (float)0.343018, (float)0.330688, (float)0.318481,
-       (float)0.306396, (float)0.294464, (float)0.282654,
-       (float)0.270966, (float)0.259460, (float)0.248108,
-       (float)0.236938, (float)0.225952, (float)0.215149,
-       (float)0.204529, (float)0.194122, (float)0.183899,
-       (float)0.173920, (float)0.164154, (float)0.154602,
-       (float)0.145294, (float)0.136230, (float)0.127411,
-       (float)0.118835, (float)0.110535, (float)0.102509,
-       (float)0.094727, (float)0.087219, (float)0.080017,
-       (float)0.073090, (float)0.066437, (float)0.060089,
-       (float)0.054047, (float)0.048309, (float)0.042877,
-       (float)0.037750, (float)0.032928, (float)0.028442,
-       (float)0.024261, (float)0.020416, (float)0.016907,
-       (float)0.013702, (float)0.010834, (float)0.008301,
-       (float)0.006104, (float)0.004242, (float)0.002716,
-       (float)0.001526, (float)0.000671, (float)0.000183
-   };
-
-
-
-Andersen, et al.              Experimental                     [Page 87]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   /* Asymmetric LPC window */
-   float lpc_asymwinTbl[BLOCKL_MAX]={
-       (float)0.000061, (float)0.000214, (float)0.000458,
-       (float)0.000824, (float)0.001282, (float)0.001831,
-       (float)0.002472, (float)0.003235, (float)0.004120,
-       (float)0.005066, (float)0.006134, (float)0.007294,
-       (float)0.008545, (float)0.009918, (float)0.011383,
-       (float)0.012939, (float)0.014587, (float)0.016357,
-       (float)0.018219, (float)0.020172, (float)0.022217,
-       (float)0.024353, (float)0.026611, (float)0.028961,
-       (float)0.031372, (float)0.033905, (float)0.036530,
-       (float)0.039276, (float)0.042084, (float)0.044983,
-       (float)0.047974, (float)0.051086, (float)0.054260,
-       (float)0.057526, (float)0.060883, (float)0.064331,
-       (float)0.067871, (float)0.071503, (float)0.075226,
-       (float)0.079010, (float)0.082916, (float)0.086884,
-       (float)0.090942, (float)0.095062, (float)0.099304,
-       (float)0.103607, (float)0.107971, (float)0.112427,
-       (float)0.116974, (float)0.121582, (float)0.126282,
-       (float)0.131073, (float)0.135895, (float)0.140839,
-       (float)0.145813, (float)0.150879, (float)0.156006,
-       (float)0.161224, (float)0.166504, (float)0.171844,
-       (float)0.177246, (float)0.182709, (float)0.188263,
-       (float)0.193848, (float)0.199524, (float)0.205231,
-       (float)0.211029, (float)0.216858, (float)0.222778,
-       (float)0.228729, (float)0.234741, (float)0.240814,
-       (float)0.246918, (float)0.253082, (float)0.259308,
-       (float)0.265564, (float)0.271881, (float)0.278259,
-       (float)0.284668, (float)0.291107, (float)0.297607,
-       (float)0.304138, (float)0.310730, (float)0.317322,
-       (float)0.323975, (float)0.330658, (float)0.337372,
-       (float)0.344147, (float)0.350922, (float)0.357727,
-       (float)0.364594, (float)0.371460, (float)0.378357,
-       (float)0.385284, (float)0.392212, (float)0.399170,
-       (float)0.406158, (float)0.413177, (float)0.420197,
-       (float)0.427246, (float)0.434296, (float)0.441376,
-       (float)0.448456, (float)0.455536, (float)0.462646,
-       (float)0.469757, (float)0.476868, (float)0.483978,
-       (float)0.491089, (float)0.498230, (float)0.505341,
-       (float)0.512451, (float)0.519592, (float)0.526703,
-       (float)0.533813, (float)0.540924, (float)0.548004,
-       (float)0.555084, (float)0.562164, (float)0.569244,
-       (float)0.576294, (float)0.583313, (float)0.590332,
-       (float)0.597321, (float)0.604309, (float)0.611267,
-       (float)0.618195, (float)0.625092, (float)0.631989,
-       (float)0.638855, (float)0.645660, (float)0.652466,
-       (float)0.659241, (float)0.665985, (float)0.672668,
-       (float)0.679352, (float)0.685974, (float)0.692566,
-
-
-
-Andersen, et al.              Experimental                     [Page 88]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       (float)0.699127, (float)0.705658, (float)0.712128,
-       (float)0.718536, (float)0.724945, (float)0.731262,
-       (float)0.737549, (float)0.743805, (float)0.750000,
-       (float)0.756134, (float)0.762238, (float)0.768280,
-       (float)0.774261, (float)0.780182, (float)0.786072,
-       (float)0.791870, (float)0.797638, (float)0.803314,
-       (float)0.808960, (float)0.814514, (float)0.820038,
-       (float)0.825470, (float)0.830841, (float)0.836151,
-       (float)0.841400, (float)0.846558, (float)0.851654,
-       (float)0.856689, (float)0.861633, (float)0.866516,
-       (float)0.871338, (float)0.876068, (float)0.880737,
-       (float)0.885315, (float)0.889801, (float)0.894226,
-       (float)0.898560, (float)0.902832, (float)0.907013,
-       (float)0.911102, (float)0.915100, (float)0.919037,
-       (float)0.922882, (float)0.926636, (float)0.930328,
-       (float)0.933899, (float)0.937408, (float)0.940796,
-       (float)0.944122, (float)0.947357, (float)0.950470,
-       (float)0.953522, (float)0.956482, (float)0.959351,
-       (float)0.962097, (float)0.964783, (float)0.967377,
-       (float)0.969849, (float)0.972229, (float)0.974518,
-       (float)0.976715, (float)0.978821, (float)0.980835,
-       (float)0.982727, (float)0.984528, (float)0.986237,
-       (float)0.987854, (float)0.989380, (float)0.990784,
-       (float)0.992096, (float)0.993317, (float)0.994415,
-       (float)0.995422, (float)0.996338, (float)0.997162,
-       (float)0.997864, (float)0.998474, (float)0.998962,
-       (float)0.999390, (float)0.999695, (float)0.999878,
-       (float)0.999969, (float)0.999969, (float)0.996918,
-       (float)0.987701, (float)0.972382, (float)0.951050,
-       (float)0.923889, (float)0.891022, (float)0.852631,
-       (float)0.809021, (float)0.760406, (float)0.707092,
-       (float)0.649445, (float)0.587799, (float)0.522491,
-       (float)0.453979, (float)0.382690, (float)0.309021,
-       (float)0.233459, (float)0.156433, (float)0.078461
-   };
-
-   /* Lag window for LPC */
-   float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
-       (float)1.000100, (float)0.998890, (float)0.995569,
-           (float)0.990057, (float)0.982392,
-       (float)0.972623, (float)0.960816, (float)0.947047,
-           (float)0.931405, (float)0.913989, (float)0.894909};
-
-   /* LSF quantization*/
-   float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
-   (float)0.155396, (float)0.273193, (float)0.451172,
-   (float)0.390503, (float)0.648071, (float)1.002075,
-   (float)0.440186, (float)0.692261, (float)0.955688,
-
-
-
-Andersen, et al.              Experimental                     [Page 89]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)0.343628, (float)0.642334, (float)1.071533,
-   (float)0.318359, (float)0.491577, (float)0.670532,
-   (float)0.193115, (float)0.375488, (float)0.725708,
-   (float)0.364136, (float)0.510376, (float)0.658691,
-   (float)0.297485, (float)0.527588, (float)0.842529,
-   (float)0.227173, (float)0.365967, (float)0.563110,
-   (float)0.244995, (float)0.396729, (float)0.636475,
-   (float)0.169434, (float)0.300171, (float)0.520264,
-   (float)0.312866, (float)0.464478, (float)0.643188,
-   (float)0.248535, (float)0.429932, (float)0.626099,
-   (float)0.236206, (float)0.491333, (float)0.817139,
-   (float)0.334961, (float)0.625122, (float)0.895752,
-   (float)0.343018, (float)0.518555, (float)0.698608,
-   (float)0.372803, (float)0.659790, (float)0.945435,
-   (float)0.176880, (float)0.316528, (float)0.581421,
-   (float)0.416382, (float)0.625977, (float)0.805176,
-   (float)0.303223, (float)0.568726, (float)0.915039,
-   (float)0.203613, (float)0.351440, (float)0.588135,
-   (float)0.221191, (float)0.375000, (float)0.614746,
-   (float)0.199951, (float)0.323364, (float)0.476074,
-   (float)0.300781, (float)0.433350, (float)0.566895,
-   (float)0.226196, (float)0.354004, (float)0.507568,
-   (float)0.300049, (float)0.508179, (float)0.711670,
-   (float)0.312012, (float)0.492676, (float)0.763428,
-   (float)0.329956, (float)0.541016, (float)0.795776,
-   (float)0.373779, (float)0.604614, (float)0.928833,
-   (float)0.210571, (float)0.452026, (float)0.755249,
-   (float)0.271118, (float)0.473267, (float)0.662476,
-   (float)0.285522, (float)0.436890, (float)0.634399,
-   (float)0.246704, (float)0.565552, (float)0.859009,
-   (float)0.270508, (float)0.406250, (float)0.553589,
-   (float)0.361450, (float)0.578491, (float)0.813843,
-   (float)0.342651, (float)0.482788, (float)0.622437,
-   (float)0.340332, (float)0.549438, (float)0.743164,
-   (float)0.200439, (float)0.336304, (float)0.540894,
-   (float)0.407837, (float)0.644775, (float)0.895142,
-   (float)0.294678, (float)0.454834, (float)0.699097,
-   (float)0.193115, (float)0.344482, (float)0.643188,
-   (float)0.275757, (float)0.420776, (float)0.598755,
-   (float)0.380493, (float)0.608643, (float)0.861084,
-   (float)0.222778, (float)0.426147, (float)0.676514,
-   (float)0.407471, (float)0.700195, (float)1.053101,
-   (float)0.218384, (float)0.377197, (float)0.669922,
-   (float)0.313232, (float)0.454102, (float)0.600952,
-   (float)0.347412, (float)0.571533, (float)0.874146,
-   (float)0.238037, (float)0.405396, (float)0.729492,
-   (float)0.223877, (float)0.412964, (float)0.822021,
-   (float)0.395264, (float)0.582153, (float)0.743896,
-
-
-
-Andersen, et al.              Experimental                     [Page 90]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)0.247925, (float)0.485596, (float)0.720581,
-   (float)0.229126, (float)0.496582, (float)0.907715,
-   (float)0.260132, (float)0.566895, (float)1.012695,
-   (float)0.337402, (float)0.611572, (float)0.978149,
-   (float)0.267822, (float)0.447632, (float)0.769287,
-   (float)0.250610, (float)0.381714, (float)0.530029,
-   (float)0.430054, (float)0.805054, (float)1.221924,
-   (float)0.382568, (float)0.544067, (float)0.701660,
-   (float)0.383545, (float)0.710327, (float)1.149170,
-   (float)0.271362, (float)0.529053, (float)0.775513,
-   (float)0.246826, (float)0.393555, (float)0.588623,
-   (float)0.266846, (float)0.422119, (float)0.676758,
-   (float)0.311523, (float)0.580688, (float)0.838623,
-   (float)1.331177, (float)1.576782, (float)1.779541,
-   (float)1.160034, (float)1.401978, (float)1.768188,
-   (float)1.161865, (float)1.525146, (float)1.715332,
-   (float)0.759521, (float)0.913940, (float)1.119873,
-   (float)0.947144, (float)1.121338, (float)1.282471,
-   (float)1.015015, (float)1.557007, (float)1.804932,
-   (float)1.172974, (float)1.402100, (float)1.692627,
-   (float)1.087524, (float)1.474243, (float)1.665405,
-   (float)0.899536, (float)1.105225, (float)1.406250,
-   (float)1.148438, (float)1.484741, (float)1.796265,
-   (float)0.785645, (float)1.209839, (float)1.567749,
-   (float)0.867798, (float)1.166504, (float)1.450684,
-   (float)0.922485, (float)1.229858, (float)1.420898,
-   (float)0.791260, (float)1.123291, (float)1.409546,
-   (float)0.788940, (float)0.966064, (float)1.340332,
-   (float)1.051147, (float)1.272827, (float)1.556641,
-   (float)0.866821, (float)1.181152, (float)1.538818,
-   (float)0.906738, (float)1.373535, (float)1.607910,
-   (float)1.244751, (float)1.581421, (float)1.933838,
-   (float)0.913940, (float)1.337280, (float)1.539673,
-   (float)0.680542, (float)0.959229, (float)1.662720,
-   (float)0.887207, (float)1.430542, (float)1.800781,
-   (float)0.912598, (float)1.433594, (float)1.683960,
-   (float)0.860474, (float)1.060303, (float)1.455322,
-   (float)1.005127, (float)1.381104, (float)1.706909,
-   (float)0.800781, (float)1.363892, (float)1.829102,
-   (float)0.781860, (float)1.124390, (float)1.505981,
-   (float)1.003662, (float)1.471436, (float)1.684692,
-   (float)0.981323, (float)1.309570, (float)1.618042,
-   (float)1.228760, (float)1.554321, (float)1.756470,
-   (float)0.734375, (float)0.895752, (float)1.225586,
-   (float)0.841797, (float)1.055664, (float)1.249268,
-   (float)0.920166, (float)1.119385, (float)1.486206,
-   (float)0.894409, (float)1.539063, (float)1.828979,
-   (float)1.283691, (float)1.543335, (float)1.858276,
-
-
-
-Andersen, et al.              Experimental                     [Page 91]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)0.676025, (float)0.933105, (float)1.490845,
-   (float)0.821289, (float)1.491821, (float)1.739868,
-   (float)0.923218, (float)1.144653, (float)1.580566,
-   (float)1.057251, (float)1.345581, (float)1.635864,
-   (float)0.888672, (float)1.074951, (float)1.353149,
-   (float)0.942749, (float)1.195435, (float)1.505493,
-   (float)1.492310, (float)1.788086, (float)2.039673,
-   (float)1.070313, (float)1.634399, (float)1.860962,
-   (float)1.253296, (float)1.488892, (float)1.686035,
-   (float)0.647095, (float)0.864014, (float)1.401855,
-   (float)0.866699, (float)1.254883, (float)1.453369,
-   (float)1.063965, (float)1.532593, (float)1.731323,
-   (float)1.167847, (float)1.521484, (float)1.884033,
-   (float)0.956055, (float)1.502075, (float)1.745605,
-   (float)0.928711, (float)1.288574, (float)1.479614,
-   (float)1.088013, (float)1.380737, (float)1.570801,
-   (float)0.905029, (float)1.186768, (float)1.371948,
-   (float)1.057861, (float)1.421021, (float)1.617432,
-   (float)1.108276, (float)1.312500, (float)1.501465,
-   (float)0.979492, (float)1.416992, (float)1.624268,
-   (float)1.276001, (float)1.661011, (float)2.007935,
-   (float)0.993042, (float)1.168579, (float)1.331665,
-   (float)0.778198, (float)0.944946, (float)1.235962,
-   (float)1.223755, (float)1.491333, (float)1.815674,
-   (float)0.852661, (float)1.350464, (float)1.722290,
-   (float)1.134766, (float)1.593140, (float)1.787354,
-   (float)1.051392, (float)1.339722, (float)1.531006,
-   (float)0.803589, (float)1.271240, (float)1.652100,
-   (float)0.755737, (float)1.143555, (float)1.639404,
-   (float)0.700928, (float)0.837280, (float)1.130371,
-   (float)0.942749, (float)1.197876, (float)1.669800,
-   (float)0.993286, (float)1.378296, (float)1.566528,
-   (float)0.801025, (float)1.095337, (float)1.298950,
-   (float)0.739990, (float)1.032959, (float)1.383667,
-   (float)0.845703, (float)1.072266, (float)1.543823,
-   (float)0.915649, (float)1.072266, (float)1.224487,
-   (float)1.021973, (float)1.226196, (float)1.481323,
-   (float)0.999878, (float)1.204102, (float)1.555908,
-   (float)0.722290, (float)0.913940, (float)1.340210,
-   (float)0.673340, (float)0.835938, (float)1.259521,
-   (float)0.832397, (float)1.208374, (float)1.394165,
-   (float)0.962158, (float)1.576172, (float)1.912842,
-   (float)1.166748, (float)1.370850, (float)1.556763,
-   (float)0.946289, (float)1.138550, (float)1.400391,
-   (float)1.035034, (float)1.218262, (float)1.386475,
-   (float)1.393799, (float)1.717773, (float)2.000244,
-   (float)0.972656, (float)1.260986, (float)1.760620,
-   (float)1.028198, (float)1.288452, (float)1.484619,
-
-
-
-Andersen, et al.              Experimental                     [Page 92]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)0.773560, (float)1.258057, (float)1.756714,
-   (float)1.080322, (float)1.328003, (float)1.742676,
-   (float)0.823975, (float)1.450806, (float)1.917725,
-   (float)0.859009, (float)1.016602, (float)1.191895,
-   (float)0.843994, (float)1.131104, (float)1.645020,
-   (float)1.189697, (float)1.702759, (float)1.894409,
-   (float)1.346680, (float)1.763184, (float)2.066040,
-   (float)0.980469, (float)1.253784, (float)1.441650,
-   (float)1.338135, (float)1.641968, (float)1.932739,
-   (float)1.223267, (float)1.424194, (float)1.626465,
-   (float)0.765747, (float)1.004150, (float)1.579102,
-   (float)1.042847, (float)1.269165, (float)1.647461,
-   (float)0.968750, (float)1.257568, (float)1.555786,
-   (float)0.826294, (float)0.993408, (float)1.275146,
-   (float)0.742310, (float)0.950439, (float)1.430542,
-   (float)1.054321, (float)1.439819, (float)1.828003,
-   (float)1.072998, (float)1.261719, (float)1.441895,
-   (float)0.859375, (float)1.036377, (float)1.314819,
-   (float)0.895752, (float)1.267212, (float)1.605591,
-   (float)0.805420, (float)0.962891, (float)1.142334,
-   (float)0.795654, (float)1.005493, (float)1.468506,
-   (float)1.105347, (float)1.313843, (float)1.584839,
-   (float)0.792236, (float)1.221802, (float)1.465698,
-   (float)1.170532, (float)1.467651, (float)1.664063,
-   (float)0.838257, (float)1.153198, (float)1.342163,
-   (float)0.968018, (float)1.198242, (float)1.391235,
-   (float)1.250122, (float)1.623535, (float)1.823608,
-   (float)0.711670, (float)1.058350, (float)1.512085,
-   (float)1.204834, (float)1.454468, (float)1.739136,
-   (float)1.137451, (float)1.421753, (float)1.620117,
-   (float)0.820435, (float)1.322754, (float)1.578247,
-   (float)0.798706, (float)1.005005, (float)1.213867,
-   (float)0.980713, (float)1.324951, (float)1.512939,
-   (float)1.112305, (float)1.438843, (float)1.735596,
-   (float)1.135498, (float)1.356689, (float)1.635742,
-   (float)1.101318, (float)1.387451, (float)1.686523,
-   (float)0.849854, (float)1.276978, (float)1.523438,
-   (float)1.377930, (float)1.627563, (float)1.858154,
-   (float)0.884888, (float)1.095459, (float)1.287476,
-   (float)1.289795, (float)1.505859, (float)1.756592,
-   (float)0.817505, (float)1.384155, (float)1.650513,
-   (float)1.446655, (float)1.702148, (float)1.931885,
-   (float)0.835815, (float)1.023071, (float)1.385376,
-   (float)0.916626, (float)1.139038, (float)1.335327,
-   (float)0.980103, (float)1.174072, (float)1.453735,
-   (float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
-   (float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
-   (float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
-
-
-
-Andersen, et al.              Experimental                     [Page 93]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
-   (float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
-   (float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
-   (float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
-   (float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
-   (float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
-   (float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
-   (float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
-   (float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
-   (float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
-   (float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
-   (float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
-   (float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
-   (float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
-   (float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
-   (float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
-   (float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
-   (float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
-   (float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
-   (float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
-   (float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
-   (float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
-   (float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
-   (float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
-   (float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
-   (float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
-   (float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
-   (float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
-   (float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
-   (float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
-   (float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
-   (float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
-   (float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
-   (float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
-   (float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
-   (float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
-   (float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
-   (float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
-   (float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
-   (float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
-   (float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
-   (float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
-   (float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
-   (float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
-   (float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
-   (float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
-   (float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
-   (float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
-
-
-
-Andersen, et al.              Experimental                     [Page 94]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
-   (float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
-   (float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
-   (float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
-   (float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
-   (float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
-   (float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
-   (float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
-   (float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
-   (float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
-   (float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
-   (float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
-   (float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
-   (float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
-   (float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
-   (float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
-   (float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
-   (float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
-   (float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
-   (float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
-   (float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
-   (float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
-   (float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
-   (float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
-   (float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
-   (float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
-   (float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
-   (float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
-   (float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
-   (float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
-   (float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
-   (float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
-   (float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
-   (float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
-   (float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
-   (float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
-   (float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
-   (float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
-   (float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
-   (float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
-   (float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
-   (float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
-   (float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
-   (float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
-   (float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
-   (float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
-   (float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
-   (float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
-
-
-
-Andersen, et al.              Experimental                     [Page 95]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   (float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
-   (float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
-   (float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
-   (float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
-   (float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
-   (float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
-   (float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
-   (float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
-   (float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
-   (float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
-   (float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
-   (float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
-   (float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
-   (float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
-   (float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
-   (float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
-   (float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
-   (float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
-   (float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
-   (float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
-   (float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
-   (float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
-   (float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
-   (float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
-   (float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
-   (float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
-   (float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
-   (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
-   (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
-   };
-
-A.9.  anaFilter.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       anaFilter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ANAFILTER_H
-   #define __iLBC_ANAFILTER_H
-
-   void anaFilter(
-
-
-
-Andersen, et al.              Experimental                     [Page 96]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *In,  /* (i) Signal to be filtered */
-       float *a,   /* (i) LP parameters */
-       int len,/* (i) Length of signal */
-       float *Out, /* (o) Filtered signal */
-       float *mem  /* (i/o) Filter state */
-   );
-
-   #endif
-
-A.10.  anaFilter.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       anaFilter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  LP analysis filter.
-    *---------------------------------------------------------------*/
-
-   void anaFilter(
-       float *In,  /* (i) Signal to be filtered */
-       float *a,   /* (i) LP parameters */
-       int len,/* (i) Length of signal */
-       float *Out, /* (o) Filtered signal */
-       float *mem  /* (i/o) Filter state */
-   ){
-       int i, j;
-       float *po, *pi, *pm, *pa;
-
-       po = Out;
-
-       /* Filter first part using memory from past */
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           pi = &In[i];
-           pm = &mem[LPC_FILTERORDER-1];
-           pa = a;
-           *po=0.0;
-
-
-
-Andersen, et al.              Experimental                     [Page 97]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           for (j=0; j<=i; j++) {
-               *po+=(*pa++)*(*pi--);
-           }
-           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-
-               *po+=(*pa++)*(*pm--);
-           }
-           po++;
-       }
-
-       /* Filter last part where the state is entirely
-          in the input vector */
-
-       for (i=LPC_FILTERORDER; i<len; i++) {
-           pi = &In[i];
-           pa = a;
-           *po=0.0;
-           for (j=0; j<LPC_FILTERORDER+1; j++) {
-               *po+=(*pa++)*(*pi--);
-           }
-           po++;
-       }
-
-       /* Update state vector */
-
-       memcpy(mem, &In[len-LPC_FILTERORDER],
-           LPC_FILTERORDER*sizeof(float));
-   }
-
-A.11.  createCB.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       createCB.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_CREATECB_H
-   #define __iLBC_CREATECB_H
-
-   void filteredCBvecs(
-       float *cbvectors,   /* (o) Codebook vector for the
-                                  higher section */
-
-
-
-Andersen, et al.              Experimental                     [Page 98]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *mem,         /* (i) Buffer to create codebook
-                                  vectors from */
-       int lMem        /* (i) Length of buffer */
-   );
-
-   void searchAugmentedCB(
-       int low,        /* (i) Start index for the search */
-       int high,           /* (i) End index for the search */
-       int stage,          /* (i) Current stage */
-       int startIndex,     /* (i) CB index for the first
-                                  augmented vector */
-       float *target,      /* (i) Target vector for encoding */
-       float *buffer,      /* (i) Pointer to the end of the
-                                  buffer for augmented codebook
-                                  construction */
-       float *max_measure, /* (i/o) Currently maximum measure */
-       int *best_index,/* (o) Currently the best index */
-       float *gain,    /* (o) Currently the best gain */
-       float *energy,      /* (o) Energy of augmented
-                                  codebook vectors */
-       float *invenergy/* (o) Inv energy of aug codebook
-                                  vectors */
-   );
-
-   void createAugmentedVec(
-       int index,          /* (i) Index for the aug vector
-                                  to be created */
-       float *buffer,      /* (i) Pointer to the end of the
-                                  buffer for augmented codebook
-                                  construction */
-       float *cbVec    /* (o) The construced codebook vector */
-   );
-
-   #endif
-
-A.12.  createCB.c
-
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       createCB.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-
-
-Andersen, et al.              Experimental                     [Page 99]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include <string.h>
-   #include <math.h>
-
-   /*----------------------------------------------------------------*
-    *  Construct an additional codebook vector by filtering the
-    *  initial codebook buffer. This vector is then used to expand
-    *  the codebook with an additional section.
-    *---------------------------------------------------------------*/
-
-   void filteredCBvecs(
-       float *cbvectors,   /* (o) Codebook vectors for the
-                                  higher section */
-       float *mem,         /* (i) Buffer to create codebook
-                                  vector from */
-       int lMem        /* (i) Length of buffer */
-   ){
-       int j, k;
-       float *pp, *pp1;
-       float tempbuff2[CB_MEML+CB_FILTERLEN];
-       float *pos;
-
-       memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
-       memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
-       memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0,
-           (CB_HALFFILTERLEN+1)*sizeof(float));
-
-       /* Create codebook vector for higher section by filtering */
-
-       /* do filtering */
-       pos=cbvectors;
-       memset(pos, 0, lMem*sizeof(float));
-       for (k=0; k<lMem; k++) {
-           pp=&tempbuff2[k];
-           pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-           for (j=0;j<CB_FILTERLEN;j++) {
-               (*pos)+=(*pp++)*(*pp1--);
-           }
-           pos++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  Search the augmented part of the codebook to find the best
-    *  measure.
-    *----------------------------------------------------------------*/
-
-
-
-
-Andersen, et al.              Experimental                    [Page 100]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void searchAugmentedCB(
-       int low,        /* (i) Start index for the search */
-       int high,           /* (i) End index for the search */
-       int stage,          /* (i) Current stage */
-       int startIndex,     /* (i) Codebook index for the first
-                                  aug vector */
-       float *target,      /* (i) Target vector for encoding */
-       float *buffer,      /* (i) Pointer to the end of the buffer for
-                                  augmented codebook construction */
-       float *max_measure, /* (i/o) Currently maximum measure */
-       int *best_index,/* (o) Currently the best index */
-       float *gain,    /* (o) Currently the best gain */
-       float *energy,      /* (o) Energy of augmented codebook
-                                  vectors */
-       float *invenergy/* (o) Inv energy of augmented codebook
-                                  vectors */
-   ) {
-       int icount, ilow, j, tmpIndex;
-       float *pp, *ppo, *ppi, *ppe, crossDot, alfa;
-       float weighted, measure, nrjRecursive;
-       float ftmp;
-
-       /* Compute the energy for the first (low-5)
-          noninterpolated samples */
-       nrjRecursive = (float) 0.0;
-       pp = buffer - low + 1;
-       for (j=0; j<(low-5); j++) {
-           nrjRecursive += ( (*pp)*(*pp) );
-           pp++;
-       }
-       ppe = buffer - low;
-
-
-       for (icount=low; icount<=high; icount++) {
-
-           /* Index of the codebook vector used for retrieving
-              energy values */
-           tmpIndex = startIndex+icount-20;
-
-           ilow = icount-4;
-
-           /* Update the energy recursively to save complexity */
-           nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
-           ppe--;
-           energy[tmpIndex] = nrjRecursive;
-
-           /* Compute cross dot product for the first (low-5)
-              samples */
-
-
-
-Andersen, et al.              Experimental                    [Page 101]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           crossDot = (float) 0.0;
-           pp = buffer-icount;
-           for (j=0; j<ilow; j++) {
-               crossDot += target[j]*(*pp++);
-           }
-
-           /* interpolation */
-           alfa = (float) 0.2;
-           ppo = buffer-4;
-           ppi = buffer-icount-4;
-           for (j=ilow; j<icount; j++) {
-               weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-               ppo++;
-               ppi++;
-               energy[tmpIndex] += weighted*weighted;
-               crossDot += target[j]*weighted;
-               alfa += (float)0.2;
-           }
-
-           /* Compute energy and cross dot product for the
-              remaining samples */
-           pp = buffer - icount;
-           for (j=icount; j<SUBL; j++) {
-               energy[tmpIndex] += (*pp)*(*pp);
-               crossDot += target[j]*(*pp++);
-           }
-
-           if (energy[tmpIndex]>0.0) {
-               invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
-           } else {
-               invenergy[tmpIndex] = (float) 0.0;
-           }
-
-           if (stage==0) {
-               measure = (float)-10000000.0;
-
-               if (crossDot > 0.0) {
-                   measure = crossDot*crossDot*invenergy[tmpIndex];
-               }
-           }
-           else {
-               measure = crossDot*crossDot*invenergy[tmpIndex];
-           }
-
-           /* check if measure is better */
-           ftmp = crossDot*invenergy[tmpIndex];
-
-           if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-
-
-
-Andersen, et al.              Experimental                    [Page 102]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               *best_index = tmpIndex;
-               *max_measure = measure;
-               *gain = ftmp;
-           }
-       }
-   }
-
-
-   /*----------------------------------------------------------------*
-    *  Recreate a specific codebook vector from the augmented part.
-    *
-    *----------------------------------------------------------------*/
-
-   void createAugmentedVec(
-       int index,      /* (i) Index for the augmented vector
-                              to be created */
-       float *buffer,  /* (i) Pointer to the end of the buffer for
-                              augmented codebook construction */
-       float *cbVec/* (o) The construced codebook vector */
-   ) {
-       int ilow, j;
-       float *pp, *ppo, *ppi, alfa, alfa1, weighted;
-
-       ilow = index-5;
-
-       /* copy the first noninterpolated part */
-
-       pp = buffer-index;
-       memcpy(cbVec,pp,sizeof(float)*index);
-
-       /* interpolation */
-
-       alfa1 = (float)0.2;
-       alfa = 0.0;
-       ppo = buffer-5;
-       ppi = buffer-index-5;
-       for (j=ilow; j<index; j++) {
-           weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-           ppo++;
-           ppi++;
-           cbVec[j] = weighted;
-           alfa += alfa1;
-       }
-
-       /* copy the second noninterpolated part */
-
-       pp = buffer - index;
-       memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
-
-
-
-Andersen, et al.              Experimental                    [Page 103]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   }
-
-A.13.  doCPLC.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       doCPLC.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_DOLPC_H
-   #define __iLBC_DOLPC_H
-
-   void doThePLC(
-       float *PLCresidual, /* (o) concealed residual */
-       float *PLClpc,      /* (o) concealed LP parameters */
-       int PLI,        /* (i) packet loss indicator
-                                  0 - no PL, 1 = PL */
-       float *decresidual, /* (i) decoded residual */
-       float *lpc,         /* (i) decoded LPC (only used for no PL) */
-       int inlag,          /* (i) pitch lag */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) decoder instance */
-   );
-
-   #endif
-
-A.14.  doCPLC.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       doCPLC.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-   #include <stdio.h>
-
-
-
-Andersen, et al.              Experimental                    [Page 104]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  Compute cross correlation and pitch gain for pitch prediction
-    *  of last subframe at given lag.
-    *---------------------------------------------------------------*/
-
-   void compCorr(
-       float *cc,      /* (o) cross correlation coefficient */
-       float *gc,      /* (o) gain */
-       float *pm,
-       float *buffer,  /* (i) signal buffer */
-       int lag,    /* (i) pitch lag */
-       int bLen,       /* (i) length of buffer */
-       int sRange      /* (i) correlation search length */
-   ){
-       int i;
-       float ftmp1, ftmp2, ftmp3;
-
-       /* Guard against getting outside buffer */
-       if ((bLen-sRange-lag)<0) {
-           sRange=bLen-lag;
-       }
-
-       ftmp1 = 0.0;
-       ftmp2 = 0.0;
-       ftmp3 = 0.0;
-       for (i=0; i<sRange; i++) {
-           ftmp1 += buffer[bLen-sRange+i] *
-               buffer[bLen-sRange+i-lag];
-           ftmp2 += buffer[bLen-sRange+i-lag] *
-                   buffer[bLen-sRange+i-lag];
-           ftmp3 += buffer[bLen-sRange+i] *
-                   buffer[bLen-sRange+i];
-       }
-
-       if (ftmp2 > 0.0) {
-           *cc = ftmp1*ftmp1/ftmp2;
-           *gc = (float)fabs(ftmp1/ftmp2);
-           *pm=(float)fabs(ftmp1)/
-               ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
-       }
-       else {
-           *cc = 0.0;
-           *gc = 0.0;
-           *pm=0.0;
-       }
-   }
-
-
-
-Andersen, et al.              Experimental                    [Page 105]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   /*----------------------------------------------------------------*
-    *  Packet loss concealment routine. Conceals a residual signal
-    *  and LP parameters. If no packet loss, update state.
-    *---------------------------------------------------------------*/
-
-   void doThePLC(
-       float *PLCresidual, /* (o) concealed residual */
-       float *PLClpc,      /* (o) concealed LP parameters */
-       int PLI,        /* (i) packet loss indicator
-                                  0 - no PL, 1 = PL */
-       float *decresidual, /* (i) decoded residual */
-       float *lpc,         /* (i) decoded LPC (only used for no PL) */
-       int inlag,          /* (i) pitch lag */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) decoder instance */
-   ){
-       int lag=20, randlag;
-       float gain, maxcc;
-       float use_gain;
-       float gain_comp, maxcc_comp, per, max_per;
-       int i, pick, use_lag;
-       float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
-
-       /* Packet Loss */
-
-       if (PLI == 1) {
-
-           iLBCdec_inst->consPLICount += 1;
-
-           /* if previous frame not lost,
-              determine pitch pred. gain */
-
-           if (iLBCdec_inst->prevPLI != 1) {
-
-               /* Search around the previous lag to find the
-                  best pitch period */
-
-               lag=inlag-3;
-               compCorr(&maxcc, &gain, &max_per,
-                   iLBCdec_inst->prevResidual,
-                   lag, iLBCdec_inst->blockl, 60);
-               for (i=inlag-2;i<=inlag+3;i++) {
-                   compCorr(&maxcc_comp, &gain_comp, &per,
-                       iLBCdec_inst->prevResidual,
-                       i, iLBCdec_inst->blockl, 60);
-
-                   if (maxcc_comp>maxcc) {
-                       maxcc=maxcc_comp;
-
-
-
-Andersen, et al.              Experimental                    [Page 106]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                       gain=gain_comp;
-                       lag=i;
-                       max_per=per;
-                   }
-               }
-
-           }
-
-           /* previous frame lost, use recorded lag and periodicity */
-
-           else {
-               lag=iLBCdec_inst->prevLag;
-               max_per=iLBCdec_inst->per;
-           }
-
-           /* downscaling */
-
-           use_gain=1.0;
-           if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
-               use_gain=(float)0.9;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>2*320)
-               use_gain=(float)0.7;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>3*320)
-               use_gain=(float)0.5;
-           else if (iLBCdec_inst->consPLICount*
-                           iLBCdec_inst->blockl>4*320)
-               use_gain=(float)0.0;
-
-           /* mix noise and pitch repeatition */
-           ftmp=(float)sqrt(max_per);
-           if (ftmp>(float)0.7)
-               pitchfact=(float)1.0;
-           else if (ftmp>(float)0.4)
-               pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
-           else
-               pitchfact=0.0;
-
-
-           /* avoid repetition of same pitch cycle */
-           use_lag=lag;
-           if (lag<80) {
-               use_lag=2*lag;
-           }
-
-           /* compute concealed residual */
-
-
-
-
-Andersen, et al.              Experimental                    [Page 107]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           energy = 0.0;
-           for (i=0; i<iLBCdec_inst->blockl; i++) {
-
-               /* noise component */
-
-               iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) &
-                   (0x80000000L-1);
-               randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
-               pick = i - randlag;
-
-               if (pick < 0) {
-                   randvec[i] =
-                       iLBCdec_inst->prevResidual[
-                                   iLBCdec_inst->blockl+pick];
-               } else {
-                   randvec[i] =  randvec[pick];
-               }
-
-               /* pitch repeatition component */
-               pick = i - use_lag;
-
-               if (pick < 0) {
-                   PLCresidual[i] =
-                       iLBCdec_inst->prevResidual[
-                                   iLBCdec_inst->blockl+pick];
-               } else {
-                   PLCresidual[i] = PLCresidual[pick];
-               }
-
-               /* mix random and periodicity component */
-
-               if (i<80)
-                   PLCresidual[i] = use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-               else if (i<160)
-                   PLCresidual[i] = (float)0.95*use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-               else
-                   PLCresidual[i] = (float)0.9*use_gain*(pitchfact *
-                               PLCresidual[i] +
-                               ((float)1.0 - pitchfact) * randvec[i]);
-
-               energy += PLCresidual[i] * PLCresidual[i];
-           }
-
-           /* less than 30 dB, use only noise */
-
-
-
-Andersen, et al.              Experimental                    [Page 108]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-
-           if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) {
-               gain=0.0;
-               for (i=0; i<iLBCdec_inst->blockl; i++) {
-                   PLCresidual[i] = randvec[i];
-               }
-           }
-
-           /* use old LPC */
-
-           memcpy(PLClpc,iLBCdec_inst->prevLpc,
-               (LPC_FILTERORDER+1)*sizeof(float));
-
-       }
-
-       /* no packet loss, copy input */
-
-       else {
-           memcpy(PLCresidual, decresidual,
-               iLBCdec_inst->blockl*sizeof(float));
-           memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
-           iLBCdec_inst->consPLICount = 0;
-       }
-
-       /* update state */
-
-       if (PLI) {
-           iLBCdec_inst->prevLag = lag;
-           iLBCdec_inst->per=max_per;
-       }
-
-       iLBCdec_inst->prevPLI = PLI;
-       memcpy(iLBCdec_inst->prevLpc, PLClpc,
-           (LPC_FILTERORDER+1)*sizeof(float));
-       memcpy(iLBCdec_inst->prevResidual, PLCresidual,
-           iLBCdec_inst->blockl*sizeof(float));
-   }
-
-A.15.  enhancer.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       enhancer.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-
-
-Andersen, et al.              Experimental                    [Page 109]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   ******************************************************************/
-
-   #ifndef __ENHANCER_H
-   #define __ENHANCER_H
-
-   #include "iLBC_define.h"
-
-   float xCorrCoef(
-       float *target,      /* (i) first array */
-       float *regressor,   /* (i) second array */
-       int subl        /* (i) dimension arrays */
-   );
-
-   int enhancerInterface(
-       float *out,         /* (o) the enhanced recidual signal */
-       float *in,          /* (i) the recidual signal to enhance */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i/o) the decoder state structure */
-   );
-
-   #endif
-
-A.16.  enhancer.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       enhancer.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    * Find index in array such that the array element with said
-    * index is the element of said array closest to "value"
-    * according to the squared-error criterion
-    *---------------------------------------------------------------*/
-
-   void NearestNeighbor(
-
-
-
-Andersen, et al.              Experimental                    [Page 110]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       int   *index,   /* (o) index of array element closest
-                              to value */
-       float *array,   /* (i) data array */
-       float value,/* (i) value */
-       int arlength/* (i) dimension of data array */
-   ){
-       int i;
-       float bestcrit,crit;
-
-       crit=array[0]-value;
-       bestcrit=crit*crit;
-       *index=0;
-       for (i=1; i<arlength; i++) {
-           crit=array[i]-value;
-           crit=crit*crit;
-
-           if (crit<bestcrit) {
-               bestcrit=crit;
-               *index=i;
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * compute cross correlation between sequences
-    *---------------------------------------------------------------*/
-
-   void mycorr1(
-       float* corr,    /* (o) correlation of seq1 and seq2 */
-       float* seq1,    /* (i) first sequence */
-       int dim1,           /* (i) dimension first seq1 */
-       const float *seq2,  /* (i) second sequence */
-       int dim2        /* (i) dimension seq2 */
-   ){
-       int i,j;
-
-       for (i=0; i<=dim1-dim2; i++) {
-           corr[i]=0.0;
-           for (j=0; j<dim2; j++) {
-               corr[i] += seq1[i+j] * seq2[j];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * upsample finite array assuming zeros outside bounds
-    *---------------------------------------------------------------*/
-
-
-
-
-Andersen, et al.              Experimental                    [Page 111]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void enh_upsample(
-       float* useq1,   /* (o) upsampled output sequence */
-       float* seq1,/* (i) unupsampled sequence */
-       int dim1,       /* (i) dimension seq1 */
-       int hfl         /* (i) polyphase filter length=2*hfl+1 */
-   ){
-       float *pu,*ps;
-       int i,j,k,q,filterlength,hfl2;
-       const float *polyp[ENH_UPS0]; /* pointers to
-                                        polyphase columns */
-       const float *pp;
-
-       /* define pointers for filter */
-
-       filterlength=2*hfl+1;
-
-       if ( filterlength > dim1 ) {
-           hfl2=(int) (dim1/2);
-           for (j=0; j<ENH_UPS0; j++) {
-               polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
-           }
-           hfl=hfl2;
-           filterlength=2*hfl+1;
-       }
-       else {
-           for (j=0; j<ENH_UPS0; j++) {
-               polyp[j]=polyphaserTbl+j*filterlength;
-           }
-       }
-
-       /* filtering: filter overhangs left side of sequence */
-
-       pu=useq1;
-       for (i=hfl; i<filterlength; i++) {
-           for (j=0; j<ENH_UPS0; j++) {
-               *pu=0.0;
-               pp = polyp[j];
-               ps = seq1+i;
-               for (k=0; k<=i; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-
-       /* filtering: simple convolution=inner products */
-
-       for (i=filterlength; i<dim1; i++) {
-
-
-
-Andersen, et al.              Experimental                    [Page 112]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           for (j=0;j<ENH_UPS0; j++){
-               *pu=0.0;
-               pp = polyp[j];
-               ps = seq1+i;
-               for (k=0; k<filterlength; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-
-       /* filtering: filter overhangs right side of sequence */
-
-       for (q=1; q<=hfl; q++) {
-           for (j=0; j<ENH_UPS0; j++) {
-               *pu=0.0;
-               pp = polyp[j]+q;
-               ps = seq1+dim1-1;
-               for (k=0; k<filterlength-q; k++) {
-                   *pu += *ps-- * *pp++;
-               }
-               pu++;
-           }
-       }
-   }
-
-
-   /*----------------------------------------------------------------*
-    * find segment starting near idata+estSegPos that has highest
-    * correlation with idata+centerStartPos through
-    * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a
-    * resolution of ENH_UPSO times the original of the original
-    * sampling rate
-    *---------------------------------------------------------------*/
-
-   void refiner(
-       float *seg,         /* (o) segment array */
-       float *updStartPos, /* (o) updated start point */
-       float* idata,       /* (i) original data buffer */
-       int idatal,         /* (i) dimension of idata */
-       int centerStartPos, /* (i) beginning center segment */
-       float estSegPos,/* (i) estimated beginning other segment */
-       float period    /* (i) estimated pitch period */
-   ){
-       int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
-       int tloc,tloc2,i,st,en,fraction;
-       float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
-       float corrVecUps[ENH_CORRDIM*ENH_UPS0];
-
-
-
-Andersen, et al.              Experimental                    [Page 113]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* defining array bounds */
-
-       estSegPosRounded=(int)(estSegPos - 0.5);
-
-       searchSegStartPos=estSegPosRounded-ENH_SLOP;
-
-       if (searchSegStartPos<0) {
-           searchSegStartPos=0;
-       }
-       searchSegEndPos=estSegPosRounded+ENH_SLOP;
-
-       if (searchSegEndPos+ENH_BLOCKL >= idatal) {
-           searchSegEndPos=idatal-ENH_BLOCKL-1;
-       }
-       corrdim=searchSegEndPos-searchSegStartPos+1;
-
-       /* compute upsampled correlation (corr33) and find
-          location of max */
-
-       mycorr1(corrVec,idata+searchSegStartPos,
-           corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
-       enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
-       tloc=0; maxv=corrVecUps[0];
-       for (i=1; i<ENH_UPS0*corrdim; i++) {
-
-           if (corrVecUps[i]>maxv) {
-               tloc=i;
-               maxv=corrVecUps[i];
-           }
-       }
-
-       /* make vector can be upsampled without ever running outside
-          bounds */
-
-       *updStartPos= (float)searchSegStartPos +
-           (float)tloc/(float)ENH_UPS0+(float)1.0;
-       tloc2=(int)(tloc/ENH_UPS0);
-
-       if (tloc>tloc2*ENH_UPS0) {
-           tloc2++;
-       }
-       st=searchSegStartPos+tloc2-ENH_FL0;
-
-       if (st<0) {
-           memset(vect,0,-st*sizeof(float));
-           memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
-       }
-       else {
-
-
-
-Andersen, et al.              Experimental                    [Page 114]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           en=st+ENH_VECTL;
-
-           if (en>idatal) {
-               memcpy(vect, &idata[st],
-                   (ENH_VECTL-(en-idatal))*sizeof(float));
-               memset(&vect[ENH_VECTL-(en-idatal)], 0,
-                   (en-idatal)*sizeof(float));
-           }
-           else {
-               memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
-           }
-       }
-       fraction=tloc2*ENH_UPS0-tloc;
-
-       /* compute the segment (this is actually a convolution) */
-
-       mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
-           2*ENH_FL0+1);
-   }
-
-   /*----------------------------------------------------------------*
-    * find the smoothed output data
-    *---------------------------------------------------------------*/
-
-   void smath(
-       float *odata,   /* (o) smoothed output */
-       float *sseq,/* (i) said second sequence of waveforms */
-       int hl,         /* (i) 2*hl+1 is sseq dimension */
-       float alpha0/* (i) max smoothing energy fraction */
-   ){
-       int i,k;
-       float w00,w10,w11,A,B,C,*psseq,err,errs;
-       float surround[BLOCKL_MAX]; /* shape contributed by other than
-                                      current */
-       float wt[2*ENH_HL+1];       /* waveform weighting to get
-                                      surround shape */
-       float denom;
-
-       /* create shape of contribution from all waveforms except the
-          current one */
-
-       for (i=1; i<=2*hl+1; i++) {
-           wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2)));
-       }
-       wt[hl]=0.0; /* for clarity, not used */
-       for (i=0; i<ENH_BLOCKL; i++) {
-           surround[i]=sseq[i]*wt[0];
-       }
-
-
-
-Andersen, et al.              Experimental                    [Page 115]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       for (k=1; k<hl; k++) {
-           psseq=sseq+k*ENH_BLOCKL;
-           for(i=0;i<ENH_BLOCKL; i++) {
-               surround[i]+=psseq[i]*wt[k];
-           }
-       }
-       for (k=hl+1; k<=2*hl; k++) {
-           psseq=sseq+k*ENH_BLOCKL;
-           for(i=0;i<ENH_BLOCKL; i++) {
-               surround[i]+=psseq[i]*wt[k];
-           }
-       }
-
-       /* compute some inner products */
-
-       w00 = w10 = w11 = 0.0;
-       psseq=sseq+hl*ENH_BLOCKL; /* current block  */
-       for (i=0; i<ENH_BLOCKL;i++) {
-           w00+=psseq[i]*psseq[i];
-           w11+=surround[i]*surround[i];
-           w10+=surround[i]*psseq[i];
-       }
-
-       if (fabs(w11) < 1.0) {
-           w11=1.0;
-       }
-       C = (float)sqrt( w00/w11);
-
-       /* first try enhancement without power-constraint */
-
-       errs=0.0;
-       psseq=sseq+hl*ENH_BLOCKL;
-       for (i=0; i<ENH_BLOCKL; i++) {
-           odata[i]=C*surround[i];
-           err=psseq[i]-odata[i];
-           errs+=err*err;
-       }
-
-       /* if constraint violated by first try, add constraint */
-
-       if (errs > alpha0 * w00) {
-           if ( w00 < 1) {
-               w00=1;
-           }
-           denom = (w11*w00-w10*w10)/(w00*w00);
-
-           if (denom > 0.0001) { /* eliminates numerical problems
-                                    for if smooth */
-
-
-
-Andersen, et al.              Experimental                    [Page 116]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
-               B = -alpha0/2 - A * w10/w00;
-               B = B+1;
-           }
-           else { /* essentially no difference between cycles;
-                     smoothing not needed */
-               A= 0.0;
-               B= 1.0;
-           }
-
-           /* create smoothed sequence */
-
-           psseq=sseq+hl*ENH_BLOCKL;
-           for (i=0; i<ENH_BLOCKL; i++) {
-               odata[i]=A*surround[i]+B*psseq[i];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * get the pitch-synchronous sample sequence
-    *---------------------------------------------------------------*/
-
-   void getsseq(
-       float *sseq,    /* (o) the pitch-synchronous sequence */
-       float *idata,       /* (i) original data */
-       int idatal,         /* (i) dimension of data */
-       int centerStartPos, /* (i) where current block starts */
-       float *period,      /* (i) rough-pitch-period array */
-       float *plocs,       /* (i) where periods of period array
-                                  are taken */
-       int periodl,    /* (i) dimension period array */
-       int hl              /* (i) 2*hl+1 is the number of sequences */
-   ){
-       int i,centerEndPos,q;
-       float blockStartPos[2*ENH_HL+1];
-       int lagBlock[2*ENH_HL+1];
-       float plocs2[ENH_PLOCSL];
-       float *psseq;
-
-       centerEndPos=centerStartPos+ENH_BLOCKL-1;
-
-       /* present */
-
-       NearestNeighbor(lagBlock+hl,plocs,
-           (float)0.5*(centerStartPos+centerEndPos),periodl);
-
-       blockStartPos[hl]=(float)centerStartPos;
-
-
-
-Andersen, et al.              Experimental                    [Page 117]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       psseq=sseq+ENH_BLOCKL*hl;
-       memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
-
-       /* past */
-
-       for (q=hl-1; q>=0; q--) {
-           blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
-           NearestNeighbor(lagBlock+q,plocs,
-               blockStartPos[q]+
-               ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
-
-
-           if (blockStartPos[q]-ENH_OVERHANG>=0) {
-               refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
-                   idatal, centerStartPos, blockStartPos[q],
-                   period[lagBlock[q+1]]);
-           } else {
-               psseq=sseq+q*ENH_BLOCKL;
-               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-           }
-       }
-
-       /* future */
-
-       for (i=0; i<periodl; i++) {
-           plocs2[i]=plocs[i]-period[i];
-       }
-       for (q=hl+1; q<=2*hl; q++) {
-           NearestNeighbor(lagBlock+q,plocs2,
-               blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
-
-           blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
-           if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
-               refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
-                   idatal, centerStartPos, blockStartPos[q],
-                   period[lagBlock[q]]);
-           }
-           else {
-               psseq=sseq+q*ENH_BLOCKL;
-               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * perform enhancement on idata+centerStartPos through
-    * idata+centerStartPos+ENH_BLOCKL-1
-    *---------------------------------------------------------------*/
-
-
-
-Andersen, et al.              Experimental                    [Page 118]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void enhancer(
-       float *odata,       /* (o) smoothed block, dimension blockl */
-       float *idata,       /* (i) data buffer used for enhancing */
-       int idatal,         /* (i) dimension idata */
-       int centerStartPos, /* (i) first sample current block
-                                  within idata */
-       float alpha0,       /* (i) max correction-energy-fraction
-                                 (in [0,1]) */
-       float *period,      /* (i) pitch period array */
-       float *plocs,       /* (i) locations where period array
-                                  values valid */
-       int periodl         /* (i) dimension of period and plocs */
-   ){
-       float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
-
-       /* get said second sequence of segments */
-
-       getsseq(sseq,idata,idatal,centerStartPos,period,
-           plocs,periodl,ENH_HL);
-
-       /* compute the smoothed output from said second sequence */
-
-       smath(odata,sseq,ENH_HL,alpha0);
-
-   }
-
-   /*----------------------------------------------------------------*
-    * cross correlation
-    *---------------------------------------------------------------*/
-
-   float xCorrCoef(
-       float *target,      /* (i) first array */
-       float *regressor,   /* (i) second array */
-       int subl        /* (i) dimension arrays */
-   ){
-       int i;
-       float ftmp1, ftmp2;
-
-       ftmp1 = 0.0;
-       ftmp2 = 0.0;
-       for (i=0; i<subl; i++) {
-           ftmp1 += target[i]*regressor[i];
-           ftmp2 += regressor[i]*regressor[i];
-       }
-
-       if (ftmp1 > 0.0) {
-           return (float)(ftmp1*ftmp1/ftmp2);
-       }
-
-
-
-Andersen, et al.              Experimental                    [Page 119]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       else {
-           return (float)0.0;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    * interface for enhancer
-    *---------------------------------------------------------------*/
-
-   int enhancerInterface(
-       float *out,                     /* (o) enhanced signal */
-       float *in,                      /* (i) unenhanced signal */
-       iLBC_Dec_Inst_t *iLBCdec_inst   /* (i) buffers etc */
-   ){
-       float *enh_buf, *enh_period;
-       int iblock, isample;
-       int lag=0, ilag, i, ioffset;
-       float cc, maxcc;
-       float ftmp1, ftmp2;
-       float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
-       float plc_pred[ENH_BLOCKL];
-
-       float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
-       int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
-       int start, plc_blockl, inlag;
-
-       enh_buf=iLBCdec_inst->enh_buf;
-       enh_period=iLBCdec_inst->enh_period;
-
-       memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
-           (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
-
-       memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
-           iLBCdec_inst->blockl*sizeof(float));
-
-       if (iLBCdec_inst->mode==30)
-           plc_blockl=ENH_BLOCKL;
-       else
-           plc_blockl=40;
-
-       /* when 20 ms frame, move processing one block */
-       ioffset=0;
-       if (iLBCdec_inst->mode==20) ioffset=1;
-
-       i=3-ioffset;
-       memmove(enh_period, &enh_period[i],
-           (ENH_NBLOCKS_TOT-i)*sizeof(float));
-
-
-
-
-Andersen, et al.              Experimental                    [Page 120]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* Set state information to the 6 samples right before
-          the samples to be downsampled. */
-
-       memcpy(lpState,
-           enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126,
-           6*sizeof(float));
-
-       /* Down sample a factor 2 to save computations */
-
-       DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
-                   lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
-                   lpState, downsampled);
-
-       /* Estimate the pitch in the down sampled domain. */
-       for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
-
-           lag = 10;
-           maxcc = xCorrCoef(downsampled+60+iblock*
-               ENH_BLOCKL_HALF, downsampled+60+iblock*
-               ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
-           for (ilag=11; ilag<60; ilag++) {
-               cc = xCorrCoef(downsampled+60+iblock*
-                   ENH_BLOCKL_HALF, downsampled+60+iblock*
-                   ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-
-           /* Store the estimated lag in the non-downsampled domain */
-           enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
-
-
-       }
-
-
-       /* PLC was performed on the previous packet */
-       if (iLBCdec_inst->prev_enh_pl==1) {
-
-           inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
-
-           lag = inlag-1;
-           maxcc = xCorrCoef(in, in+lag, plc_blockl);
-           for (ilag=inlag; ilag<=inlag+1; ilag++) {
-               cc = xCorrCoef(in, in+ilag, plc_blockl);
-
-
-
-
-Andersen, et al.              Experimental                    [Page 121]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               if (cc > maxcc) {
-                   maxcc = cc;
-                   lag = ilag;
-               }
-           }
-
-           enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
-
-           /* compute new concealed residual for the old lookahead,
-              mix the forward PLC with a backward PLC from
-              the new frame */
-
-           inPtr=&in[lag-1];
-
-           enh_bufPtr1=&plc_pred[plc_blockl-1];
-
-           if (lag>plc_blockl) {
-               start=plc_blockl;
-           } else {
-               start=lag;
-           }
-
-           for (isample = start; isample>0; isample--) {
-               *enh_bufPtr1-- = *inPtr--;
-           }
-
-           enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-           for (isample = (plc_blockl-1-lag); isample>=0; isample--) {
-               *enh_bufPtr1-- = *enh_bufPtr2--;
-           }
-
-           /* limit energy change */
-           ftmp2=0.0;
-           ftmp1=0.0;
-           for (i=0;i<plc_blockl;i++) {
-               ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
-                   enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
-               ftmp1+=plc_pred[i]*plc_pred[i];
-           }
-           ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
-           ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
-           if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
-               for (i=0;i<plc_blockl-10;i++) {
-                   plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
-               }
-               for (i=plc_blockl-10;i<plc_blockl;i++) {
-                   plc_pred[i]*=(float)(i-plc_blockl+10)*
-                       ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
-
-
-
-Andersen, et al.              Experimental                    [Page 122]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                       (float)2.0*ftmp2/ftmp1;
-               }
-           }
-
-           enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-           for (i=0; i<plc_blockl; i++) {
-               ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
-               *enh_bufPtr1 *= ftmp1;
-               *enh_bufPtr1 += ((float)1.0-ftmp1)*
-                                   plc_pred[plc_blockl-1-i];
-               enh_bufPtr1--;
-           }
-       }
-
-       if (iLBCdec_inst->mode==20) {
-           /* Enhancer with 40 samples delay */
-           for (iblock = 0; iblock<2; iblock++) {
-               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
-                   ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
-                   ENH_ALPHA0, enh_period, enh_plocsTbl,
-                       ENH_NBLOCKS_TOT);
-           }
-       } else if (iLBCdec_inst->mode==30) {
-           /* Enhancer with 80 samples delay */
-           for (iblock = 0; iblock<3; iblock++) {
-               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
-                   ENH_BUFL, (4+iblock)*ENH_BLOCKL,
-                   ENH_ALPHA0, enh_period, enh_plocsTbl,
-                       ENH_NBLOCKS_TOT);
-           }
-       }
-
-       return (lag*2);
-   }
-
-A.17.  filter.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       filter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-
-
-
-Andersen, et al.              Experimental                    [Page 123]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #ifndef __iLBC_FILTER_H
-   #define __iLBC_FILTER_H
-
-   void AllPoleFilter(
-       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
-                              InOut[-1] contain the state of the
-                              filter (delayed samples). InOut[0] to
-                              InOut[lengthInOut-1] contain the filter
-                              input, on en exit InOut[-orderCoef] to
-                              InOut[-1] is unchanged and InOut[0] to
-                              InOut[lengthInOut-1] contain filtered
-                              samples */
-       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
-                              to be 1.0 */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef   /* (i) number of filter coefficients */
-   );
-
-   void AllZeroFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples */
-       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
-                              to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain the filter state, on exit Out[0]
-                              to Out[lengthInOut-1] contain filtered
-                              samples */
-   );
-
-   void ZeroPoleFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain filter
-                              input samples In[-orderCoef] to In[-1]
-                              contain state of all-zero section */
-       float *ZeroCoef,/* (i) filter coefficients for all-zero
-                              section (ZeroCoef[0] is assumed to
-                              be 1.0) */
-       float *PoleCoef,/* (i) filter coefficients for all-pole section
-                              (ZeroCoef[0] is assumed to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain state of all-pole section. On
-                              exit Out[0] to Out[lengthInOut-1]
-                              contain filtered samples */
-   );
-
-
-
-
-Andersen, et al.              Experimental                    [Page 124]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void DownSample (
-       float  *In,     /* (i) input samples */
-       float  *Coef,   /* (i) filter coefficients */
-       int lengthIn,   /* (i) number of input samples */
-       float  *state,  /* (i) filter state */
-       float  *Out     /* (o) downsampled output */
-   );
-
-   #endif
-
-A.18.  filter.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       filter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  all-pole filter
-    *---------------------------------------------------------------*/
-
-   void AllPoleFilter(
-       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
-                              InOut[-1] contain the state of the
-                              filter (delayed samples). InOut[0] to
-                              InOut[lengthInOut-1] contain the filter
-                              input, on en exit InOut[-orderCoef] to
-                              InOut[-1] is unchanged and InOut[0] to
-                              InOut[lengthInOut-1] contain filtered
-                              samples */
-       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
-                              to be 1.0 */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef   /* (i) number of filter coefficients */
-   ){
-       int n,k;
-
-       for(n=0;n<lengthInOut;n++){
-           for(k=1;k<=orderCoef;k++){
-               *InOut -= Coef[k]*InOut[-k];
-
-
-
-Andersen, et al.              Experimental                    [Page 125]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           }
-           InOut++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  all-zero filter
-    *---------------------------------------------------------------*/
-
-   void AllZeroFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples */
-       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
-                              to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain the filter state, on exit Out[0]
-                              to Out[lengthInOut-1] contain filtered
-                              samples */
-   ){
-       int n,k;
-
-       for(n=0;n<lengthInOut;n++){
-           *Out = Coef[0]*In[0];
-           for(k=1;k<=orderCoef;k++){
-               *Out += Coef[k]*In[-k];
-           }
-           Out++;
-           In++;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  pole-zero filter
-    *---------------------------------------------------------------*/
-
-   void ZeroPoleFilter(
-       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
-                              filter input samples In[-orderCoef] to
-                              In[-1] contain state of all-zero
-                              section */
-       float *ZeroCoef,/* (i) filter coefficients for all-zero
-                              section (ZeroCoef[0] is assumed to
-                              be 1.0) */
-       float *PoleCoef,/* (i) filter coefficients for all-pole section
-                              (ZeroCoef[0] is assumed to be 1.0) */
-       int lengthInOut,/* (i) number of input/output samples */
-
-
-
-Andersen, et al.              Experimental                    [Page 126]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       int orderCoef,  /* (i) number of filter coefficients */
-       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-                              contain state of all-pole section. On
-                              exit Out[0] to Out[lengthInOut-1]
-                              contain filtered samples */
-   ){
-       AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
-       AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
-   }
-
-   /*----------------------------------------------------------------*
-    * downsample (LP filter and decimation)
-    *---------------------------------------------------------------*/
-
-   void DownSample (
-       float  *In,     /* (i) input samples */
-       float  *Coef,   /* (i) filter coefficients */
-       int lengthIn,   /* (i) number of input samples */
-       float  *state,  /* (i) filter state */
-       float  *Out     /* (o) downsampled output */
-   ){
-       float   o;
-       float *Out_ptr = Out;
-       float *Coef_ptr, *In_ptr;
-       float *state_ptr;
-       int i, j, stop;
-
-       /* LP filter and decimate at the same time */
-
-       for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
-       {
-           Coef_ptr = &Coef[0];
-           In_ptr = &In[i];
-           state_ptr = &state[FILTERORDER_DS-2];
-
-           o = (float)0.0;
-
-           stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
-
-           for (j = 0; j < stop; j++)
-           {
-               o += *Coef_ptr++ * (*In_ptr--);
-           }
-           for (j = i + 1; j < FILTERORDER_DS; j++)
-           {
-               o += *Coef_ptr++ * (*state_ptr--);
-           }
-
-
-
-
-Andersen, et al.              Experimental                    [Page 127]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           *Out_ptr++ = o;
-       }
-
-       /* Get the last part (use zeros as input for the future) */
-
-       for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS);
-               i+=FACTOR_DS) {
-
-           o=(float)0.0;
-
-           if (i<lengthIn) {
-               Coef_ptr = &Coef[0];
-               In_ptr = &In[i];
-               for (j=0; j<FILTERORDER_DS; j++) {
-                       o += *Coef_ptr++ * (*Out_ptr--);
-               }
-           } else {
-               Coef_ptr = &Coef[i-lengthIn];
-               In_ptr = &In[lengthIn-1];
-               for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
-                       o += *Coef_ptr++ * (*In_ptr--);
-               }
-           }
-           *Out_ptr++ = o;
-       }
-   }
-
-A.19.  FrameClassify.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       FrameClassify.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_FRAMECLASSIFY_H
-   #define __iLBC_FRAMECLASSIFY_H
-
-   int FrameClassify(      /* index to the max-energy sub-frame */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i/o) the encoder state structure */
-       float *residual     /* (i) lpc residual signal */
-   );
-
-
-
-Andersen, et al.              Experimental                    [Page 128]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #endif
-
-A.20.  FrameClassify.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       FrameClassify.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*---------------------------------------------------------------*
-    *  Classification of subframes to localize start state
-    *--------------------------------------------------------------*/
-
-   int FrameClassify(      /* index to the max-energy sub-frame */
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i/o) the encoder state structure */
-       float *residual     /* (i) lpc residual signal */
-   ) {
-       float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
-       int n, l, max_ssqEn_n;
-       const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
-           (float)1.0,(float)0.9,(float)0.8};
-       const float sampEn_win[5]={(float)1.0/(float)6.0,
-           (float)2.0/(float)6.0, (float)3.0/(float)6.0,
-           (float)4.0/(float)6.0, (float)5.0/(float)6.0};
-
-       /* init the front and back energies to zero */
-
-       memset(fssqEn, 0, NSUB_MAX*sizeof(float));
-       memset(bssqEn, 0, NSUB_MAX*sizeof(float));
-
-       /* Calculate front of first seqence */
-
-       n=0;
-       pp=residual;
-       for (l=0; l<5; l++) {
-           fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-           pp++;
-       }
-       for (l=5; l<SUBL; l++) {
-
-
-
-Andersen, et al.              Experimental                    [Page 129]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           fssqEn[n] += (*pp) * (*pp);
-           pp++;
-       }
-
-       /* Calculate front and back of all middle sequences */
-
-       for (n=1; n<iLBCenc_inst->nsub-1; n++) {
-           pp=residual+n*SUBL;
-           for (l=0; l<5; l++) {
-               fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-               bssqEn[n] += (*pp) * (*pp);
-               pp++;
-           }
-           for (l=5; l<SUBL-5; l++) {
-               fssqEn[n] += (*pp) * (*pp);
-               bssqEn[n] += (*pp) * (*pp);
-               pp++;
-           }
-           for (l=SUBL-5; l<SUBL; l++) {
-               fssqEn[n] += (*pp) * (*pp);
-               bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-               pp++;
-           }
-       }
-
-       /* Calculate back of last seqence */
-
-       n=iLBCenc_inst->nsub-1;
-       pp=residual+n*SUBL;
-       for (l=0; l<SUBL-5; l++) {
-           bssqEn[n] += (*pp) * (*pp);
-           pp++;
-       }
-       for (l=SUBL-5; l<SUBL; l++) {
-           bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-           pp++;
-       }
-
-       /* find the index to the weighted 80 sample with
-          most energy */
-
-       if (iLBCenc_inst->mode==20) l=1;
-       else                        l=0;
-
-       max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
-       max_ssqEn_n=1;
-       for (n=2; n<iLBCenc_inst->nsub; n++) {
-
-
-
-
-Andersen, et al.              Experimental                    [Page 130]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           l++;
-           if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
-               max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
-                               ssqEn_win[l];
-               max_ssqEn_n=n;
-           }
-       }
-
-       return max_ssqEn_n;
-   }
-
-A.21.  gainquant.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       gainquant.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_GAINQUANT_H
-   #define __iLBC_GAINQUANT_H
-
-   float gainquant(/* (o) quantized gain value */
-       float in,       /* (i) gain value */
-       float maxIn,/* (i) maximum of gain value */
-       int cblen,      /* (i) number of quantization indices */
-       int *index      /* (o) quantization index */
-   );
-
-   float gaindequant(  /* (o) quantized gain value */
-       int index,      /* (i) quantization index */
-       float maxIn,/* (i) maximum of unquantized gain */
-       int cblen       /* (i) number of quantization indices */
-   );
-
-   #endif
-
-A.22.  gainquant.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-
-
-
-Andersen, et al.              Experimental                    [Page 131]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       gainquant.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-   #include <math.h>
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    *  quantizer for the gain in the gain-shape coding of residual
-    *---------------------------------------------------------------*/
-
-   float gainquant(/* (o) quantized gain value */
-       float in,       /* (i) gain value */
-       float maxIn,/* (i) maximum of gain value */
-       int cblen,      /* (i) number of quantization indices */
-       int *index      /* (o) quantization index */
-   ){
-       int i, tindex;
-       float minmeasure,measure, *cb, scale;
-
-       /* ensure a lower bound on the scaling factor */
-
-       scale=maxIn;
-
-       if (scale<0.1) {
-           scale=(float)0.1;
-       }
-
-       /* select the quantization table */
-
-       if (cblen == 8) {
-           cb = gain_sq3Tbl;
-       } else if (cblen == 16) {
-           cb = gain_sq4Tbl;
-       } else  {
-           cb = gain_sq5Tbl;
-       }
-
-       /* select the best index in the quantization table */
-
-       minmeasure=10000000.0;
-       tindex=0;
-       for (i=0; i<cblen; i++) {
-
-
-
-Andersen, et al.              Experimental                    [Page 132]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           measure=(in-scale*cb[i])*(in-scale*cb[i]);
-
-           if (measure<minmeasure) {
-               tindex=i;
-               minmeasure=measure;
-           }
-       }
-       *index=tindex;
-
-       /* return the quantized value */
-
-       return scale*cb[tindex];
-   }
-
-   /*----------------------------------------------------------------*
-    *  decoder for quantized gains in the gain-shape coding of
-    *  residual
-    *---------------------------------------------------------------*/
-
-   float gaindequant(  /* (o) quantized gain value */
-       int index,      /* (i) quantization index */
-       float maxIn,/* (i) maximum of unquantized gain */
-       int cblen       /* (i) number of quantization indices */
-   ){
-       float scale;
-
-       /* obtain correct scale factor */
-
-       scale=(float)fabs(maxIn);
-
-       if (scale<0.1) {
-           scale=(float)0.1;
-       }
-
-       /* select the quantization table and return the decoded value */
-
-       if (cblen==8) {
-           return scale*gain_sq3Tbl[index];
-       } else if (cblen==16) {
-           return scale*gain_sq4Tbl[index];
-       }
-       else if (cblen==32) {
-           return scale*gain_sq5Tbl[index];
-       }
-
-       return 0.0;
-   }
-
-
-
-
-Andersen, et al.              Experimental                    [Page 133]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.23.  getCBvec.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       getCBvec.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_GETCBVEC_H
-   #define __iLBC_GETCBVEC_H
-
-   void getCBvec(
-       float *cbvec,   /* (o) Constructed codebook vector */
-       float *mem,     /* (i) Codebook buffer */
-       int index,      /* (i) Codebook index */
-       int lMem,       /* (i) Length of codebook buffer */
-       int cbveclen/* (i) Codebook vector length */
-   );
-
-   #endif
-
-A.24.  getCBvec.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       getCBvec.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include <string.h>
-
-   /*----------------------------------------------------------------*
-    *  Construct codebook vector for given index.
-    *---------------------------------------------------------------*/
-
-   void getCBvec(
-
-
-
-Andersen, et al.              Experimental                    [Page 134]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *cbvec,   /* (o) Constructed codebook vector */
-       float *mem,     /* (i) Codebook buffer */
-       int index,      /* (i) Codebook index */
-       int lMem,       /* (i) Length of codebook buffer */
-       int cbveclen/* (i) Codebook vector length */
-   ){
-       int j, k, n, memInd, sFilt;
-       float tmpbuf[CB_MEML];
-       int base_size;
-       int ilow, ihigh;
-       float alfa, alfa1;
-
-       /* Determine size of codebook sections */
-
-       base_size=lMem-cbveclen+1;
-
-       if (cbveclen==SUBL) {
-           base_size+=cbveclen/2;
-       }
-
-       /* No filter -> First codebook section */
-
-       if (index<lMem-cbveclen+1) {
-
-           /* first non-interpolated vectors */
-
-           k=index+cbveclen;
-           /* get vector */
-           memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
-
-       } else if (index < base_size) {
-
-           k=2*(index-(lMem-cbveclen+1))+cbveclen;
-
-           ihigh=k/2;
-           ilow=ihigh-5;
-
-           /* Copy first noninterpolated part */
-
-           memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
-
-           /* interpolation */
-
-           alfa1=(float)0.2;
-           alfa=0.0;
-           for (j=ilow; j<ihigh; j++) {
-               cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
-                   alfa*mem[lMem-k+j];
-
-
-
-Andersen, et al.              Experimental                    [Page 135]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               alfa+=alfa1;
-           }
-
-           /* Copy second noninterpolated part */
-
-           memcpy(cbvec+ihigh, mem+lMem-k+ihigh,
-               (cbveclen-ihigh)*sizeof(float));
-
-       }
-
-       /* Higher codebook section based on filtering */
-
-       else {
-
-           /* first non-interpolated vectors */
-
-           if (index-base_size<lMem-cbveclen+1) {
-               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-               float *pos;
-               float *pp, *pp1;
-
-               memset(tempbuff2, 0,
-                   CB_HALFFILTERLEN*sizeof(float));
-               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-                   lMem*sizeof(float));
-               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-                   (CB_HALFFILTERLEN+1)*sizeof(float));
-
-               k=index-base_size+cbveclen;
-               sFilt=lMem-k;
-               memInd=sFilt+1-CB_HALFFILTERLEN;
-
-               /* do filtering */
-               pos=cbvec;
-               memset(pos, 0, cbveclen*sizeof(float));
-               for (n=0; n<cbveclen; n++) {
-                   pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
-                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-                   for (j=0; j<CB_FILTERLEN; j++) {
-                       (*pos)+=(*pp++)*(*pp1--);
-                   }
-                   pos++;
-               }
-           }
-
-           /* interpolated vectors */
-
-           else {
-
-
-
-Andersen, et al.              Experimental                    [Page 136]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-
-               float *pos;
-               float *pp, *pp1;
-               int i;
-
-               memset(tempbuff2, 0,
-                   CB_HALFFILTERLEN*sizeof(float));
-               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-                   lMem*sizeof(float));
-               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-                   (CB_HALFFILTERLEN+1)*sizeof(float));
-
-               k=2*(index-base_size-
-                   (lMem-cbveclen+1))+cbveclen;
-               sFilt=lMem-k;
-               memInd=sFilt+1-CB_HALFFILTERLEN;
-
-               /* do filtering */
-               pos=&tmpbuf[sFilt];
-               memset(pos, 0, k*sizeof(float));
-               for (i=0; i<k; i++) {
-                   pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
-                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-                   for (j=0; j<CB_FILTERLEN; j++) {
-                       (*pos)+=(*pp++)*(*pp1--);
-                   }
-                   pos++;
-               }
-
-               ihigh=k/2;
-               ilow=ihigh-5;
-
-               /* Copy first noninterpolated part */
-
-               memcpy(cbvec, tmpbuf+lMem-k/2,
-                   ilow*sizeof(float));
-
-               /* interpolation */
-
-               alfa1=(float)0.2;
-               alfa=0.0;
-               for (j=ilow; j<ihigh; j++) {
-                   cbvec[j]=((float)1.0-alfa)*
-                       tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
-                   alfa+=alfa1;
-               }
-
-
-
-
-Andersen, et al.              Experimental                    [Page 137]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               /* Copy second noninterpolated part */
-
-               memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh,
-                   (cbveclen-ihigh)*sizeof(float));
-           }
-       }
-   }
-
-A.25.  helpfun.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       helpfun.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HELPFUN_H
-   #define __iLBC_HELPFUN_H
-
-   void autocorr(
-       float *r,       /* (o) autocorrelation vector */
-       const float *x, /* (i) data vector */
-       int N,          /* (i) length of data vector */
-       int order       /* largest lag for calculated
-                          autocorrelations */
-   );
-
-   void window(
-       float *z,       /* (o) the windowed data */
-       const float *x, /* (i) the original data vector */
-       const float *y, /* (i) the window */
-       int N           /* (i) length of all vectors */
-   );
-
-   void levdurb(
-       float *a,       /* (o) lpc coefficient vector starting
-                              with 1.0 */
-       float *k,       /* (o) reflection coefficients */
-       float *r,       /* (i) autocorrelation vector */
-       int order       /* (i) order of lpc filter */
-   );
-
-   void interpolate(
-
-
-
-Andersen, et al.              Experimental                    [Page 138]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *out,     /* (o) the interpolated vector */
-       float *in1,     /* (i) the first vector for the
-                              interpolation */
-       float *in2,     /* (i) the second vector for the
-                              interpolation */
-       float coef,     /* (i) interpolation weights */
-       int length      /* (i) length of all vectors */
-   );
-
-   void bwexpand(
-       float *out,     /* (o) the bandwidth expanded lpc
-                              coefficients */
-       float *in,      /* (i) the lpc coefficients before bandwidth
-                              expansion */
-       float coef,     /* (i) the bandwidth expansion factor */
-       int length      /* (i) the length of lpc coefficient vectors */
-   );
-
-   void vq(
-       float *Xq,      /* (o) the quantized vector */
-       int *index,     /* (o) the quantization index */
-       const float *CB,/* (i) the vector quantization codebook */
-       float *X,       /* (i) the vector to quantize */
-       int n_cb,       /* (i) the number of vectors in the codebook */
-       int dim         /* (i) the dimension of all vectors */
-   );
-
-   void SplitVQ(
-       float *qX,      /* (o) the quantized vector */
-       int *index,     /* (o) a vector of indexes for all vector
-                              codebooks in the split */
-       float *X,       /* (i) the vector to quantize */
-       const float *CB,/* (i) the quantizer codebook */
-       int nsplit,     /* the number of vector splits */
-       const int *dim, /* the dimension of X and qX */
-       const int *cbsize /* the number of vectors in the codebook */
-   );
-
-
-   void sort_sq(
-       float *xq,      /* (o) the quantized value */
-       int *index,     /* (o) the quantization index */
-       float x,    /* (i) the value to quantize */
-       const float *cb,/* (i) the quantization codebook */
-       int cb_size     /* (i) the size of the quantization codebook */
-   );
-
-   int LSF_check(      /* (o) 1 for stable lsf vectors and 0 for
-
-
-
-Andersen, et al.              Experimental                    [Page 139]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                              nonstable ones */
-       float *lsf,     /* (i) a table of lsf vectors */
-       int dim,    /* (i) the dimension of each lsf vector */
-       int NoAn    /* (i) the number of lsf vectors in the
-                              table */
-   );
-
-   #endif
-
-A.26.  helpfun.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       helpfun.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  calculation of auto correlation
-    *---------------------------------------------------------------*/
-
-   void autocorr(
-       float *r,       /* (o) autocorrelation vector */
-       const float *x, /* (i) data vector */
-       int N,          /* (i) length of data vector */
-       int order       /* largest lag for calculated
-                          autocorrelations */
-   ){
-       int     lag, n;
-       float   sum;
-
-       for (lag = 0; lag <= order; lag++) {
-           sum = 0;
-           for (n = 0; n < N - lag; n++) {
-               sum += x[n] * x[n+lag];
-           }
-           r[lag] = sum;
-       }
-
-
-
-Andersen, et al.              Experimental                    [Page 140]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   }
-
-   /*----------------------------------------------------------------*
-    *  window multiplication
-    *---------------------------------------------------------------*/
-
-   void window(
-       float *z,       /* (o) the windowed data */
-       const float *x, /* (i) the original data vector */
-       const float *y, /* (i) the window */
-       int N           /* (i) length of all vectors */
-   ){
-       int     i;
-
-       for (i = 0; i < N; i++) {
-           z[i] = x[i] * y[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  levinson-durbin solution for lpc coefficients
-    *---------------------------------------------------------------*/
-
-   void levdurb(
-       float *a,       /* (o) lpc coefficient vector starting
-                              with 1.0 */
-       float *k,       /* (o) reflection coefficients */
-       float *r,       /* (i) autocorrelation vector */
-       int order       /* (i) order of lpc filter */
-   ){
-       float  sum, alpha;
-       int     m, m_h, i;
-
-       a[0] = 1.0;
-
-       if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
-           for (i = 0; i < order; i++) {
-               k[i] = 0;
-               a[i+1] = 0;
-           }
-       } else {
-           a[1] = k[0] = -r[1]/r[0];
-           alpha = r[0] + r[1] * k[0];
-           for (m = 1; m < order; m++){
-               sum = r[m + 1];
-               for (i = 0; i < m; i++){
-                   sum += a[i+1] * r[m - i];
-               }
-
-
-
-Andersen, et al.              Experimental                    [Page 141]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               k[m] = -sum / alpha;
-               alpha += k[m] * sum;
-               m_h = (m + 1) >> 1;
-               for (i = 0; i < m_h; i++){
-                   sum = a[i+1] + k[m] * a[m - i];
-                   a[m - i] += k[m] * a[i+1];
-                   a[i+1] = sum;
-               }
-               a[m+1] = k[m];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  interpolation between vectors
-    *---------------------------------------------------------------*/
-
-   void interpolate(
-       float *out,      /* (o) the interpolated vector */
-       float *in1,     /* (i) the first vector for the
-                              interpolation */
-       float *in2,     /* (i) the second vector for the
-                              interpolation */
-       float coef,      /* (i) interpolation weights */
-       int length      /* (i) length of all vectors */
-   ){
-       int i;
-       float invcoef;
-
-       invcoef = (float)1.0 - coef;
-       for (i = 0; i < length; i++) {
-           out[i] = coef * in1[i] + invcoef * in2[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lpc bandwidth expansion
-    *---------------------------------------------------------------*/
-
-   void bwexpand(
-       float *out,      /* (o) the bandwidth expanded lpc
-                              coefficients */
-       float *in,      /* (i) the lpc coefficients before bandwidth
-                              expansion */
-       float coef,     /* (i) the bandwidth expansion factor */
-       int length      /* (i) the length of lpc coefficient vectors */
-   ){
-       int i;
-
-
-
-Andersen, et al.              Experimental                    [Page 142]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float  chirp;
-
-       chirp = coef;
-
-       out[0] = in[0];
-       for (i = 1; i < length; i++) {
-           out[i] = chirp * in[i];
-           chirp *= coef;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  vector quantization
-    *---------------------------------------------------------------*/
-
-   void vq(
-       float *Xq,      /* (o) the quantized vector */
-       int *index,     /* (o) the quantization index */
-       const float *CB,/* (i) the vector quantization codebook */
-       float *X,       /* (i) the vector to quantize */
-       int n_cb,       /* (i) the number of vectors in the codebook */
-       int dim         /* (i) the dimension of all vectors */
-   ){
-       int     i, j;
-       int     pos, minindex;
-       float   dist, tmp, mindist;
-
-       pos = 0;
-       mindist = FLOAT_MAX;
-       minindex = 0;
-       for (j = 0; j < n_cb; j++) {
-           dist = X[0] - CB[pos];
-           dist *= dist;
-           for (i = 1; i < dim; i++) {
-               tmp = X[i] - CB[pos + i];
-               dist += tmp*tmp;
-           }
-
-           if (dist < mindist) {
-               mindist = dist;
-               minindex = j;
-           }
-           pos += dim;
-       }
-       for (i = 0; i < dim; i++) {
-           Xq[i] = CB[minindex*dim + i];
-       }
-       *index = minindex;
-
-
-
-Andersen, et al.              Experimental                    [Page 143]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   }
-
-   /*----------------------------------------------------------------*
-    *  split vector quantization
-    *---------------------------------------------------------------*/
-
-   void SplitVQ(
-       float *qX,      /* (o) the quantized vector */
-       int *index,     /* (o) a vector of indexes for all vector
-                              codebooks in the split */
-       float *X,       /* (i) the vector to quantize */
-       const float *CB,/* (i) the quantizer codebook */
-       int nsplit,     /* the number of vector splits */
-       const int *dim, /* the dimension of X and qX */
-       const int *cbsize /* the number of vectors in the codebook */
-   ){
-       int    cb_pos, X_pos, i;
-
-       cb_pos = 0;
-       X_pos= 0;
-       for (i = 0; i < nsplit; i++) {
-           vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos,
-               cbsize[i], dim[i]);
-           X_pos += dim[i];
-           cb_pos += dim[i] * cbsize[i];
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  scalar quantization
-    *---------------------------------------------------------------*/
-
-   void sort_sq(
-       float *xq,      /* (o) the quantized value */
-       int *index,     /* (o) the quantization index */
-       float x,    /* (i) the value to quantize */
-       const float *cb,/* (i) the quantization codebook */
-       int cb_size      /* (i) the size of the quantization codebook */
-   ){
-       int i;
-
-       if (x <= cb[0]) {
-           *index = 0;
-           *xq = cb[0];
-       } else {
-           i = 0;
-           while ((x > cb[i]) && i < cb_size - 1) {
-               i++;
-
-
-
-Andersen, et al.              Experimental                    [Page 144]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           }
-
-           if (x > ((cb[i] + cb[i - 1])/2)) {
-               *index = i;
-               *xq = cb[i];
-           } else {
-               *index = i - 1;
-               *xq = cb[i - 1];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  check for stability of lsf coefficients
-    *---------------------------------------------------------------*/
-
-   int LSF_check(    /* (o) 1 for stable lsf vectors and 0 for
-                              nonstable ones */
-       float *lsf,     /* (i) a table of lsf vectors */
-       int dim,    /* (i) the dimension of each lsf vector */
-       int NoAn    /* (i) the number of lsf vectors in the
-                              table */
-   ){
-       int k,n,m, Nit=2, change=0,pos;
-       float tmp;
-       static float eps=(float)0.039; /* 50 Hz */
-       static float eps2=(float)0.0195;
-       static float maxlsf=(float)3.14; /* 4000 Hz */
-       static float minlsf=(float)0.01; /* 0 Hz */
-
-       /* LSF separation check*/
-
-       for (n=0; n<Nit; n++) { /* Run through a couple of times */
-           for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
-               for (k=0; k<(dim-1); k++) {
-                   pos=m*dim+k;
-
-                   if ((lsf[pos+1]-lsf[pos])<eps) {
-
-                       if (lsf[pos+1]<lsf[pos]) {
-                           tmp=lsf[pos+1];
-                           lsf[pos+1]= lsf[pos]+eps2;
-                           lsf[pos]= lsf[pos+1]-eps2;
-                       } else {
-                           lsf[pos]-=eps2;
-                           lsf[pos+1]+=eps2;
-                       }
-                       change=1;
-
-
-
-Andersen, et al.              Experimental                    [Page 145]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   }
-
-                   if (lsf[pos]<minlsf) {
-                       lsf[pos]=minlsf;
-                       change=1;
-                   }
-
-                   if (lsf[pos]>maxlsf) {
-                       lsf[pos]=maxlsf;
-                       change=1;
-                   }
-               }
-           }
-       }
-
-       return change;
-   }
-
-A.27.  hpInput.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpInput.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HPINPUT_H
-   #define __iLBC_HPINPUT_H
-
-   void hpInput(
-       float *In,  /* (i) vector to filter */
-       int len,    /* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   );
-
-   #endif
-
-A.28.  hpInput.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-
-
-Andersen, et al.              Experimental                    [Page 146]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       hpInput.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Input high-pass filter
-    *---------------------------------------------------------------*/
-
-   void hpInput(
-       float *In,  /* (i) vector to filter */
-       int len,    /* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   ){
-       int i;
-       float *pi, *po;
-
-       /* all-zero section*/
-
-       pi = &In[0];
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po = hpi_zero_coefsTbl[0] * (*pi);
-           *po += hpi_zero_coefsTbl[1] * mem[0];
-           *po += hpi_zero_coefsTbl[2] * mem[1];
-
-           mem[1] = mem[0];
-           mem[0] = *pi;
-           po++;
-           pi++;
-
-       }
-
-       /* all-pole section*/
-
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po -= hpi_pole_coefsTbl[1] * mem[2];
-           *po -= hpi_pole_coefsTbl[2] * mem[3];
-
-           mem[3] = mem[2];
-           mem[2] = *po;
-           po++;
-
-
-
-Andersen, et al.              Experimental                    [Page 147]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       }
-   }
-
-A.29.  hpOutput.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpOutput.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_HPOUTPUT_H
-   #define __iLBC_HPOUTPUT_H
-
-   void hpOutput(
-       float *In,  /* (i) vector to filter */
-       int len,/* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   );
-
-   #endif
-
-A.30.  hpOutput.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       hpOutput.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Output high-pass filter
-    *---------------------------------------------------------------*/
-
-   void hpOutput(
-
-
-
-Andersen, et al.              Experimental                    [Page 148]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *In,  /* (i) vector to filter */
-       int len,/* (i) length of vector to filter */
-       float *Out, /* (o) the resulting filtered vector */
-       float *mem  /* (i/o) the filter state */
-   ){
-       int i;
-       float *pi, *po;
-
-       /* all-zero section*/
-
-       pi = &In[0];
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po = hpo_zero_coefsTbl[0] * (*pi);
-           *po += hpo_zero_coefsTbl[1] * mem[0];
-           *po += hpo_zero_coefsTbl[2] * mem[1];
-
-           mem[1] = mem[0];
-           mem[0] = *pi;
-           po++;
-           pi++;
-
-       }
-
-       /* all-pole section*/
-
-       po = &Out[0];
-       for (i=0; i<len; i++) {
-           *po -= hpo_pole_coefsTbl[1] * mem[2];
-           *po -= hpo_pole_coefsTbl[2] * mem[3];
-
-           mem[3] = mem[2];
-           mem[2] = *po;
-           po++;
-       }
-   }
-
-A.31.  iCBConstruct.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBConstruct.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-
-
-
-Andersen, et al.              Experimental                    [Page 149]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ICBCONSTRUCT_H
-   #define __iLBC_ICBCONSTRUCT_H
-
-   void index_conv_enc(
-       int *index          /* (i/o) Codebook indexes */
-   );
-
-   void index_conv_dec(
-       int *index          /* (i/o) Codebook indexes */
-   );
-
-   void iCBConstruct(
-       float *decvector,   /* (o) Decoded vector */
-       int *index,         /* (i) Codebook indices */
-       int *gain_index,/* (i) Gain quantization indices */
-       float *mem,         /* (i) Buffer for codevector construction */
-       int lMem,           /* (i) Length of buffer */
-       int veclen,         /* (i) Length of vector */
-       int nStages         /* (i) Number of codebook stages */
-   );
-
-   #endif
-
-A.32.  iCBConstruct.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBConstruct.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-   #include "gainquant.h"
-   #include "getCBvec.h"
-
-   /*----------------------------------------------------------------*
-    *  Convert the codebook indexes to make the search easier
-    *---------------------------------------------------------------*/
-
-
-
-
-Andersen, et al.              Experimental                    [Page 150]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void index_conv_enc(
-       int *index          /* (i/o) Codebook indexes */
-   ){
-       int k;
-
-       for (k=1; k<CB_NSTAGES; k++) {
-
-           if ((index[k]>=108)&&(index[k]<172)) {
-               index[k]-=64;
-           } else if (index[k]>=236) {
-               index[k]-=128;
-           } else {
-               /* ERROR */
-           }
-       }
-   }
-
-   void index_conv_dec(
-       int *index          /* (i/o) Codebook indexes */
-   ){
-       int k;
-
-       for (k=1; k<CB_NSTAGES; k++) {
-
-           if ((index[k]>=44)&&(index[k]<108)) {
-               index[k]+=64;
-           } else if ((index[k]>=108)&&(index[k]<128)) {
-               index[k]+=128;
-           } else {
-               /* ERROR */
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  Construct decoded vector from codebook and gains.
-    *---------------------------------------------------------------*/
-
-   void iCBConstruct(
-       float *decvector,   /* (o) Decoded vector */
-       int *index,         /* (i) Codebook indices */
-       int *gain_index,/* (i) Gain quantization indices */
-       float *mem,         /* (i) Buffer for codevector construction */
-       int lMem,           /* (i) Length of buffer */
-       int veclen,         /* (i) Length of vector */
-       int nStages         /* (i) Number of codebook stages */
-   ){
-       int j,k;
-
-
-
-Andersen, et al.              Experimental                    [Page 151]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float gain[CB_NSTAGES];
-       float cbvec[SUBL];
-
-       /* gain de-quantization */
-
-       gain[0] = gaindequant(gain_index[0], 1.0, 32);
-       if (nStages > 1) {
-           gain[1] = gaindequant(gain_index[1],
-               (float)fabs(gain[0]), 16);
-       }
-       if (nStages > 2) {
-           gain[2] = gaindequant(gain_index[2],
-               (float)fabs(gain[1]), 8);
-       }
-
-       /* codebook vector construction and construction of
-       total vector */
-
-       getCBvec(cbvec, mem, index[0], lMem, veclen);
-       for (j=0;j<veclen;j++){
-           decvector[j] = gain[0]*cbvec[j];
-       }
-       if (nStages > 1) {
-           for (k=1; k<nStages; k++) {
-               getCBvec(cbvec, mem, index[k], lMem, veclen);
-               for (j=0;j<veclen;j++) {
-                   decvector[j] += gain[k]*cbvec[j];
-               }
-           }
-       }
-   }
-
-A.33.  iCBSearch.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBSearch.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_ICBSEARCH_H
-   #define __iLBC_ICBSEARCH_H
-
-
-
-
-Andersen, et al.              Experimental                    [Page 152]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void iCBSearch(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) the encoder state structure */
-       int *index,         /* (o) Codebook indices */
-       int *gain_index,/* (o) Gain quantization indices */
-       float *intarget,/* (i) Target vector for encoding */
-       float *mem,         /* (i) Buffer for codebook construction */
-       int lMem,           /* (i) Length of buffer */
-       int lTarget,    /* (i) Length of vector */
-       int nStages,    /* (i) Number of codebook stages */
-       float *weightDenum, /* (i) weighting filter coefficients */
-       float *weightState, /* (i) weighting filter state */
-       int block           /* (i) the sub-block number */
-   );
-
-   #endif
-
-A.34.  iCBSearch.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       iCBSearch.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "gainquant.h"
-   #include "createCB.h"
-   #include "filter.h"
-   #include "constants.h"
-
-   /*----------------------------------------------------------------*
-    *  Search routine for codebook encoding and gain quantization.
-    *---------------------------------------------------------------*/
-
-   void iCBSearch(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) the encoder state structure */
-       int *index,         /* (o) Codebook indices */
-       int *gain_index,/* (o) Gain quantization indices */
-
-
-
-Andersen, et al.              Experimental                    [Page 153]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *intarget,/* (i) Target vector for encoding */
-       float *mem,         /* (i) Buffer for codebook construction */
-       int lMem,           /* (i) Length of buffer */
-       int lTarget,    /* (i) Length of vector */
-       int nStages,    /* (i) Number of codebook stages */
-       float *weightDenum, /* (i) weighting filter coefficients */
-       float *weightState, /* (i) weighting filter state */
-       int block           /* (i) the sub-block number */
-   ){
-       int i, j, icount, stage, best_index, range, counter;
-       float max_measure, gain, measure, crossDot, ftmp;
-       float gains[CB_NSTAGES];
-       float target[SUBL];
-       int base_index, sInd, eInd, base_size;
-       int sIndAug=0, eIndAug=0;
-       float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
-       float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
-       float *pp, *ppi=0, *ppo=0, *ppe=0;
-       float cbvectors[CB_MEML];
-       float tene, cene, cvec[SUBL];
-       float aug_vec[SUBL];
-
-       memset(cvec,0,SUBL*sizeof(float));
-
-       /* Determine size of codebook sections */
-
-       base_size=lMem-lTarget+1;
-
-       if (lTarget==SUBL) {
-           base_size=lMem-lTarget+1+lTarget/2;
-       }
-
-       /* setup buffer for weighting */
-
-       memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
-       memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
-       memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
-
-       /* weighting */
-
-       AllPoleFilter(buf+LPC_FILTERORDER, weightDenum,
-           lMem+lTarget, LPC_FILTERORDER);
-
-       /* Construct the codebook and target needed */
-
-       memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
-
-       tene=0.0;
-
-
-
-Andersen, et al.              Experimental                    [Page 154]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       for (i=0; i<lTarget; i++) {
-           tene+=target[i]*target[i];
-       }
-
-       /* Prepare search over one more codebook section. This section
-          is created by filtering the original buffer with a filter. */
-
-       filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
-
-       /* The Main Loop over stages */
-
-       for (stage=0; stage<nStages; stage++) {
-
-           range = search_rangeTbl[block][stage];
-
-           /* initialize search measure */
-
-           max_measure = (float)-10000000.0;
-           gain = (float)0.0;
-           best_index = 0;
-
-           /* Compute cross dot product between the target
-              and the CB memory */
-
-           crossDot=0.0;
-           pp=buf+LPC_FILTERORDER+lMem-lTarget;
-           for (j=0; j<lTarget; j++) {
-               crossDot += target[j]*(*pp++);
-           }
-
-           if (stage==0) {
-
-               /* Calculate energy in the first block of
-                 'lTarget' samples. */
-               ppe = energy;
-               ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
-               ppo = buf+LPC_FILTERORDER+lMem-1;
-
-               *ppe=0.0;
-               pp=buf+LPC_FILTERORDER+lMem-lTarget;
-               for (j=0; j<lTarget; j++) {
-                   *ppe+=(*pp)*(*pp++);
-               }
-
-               if (*ppe>0.0) {
-                   invenergy[0] = (float) 1.0 / (*ppe + EPS);
-               } else {
-                   invenergy[0] = (float) 0.0;
-
-
-
-Andersen, et al.              Experimental                    [Page 155]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-               }
-               ppe++;
-
-               measure=(float)-10000000.0;
-
-               if (crossDot > 0.0) {
-                      measure = crossDot*crossDot*invenergy[0];
-               }
-           }
-           else {
-               measure = crossDot*crossDot*invenergy[0];
-           }
-
-           /* check if measure is better */
-           ftmp = crossDot*invenergy[0];
-
-           if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-               best_index = 0;
-               max_measure = measure;
-               gain = ftmp;
-           }
-
-           /* loop over the main first codebook section,
-              full search */
-
-           for (icount=1; icount<range; icount++) {
-
-               /* calculate measure */
-
-               crossDot=0.0;
-               pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
-
-               for (j=0; j<lTarget; j++) {
-                   crossDot += target[j]*(*pp++);
-               }
-
-               if (stage==0) {
-                   *ppe++ = energy[icount-1] + (*ppi)*(*ppi) -
-                       (*ppo)*(*ppo);
-                   ppo--;
-                   ppi--;
-
-                   if (energy[icount]>0.0) {
-                       invenergy[icount] =
-                           (float)1.0/(energy[icount]+EPS);
-                   } else {
-                       invenergy[icount] = (float) 0.0;
-                   }
-
-
-
-Andersen, et al.              Experimental                    [Page 156]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   measure=(float)-10000000.0;
-
-                   if (crossDot > 0.0) {
-                       measure = crossDot*crossDot*invenergy[icount];
-                   }
-               }
-               else {
-                   measure = crossDot*crossDot*invenergy[icount];
-               }
-
-               /* check if measure is better */
-               ftmp = crossDot*invenergy[icount];
-
-               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-                   best_index = icount;
-                   max_measure = measure;
-                   gain = ftmp;
-               }
-           }
-
-           /* Loop over augmented part in the first codebook
-            * section, full search.
-            * The vectors are interpolated.
-            */
-
-           if (lTarget==SUBL) {
-
-               /* Search for best possible cb vector and
-                  compute the CB-vectors' energy. */
-               searchAugmentedCB(20, 39, stage, base_size-lTarget/2,
-                   target, buf+LPC_FILTERORDER+lMem,
-                   &max_measure, &best_index, &gain, energy,
-                   invenergy);
-           }
-
-           /* set search range for following codebook sections */
-
-           base_index=best_index;
-
-           /* unrestricted search */
-
-           if (CB_RESRANGE == -1) {
-               sInd=0;
-               eInd=range-1;
-               sIndAug=20;
-               eIndAug=39;
-           }
-
-
-
-
-Andersen, et al.              Experimental                    [Page 157]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           /* restricted search around best index from first
-           codebook section */
-
-           else {
-               /* Initialize search indices */
-               sIndAug=0;
-               eIndAug=0;
-               sInd=base_index-CB_RESRANGE/2;
-               eInd=sInd+CB_RESRANGE;
-
-               if (lTarget==SUBL) {
-
-                   if (sInd<0) {
-
-                       sIndAug = 40 + sInd;
-                       eIndAug = 39;
-                       sInd=0;
-
-                   } else if ( base_index < (base_size-20) ) {
-
-                       if (eInd > range) {
-                           sInd -= (eInd-range);
-                           eInd = range;
-                       }
-                   } else { /* base_index >= (base_size-20) */
-
-                       if (sInd < (base_size-20)) {
-                           sIndAug = 20;
-                           sInd = 0;
-                           eInd = 0;
-                           eIndAug = 19 + CB_RESRANGE;
-
-                           if(eIndAug > 39) {
-                               eInd = eIndAug-39;
-                               eIndAug = 39;
-                           }
-                       } else {
-                           sIndAug = 20 + sInd - (base_size-20);
-                           eIndAug = 39;
-                           sInd = 0;
-                           eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
-                       }
-                   }
-
-               } else { /* lTarget = 22 or 23 */
-
-                   if (sInd < 0) {
-                       eInd -= sInd;
-
-
-
-Andersen, et al.              Experimental                    [Page 158]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                       sInd = 0;
-                   }
-
-                   if(eInd > range) {
-                       sInd -= (eInd - range);
-                       eInd = range;
-                   }
-               }
-           }
-
-           /* search of higher codebook section */
-
-           /* index search range */
-           counter = sInd;
-           sInd += base_size;
-           eInd += base_size;
-
-
-           if (stage==0) {
-               ppe = energy+base_size;
-               *ppe=0.0;
-
-               pp=cbvectors+lMem-lTarget;
-               for (j=0; j<lTarget; j++) {
-                   *ppe+=(*pp)*(*pp++);
-               }
-
-               ppi = cbvectors + lMem - 1 - lTarget;
-               ppo = cbvectors + lMem - 1;
-
-               for (j=0; j<(range-1); j++) {
-                   *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
-                   ppo--;
-                   ppi--;
-                   ppe++;
-               }
-           }
-
-           /* loop over search range */
-
-           for (icount=sInd; icount<eInd; icount++) {
-
-               /* calculate measure */
-
-               crossDot=0.0;
-               pp=cbvectors + lMem - (counter++) - lTarget;
-
-               for (j=0;j<lTarget;j++) {
-
-
-
-Andersen, et al.              Experimental                    [Page 159]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-                   crossDot += target[j]*(*pp++);
-               }
-
-               if (energy[icount]>0.0) {
-                   invenergy[icount] =(float)1.0/(energy[icount]+EPS);
-               } else {
-                   invenergy[icount] =(float)0.0;
-               }
-
-               if (stage==0) {
-
-                   measure=(float)-10000000.0;
-
-                   if (crossDot > 0.0) {
-                       measure = crossDot*crossDot*
-                           invenergy[icount];
-                   }
-               }
-               else {
-                   measure = crossDot*crossDot*invenergy[icount];
-               }
-
-               /* check if measure is better */
-               ftmp = crossDot*invenergy[icount];
-
-               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-                   best_index = icount;
-                   max_measure = measure;
-                   gain = ftmp;
-               }
-           }
-
-           /* Search the augmented CB inside the limited range. */
-
-           if ((lTarget==SUBL)&&(sIndAug!=0)) {
-               searchAugmentedCB(sIndAug, eIndAug, stage,
-                   2*base_size-20, target, cbvectors+lMem,
-                   &max_measure, &best_index, &gain, energy,
-                   invenergy);
-           }
-
-           /* record best index */
-
-           index[stage] = best_index;
-
-           /* gain quantization */
-
-           if (stage==0){
-
-
-
-Andersen, et al.              Experimental                    [Page 160]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-
-               if (gain<0.0){
-                   gain = 0.0;
-               }
-
-               if (gain>CB_MAXGAIN) {
-                   gain = (float)CB_MAXGAIN;
-               }
-               gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
-           }
-           else {
-               if (stage==1) {
-                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
-                       16, &gain_index[stage]);
-               } else {
-                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
-                       8, &gain_index[stage]);
-               }
-           }
-
-           /* Extract the best (according to measure)
-              codebook vector */
-
-           if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
-
-               if (index[stage]<base_size) {
-                   pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
-               } else {
-                   pp=cbvectors+lMem-lTarget-
-                       index[stage]+base_size;
-               }
-           } else {
-
-               if (index[stage]<base_size) {
-                   if (index[stage]<(base_size-20)) {
-                       pp=buf+LPC_FILTERORDER+lMem-
-                           lTarget-index[stage];
-                   } else {
-                       createAugmentedVec(index[stage]-base_size+40,
-                               buf+LPC_FILTERORDER+lMem,aug_vec);
-                       pp=aug_vec;
-                   }
-               } else {
-                   int filterno, position;
-
-                   filterno=index[stage]/base_size;
-                   position=index[stage]-filterno*base_size;
-
-
-
-
-Andersen, et al.              Experimental                    [Page 161]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-
-                   if (position<(base_size-20)) {
-                       pp=cbvectors+filterno*lMem-lTarget-
-                           index[stage]+filterno*base_size;
-                   } else {
-                       createAugmentedVec(
-                           index[stage]-(filterno+1)*base_size+40,
-                           cbvectors+filterno*lMem,aug_vec);
-                       pp=aug_vec;
-                   }
-               }
-           }
-
-           /* Subtract the best codebook vector, according
-              to measure, from the target vector */
-
-           for (j=0;j<lTarget;j++) {
-               cvec[j] += gain*(*pp);
-               target[j] -= gain*(*pp++);
-           }
-
-           /* record quantized gain */
-
-           gains[stage]=gain;
-
-       }/* end of Main Loop. for (stage=0;... */
-
-       /* Gain adjustment for energy matching */
-       cene=0.0;
-       for (i=0; i<lTarget; i++) {
-           cene+=cvec[i]*cvec[i];
-       }
-       j=gain_index[0];
-
-       for (i=gain_index[0]; i<32; i++) {
-           ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
-
-           if ((ftmp<(tene*gains[0]*gains[0])) &&
-               (gain_sq5Tbl[j]<(2.0*gains[0]))) {
-               j=i;
-           }
-       }
-       gain_index[0]=j;
-   }
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 162]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.35.  LPCdecode.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPC_decode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LPC_DECODE_H
-   #define __iLBC_LPC_DECODE_H
-
-   void LSFinterpolate2a_dec(
-       float *a,           /* (o) lpc coefficients for a sub-frame */
-       float *lsf1,    /* (i) first lsf coefficient vector */
-       float *lsf2,    /* (i) second lsf coefficient vector */
-       float coef,         /* (i) interpolation weight */
-       int length          /* (i) length of lsf vectors */
-   );
-
-   void SimplelsfDEQ(
-       float *lsfdeq,      /* (o) dequantized lsf coefficients */
-       int *index,         /* (i) quantization index */
-       int lpc_n           /* (i) number of LPCs */
-   );
-
-   void DecoderInterpolateLSF(
-       float *syntdenum,   /* (o) synthesis filter coefficients */
-       float *weightdenum, /* (o) weighting denumerator
-                                  coefficients */
-       float *lsfdeq,      /* (i) dequantized lsf coefficients */
-       int length,         /* (i) length of lsf coefficient vector */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i) the decoder state structure */
-   );
-
-   #endif
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 163]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.36.  LPCdecode.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPC_decode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "helpfun.h"
-   #include "lsf.h"
-   #include "iLBC_define.h"
-   #include "constants.h"
-
-   /*---------------------------------------------------------------*
-    *  interpolation of lsf coefficients for the decoder
-    *--------------------------------------------------------------*/
-
-   void LSFinterpolate2a_dec(
-       float *a,           /* (o) lpc coefficients for a sub-frame */
-       float *lsf1,    /* (i) first lsf coefficient vector */
-       float *lsf2,    /* (i) second lsf coefficient vector */
-       float coef,         /* (i) interpolation weight */
-       int length          /* (i) length of lsf vectors */
-   ){
-       float  lsftmp[LPC_FILTERORDER];
-
-       interpolate(lsftmp, lsf1, lsf2, coef, length);
-       lsf2a(a, lsftmp);
-   }
-
-   /*---------------------------------------------------------------*
-    *  obtain dequantized lsf coefficients from quantization index
-    *--------------------------------------------------------------*/
-
-   void SimplelsfDEQ(
-       float *lsfdeq,    /* (o) dequantized lsf coefficients */
-       int *index,         /* (i) quantization index */
-       int lpc_n           /* (i) number of LPCs */
-   ){
-       int i, j, pos, cb_pos;
-
-
-
-Andersen, et al.              Experimental                    [Page 164]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* decode first LSF */
-
-       pos = 0;
-       cb_pos = 0;
-       for (i = 0; i < LSF_NSPLIT; i++) {
-           for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-               lsfdeq[pos + j] = lsfCbTbl[cb_pos +
-                   (long)(index[i])*dim_lsfCbTbl[i] + j];
-           }
-           pos += dim_lsfCbTbl[i];
-           cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-       }
-
-       if (lpc_n>1) {
-
-           /* decode last LSF */
-
-           pos = 0;
-           cb_pos = 0;
-           for (i = 0; i < LSF_NSPLIT; i++) {
-               for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-                   lsfdeq[LPC_FILTERORDER + pos + j] =
-                       lsfCbTbl[cb_pos +
-                       (long)(index[LSF_NSPLIT + i])*
-                       dim_lsfCbTbl[i] + j];
-               }
-               pos += dim_lsfCbTbl[i];
-               cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  obtain synthesis and weighting filters form lsf coefficients
-    *---------------------------------------------------------------*/
-
-   void DecoderInterpolateLSF(
-       float *syntdenum, /* (o) synthesis filter coefficients */
-       float *weightdenum, /* (o) weighting denumerator
-                                  coefficients */
-       float *lsfdeq,       /* (i) dequantized lsf coefficients */
-       int length,         /* (i) length of lsf coefficient vector */
-       iLBC_Dec_Inst_t *iLBCdec_inst
-                           /* (i) the decoder state structure */
-   ){
-       int    i, pos, lp_length;
-       float  lp[LPC_FILTERORDER + 1], *lsfdeq2;
-
-
-
-
-Andersen, et al.              Experimental                    [Page 165]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       lsfdeq2 = lsfdeq + length;
-       lp_length = length + 1;
-
-       if (iLBCdec_inst->mode==30) {
-           /* sub-frame 1: Interpolation between old and first */
-
-           LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq,
-               lsf_weightTbl_30ms[0], length);
-           memcpy(syntdenum,lp,lp_length*sizeof(float));
-           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM,
-               lp_length);
-
-           /* sub-frames 2 to 6: interpolation between first
-              and last LSF */
-
-           pos = lp_length;
-           for (i = 1; i < 6; i++) {
-               LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2,
-                   lsf_weightTbl_30ms[i], length);
-               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-               bwexpand(weightdenum + pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-       else {
-           pos = 0;
-           for (i = 0; i < iLBCdec_inst->nsub; i++) {
-               LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold,
-                   lsfdeq, lsf_weightTbl_20ms[i], length);
-               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-               bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM,
-                   lp_length);
-               pos += lp_length;
-           }
-       }
-
-       /* update memory */
-
-       if (iLBCdec_inst->mode==30)
-           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2,
-                       length*sizeof(float));
-       else
-           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq,
-                       length*sizeof(float));
-
-   }
-
-
-
-
-Andersen, et al.              Experimental                    [Page 166]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.37.  LPCencode.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPCencode.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LPCENCOD_H
-   #define __iLBC_LPCENCOD_H
-
-   void LPCencode(
-       float *syntdenum,   /* (i/o) synthesis filter coefficients
-                                  before/after encoding */
-       float *weightdenum, /* (i/o) weighting denumerator coefficients
-                                  before/after encoding */
-       int *lsf_index,     /* (o) lsf quantization index */
-       float *data,    /* (i) lsf coefficients to quantize */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   );
-
-   #endif
-
-A.38.  LPCencode.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       LPCencode.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "helpfun.h"
-   #include "lsf.h"
-   #include "constants.h"
-
-
-
-Andersen, et al.              Experimental                    [Page 167]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   /*----------------------------------------------------------------*
-    *  lpc analysis (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimpleAnalysis(
-       float *lsf,         /* (o) lsf coefficients */
-       float *data,    /* (i) new data vector */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       int k, is;
-       float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
-       float lp2[LPC_FILTERORDER + 1];
-       float r[LPC_FILTERORDER + 1];
-
-       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-       memcpy(iLBCenc_inst->lpc_buffer+is,data,
-           iLBCenc_inst->blockl*sizeof(float));
-
-       /* No lookahead, last window is asymmetric */
-
-       for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
-
-           is = LPC_LOOKBACK;
-
-           if (k < (iLBCenc_inst->lpc_n - 1)) {
-               window(temp, lpc_winTbl,
-                   iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
-           } else {
-               window(temp, lpc_asymwinTbl,
-                   iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
-           }
-
-           autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
-           window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
-
-           levdurb(lp, temp, r, LPC_FILTERORDER);
-           bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
-
-           a2lsf(lsf + k*LPC_FILTERORDER, lp2);
-       }
-       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-       memmove(iLBCenc_inst->lpc_buffer,
-           iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is,
-           is*sizeof(float));
-   }
-
-   /*----------------------------------------------------------------*
-
-
-
-Andersen, et al.              Experimental                    [Page 168]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-    *  lsf interpolator and conversion from lsf to a coefficients
-    *  (subrutine to SimpleInterpolateLSF)
-    *---------------------------------------------------------------*/
-
-   void LSFinterpolate2a_enc(
-       float *a,       /* (o) lpc coefficients */
-       float *lsf1,/* (i) first set of lsf coefficients */
-       float *lsf2,/* (i) second set of lsf coefficients */
-       float coef,     /* (i) weighting coefficient to use between
-                              lsf1 and lsf2 */
-       long length      /* (i) length of coefficient vectors */
-   ){
-       float  lsftmp[LPC_FILTERORDER];
-
-       interpolate(lsftmp, lsf1, lsf2, coef, length);
-       lsf2a(a, lsftmp);
-   }
-
-   /*----------------------------------------------------------------*
-    *  lsf interpolator (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimpleInterpolateLSF(
-       float *syntdenum,   /* (o) the synthesis filter denominator
-                                  resulting from the quantized
-                                  interpolated lsf */
-       float *weightdenum, /* (o) the weighting filter denominator
-                                  resulting from the unquantized
-                                  interpolated lsf */
-       float *lsf,         /* (i) the unquantized lsf coefficients */
-       float *lsfdeq,      /* (i) the dequantized lsf coefficients */
-       float *lsfold,      /* (i) the unquantized lsf coefficients of
-                                  the previous signal frame */
-       float *lsfdeqold, /* (i) the dequantized lsf coefficients of
-                                  the previous signal frame */
-       int length,         /* (i) should equate LPC_FILTERORDER */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       int    i, pos, lp_length;
-       float  lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
-
-       lsf2 = lsf + length;
-       lsfdeq2 = lsfdeq + length;
-       lp_length = length + 1;
-
-       if (iLBCenc_inst->mode==30) {
-           /* sub-frame 1: Interpolation between old and first
-
-
-
-Andersen, et al.              Experimental                    [Page 169]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-              set of lsf coefficients */
-
-           LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
-               lsf_weightTbl_30ms[0], length);
-           memcpy(syntdenum,lp,lp_length*sizeof(float));
-           LSFinterpolate2a_enc(lp, lsfold, lsf,
-               lsf_weightTbl_30ms[0], length);
-           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
-
-           /* sub-frame 2 to 6: Interpolation between first
-              and second set of lsf coefficients */
-
-           pos = lp_length;
-           for (i = 1; i < iLBCenc_inst->nsub; i++) {
-               LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2,
-                   lsf_weightTbl_30ms[i], length);
-               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-
-               LSFinterpolate2a_enc(lp, lsf, lsf2,
-                   lsf_weightTbl_30ms[i], length);
-               bwexpand(weightdenum + pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-       else {
-           pos = 0;
-           for (i = 0; i < iLBCenc_inst->nsub; i++) {
-               LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
-                   lsf_weightTbl_20ms[i], length);
-               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-               LSFinterpolate2a_enc(lp, lsfold, lsf,
-                   lsf_weightTbl_20ms[i], length);
-               bwexpand(weightdenum+pos, lp,
-                   LPC_CHIRP_WEIGHTDENUM, lp_length);
-               pos += lp_length;
-           }
-       }
-
-       /* update memory */
-
-       if (iLBCenc_inst->mode==30) {
-           memcpy(lsfold, lsf2, length*sizeof(float));
-           memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
-       }
-       else {
-           memcpy(lsfold, lsf, length*sizeof(float));
-           memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
-
-
-
-Andersen, et al.              Experimental                    [Page 170]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lsf quantizer (subrutine to LPCencode)
-    *---------------------------------------------------------------*/
-
-   void SimplelsfQ(
-       float *lsfdeq,    /* (o) dequantized lsf coefficients
-                              (dimension FILTERORDER) */
-       int *index,     /* (o) quantization index */
-       float *lsf,      /* (i) the lsf coefficient vector to be
-                              quantized (dimension FILTERORDER ) */
-       int lpc_n     /* (i) number of lsf sets to quantize */
-   ){
-       /* Quantize first LSF with memoryless split VQ */
-       SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT,
-           dim_lsfCbTbl, size_lsfCbTbl);
-
-       if (lpc_n==2) {
-           /* Quantize second LSF with memoryless split VQ */
-           SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT,
-               lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT,
-               dim_lsfCbTbl, size_lsfCbTbl);
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  lpc encoder
-    *---------------------------------------------------------------*/
-
-   void LPCencode(
-       float *syntdenum, /* (i/o) synthesis filter coefficients
-                                  before/after encoding */
-       float *weightdenum, /* (i/o) weighting denumerator
-                                  coefficients before/after
-                                  encoding */
-       int *lsf_index,     /* (o) lsf quantization index */
-       float *data,    /* (i) lsf coefficients to quantize */
-       iLBC_Enc_Inst_t *iLBCenc_inst
-                           /* (i/o) the encoder state structure */
-   ){
-       float lsf[LPC_FILTERORDER * LPC_N_MAX];
-       float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
-       int change=0;
-
-       SimpleAnalysis(lsf, data, iLBCenc_inst);
-       SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
-
-
-
-Andersen, et al.              Experimental                    [Page 171]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
-       SimpleInterpolateLSF(syntdenum, weightdenum,
-           lsf, lsfdeq, iLBCenc_inst->lsfold,
-           iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
-   }
-
-A.39.  lsf.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       lsf.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_LSF_H
-   #define __iLBC_LSF_H
-
-   void a2lsf(
-       float *freq,/* (o) lsf coefficients */
-       float *a    /* (i) lpc coefficients */
-   );
-
-   void lsf2a(
-       float *a_coef,  /* (o) lpc coefficients */
-       float *freq     /* (i) lsf coefficients */
-   );
-
-   #endif
-
-A.40.  lsf.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       lsf.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <string.h>
-
-
-
-Andersen, et al.              Experimental                    [Page 172]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   #include <math.h>
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  conversion from lpc coefficients to lsf coefficients
-    *---------------------------------------------------------------*/
-
-   void a2lsf(
-       float *freq,/* (o) lsf coefficients */
-       float *a    /* (i) lpc coefficients */
-   ){
-       float steps[LSF_NUMBER_OF_STEPS] =
-           {(float)0.00635, (float)0.003175, (float)0.0015875,
-           (float)0.00079375};
-       float step;
-       int step_idx;
-       int lsp_index;
-       float p[LPC_HALFORDER];
-       float q[LPC_HALFORDER];
-       float p_pre[LPC_HALFORDER];
-       float q_pre[LPC_HALFORDER];
-       float old_p, old_q, *old;
-       float *pq_coef;
-       float omega, old_omega;
-       int i;
-       float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
-
-       for (i=0; i<LPC_HALFORDER; i++) {
-           p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
-           q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
-       }
-
-       p_pre[0] = (float)-1.0 - p[0];
-       p_pre[1] = - p_pre[0] - p[1];
-       p_pre[2] = - p_pre[1] - p[2];
-       p_pre[3] = - p_pre[2] - p[3];
-       p_pre[4] = - p_pre[3] - p[4];
-       p_pre[4] = p_pre[4] / 2;
-
-       q_pre[0] = (float)1.0 - q[0];
-       q_pre[1] = q_pre[0] - q[1];
-       q_pre[2] = q_pre[1] - q[2];
-       q_pre[3] = q_pre[2] - q[3];
-       q_pre[4] = q_pre[3] - q[4];
-       q_pre[4] = q_pre[4] / 2;
-
-       omega = 0.0;
-
-
-
-Andersen, et al.              Experimental                    [Page 173]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       old_omega = 0.0;
-
-       old_p = FLOAT_MAX;
-       old_q = FLOAT_MAX;
-
-       /* Here we loop through lsp_index to find all the
-          LPC_FILTERORDER roots for omega. */
-
-       for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
-
-           /* Depending on lsp_index being even or odd, we
-           alternatively solve the roots for the two LSP equations. */
-
-
-           if ((lsp_index & 0x1) == 0) {
-               pq_coef = p_pre;
-               old = &old_p;
-           } else {
-               pq_coef = q_pre;
-               old = &old_q;
-           }
-
-           /* Start with low resolution grid */
-
-           for (step_idx = 0, step = steps[step_idx];
-               step_idx < LSF_NUMBER_OF_STEPS;){
-
-               /*  cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) +
-               pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
-
-               hlp = (float)cos(omega * TWO_PI);
-               hlp1 = (float)2.0 * hlp + pq_coef[0];
-               hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 +
-                   pq_coef[1];
-               hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
-               hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
-               hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
-
-
-               if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
-
-                   if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
-
-                       if (fabs(hlp5) >= fabs(*old)) {
-                           freq[lsp_index] = omega - step;
-                       } else {
-                           freq[lsp_index] = omega;
-                       }
-
-
-
-Andersen, et al.              Experimental                    [Page 174]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-
-
-                       if ((*old) >= 0.0){
-                           *old = (float)-1.0 * FLOAT_MAX;
-                       } else {
-                           *old = FLOAT_MAX;
-                       }
-
-                       omega = old_omega;
-                       step_idx = 0;
-
-                       step_idx = LSF_NUMBER_OF_STEPS;
-                   } else {
-
-                       if (step_idx == 0) {
-                           old_omega = omega;
-                       }
-
-                       step_idx++;
-                       omega -= steps[step_idx];
-
-                       /* Go back one grid step */
-
-                       step = steps[step_idx];
-                   }
-               } else {
-
-               /* increment omega until they are of different sign,
-               and we know there is at least one root between omega
-               and old_omega */
-                   *old = hlp5;
-                   omega += step;
-               }
-           }
-       }
-
-       for (i = 0; i<LPC_FILTERORDER; i++) {
-           freq[i] = freq[i] * TWO_PI;
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  conversion from lsf coefficients to lpc coefficients
-    *---------------------------------------------------------------*/
-
-   void lsf2a(
-       float *a_coef,  /* (o) lpc coefficients */
-       float *freq     /* (i) lsf coefficients */
-
-
-
-Andersen, et al.              Experimental                    [Page 175]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   ){
-       int i, j;
-       float hlp;
-       float p[LPC_HALFORDER], q[LPC_HALFORDER];
-       float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
-           a2[LPC_HALFORDER];
-       float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER],
-           b2[LPC_HALFORDER];
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           freq[i] = freq[i] * PI2;
-       }
-
-       /* Check input for ill-conditioned cases.  This part is not
-       found in the TIA standard.  It involves the following 2 IF
-       blocks.  If "freq" is judged ill-conditioned, then we first
-       modify freq[0] and freq[LPC_HALFORDER-1] (normally
-       LPC_HALFORDER = 10 for LPC applications), then we adjust
-       the other "freq" values slightly */
-
-
-       if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
-
-
-           if (freq[0] <= 0.0) {
-               freq[0] = (float)0.022;
-           }
-
-
-           if (freq[LPC_FILTERORDER - 1] >= 0.5) {
-               freq[LPC_FILTERORDER - 1] = (float)0.499;
-           }
-
-           hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) /
-               (float) (LPC_FILTERORDER - 1);
-
-           for (i=1; i<LPC_FILTERORDER; i++) {
-               freq[i] = freq[i - 1] + hlp;
-           }
-       }
-
-       memset(a1, 0, LPC_HALFORDER*sizeof(float));
-       memset(a2, 0, LPC_HALFORDER*sizeof(float));
-       memset(b1, 0, LPC_HALFORDER*sizeof(float));
-       memset(b2, 0, LPC_HALFORDER*sizeof(float));
-       memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
-       memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
-
-
-
-
-Andersen, et al.              Experimental                    [Page 176]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and
-       cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.
-       Note that for this code p[i] specifies the coefficients
-       used in .Q_A(z) while q[i] specifies the coefficients used
-       in .P_A(z) */
-
-       for (i=0; i<LPC_HALFORDER; i++) {
-           p[i] = (float)cos(TWO_PI * freq[2 * i]);
-           q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
-       }
-
-       a[0] = 0.25;
-       b[0] = 0.25;
-
-       for (i= 0; i<LPC_HALFORDER; i++) {
-           a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-           b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-           a2[i] = a1[i];
-           a1[i] = a[i];
-           b2[i] = b1[i];
-           b1[i] = b[i];
-       }
-
-       for (j=0; j<LPC_FILTERORDER; j++) {
-
-           if (j == 0) {
-               a[0] = 0.25;
-               b[0] = -0.25;
-           } else {
-               a[0] = b[0] = 0.0;
-           }
-
-           for (i=0; i<LPC_HALFORDER; i++) {
-               a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-               b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-               a2[i] = a1[i];
-               a1[i] = a[i];
-               b2[i] = b1[i];
-               b1[i] = b[i];
-           }
-
-           a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
-       }
-
-       a_coef[0] = 1.0;
-   }
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 177]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.41.  packing.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       packing.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __PACKING_H
-   #define __PACKING_H
-
-   void packsplit(
-       int *index,                 /* (i) the value to split */
-       int *firstpart,             /* (o) the value specified by most
-                                          significant bits */
-       int *rest,                  /* (o) the value specified by least
-                                          significant bits */
-       int bitno_firstpart,    /* (i) number of bits in most
-                                          significant part */
-       int bitno_total             /* (i) number of bits in full range
-                                          of value */
-   );
-
-   void packcombine(
-       int *index,                 /* (i/o) the msb value in the
-                                          combined value out */
-       int rest,                   /* (i) the lsb value */
-       int bitno_rest              /* (i) the number of bits in the
-                                          lsb part */
-   );
-
-   void dopack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to pack
-                                          new data, on exit pointer
-                                          to place in bitstream to
-                                          pack future data */
-       int index,                  /* (i) the value to pack */
-       int bitno,                  /* (i) the number of bits that the
-                                          value will fit within */
-       int *pos                /* (i/o) write position in the
-                                          current byte */
-   );
-
-
-
-Andersen, et al.              Experimental                    [Page 178]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   void unpack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to
-                                          unpack new data from, on
-                                          exit pointer to place in
-                                          bitstream to unpack future
-                                          data from */
-       int *index,                 /* (o) resulting value */
-       int bitno,                  /* (i) number of bits used to
-                                          represent the value */
-       int *pos                /* (i/o) read position in the
-                                          current byte */
-   );
-
-   #endif
-
-A.42.  packing.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       packing.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <stdlib.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "helpfun.h"
-   #include "string.h"
-
-   /*----------------------------------------------------------------*
-    *  splitting an integer into first most significant bits and
-    *  remaining least significant bits
-    *---------------------------------------------------------------*/
-
-   void packsplit(
-       int *index,                 /* (i) the value to split */
-       int *firstpart,             /* (o) the value specified by most
-                                          significant bits */
-       int *rest,                  /* (o) the value specified by least
-                                          significant bits */
-
-
-
-Andersen, et al.              Experimental                    [Page 179]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       int bitno_firstpart,    /* (i) number of bits in most
-                                          significant part */
-       int bitno_total             /* (i) number of bits in full range
-                                          of value */
-   ){
-       int bitno_rest = bitno_total-bitno_firstpart;
-
-       *firstpart = *index>>(bitno_rest);
-       *rest = *index-(*firstpart<<(bitno_rest));
-   }
-
-   /*----------------------------------------------------------------*
-    *  combining a value corresponding to msb's with a value
-    *  corresponding to lsb's
-    *---------------------------------------------------------------*/
-
-   void packcombine(
-       int *index,                 /* (i/o) the msb value in the
-                                          combined value out */
-       int rest,                   /* (i) the lsb value */
-       int bitno_rest              /* (i) the number of bits in the
-                                          lsb part */
-   ){
-       *index = *index<<bitno_rest;
-       *index += rest;
-   }
-
-   /*----------------------------------------------------------------*
-    *  packing of bits into bitstream, i.e., vector of bytes
-    *---------------------------------------------------------------*/
-
-   void dopack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to pack
-                                          new data, on exit pointer
-                                          to place in bitstream to
-                                          pack future data */
-       int index,                  /* (i) the value to pack */
-       int bitno,                  /* (i) the number of bits that the
-                                          value will fit within */
-       int *pos                /* (i/o) write position in the
-                                          current byte */
-   ){
-       int posLeft;
-
-       /* Clear the bits before starting in a new byte */
-
-       if ((*pos)==0) {
-
-
-
-Andersen, et al.              Experimental                    [Page 180]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           **bitstream=0;
-       }
-
-       while (bitno>0) {
-
-           /* Jump to the next byte if end of this byte is reached*/
-
-           if (*pos==8) {
-               *pos=0;
-               (*bitstream)++;
-               **bitstream=0;
-           }
-
-           posLeft=8-(*pos);
-
-           /* Insert index into the bitstream */
-
-           if (bitno <= posLeft) {
-               **bitstream |= (unsigned char)(index<<(posLeft-bitno));
-               *pos+=bitno;
-               bitno=0;
-           } else {
-               **bitstream |= (unsigned char)(index>>(bitno-posLeft));
-
-               *pos=8;
-               index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
-
-               bitno-=posLeft;
-           }
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  unpacking of bits from bitstream, i.e., vector of bytes
-    *---------------------------------------------------------------*/
-
-   void unpack(
-       unsigned char **bitstream,  /* (i/o) on entrance pointer to
-                                          place in bitstream to
-                                          unpack new data from, on
-                                          exit pointer to place in
-                                          bitstream to unpack future
-                                          data from */
-       int *index,                 /* (o) resulting value */
-       int bitno,                  /* (i) number of bits used to
-                                          represent the value */
-       int *pos                /* (i/o) read position in the
-                                          current byte */
-
-
-
-Andersen, et al.              Experimental                    [Page 181]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   ){
-       int BitsLeft;
-
-       *index=0;
-
-       while (bitno>0) {
-
-           /* move forward in bitstream when the end of the
-              byte is reached */
-
-           if (*pos==8) {
-               *pos=0;
-               (*bitstream)++;
-           }
-
-           BitsLeft=8-(*pos);
-
-           /* Extract bits to index */
-
-           if (BitsLeft>=bitno) {
-               *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
-
-               *pos+=bitno;
-               bitno=0;
-           } else {
-
-               if ((8-bitno)>0) {
-                   *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
-                       (8-bitno));
-                   *pos=8;
-               } else {
-                   *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
-                       (bitno-8));
-                   *pos=8;
-               }
-               bitno-=BitsLeft;
-           }
-       }
-   }
-
-A.43.  StateConstructW.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateConstructW.h
-
-
-
-
-Andersen, et al.              Experimental                    [Page 182]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_STATECONSTRUCTW_H
-   #define __iLBC_STATECONSTRUCTW_H
-
-   void StateConstructW(
-       int idxForMax,      /* (i) 6-bit index for the quantization of
-                                  max amplitude */
-       int *idxVec,    /* (i) vector of quantization indexes */
-       float *syntDenum,   /* (i) synthesis filter denumerator */
-       float *out,         /* (o) the decoded state vector */
-       int len             /* (i) length of a state vector */
-   );
-
-   #endif
-
-A.44.  StateConstructW.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateConstructW.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-
-   /*----------------------------------------------------------------*
-    *  decoding of the start state
-    *---------------------------------------------------------------*/
-
-   void StateConstructW(
-       int idxForMax,      /* (i) 6-bit index for the quantization of
-                                  max amplitude */
-       int *idxVec,    /* (i) vector of quantization indexes */
-       float *syntDenum,   /* (i) synthesis filter denumerator */
-
-
-
-Andersen, et al.              Experimental                    [Page 183]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *out,         /* (o) the decoded state vector */
-       int len             /* (i) length of a state vector */
-   ){
-       float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp,
-           numerator[LPC_FILTERORDER+1];
-       float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
-       int k,tmpi;
-
-       /* decoding of the maximum value */
-
-       maxVal = state_frgqTbl[idxForMax];
-       maxVal = (float)pow(10,maxVal)/(float)4.5;
-
-       /* initialization of buffers and coefficients */
-
-       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-       for (k=0; k<LPC_FILTERORDER; k++) {
-           numerator[k]=syntDenum[LPC_FILTERORDER-k];
-       }
-       numerator[LPC_FILTERORDER]=syntDenum[0];
-       tmp = &tmpbuf[LPC_FILTERORDER];
-       fout = &foutbuf[LPC_FILTERORDER];
-
-       /* decoding of the sample values */
-
-       for (k=0; k<len; k++) {
-           tmpi = len-1-k;
-           /* maxVal = 1/scal */
-           tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
-       }
-
-       /* circular convolution with all-pass filter */
-
-       memset(tmp+len, 0, len*sizeof(float));
-       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
-           LPC_FILTERORDER, fout);
-       for (k=0;k<len;k++) {
-           out[k] = fout[len-1-k]+fout[2*len-1-k];
-       }
-   }
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 184]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.45.  StateSearchW.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateSearchW.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_STATESEARCHW_H
-   #define __iLBC_STATESEARCHW_H
-
-   void AbsQuantW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *in,          /* (i) vector to encode */
-       float *syntDenum,   /* (i) denominator of synthesis filter */
-       float *weightDenum, /* (i) denominator of weighting filter */
-       int *out,           /* (o) vector of quantizer indexes */
-       int len,        /* (i) length of vector to encode and
-                                  vector of quantizer indexes */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   );
-
-   void StateSearchW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *residual,/* (i) target residual vector */
-       float *syntDenum,   /* (i) lpc synthesis filter */
-       float *weightDenum, /* (i) weighting filter denuminator */
-       int *idxForMax,     /* (o) quantizer index for maximum
-                                  amplitude */
-       int *idxVec,    /* (o) vector of quantization indexes */
-       int len,        /* (i) length of all vectors */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   );
-
-
-   #endif
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 185]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.46.  StateSearchW.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       StateSearchW.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include <math.h>
-   #include <string.h>
-
-   #include "iLBC_define.h"
-   #include "constants.h"
-   #include "filter.h"
-   #include "helpfun.h"
-
-   /*----------------------------------------------------------------*
-    *  predictive noise shaping encoding of scaled start state
-    *  (subrutine for StateSearchW)
-    *---------------------------------------------------------------*/
-
-   void AbsQuantW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *in,          /* (i) vector to encode */
-       float *syntDenum,   /* (i) denominator of synthesis filter */
-       float *weightDenum, /* (i) denominator of weighting filter */
-       int *out,           /* (o) vector of quantizer indexes */
-       int len,        /* (i) length of vector to encode and
-                                  vector of quantizer indexes */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   ){
-       float *syntOut;
-       float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
-       float toQ, xq;
-       int n;
-       int index;
-
-       /* initialization of buffer for filtering */
-
-       memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
-
-
-
-
-Andersen, et al.              Experimental                    [Page 186]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       /* initialization of pointer for filtering */
-
-       syntOut = &syntOutBuf[LPC_FILTERORDER];
-
-       /* synthesis and weighting filters on input */
-
-       if (state_first) {
-           AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
-       } else {
-           AllPoleFilter (in, weightDenum,
-               iLBCenc_inst->state_short_len-SUBL,
-               LPC_FILTERORDER);
-       }
-
-       /* encoding loop */
-
-       for (n=0; n<len; n++) {
-
-           /* time update of filter coefficients */
-
-           if ((state_first)&&(n==SUBL)){
-               syntDenum += (LPC_FILTERORDER+1);
-               weightDenum += (LPC_FILTERORDER+1);
-
-               /* synthesis and weighting filters on input */
-               AllPoleFilter (&in[n], weightDenum, len-n,
-                   LPC_FILTERORDER);
-
-           } else if ((state_first==0)&&
-               (n==(iLBCenc_inst->state_short_len-SUBL))) {
-               syntDenum += (LPC_FILTERORDER+1);
-               weightDenum += (LPC_FILTERORDER+1);
-
-               /* synthesis and weighting filters on input */
-               AllPoleFilter (&in[n], weightDenum, len-n,
-                   LPC_FILTERORDER);
-
-           }
-
-           /* prediction of synthesized and weighted input */
-
-           syntOut[n] = 0.0;
-           AllPoleFilter (&syntOut[n], weightDenum, 1,
-               LPC_FILTERORDER);
-
-           /* quantization */
-
-           toQ = in[n]-syntOut[n];
-
-
-
-Andersen, et al.              Experimental                    [Page 187]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-           sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
-           out[n]=index;
-           syntOut[n] = state_sq3Tbl[out[n]];
-
-           /* update of the prediction filter */
-
-           AllPoleFilter(&syntOut[n], weightDenum, 1,
-               LPC_FILTERORDER);
-       }
-   }
-
-   /*----------------------------------------------------------------*
-    *  encoding of start state
-    *---------------------------------------------------------------*/
-
-   void StateSearchW(
-       iLBC_Enc_Inst_t *iLBCenc_inst,
-                           /* (i) Encoder instance */
-       float *residual,/* (i) target residual vector */
-       float *syntDenum,   /* (i) lpc synthesis filter */
-       float *weightDenum, /* (i) weighting filter denuminator */
-       int *idxForMax,     /* (o) quantizer index for maximum
-                                  amplitude */
-       int *idxVec,    /* (o) vector of quantization indexes */
-       int len,        /* (i) length of all vectors */
-       int state_first     /* (i) position of start state in the
-                                  80 vec */
-   ){
-       float dtmp, maxVal;
-       float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
-       float *tmp, numerator[1+LPC_FILTERORDER];
-       float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
-       int k;
-       float qmax, scal;
-
-       /* initialization of buffers and filter coefficients */
-
-       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-       for (k=0; k<LPC_FILTERORDER; k++) {
-           numerator[k]=syntDenum[LPC_FILTERORDER-k];
-       }
-       numerator[LPC_FILTERORDER]=syntDenum[0];
-       tmp = &tmpbuf[LPC_FILTERORDER];
-       fout = &foutbuf[LPC_FILTERORDER];
-
-       /* circular convolution with the all-pass filter */
-
-
-
-
-Andersen, et al.              Experimental                    [Page 188]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       memcpy(tmp, residual, len*sizeof(float));
-       memset(tmp+len, 0, len*sizeof(float));
-       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
-           LPC_FILTERORDER, fout);
-       for (k=0; k<len; k++) {
-           fout[k] += fout[k+len];
-       }
-
-       /* identification of the maximum amplitude value */
-
-       maxVal = fout[0];
-       for (k=1; k<len; k++) {
-
-           if (fout[k]*fout[k] > maxVal*maxVal){
-               maxVal = fout[k];
-           }
-       }
-       maxVal=(float)fabs(maxVal);
-
-       /* encoding of the maximum amplitude value */
-
-       if (maxVal < 10.0) {
-           maxVal = 10.0;
-       }
-       maxVal = (float)log10(maxVal);
-       sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
-
-       /* decoding of the maximum amplitude representation value,
-          and corresponding scaling of start state */
-
-       maxVal=state_frgqTbl[*idxForMax];
-       qmax = (float)pow(10,maxVal);
-       scal = (float)(4.5)/qmax;
-       for (k=0; k<len; k++){
-           fout[k] *= scal;
-       }
-
-       /* predictive noise shaping encoding of scaled start state */
-
-       AbsQuantW(iLBCenc_inst, fout,syntDenum,
-           weightDenum,idxVec, len, state_first);
-   }
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 189]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-A.47.  syntFilter.h
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       syntFilter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_SYNTFILTER_H
-   #define __iLBC_SYNTFILTER_H
-
-   void syntFilter(
-       float *Out,     /* (i/o) Signal to be filtered */
-       float *a,       /* (i) LP parameters */
-       int len,    /* (i) Length of signal */
-       float *mem      /* (i/o) Filter state */
-   );
-
-   #endif
-
-A.48.  syntFilter.c
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       syntFilter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  LP synthesis filter.
-    *---------------------------------------------------------------*/
-
-   void syntFilter(
-       float *Out,     /* (i/o) Signal to be filtered */
-       float *a,       /* (i) LP parameters */
-       int len,    /* (i) Length of signal */
-
-
-
-Andersen, et al.              Experimental                    [Page 190]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-       float *mem      /* (i/o) Filter state */
-   ){
-       int i, j;
-       float *po, *pi, *pa, *pm;
-
-       po=Out;
-
-       /* Filter first part using memory from past */
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           pi=&Out[i-1];
-           pa=&a[1];
-           pm=&mem[LPC_FILTERORDER-1];
-           for (j=1; j<=i; j++) {
-               *po-=(*pa++)*(*pi--);
-           }
-           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-               *po-=(*pa++)*(*pm--);
-           }
-           po++;
-       }
-
-       /* Filter last part where the state is entirely in
-          the output vector */
-
-       for (i=LPC_FILTERORDER; i<len; i++) {
-           pi=&Out[i-1];
-           pa=&a[1];
-           for (j=1; j<LPC_FILTERORDER+1; j++) {
-               *po-=(*pa++)*(*pi--);
-           }
-           po++;
-       }
-
-       /* Update state vector */
-
-       memcpy(mem, &Out[len-LPC_FILTERORDER],
-           LPC_FILTERORDER*sizeof(float));
-   }
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 191]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-Authors' Addresses
-
-   Soren Vang Andersen
-   Department of Communication Technology
-   Aalborg University
-   Fredrik Bajers Vej 7A
-   9200 Aalborg
-   Denmark
-
-   Phone:  ++45 9 6358627
-   EMail:  sva@kom.auc.dk
-
-
-   Alan Duric
-   Telio AS
-   Stoperigt. 2
-   Oslo, N-0250
-   Norway
-
-   Phone:  +47 21673555
-   EMail:  alan.duric@telio.no
-
-
-   Henrik Astrom
-   Global IP Sound AB
-   Olandsgatan 42
-   Stockholm, S-11663
-   Sweden
-
-   Phone:  +46 8 54553040
-   EMail:  henrik.astrom@globalipsound.com
-
-
-   Roar Hagen
-   Global IP Sound AB
-   Olandsgatan 42
-   Stockholm, S-11663
-   Sweden
-
-   Phone:  +46 8 54553040
-   EMail:  roar.hagen@globalipsound.com
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 192]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-   W. Bastiaan Kleijn
-   Global IP Sound AB
-   Olandsgatan 42
-   Stockholm, S-11663
-   Sweden
-
-   Phone:  +46 8 54553040
-   EMail:  bastiaan.kleijn@globalipsound.com
-
-
-   Jan Linden
-   Global IP Sound Inc.
-   900 Kearny Street, suite 500
-   San Francisco, CA-94133
-   USA
-
-   Phone: +1 415 397 2555
-   EMail: jan.linden@globalipsound.com
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 193]
-
-RFC 3951              Internet Low Bit Rate Codec          December 2004
-
-
-Full Copyright Statement
-
-   Copyright (C) The Internet Society (2004).
-
-   This document is subject to the rights, licenses and restrictions
-   contained in BCP 78, and except as set forth therein, the authors
-   retain all their rights.
-
-   This document and the information contained herein are provided on an
-   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
-   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
-   ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
-   INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
-   INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
-   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-Intellectual Property
-
-   The IETF takes no position regarding the validity or scope of any
-   Intellectual Property Rights or other rights that might be claimed to
-   pertain to the implementation or use of the technology described in
-   this document or the extent to which any license under such rights
-   might or might not be available; nor does it represent that it has
-   made any independent effort to identify any such rights.  Information
-   on the IETF's procedures with respect to rights in IETF Documents can
-   be found in BCP 78 and BCP 79.
-
-   Copies of IPR disclosures made to the IETF Secretariat and any
-   assurances of licenses to be made available, or the result of an
-   attempt made to obtain a general license or permission for the use of
-   such proprietary rights by implementers or users of this
-   specification can be obtained from the IETF on-line IPR repository at
-   http://www.ietf.org/ipr.
-
-   The IETF invites any interested party to bring to its attention any
-   copyrights, patents or patent applications, or other proprietary
-   rights that may cover technology that may be required to implement
-   this standard.  Please address the information to the IETF at ietf-
-   ipr@ietf.org.
-
-
-Acknowledgement
-
-   Funding for the RFC Editor function is currently provided by the
-   Internet Society.
-
-
-
-
-
-
-Andersen, et al.              Experimental                    [Page 194]
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
deleted file mode 100644
index 190eb00..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
+++ /dev/null
@@ -1,80 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       syntFilter.c
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #include "iLBC_define.h"
-
-   /*----------------------------------------------------------------*
-    *  LP synthesis filter.
-    *---------------------------------------------------------------*/
-
-   void syntFilter(
-       float *Out,     /* (i/o) Signal to be filtered */
-       float *a,       /* (i) LP parameters */
-       int len,    /* (i) Length of signal */
-
-
-
-
-
-       float *mem      /* (i/o) Filter state */
-   ){
-       int i, j;
-       float *po, *pi, *pa, *pm;
-
-       po=Out;
-
-       /* Filter first part using memory from past */
-
-       for (i=0; i<LPC_FILTERORDER; i++) {
-           pi=&Out[i-1];
-           pa=&a[1];
-           pm=&mem[LPC_FILTERORDER-1];
-           for (j=1; j<=i; j++) {
-               *po-=(*pa++)*(*pi--);
-           }
-           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-               *po-=(*pa++)*(*pm--);
-           }
-           po++;
-       }
-
-       /* Filter last part where the state is entirely in
-          the output vector */
-
-       for (i=LPC_FILTERORDER; i<len; i++) {
-           pi=&Out[i-1];
-           pa=&a[1];
-           for (j=1; j<LPC_FILTERORDER+1; j++) {
-               *po-=(*pa++)*(*pi--);
-           }
-           po++;
-       }
-
-       /* Update state vector */
-
-       memcpy(mem, &Out[len-LPC_FILTERORDER],
-           LPC_FILTERORDER*sizeof(float));
-   }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
deleted file mode 100644
index 8865b89..0000000
--- a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-   /******************************************************************
-
-       iLBC Speech Coder ANSI-C Source Code
-
-       syntFilter.h
-
-       Copyright (C) The Internet Society (2004).
-       All Rights Reserved.
-
-   ******************************************************************/
-
-   #ifndef __iLBC_SYNTFILTER_H
-   #define __iLBC_SYNTFILTER_H
-
-   void syntFilter(
-       float *Out,     /* (i/o) Signal to be filtered */
-       float *a,       /* (i) LP parameters */
-       int len,    /* (i) Length of signal */
-       float *mem      /* (i/o) Filter state */
-   );
-
-   #endif
-
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.confd b/net-misc/asterisk/files/1.4.39.1/asterisk.confd
deleted file mode 100644
index fac8683..0000000
--- a/net-misc/asterisk/files/1.4.39.1/asterisk.confd
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.confd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
-
-#
-# Additional options for asterisk
-#
-# see "asterisk -h" for a list of options
-#
-ASTERISK_OPTS=" -p -vvv -c"
-
-#
-# User and group to run asterisk as
-#
-# Value: double-colon separated list of user and group, or empty to run as root:
-#
-#
-# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
-#
-#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
-#
-#         ":asterisk" to run as user "root" and group "asterisk"
-#
-#                  "" to run as user "root" and group "root"
-#
-ASTERISK_USER=""
-
-#
-# Nicelevel
-#
-# Set the priority of the asterisk process
-#
-# Value: (highest) -20..19 (lowest)
-#
-#ASTERISK_NICE="19"
-
-# Send crash notifications emails to this address
-# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
-#
-# Value: Email address or empty to disable
-#
-#ASTERISK_NOTIFY_EMAIL="root"
-
-#
-# Send asterisk's output to this terminal
-#
-# Value: Full path to device node or a number
-#
-#ASTERISK_TTY="/dev/tty9"
-
-#
-# Start an asterisk console on the terminal specified by ASTERISK_TTY
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# Value: yes or no/empty
-#
-ASTERISK_CONSOLE="no"
-
-#
-# Maximum size of core files. 
-#
-# Value: Size in bytes, unlimited for no limit or empty to disable.
-# 
-ASTERISK_CORE_SIZE="unlimited"
-
-#
-# ASTERISK_CORE_DIR
-#
-# Value: Directory (will be created if non-existant), default is /tmp
-#
-ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
-
-#
-# Max number of filedescriptors
-#
-# Value: Number of descriptors
-#
-ASTERISK_MAX_FD="65535"
-
-#
-# Delay time before restarting asterisk after a crash.
-#
-# Value: Number of seconds to sleep after a crash before restarting.
-#
-ASTERISK_RESTART_DELAY=5
-
-#
-# Kill these tasks after asterisk crashed
-#
-# Warning! This will kill _ALL_ tasks with the specified names!
-#
-# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
-#
-#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.initd b/net-misc/asterisk/files/1.4.39.1/asterisk.initd
deleted file mode 100755
index c564fcf..0000000
--- a/net-misc/asterisk/files/1.4.39.1/asterisk.initd
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/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/asterisk/files/1.8.0/asterisk.initd5,v 1.1 2013/01/24 13:10:46 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r /var/run/asterisk/asterisk.pid ] || return 1
-	local ast_pid="`pidof asterisk`"
-	if [ -z "${ast_pid}" ]; then
-		return 1
-	else
-		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in ${ast_pid}; do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing asterisk wrapper"
-	OPTS="$*"
-
-	trap "rm -f /var/run/asterisk/wrapper_loop.running" EXIT
-	touch "/var/run/asterisk/wrapper_loop.running"
-
-	while [ -r "/var/run/asterisk/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=`expr $result - 128`
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 `pidof ${X}`;
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID NICE=""
-	local tmp x
-
-	local OPTS ARGS 
-		
-	ebegin "Starting asterisk PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
-	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
-		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
-		if [ -n "${USER}" ]; then
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
-		for element in `find /var/{log,run}/asterisk`; do
-			if [ `stat -c %U $element` != "${USER}" ]; then
- 				ewarn "${USER} is not the owner of $element, fixing."
-				chown -R ${USER} /var/{log,run}/asterisk
-				chmod -R u+r /var/{log,run}/asterisk
-				chmod u+x /var/{log,run}/asterisk
-			fi;
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eoutdent
-	eend $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r /var/run/asterisk/wrapper_loop.running ]; then
-		ebegin "Signalling wrapper script to terminate"
-		rm /var/run/asterisk/wrapper_loop.running
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	wrapperstop
-
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate b/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
deleted file mode 100644
index f6e61db..0000000
--- a/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/asterisk/event_log /var/log/asterisk/full /var/log/asterisk/queue_log /var/log/asterisk/console{ 
-   missingok 
-   rotate 2
-   daily 
-   postrotate 
-       /usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null 
-   endscript 
-} 
diff --git a/net-misc/asterisk/files/1.4.39.1/dahdi.initd b/net-misc/asterisk/files/1.4.39.1/dahdi.initd
deleted file mode 100755
index a2f2a5b..0000000
--- a/net-misc/asterisk/files/1.4.39.1/dahdi.initd
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Ultimate Linux Solutions CC
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before dahdi
-	after wanrouter
-}
-
-dahdi_load_modules() {
-	local hwlist loc status mod mod_vname pciid desc
-
-	hwlist=$(/usr/sbin/dahdi_hardware)
-
-	if [ -z "${hwlist}" ]; then
-		einfo "No digium hardware found."
-		/sbin/modprobe dahdi max_pseudo_channels=8192
-		#ebegin "Loading module wanpipe_voicetime"
-		#/sbin/modprobe wanpipe_voicetime
-		ebegin "Loading module dahdi_dummy"
-		/sbin/modprobe dahdi_dummy
-		eend $?
-		return
-	fi
-
-	echo "${hwlist}" | while read loc mod pciid desc; do
-		status="${mod:${#mod}-1:1}"
-		mod="${mod%[+-]}"
-		mod_vname="mod_${mod}"
-
-		einfo "Found $desc at $loc (module: $mod)"
-
-		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
-			ebegin "Loading module $mod"
-			/sbin/modprobe $mod
-			eend
-
-			[ $? -eq 0 ] && eval "$mod_vname=loaded"
-		fi
-	done
-}
-
-dahdi_module_unload() {
-	local mod=$1 s
-	[ -d /sys/module/${mod} ] || return 0
-
-	for s in $(find /sys/module/${mod}/holders -type l); do
-		dahdi_module_unload $(basename $s)
-	done
-
-	ebegin "Removing dahdi module: $mod"
-	/sbin/rmmod $mod
-	eend $?
-}
-
-dahdi_gen_fxo_config() {
-	local port=$1
-
-	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_fxs_config() {
-	local port=$1
-
-	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_bri_te_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_bri_nt_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_e1_cpe_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_e1_net_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_conf_span() {
-	local span=$1
-	local type=$2
-	local desc=$3
-	local port=$4
-	local basechan=$5
-	local vname=""
-
-	# Analog we need to deal with on a port-by-port basis.
-	[ "${type}" = "analog" ] && return 0
-
-	echo -e "\n# ${desc}"
-	case "${type}" in
-		digital-TE)
-			dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}"
-		;;
-		digital-NT)
-			dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
-		;;
-		digital-E1)
-			# Use CPE by default.  Unfortunately there is no easy
-			# way to detect CPE vs NET as far as I know and specifying
-			# in a config that you want NET mode seems the sanest way.
-			vname="PRI_SPAN_${span}_NET"
-			if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
-				dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
-			else
-				dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
-			fi
-		;;
-		*)
-			echo "# Don't know how to configure this (type=${type})."
-			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
-		;;
-	esac
-}
-
-dahdi_gen_config() {
-	local type manufacturer devicetype basechan aport atype
-	local span=
-	local tfile="$(mktemp)"
-	local sfile="$(mktemp)"
-	local plocation=""
-	local isdnport=0
-
-	/usr/sbin/dahdi_scan > "${sfile}" 
-	exec 3<"${sfile}"
-
-	echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}"
-	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}"
-
-	while read LINE <&3; do
-		case "$LINE" in
-			[[]*[]])
-				[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
-				span="${LINE%?}"
-				span="${span#?}"
-			;;
-			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-			;;
-			location=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-				if [ "${location}" == "${plocation}" ]; then
-					(( ++isdnport ))
-				else
-					plocation="${location}"
-					isdnport=1
-				fi
-			;;
-			port=*)
-				# For analog cards only.
-				aport="${LINE#*=}"; aport="${aport%,*}"
-				atype="${LINE#*,}"
-				[ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}"
-				case "${atype}" in
-					FXO)
-						dahdi_gen_fxo_config $aport >> "${tfile}"
-					;;
-					FXS)
-						dahdi_gen_fxs_config $aport >> "${tfile}"
-					;;
-				esac
-			;;
-		esac
-	done
-	
-	[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
-
-	echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}"
-
-	exec 3<&-
-
-	rm -f "${sfile}"
-	mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
-	mv "${tfile}" /etc/dahdi/system.conf
-}
-
-start() {
-	dahdi_load_modules
-
-	if [ ! -r /dev/dahdi/ctl ]; then
-		eerror "No DAHDI compatible cards detected."
-		return 1
-	fi
-
-	ebegin "Generating DAHDI Configuration"
-	dahdi_gen_config
-	eend $?
-}
-
-stop() {
-	dahdi_module_unload dahdi
-}
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
deleted file mode 100644
index 7b0ae86..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
+++ /dev/null
@@ -1,281 +0,0 @@
---- asterisk-1.4.39.1/apps/.moduleinfo	2011-01-17 11:08:18.000000000 -0800
-+++ asterisk-1.4.39.1-vici/apps/.moduleinfo	2013-05-13 21:48:22.000000000 -0700
-@@ -1,179 +1,179 @@
- <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
--<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
--	<depend>res_adsi</depend>
--</member>
--<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
-+<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
- </member>
--<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
-+<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
-+	<depend>dahdi</depend>
-+	<depend>tonezone</depend>
-+	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
-+<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
- </member>
--<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
-+<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
- </member>
--<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
-+<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
- </member>
--<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
-+<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
- </member>
--<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
-+<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
- </member>
--<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
-+<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
- </member>
--<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
--	<depend>dahdi</depend>
-+<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
-+	<depend>res_indications</depend>
- </member>
--<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
--	<depend>dahdi</depend>
--	<depend>working_fork</depend>
-+<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
- </member>
--<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
--	<depend>dahdi</depend>
-+<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
- </member>
--<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
-+<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
- </member>
--<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
--        <depend>chan_local</depend>
-+<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
- </member>
- <member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
- </member>
--<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-+<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-+	<depend>dahdi</depend>
-+	<depend>app_meetme</depend>
- </member>
--<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
-+<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
- </member>
--<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-+<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
- </member>
--<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
-+<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
- </member>
--<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
-+<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
--<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
-+<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
- </member>
--<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
--	<depend>working_fork</depend>
-+<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
- </member>
--<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
--	<depend>working_fork</depend>
-+<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
- </member>
--<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
--	<depend>dahdi</depend>
-+<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
-+<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
- </member>
--<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
-+<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
- </member>
--<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
-+<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
- </member>
--<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
-+<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
-+	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
--	<depend>working_fork</depend>
-+<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-+</member>
-+<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
-+</member>
-+<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
-+	<depend>res_adsi</depend>
-+	<depend>res_smdi</depend>
- </member>
- <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
- </member>
--<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
--	<defaultenabled>no</defaultenabled>
-+<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-+        <depend>chan_local</depend>
- </member>
--<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
-+<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
- </member>
--<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
-+<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
- </member>
--<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
-+<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
- </member>
--<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-+<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
--	<depend>res_indications</depend>
-+<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
- </member>
--<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
-+<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
-+        <depend>chan_local</depend>
- </member>
--<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
-+<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-+</member>
-+<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
-+</member>
-+<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
- </member>
- <member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
- 	<depend>working_fork</depend>
- </member>
--<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-+<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-+</member>
-+<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
- 	<depend>working_fork</depend>
- </member>
--<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
--	<depend>osptk</depend>
--	<depend>ssl</depend>
-+<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
- </member>
--<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-+<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
- 	<depend>dahdi</depend>
--	<depend>app_meetme</depend>
--</member>
--<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
--</member>
--<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
--</member>
--<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
--</member>
--<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
--        <depend>res_monitor</depend>
- </member>
--<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
-+<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
- </member>
--<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
-+<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
- </member>
--<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
-+<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
-+	<depend>dahdi</depend>
-+	<depend>working_fork</depend>
- </member>
--<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
-+<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
-+<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
-+	<depend>osptk</depend>
-+	<depend>ssl</depend>
- </member>
--<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
--	<depend>dahdi</depend>
--	<depend>tonezone</depend>
-+<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
- 	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
--</member>
--<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
-+<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
-+	<depend>dahdi</depend>
- </member>
--<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
-+<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
- </member>
- <member name="app_setcallerid" displayname="Set CallerID Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
- </member>
--<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
-+<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
-+	<depend>res_adsi</depend>
- </member>
--<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
-+<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
- </member>
--<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
--	<defaultenabled>no</defaultenabled>
-+<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
- </member>
--<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
-+<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
- </member>
--<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
-+<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
- </member>
--<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
-+<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
- </member>
--<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
-+<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
-+<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
- </member>
--<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
-+<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
-+<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
- </member>
--<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
-+<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
- </member>
--<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-+<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
-+        <depend>res_monitor</depend>
- </member>
--<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
-+<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
- </member>
--<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
-+<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
- </member>
--<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
--	<depend>res_adsi</depend>
--	<depend>res_smdi</depend>
-+<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-+	<depend>dahdi</depend>
- </member>
--<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
-+<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
- </member>
--<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
-+<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
- </member>
--<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-+<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
- </member>
--<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
-+<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-+</member>
-+<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
- </member>
- </category>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
deleted file mode 100644
index 1c702a4..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- asterisk-1.4.39.1/apps/app_meetme.c	2010-12-02 05:16:15.000000000 -0800
-+++ asterisk-1.4.39.1-vici/apps/app_meetme.c	2013-05-13 21:48:19.000000000 -0700
-@@ -2117,10 +2117,6 @@ static int conf_run(struct ast_channel *
- 				break;
- 			}
- 
--			/* Perform an extra hangup check just in case */
--			if (ast_check_hangup(chan))
--				break;
--
- 			c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
- 
- 			if (c) {
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
deleted file mode 100644
index 4c33e05..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- asterisk-1.4.39.1/apps/app_waitforsilence.c	2010-01-13 09:16:12.000000000 -0800
-+++ asterisk-1.4.39.1-vici/apps/app_waitforsilence.c	2011-02-08 18:15:06.000000000 -0800
-@@ -83,6 +83,7 @@ static int do_waiting(struct ast_channel
- 	int res = 0;
- 	struct ast_dsp *sildet;	 /* silence detector dsp */
-  	time_t now;
-+	int loop_count = 1;
- 
- 	rfmt = chan->readformat; /* Set to linear mode */
- 	res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
-@@ -128,8 +129,19 @@ static int do_waiting(struct ast_channel
- 			}
- 		}
- 
--		if (option_verbose > 6)
--			ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence< %dms required\n", dspsilence, silencereqd);
-+		loop_count++;
-+
-+		/* Lets not spam the logs */
-+		if (loop_count >= 51) {
-+			if ((option_verbose > 6) && (option_verbose <= 21))
-+				ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence < %dms required\n", dspsilence, silencereqd);
-+			loop_count = 1;
-+		}
-+
-+		/* They must really want us to spam the logs */
-+		if (option_verbose > 21)
-+			ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence < %dms required\n", dspsilence, silencereqd);
-+
- 
- 		if (dspsilence >= silencereqd) {
- 			if (option_verbose > 2)
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch b/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
deleted file mode 100644
index 5452d86..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- asterisk-1.4.39.1/build_tools/menuselect-deps.in	2010-01-25 13:36:33.000000000 -0800
-+++ asterisk-1.4.39.1-vici/build_tools/menuselect-deps.in	2011-02-08 18:15:16.000000000 -0800
-@@ -24,6 +24,7 @@ OSSAUDIO=@PBX_OSS@
- PGSQL=@PBX_PGSQL@
- POPT=@PBX_POPT@
- PRI=@PBX_PRI@
-+OPENR2=@PBX_OPENR2@
- RADIUS=@PBX_RADIUS@
- SPEEX=@PBX_SPEEX@
- SPEEXDSP=@PBX_SPEEXDSP@
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
deleted file mode 100644
index d63b7bd..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- asterisk-1.4.39.1/channels/.chan_dahdi.moduleinfo	2011-01-17 11:08:18.000000000 -0800
-+++ asterisk-1.4.39.1-vici/channels/.chan_dahdi.moduleinfo	2012-05-16 19:02:35.000000000 -0700
-@@ -4,4 +4,5 @@
- 	<depend>tonezone</depend>
- 	<depend>res_features</depend>
- 	<use>pri</use>
-+	<use>openr2</use>
- </member>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
deleted file mode 100644
index 46848e1..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- asterisk-1.4.39.1/channels/.moduleinfo	2011-01-17 11:08:19.000000000 -0800
-+++ asterisk-1.4.39.1-vici/channels/.moduleinfo	2012-05-16 19:02:36.000000000 -0700
-@@ -11,6 +11,7 @@
- 	<depend>tonezone</depend>
- 	<depend>res_features</depend>
- 	<use>pri</use>
-+	<use>openr2</use>
- </member>
- <member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
-         <defaultenabled>no</defaultenabled>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
deleted file mode 100644
index 7bbb077..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
+++ /dev/null
@@ -1,1909 +0,0 @@
---- asterisk-1.4.39.1/channels/chan_dahdi.c	2010-11-24 14:41:07.000000000 -0800
-+++ asterisk-1.4.39.1-vici/channels/chan_dahdi.c	2011-02-08 18:15:16.000000000 -0800
-@@ -43,6 +43,7 @@
- 	<depend>tonezone</depend>
- 	<depend>res_features</depend>
- 	<use>pri</use>
-+	<use>openr2</use>
-  ***/
- 
- #include "asterisk.h"
-@@ -71,6 +72,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include <libpri.h>
- #endif
- 
-+#ifdef HAVE_OPENR2
-+#include <openr2.h>
-+#endif
-+
- #include "asterisk/lock.h"
- #include "asterisk/channel.h"
- #include "asterisk/config.h"
-@@ -157,6 +162,9 @@ static const char tdesc[] = "DAHDI Telep
- #ifdef HAVE_PRI
-                " w/PRI"
- #endif
-+#ifdef HAVE_OPENR2
-+	       " w/OPENR2"
-+#endif
- ;
- 
- #define SIG_EM		DAHDI_SIG_EM
-@@ -175,6 +183,7 @@ static const char tdesc[] = "DAHDI Telep
- #define SIG_FXOGS	DAHDI_SIG_FXOGS
- #define SIG_FXOKS	DAHDI_SIG_FXOKS
- #define SIG_PRI		DAHDI_SIG_CLEAR
-+#define SIG_MFCR2	DAHDI_SIG_CAS
- #define	SIG_SF		DAHDI_SIG_SF
- #define SIG_SFWINK 	(0x0100000 | DAHDI_SIG_SF)
- #define SIG_SF_FEATD	(0x0200000 | DAHDI_SIG_SF)
-@@ -300,6 +309,45 @@ struct dahdi_pvt;
-  */
- static int ringt_base = DEFAULT_RINGT;
- 
-+#ifdef HAVE_OPENR2
-+
-+struct dahdi_mfcr2 {
-+	pthread_t master;		       /*!< Thread of master */
-+	openr2_context_t *protocol_context;    /*!< OpenR2 context handle */ 
-+	struct dahdi_pvt *pvts[MAX_CHANNELS];     /*!< Member channel pvt structs */
-+	int numchans;                          /*!< Number of channels in this R2 block */
-+};
-+
-+static struct dahdi_mfcr2 r2links[NUM_SPANS];
-+static openr2_variant_t mfcr2_cur_variant = OR2_VAR_UNKNOWN;
-+static int mfcr2_cur_mfback_timeout = -1;
-+static int mfcr2_cur_metering_pulse_timeout = -1;
-+static int mfcr2_cur_max_ani = 10;
-+static int mfcr2_cur_max_dnis = 4;
-+static int mfcr2_cur_get_ani_first = -1;
-+static int mfcr2_cur_skip_category = -1;
-+static int mfcr2_cur_context_index = 0;
-+static int mfcr2_cur_call_files = 0;
-+static int mfcr2_cur_allow_collect_calls = 0;
-+static int mfcr2_cur_accept_on_offer = 1;
-+static int mfcr2_cur_charge_calls = 1;
-+static int mfcr2_cur_forced_release = 0;
-+static int mfcr2_cur_double_answer = 0;
-+static int mfcr2_cur_immediate_accept = -1;
-+/* starting with openr2 interface 3 we have DTMF support */
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
-+static int mfcr2_cur_dtmf_dialing = -1;
-+static int mfcr2_cur_dtmf_detection = -1;
-+static int mfcr2_cur_dtmf_time_on = OR2_DEFAULT_DTMF_ON;
-+static int mfcr2_cur_dtmf_time_off = OR2_DEFAULT_DTMF_OFF;
-+#endif
-+static char mfcr2_cur_logdir[OR2_MAX_PATH];
-+static char mfcr2_cur_r2proto_file[OR2_MAX_PATH];
-+static openr2_log_level_t mfcr2_cur_loglevel = OR2_LOG_ERROR | OR2_LOG_WARNING;
-+static openr2_calling_party_category_t mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
-+
-+#endif /* HAVE_OPENR2 */
-+
- #ifdef HAVE_PRI
- 
- #define PVT_TO_CHANNEL(p) (((p)->prioffset) | ((p)->logicalspan << 8) | (p->pri->mastertrunkgroup ? 0x10000 : 0))
-@@ -891,6 +939,22 @@ static struct dahdi_pvt {
- 	/*! \brief Logical span number within trunk group */
- 	int logicalspan;
- #endif	
-+#ifdef HAVE_OPENR2
-+	int mfcr2call;
-+	int mfcr2block;
-+	struct dahdi_mfcr2 *mfcr2;
-+	openr2_chan_t *r2chan;
-+	openr2_calling_party_category_t mfcr2_recvd_category;
-+	openr2_calling_party_category_t mfcr2_category;
-+	int mfcr2_accept_on_offer;
-+	int mfcr2_charge_calls;
-+	int mfcr2_allow_collect_calls;
-+	int mfcr2_forced_release;
-+	int mfcr2_dnis_index;
-+	int mfcr2_ani_index;
-+	int mfcr2_dnis_matched;
-+	int mfcr2_call_accepted;
-+#endif
- 	/*! \brief Current line interface polarity. POLARITY_IDLE, POLARITY_REV */
- 	int polarity;
- 	/*! \brief DSP feature flags: DSP_FEATURE_xxx */
-@@ -1212,6 +1276,512 @@ static void dahdi_queue_frame(struct dah
- #endif		
- }
- 
-+static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpbx, int index, int law, int transfercapability);
-+#ifdef HAVE_OPENR2
-+static void init_mfcr2_globals(void)
-+{
-+	int r;
-+	mfcr2_cur_context_index = 0;
-+	mfcr2_cur_variant = OR2_VAR_UNKNOWN;
-+	mfcr2_cur_mfback_timeout = -1;
-+	mfcr2_cur_metering_pulse_timeout = -1;
-+	mfcr2_cur_max_ani = 10;
-+	mfcr2_cur_max_dnis = 4;
-+	mfcr2_cur_get_ani_first = -1;
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
-+	mfcr2_cur_dtmf_dialing = -1;
-+	mfcr2_cur_dtmf_detection = -1;
-+	mfcr2_cur_dtmf_time_on = OR2_DEFAULT_DTMF_ON;
-+	mfcr2_cur_dtmf_time_off = OR2_DEFAULT_DTMF_OFF;
-+#endif
-+	mfcr2_cur_skip_category = -1;
-+	mfcr2_cur_call_files = 0;
-+	mfcr2_cur_allow_collect_calls = 0;
-+	mfcr2_cur_forced_release = 0;
-+	mfcr2_cur_double_answer = 0;
-+	mfcr2_cur_immediate_accept = -1;
-+	mfcr2_cur_loglevel = OR2_LOG_ERROR | OR2_LOG_WARNING;
-+	mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
-+	memset(mfcr2_cur_logdir, 0, sizeof(mfcr2_cur_logdir));
-+	memset(mfcr2_cur_r2proto_file, 0, sizeof(mfcr2_cur_r2proto_file));
-+	memset(r2links, 0, sizeof(r2links));
-+	for (r = 0; r < NUM_SPANS; r++) {
-+		r2links[r].master = AST_PTHREADT_NULL;
-+	}
-+}
-+
-+static int dahdi_r2_answer(struct dahdi_pvt *p)
-+{
-+	int res = 0;
-+	/* openr2 1.1.0 and older does not even define OR2_LIB_INTERFACE
-+	 * and does not has support for openr2_chan_answer_call_with_mode
-+	 *  */
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
-+	const char *double_answer = pbx_builtin_getvar_helper(p->owner, "MFCR2_DOUBLE_ANSWER");
-+	int wants_double_answer = ast_true(double_answer) ? 1 : 0;
-+	if (!double_answer) {
-+		/* this still can result in double answer if the channel context 
-+		 * was configured that way */
-+		res = openr2_chan_answer_call(p->r2chan);
-+	} else if (wants_double_answer) {
-+		res = openr2_chan_answer_call_with_mode(p->r2chan, OR2_ANSWER_DOUBLE);
-+	} else {
-+		res = openr2_chan_answer_call_with_mode(p->r2chan, OR2_ANSWER_SIMPLE);
-+	} 
-+#else
-+	res = openr2_chan_answer_call(p->r2chan);
-+#endif
-+	return res;
-+}
-+
-+static openr2_calling_party_category_t dahdi_r2_get_channel_category(struct ast_channel *c)
-+{
-+	openr2_calling_party_category_t cat;
-+	const char *catstr = pbx_builtin_getvar_helper(c, "MFCR2_CATEGORY");
-+	struct dahdi_pvt *p = c->tech_pvt;
-+	if (ast_strlen_zero(catstr)) {
-+		ast_log(LOG_DEBUG, "no MFC/R2 category specified for chan %s, using default %s\n", 
-+				c->name, openr2_proto_get_category_string(p->mfcr2_category));
-+		return p->mfcr2_category;
-+	}
-+	if ((cat = openr2_proto_get_category(catstr)) == OR2_CALLING_PARTY_CATEGORY_UNKNOWN) {
-+		ast_log(LOG_WARNING, "Invalid category specified '%s' for chan %s, using default %s\n",
-+				catstr, c->name, openr2_proto_get_category_string(p->mfcr2_category));
-+		return p->mfcr2_category;
-+	}
-+	ast_log(LOG_DEBUG, "Using category %s\n", catstr);
-+	return cat;
-+}
-+
-+static void dahdi_r2_on_call_init(openr2_chan_t *r2chan)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_mutex_lock(&p->lock);
-+	if (p->mfcr2call) {
-+		ast_mutex_unlock(&p->lock);
-+		/* TODO: This can happen when some other thread just finished zt_request requesting this very same
-+		interface but has not yet seized the line (zt_call), and the far end wins and seize the line,
-+		can we avoid this somehow?, at this point when zt_call send the seize, it is likely that since
-+		the other end will see our seize as a forced release and drop the call, we will see an invalid
-+		pattern that will be seen and treated as protocol error. */
-+		ast_log(LOG_ERROR, "Collision of calls on chan %d detected!.\n", openr2_chan_get_number(r2chan));
-+		return;
-+	}
-+	p->mfcr2call = 1;
-+	/* better safe than sorry ... */
-+	p->cid_name[0] = 0;
-+	p->cid_num[0] = 0;
-+	p->rdnis[0] = 0;
-+	p->exten[0] = 0;
-+	p->mfcr2_ani_index = 0;
-+	p->mfcr2_dnis_index = 0;
-+	p->mfcr2_dnis_matched = 0;
-+	p->mfcr2_call_accepted = 0;
-+	ast_mutex_unlock(&p->lock);
-+	ast_verbose("New MFC/R2 call detected on chan %d.\n", openr2_chan_get_number(r2chan));
-+}
-+
-+static void handle_alarms(struct dahdi_pvt *p, int alarms);
-+static int get_alarms(struct dahdi_pvt *p);
-+static void dahdi_r2_on_hardware_alarm(openr2_chan_t *r2chan, int alarm)
-+{
-+	int res;
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_mutex_lock(&p->lock);
-+	p->inalarm = alarm ? 1 : 0;
-+	if (p->inalarm) {
-+		res = get_alarms(p);
-+		/* unknown_alarm may be set here */
-+		handle_alarms(p, res);
-+	} else {
-+		if (!p->unknown_alarm) {
-+			ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", p->channel);
-+			manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", "Channel: %d\r\n", p->channel);
-+		} else {
-+			p->unknown_alarm = 0;
-+		}
-+	}
-+	ast_mutex_unlock(&p->lock);
-+	ast_log(LOG_WARNING, "Zap alarm on chan %d.\n", openr2_chan_get_number(r2chan));
-+}
-+
-+static void dahdi_r2_on_os_error(openr2_chan_t *r2chan, int errorcode)
-+{
-+	ast_log(LOG_ERROR, "OS error on chan %d: %s\n", openr2_chan_get_number(r2chan), strerror(errorcode));
-+}
-+
-+static void dahdi_r2_on_protocol_error(openr2_chan_t *r2chan, openr2_protocol_error_t reason)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_log(LOG_ERROR, "MFC/R2 protocol error on chan %d: %s\n", openr2_chan_get_number(r2chan), openr2_proto_get_error(reason));
-+	if (p->owner) {
-+		p->owner->hangupcause = AST_CAUSE_PROTOCOL_ERROR;
-+		p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-+	} 
-+	ast_mutex_lock(&p->lock);
-+	p->mfcr2call = 0;
-+	ast_mutex_unlock(&p->lock);
-+}
-+
-+static void dahdi_r2_disconnect_call(struct dahdi_pvt *p, openr2_call_disconnect_cause_t cause)
-+{
-+	if (openr2_chan_disconnect_call(p->r2chan, cause)) {
-+		ast_log(LOG_NOTICE, "Bad! failed to disconnect call on channel %d with reason %s, hope for the best!\n", 
-+				p->channel, openr2_proto_get_disconnect_string(cause));
-+		/* force the chan to idle and release the call flag now since we will not see a clean on_call_end */
-+		openr2_chan_set_idle(p->r2chan);
-+		ast_mutex_lock(&p->lock);
-+		p->mfcr2call = 0;
-+		ast_mutex_unlock(&p->lock);
-+	}
-+}
-+
-+static void dahdi_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, const char *dnis, openr2_calling_party_category_t category)
-+{
-+	struct dahdi_pvt *p;
-+	struct ast_channel *c;
-+	ast_verbose("MFC/R2 call offered on chan %d. ANI = %s, DNIS = %s, Category = %s\n", 
-+			openr2_chan_get_number(r2chan), ani ? ani : "(restricted)", dnis, openr2_proto_get_category_string(category));
-+	p = openr2_chan_get_client_data(r2chan);
-+	if (!p->mfcr2_allow_collect_calls && category == OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL) {
-+		ast_log(LOG_NOTICE, "Rejecting MFC/R2 collect call on chan %d\n", p->channel);
-+		dahdi_r2_disconnect_call(p, OR2_CAUSE_COLLECT_CALL_REJECTED);
-+		return;
-+	}
-+	ast_mutex_lock(&p->lock);
-+	p->mfcr2_recvd_category = category;
-+	/* if we're not supposed to use CID, clear whatever we have */
-+	if (!p->use_callerid) {
-+		ast_log(LOG_DEBUG, "No CID allowed in configuration, CID is being cleared!\n");
-+		p->cid_num[0] = 0;
-+		p->cid_name[0] = 0;
-+	}
-+	/* if we're supposed to answer immediately, clear DNIS and set 's' exten */
-+	if (p->immediate || !openr2_context_get_max_dnis(openr2_chan_get_context(r2chan))) {
-+		ast_log(LOG_DEBUG, "Setting exten => s because of immediate or 0 DNIS configured\n");
-+		p->exten[0] = 's';
-+		p->exten[1] = 0;
-+	}
-+	ast_mutex_unlock(&p->lock);
-+	if (!ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num)) {
-+		ast_log(LOG_NOTICE, "MFC/R2 call on channel %d requested non-existent extension '%s' in context '%s'. Rejecting call.\n",
-+				p->channel, p->exten, p->context);
-+		dahdi_r2_disconnect_call(p, OR2_CAUSE_UNALLOCATED_NUMBER);
-+	} else {
-+		/* if the user does not want to accept on offer, then we should launch the PBX thread now */
-+		if (!p->mfcr2_accept_on_offer) {
-+			c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
-+			if (!c) {
-+				ast_log(LOG_ERROR, "Unable to create PBX channel on chan %d\n", p->channel);
-+				dahdi_r2_disconnect_call(p, OR2_CAUSE_OUT_OF_ORDER);
-+			}
-+			/* Don't disable reading since we still need to generate MF tone to accept
-+			   the call or reject it and detect the tone off condition of the other end */
-+		} else if (p->mfcr2_charge_calls) {
-+			ast_log(LOG_DEBUG, "Accepting MFC/R2 call on offer with charge on chan %d\n", p->channel);
-+			openr2_chan_accept_call(r2chan, OR2_CALL_WITH_CHARGE);
-+		} else {
-+			ast_log(LOG_DEBUG, "Accepting MFC/R2 call on offer with no charge on chan %d\n", p->channel);
-+			openr2_chan_accept_call(r2chan, OR2_CALL_NO_CHARGE);
-+		}	
-+	}	
-+}
-+
-+static void dahdi_r2_on_call_end(openr2_chan_t *r2chan)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_verbose("MFC/R2 call end on chan %d\n", p->channel);
-+	ast_mutex_lock(&p->lock);
-+	p->mfcr2call = 0;
-+	ast_mutex_unlock(&p->lock);
-+}
-+
-+static void dahdi_enable_ec(struct dahdi_pvt *p);
-+static void dahdi_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode)
-+{
-+	struct dahdi_pvt *p = NULL;
-+	struct ast_channel *c = NULL;
-+	p = openr2_chan_get_client_data(r2chan);
-+	dahdi_enable_ec(p);
-+	p->mfcr2_call_accepted = 1;
-+	if (OR2_DIR_BACKWARD == openr2_chan_get_direction(r2chan)) {
-+		ast_verbose("MFC/R2 call has been accepted on backward channel %d\n", openr2_chan_get_number(r2chan));
-+		/* if accept on offer is not set, it means at this point the PBX thread is already
-+		   launched and therefore this callback is being executed in the PBX thread rather than
-+		   the monitor thread, don't launch any other thread, just disable the R2 reading and
-+		   answer the call */
-+		if (!p->mfcr2_accept_on_offer) {
-+			openr2_chan_disable_read(r2chan);
-+			ast_verbose("Answering MFC/R2 call after accepting it on chan %d\n", openr2_chan_get_number(r2chan));
-+			dahdi_r2_answer(p);
-+			return;
-+		}
-+		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
-+		if (c) {
-+			/* chan_dahdi will take care of reading from now on, tell the library to forget about it */
-+			openr2_chan_disable_read(r2chan);
-+		} else {
-+			ast_log(LOG_ERROR, "Unable to create PBX channel on chan %d\n", p->channel);
-+			dahdi_r2_disconnect_call(p, OR2_CAUSE_OUT_OF_ORDER);
-+			return;
-+		}
-+	} else {
-+		ast_verbose("Call accepted on forward channel %d\n", p->channel);
-+		p->subs[SUB_REAL].needringing = 1;
-+		p->dialing = 0;
-+		/* chan_dahdi will take care of reading from now on, tell the library to forget about it */
-+		openr2_chan_disable_read(r2chan);
-+	}	
-+}
-+
-+static void dahdi_r2_on_call_answered(openr2_chan_t *r2chan)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_verbose("MFC/R2 call has been answered on chan %d\n", openr2_chan_get_number(r2chan));
-+	p->subs[SUB_REAL].needanswer = 1;
-+}
-+
-+static void dahdi_r2_on_call_read(openr2_chan_t *r2chan, const unsigned char *buf, int buflen)
-+{
-+	/*ast_log(LOG_DEBUG, "Read data from dahdi channel %d\n", openr2_chan_get_number(r2chan));*/
-+}
-+
-+/*static int dahdi_r2_cause_to_ast_cause(openr2_call_disconnect_cause_t cause)
-+{
-+	switch (cause) {
-+	case OR2_CAUSE_BUSY_NUMBER:
-+		return AST_CAUSE_BUSY;
-+	case OR2_CAUSE_NETWORK_CONGESTION:
-+		return AST_CAUSE_CONGESTION;
-+	case OR2_CAUSE_OUT_OF_ORDER:
-+		return AST_CAUSE_DESTINATION_OUT_OF_ORDER;
-+	case OR2_CAUSE_UNALLOCATED_NUMBER:
-+		return AST_CAUSE_UNREGISTERED;
-+	case OR2_CAUSE_NO_ANSWER:
-+		return AST_CAUSE_NO_ANSWER;
-+	case OR2_CAUSE_NORMAL_CLEARING:
-+		return AST_CAUSE_NORMAL_CLEARING;
-+	case OR2_CAUSE_UNSPECIFIED:
-+	default:
-+		return AST_CAUSE_NOTDEFINED;
-+	}	
-+}*/
-+
-+static void dahdi_r2_on_call_disconnect(openr2_chan_t *r2chan, openr2_call_disconnect_cause_t cause)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_verbose("MFC/R2 call disconnected on chan %d\n", openr2_chan_get_number(r2chan));
-+	ast_mutex_lock(&p->lock);
-+	if (p->owner) {
-+		/* when we have an owner we don't call openr2_chan_disconnect_call here, that will
-+		   be done in zt_hangup */
-+		if (p->owner->_state == AST_STATE_UP) {
-+			p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-+			ast_mutex_unlock(&p->lock);
-+		} else if (openr2_chan_get_direction(r2chan) == OR2_DIR_FORWARD) {
-+			/* being the forward side we must report what happened to the call to whoever requested it */
-+			switch (cause) {
-+			case OR2_CAUSE_BUSY_NUMBER:
-+				p->owner->hangupcause = AST_CAUSE_BUSY;
-+				p->subs[SUB_REAL].needbusy = 1;
-+				break;
-+			case OR2_CAUSE_NUMBER_CHANGED:
-+				p->owner->hangupcause = AST_CAUSE_NUMBER_CHANGED;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_NETWORK_CONGESTION:
-+				p->owner->hangupcause = AST_CAUSE_NETWORK_OUT_OF_ORDER;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_OUT_OF_ORDER:
-+				p->owner->hangupcause = AST_CAUSE_DESTINATION_OUT_OF_ORDER;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_UNALLOCATED_NUMBER:
-+				p->owner->hangupcause = AST_CAUSE_UNALLOCATED;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_NO_ANSWER:
-+				p->owner->hangupcause = AST_CAUSE_NO_ANSWER;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_UNSPECIFIED:
-+				p->owner->hangupcause = AST_CAUSE_NOTDEFINED;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			case OR2_CAUSE_NORMAL_CLEARING:
-+				p->owner->hangupcause = AST_CAUSE_NORMAL_CLEARING;
-+				p->subs[SUB_REAL].needcongestion = 1;
-+				break;
-+			default:
-+				ast_log(LOG_WARNING, "Unhandled cause %d\n", cause);
-+			}
-+			p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-+			ast_mutex_unlock(&p->lock);
-+		} else {
-+			ast_mutex_unlock(&p->lock);
-+			/* being the backward side and not UP yet, we only need to request hangup */
-+			/* TODO: what about doing this same thing when were AST_STATE_UP? */
-+			ast_queue_hangup(p->owner);
-+		}	
-+	} else {
-+		ast_mutex_unlock(&p->lock);
-+		/* no owner, therefore we can't use zt_hangup to disconnect, do it right now */
-+		dahdi_r2_disconnect_call(p, OR2_CAUSE_NORMAL_CLEARING);
-+	}
-+}
-+
-+static void dahdi_r2_write_log(openr2_log_level_t level, char *logmessage)
-+{
-+	switch (level) {
-+	case OR2_LOG_NOTICE:
-+		ast_verbose("%s", logmessage);
-+		break;
-+	case OR2_LOG_WARNING:
-+		ast_log(LOG_WARNING, "%s", logmessage);
-+		break;
-+	case OR2_LOG_ERROR:
-+		ast_log(LOG_ERROR, "%s", logmessage);
-+		break;
-+	case OR2_LOG_STACK_TRACE:
-+	case OR2_LOG_MF_TRACE:
-+	case OR2_LOG_CAS_TRACE:
-+	case OR2_LOG_DEBUG:
-+	case OR2_LOG_EX_DEBUG:
-+		ast_log(LOG_DEBUG, "%s", logmessage);
-+		break;
-+	default:
-+		ast_log(LOG_WARNING, "We should handle logging level %d here.\n", level);
-+		ast_log(LOG_NOTICE, "%s", logmessage);
-+		break;
-+	}
-+}
-+
-+#define DAHDI_R2_REMOTE_BLOCK (1 << 0)
-+#define DAHDI_R2_LOCAL_BLOCK (1 << 1)
-+static void dahdi_r2_on_line_blocked(openr2_chan_t *r2chan)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_log(LOG_NOTICE, "Far end blocked on chan %d\n", p->channel);
-+	ast_mutex_lock(&p->lock);
-+	p->mfcr2block |= DAHDI_R2_REMOTE_BLOCK;
-+	ast_mutex_unlock(&p->lock);
-+}
-+
-+static void dahdi_r2_on_line_idle(openr2_chan_t *r2chan)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	ast_log(LOG_NOTICE, "Far end unblocked on chan %d\n", openr2_chan_get_number(r2chan));
-+	ast_mutex_lock(&p->lock);
-+	p->mfcr2block &= ~DAHDI_R2_REMOTE_BLOCK;
-+	ast_mutex_unlock(&p->lock);
-+}
-+
-+static void dahdi_r2_on_context_log(openr2_context_t *r2context, openr2_log_level_t level, const char *fmt, va_list ap)
-+	__attribute__((format (printf, 3, 0)));
-+static void dahdi_r2_on_context_log(openr2_context_t *r2context, openr2_log_level_t level, const char *fmt, va_list ap)
-+{
-+	char logmsg[256];
-+	char completemsg[sizeof(logmsg)+50];
-+	vsnprintf(logmsg, sizeof(logmsg), fmt, ap);
-+	snprintf(completemsg, sizeof(completemsg), "Context - %s", logmsg);
-+	dahdi_r2_write_log(level, completemsg);
-+}
-+
-+static void dahdi_r2_on_chan_log(openr2_chan_t *r2chan, openr2_log_level_t level, const char *fmt, va_list ap)
-+	__attribute__((format (printf, 3, 0)));
-+static void dahdi_r2_on_chan_log(openr2_chan_t *r2chan, openr2_log_level_t level, const char *fmt, va_list ap)
-+{
-+	char logmsg[256];
-+	char completemsg[sizeof(logmsg)+50];
-+	vsnprintf(logmsg, sizeof(logmsg), fmt, ap);
-+	snprintf(completemsg, sizeof(completemsg), "Chan %d - %s", openr2_chan_get_number(r2chan), logmsg);
-+	dahdi_r2_write_log(level, completemsg);
-+}
-+
-+static int dahdi_r2_on_dnis_digit_received(openr2_chan_t *r2chan, char digit)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	/* if 'immediate' is set, let's stop requesting DNIS */
-+	if (p->immediate) {
-+		return 0;
-+	}
-+	p->exten[p->mfcr2_dnis_index] = digit;
-+	p->rdnis[p->mfcr2_dnis_index] = digit;
-+	p->mfcr2_dnis_index++;
-+	p->exten[p->mfcr2_dnis_index] = 0;
-+	p->rdnis[p->mfcr2_dnis_index] = 0;
-+	/*
-+	ast_log(LOG_DEBUG, "Got digit %c in dahdi, dnis so far: %s\n", digit, p->exten);
-+	int ret;
-+	ret = ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num);
-+	ast_log(LOG_DEBUG, "ast_exists_extension(%s, %s, 1, %s) = %d\n", p->context, p->exten, p->cid_num, ret);
-+	ret = ast_matchmore_extension(NULL, p->context, p->exten, 1, p->cid_num);
-+	ast_log(LOG_DEBUG, "ast_matchmore_extension(%s, %s, 1, %s) = %d\n", p->context, p->exten, p->cid_num, ret);
-+	*/
-+	/* if the DNIS is a match and cannot match more, stop requesting DNIS */
-+	if ((p->mfcr2_dnis_matched || 
-+	    (ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num) && (p->mfcr2_dnis_matched = 1))) &&
-+	    !ast_matchmore_extension(NULL, p->context, p->exten, 1, p->cid_num)) {
-+		return 0;
-+	}
-+	/* otherwise keep going */
-+	return 1;
-+}
-+
-+static void dahdi_r2_on_ani_digit_received(openr2_chan_t *r2chan, char digit)
-+{
-+	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
-+	p->cid_num[p->mfcr2_ani_index] = digit;
-+	p->cid_name[p->mfcr2_ani_index] = digit;
-+	p->mfcr2_ani_index++;
-+	p->cid_num[p->mfcr2_ani_index] = 0;
-+	p->cid_name[p->mfcr2_ani_index] = 0;
-+}
-+
-+static void dahdi_r2_on_billing_pulse_received(openr2_chan_t *r2chan)
-+{
-+	ast_log(LOG_NOTICE, "MFC/R2 billing pulse received on channel %d\n", openr2_chan_get_number(r2chan));
-+}
-+
-+static openr2_event_interface_t dahdi_r2_event_iface = {
-+	.on_call_init = dahdi_r2_on_call_init,
-+	.on_call_offered = dahdi_r2_on_call_offered,
-+	.on_call_accepted = dahdi_r2_on_call_accepted,
-+	.on_call_answered = dahdi_r2_on_call_answered,
-+	.on_call_disconnect = dahdi_r2_on_call_disconnect,
-+	.on_call_end = dahdi_r2_on_call_end,
-+	.on_call_read = dahdi_r2_on_call_read,
-+	.on_hardware_alarm = dahdi_r2_on_hardware_alarm,
-+	.on_os_error = dahdi_r2_on_os_error,
-+	.on_protocol_error = dahdi_r2_on_protocol_error,
-+	.on_line_blocked = dahdi_r2_on_line_blocked,
-+	.on_line_idle = dahdi_r2_on_line_idle,
-+	/* cast seems to be needed to get rid of the annoying warning regarding format attribute */
-+	.on_context_log = (openr2_handle_context_logging_func)dahdi_r2_on_context_log,
-+	.on_dnis_digit_received = dahdi_r2_on_dnis_digit_received,
-+	.on_ani_digit_received = dahdi_r2_on_ani_digit_received,
-+	/* so far we do nothing with billing pulses, just log it */
-+	.on_billing_pulse_received = dahdi_r2_on_billing_pulse_received 
-+};
-+
-+static inline int16_t dahdi_r2_alaw_to_linear(uint8_t sample)
-+{
-+	return AST_ALAW(sample);
-+}
-+
-+static inline uint8_t dahdi_r2_linear_to_alaw(int sample)
-+{
-+	return AST_LIN2A(sample);
-+}
-+
-+static openr2_transcoder_interface_t dahdi_r2_transcode_iface = {
-+	dahdi_r2_alaw_to_linear,
-+	dahdi_r2_linear_to_alaw
-+};
-+
-+#endif /* HAVE_OPENR2 */
-+
- static int restore_gains(struct dahdi_pvt *p);
- 
- static void swap_subs(struct dahdi_pvt *p, int a, int b)
-@@ -1584,6 +2154,8 @@ static char *dahdi_sig2str(int sig)
- 		return "FXO Kewlstart";
- 	case SIG_PRI:
- 		return "ISDN PRI";
-+	case SIG_MFCR2:
-+		return "MFC/R2";
- 	case SIG_SF:
- 		return "SF (Tone) Immediate";
- 	case SIG_SFWINK:
-@@ -2433,6 +3005,7 @@ static int dahdi_call(struct ast_channel
- 		ast_setstate(ast, AST_STATE_UP);
- 		break;		
- 	case SIG_PRI:
-+	case SIG_MFCR2:
- 		/* We'll get it in a moment -- but use dialdest to store pre-setup_ack digits */
- 		p->dialdest[0] = '\0';
- 		p->dialing = 1;
-@@ -2442,6 +3015,35 @@ static int dahdi_call(struct ast_channel
- 		ast_mutex_unlock(&p->lock);
- 		return -1;
- 	}
-+#ifdef HAVE_OPENR2
-+	if (p->mfcr2) {
-+		int strip = p->stripmsd;
-+		int callres = 0;
-+		c = strchr(dest, '/');
-+		if (c) {
-+			c++;
-+		} else {
-+			c = dest;
-+		}
-+		if (!p->hidecallerid) {
-+			l = ast->cid.cid_num;
-+		} else {
-+			l = NULL;
-+		}
-+		if (strlen(c) < strip) {
-+			ast_log(LOG_WARNING, "Destiny number '%s' is shorter than stripmsd(%d)? hum, you should fix that. Assuming stripmsd = 0\n", c, strip);
-+			strip = 0;
-+		}
-+		p->dialing = 1;
-+		callres = openr2_chan_make_call(p->r2chan, l, (c + strip), dahdi_r2_get_channel_category(ast));
-+		if (-1 == callres) {
-+			ast_mutex_unlock(&p->lock);
-+			ast_log(LOG_ERROR, "unable to make new MFC/R2 call!\n");
-+			return -1;
-+		}
-+		ast_setstate(ast, AST_STATE_DIALING);
-+	}
-+#endif /* HAVE_OPENR2 */
- #ifdef HAVE_PRI
- 	if (p->pri) {
- 		struct pri_sr *sr;
-@@ -2852,6 +3454,166 @@ static int pri_find_dchan(struct dahdi_p
- }
- #endif
- 
-+#ifdef HAVE_OPENR2
-+static char *dahdi_accept_r2_call_app = "DAHDIAcceptR2Call";
-+static char *zap_accept_r2_call_app = "ZapAcceptR2Call";
-+
-+static char *dahdi_accept_r2_call_synopsis = "Accept an R2 call if its not already accepted (you still need to answer it)";
-+static char *zap_accept_r2_call_synopsis = "Accept an R2 call if its not already accepted (you still need to answer it)";
-+
-+static char *dahdi_accept_r2_call_descrip = 
-+"  DAHDIAcceptR2Call(): This application will accept the current MFC/R2 call\n"
-+"  You can specify yes or no as argument to accept with or without charge.\n";
-+
-+static char *zap_accept_r2_call_descrip = 
-+"  ZapAcceptR2Call(): This application will accept the current MFC/R2 call\n"
-+"  You can specify yes or no as argument to accept with or without charge.\n";
-+
-+static int dahdi_accept_r2_call_exec(struct ast_channel *chan, void *data)
-+{
-+	/* data is whether to accept with charge or no charge */
-+	openr2_call_mode_t accept_mode;
-+	int res, timeout, maxloops;
-+	struct ast_frame *f;
-+	struct dahdi_pvt *p;
-+	char *parse;
-+	AST_DECLARE_APP_ARGS(args,
-+			AST_APP_ARG(charge);
-+	);
-+
-+	if (ast_strlen_zero(data)) {
-+		ast_log(LOG_DEBUG, "No data sent to application!\n");
-+		return -1;
-+	}
-+
-+	if (chan->tech != &dahdi_tech) {
-+		ast_log(LOG_DEBUG, "Only DAHDI technology accepted!\n");
-+		return -1;
-+	}
-+
-+	p = (struct dahdi_pvt *)chan->tech_pvt;
-+	if (!p) {
-+		ast_log(LOG_DEBUG, "Unable to find technology private!\n");
-+		return -1;
-+	}
-+
-+	parse = ast_strdupa(data);
-+	AST_STANDARD_APP_ARGS(args, parse);
-+
-+	if (ast_strlen_zero(args.charge)) {
-+		ast_log(LOG_WARNING, "DAHDIAcceptR2Call requires 'yes' or 'no' for the charge parameter\n");
-+		return -1;
-+	}
-+
-+	ast_mutex_lock(&p->lock);
-+	if (!p->mfcr2 || !p->mfcr2call) {
-+		ast_mutex_unlock(&p->lock);
-+		ast_log(LOG_DEBUG, "Channel %s does not seems to be an R2 active channel!\n", chan->name);
-+		return -1;
-+	}
-+
-+	if (p->mfcr2_call_accepted) {
-+		ast_mutex_unlock(&p->lock);
-+		ast_log(LOG_DEBUG, "MFC/R2 call already accepted on channel %s!\n", chan->name);
-+		return 0;
-+	}
-+	accept_mode = ast_true(args.charge) ? OR2_CALL_WITH_CHARGE : OR2_CALL_NO_CHARGE;
-+	if (openr2_chan_accept_call(p->r2chan, accept_mode)) {
-+		ast_mutex_unlock(&p->lock);
-+		ast_log(LOG_WARNING, "Failed to accept MFC/R2 call!\n");
-+		return -1;
-+	}
-+	ast_mutex_unlock(&p->lock);
-+
-+	res = 0;
-+	timeout = 100;
-+	maxloops = 50; /* wait up to 5 seconds */
-+	/* we need to read() until the call is accepted */
-+	while (maxloops > 0) {
-+		maxloops--;
-+		if (ast_check_hangup(chan)) {
-+			break;
-+		}
-+		res = ast_waitfor(chan, timeout);
-+		if (res < 0) {
-+			ast_log(LOG_DEBUG, "ast_waitfor failed on channel %s, going out ...\n", chan->name);
-+			res = -1;
-+			break;
-+		}
-+		if (res == 0) {
-+			continue;
-+		}
-+		f = ast_read(chan);
-+		if (!f) {
-+			ast_log(LOG_DEBUG, "No frame read on channel %s, going out ...\n", chan->name);
-+			res = -1;
-+			break;
-+		}
-+		if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP) {
-+			ast_log(LOG_DEBUG, "Got HANGUP frame on channel %s, going out ...\n", chan->name);
-+			ast_frfree(f);
-+			res = -1;
-+			break;
-+		}
-+		ast_frfree(f);
-+		ast_mutex_lock(&p->lock);
-+		if (p->mfcr2_call_accepted) {
-+			ast_mutex_unlock(&p->lock);
-+			ast_log(LOG_DEBUG, "Accepted MFC/R2 call!\n");
-+			break;
-+		}
-+		ast_mutex_unlock(&p->lock);
-+	}
-+	if (res == -1) {
-+		ast_log(LOG_WARNING, "Failed to accept MFC/R2 call!\n");
-+	}
-+	return res;
-+}
-+
-+static int zap_accept_r2_call_exec(struct ast_channel *chan, void *data)
-+{
-+	return dahdi_accept_r2_call_exec(chan, data);
-+}
-+
-+static openr2_call_disconnect_cause_t dahdi_ast_cause_to_r2_cause(int cause)
-+{
-+	openr2_call_disconnect_cause_t r2cause = OR2_CAUSE_NORMAL_CLEARING;
-+	switch (cause) {
-+	case AST_CAUSE_USER_BUSY:
-+	case AST_CAUSE_CALL_REJECTED:
-+	case AST_CAUSE_INTERWORKING: /* I don't know wtf is this but is used sometimes when ekiga rejects a call */
-+		r2cause = OR2_CAUSE_BUSY_NUMBER;
-+		break;
-+
-+	case AST_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-+	case AST_CAUSE_SWITCH_CONGESTION:
-+		r2cause = OR2_CAUSE_NETWORK_CONGESTION;
-+		break;
-+
-+	case AST_CAUSE_UNALLOCATED:
-+		r2cause = OR2_CAUSE_UNALLOCATED_NUMBER;
-+		break;
-+
-+	case AST_CAUSE_NETWORK_OUT_OF_ORDER:
-+	case AST_CAUSE_DESTINATION_OUT_OF_ORDER:
-+		r2cause = OR2_CAUSE_OUT_OF_ORDER;
-+		break;
-+
-+	case AST_CAUSE_NO_ANSWER:
-+	case AST_CAUSE_NO_USER_RESPONSE:
-+		r2cause = OR2_CAUSE_NO_ANSWER;
-+		break;
-+
-+	default:
-+		r2cause = OR2_CAUSE_NORMAL_CLEARING;
-+		break;
-+	}
-+	ast_log(LOG_DEBUG, "dahdi_ast_cause_to_r2_cause returned %d/%s for ast cause %d\n", 
-+			r2cause, openr2_proto_get_disconnect_string(r2cause), cause);
-+	return r2cause;
-+}
-+#endif
-+
- static int dahdi_hangup(struct ast_channel *ast)
- {
- 	int res;
-@@ -3076,6 +3838,25 @@ static int dahdi_hangup(struct ast_chann
- 		if (res < 0) 
- 			ast_log(LOG_WARNING, "Unable to set law on channel %d to default: %s\n", p->channel, strerror(errno));
- 		/* Perform low level hangup if no owner left */
-+#ifdef HAVE_OPENR2
-+		if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
-+			ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %d\n", p->channel);
-+			ast_log(LOG_DEBUG, "ast->hangupcause is %d\n", ast->hangupcause);
-+			if (openr2_chan_get_direction(p->r2chan) == OR2_DIR_BACKWARD && p->mfcr2_forced_release) {
-+				dahdi_r2_disconnect_call(p, OR2_CAUSE_FORCED_RELEASE);
-+			} else {
-+				const char *r2causestr = pbx_builtin_getvar_helper(ast,"MFCR2_CAUSE");
-+				int r2cause_user = r2causestr ? atoi(r2causestr) : 0;
-+				openr2_call_disconnect_cause_t r2cause = r2cause_user
-+								       ? dahdi_ast_cause_to_r2_cause(r2cause_user)
-+								       : dahdi_ast_cause_to_r2_cause(ast->hangupcause);
-+				dahdi_r2_disconnect_call(p, r2cause);
-+			}
-+		} else if (p->mfcr2call) {
-+			ast_log(LOG_DEBUG, "Clearing call request on channel %d\n", p->channel);
-+			p->mfcr2call = 0;
-+		}
-+#endif
- #ifdef HAVE_PRI
- 		if (p->pri) {
- #ifdef SUPPORT_USERUSER
-@@ -3129,7 +3910,7 @@ static int dahdi_hangup(struct ast_chann
- 			}
- 		}
- #endif
--		if (p->sig && (p->sig != SIG_PRI))
-+		if (p->sig && (p->sig != SIG_PRI) && (p->sig != SIG_MFCR2))
- 			res = dahdi_set_hook(p->subs[SUB_REAL].dfd, DAHDI_ONHOOK);
- 		if (res < 0) {
- 			ast_log(LOG_WARNING, "Unable to hangup line %s\n", ast->name);
-@@ -3310,6 +4091,24 @@ static int dahdi_answer(struct ast_chann
- 		}
- 		break;
- #endif
-+#ifdef HAVE_OPENR2
-+	case SIG_MFCR2:
-+		if (!p->mfcr2_accept_on_offer) {
-+			/* the call was not accepted on offer, so it must be accepted now before answering,
-+			   the answer will be executed when the callback on_call_accepted is executed */
-+			if (p->mfcr2_charge_calls) {
-+				ast_log(LOG_DEBUG, "Accepting MFC/R2 call before answering with charge on chan %d\n", p->channel);
-+				openr2_chan_accept_call(p->r2chan, OR2_CALL_WITH_CHARGE);
-+			} else {
-+				ast_log(LOG_DEBUG, "Accepting MFC/R2 call before answering with no charge on chan %d\n", p->channel);
-+				openr2_chan_accept_call(p->r2chan, OR2_CALL_NO_CHARGE);
-+			}
-+		} else {
-+			ast_log(LOG_DEBUG, "Answering MFC/R2 call on chan %d\n", p->channel);
-+			res = dahdi_r2_answer(p);
-+		}
-+		break;
-+#endif
- 	case 0:
- 		ast_mutex_unlock(&p->lock);
- 		return 0;
-@@ -4079,8 +4878,6 @@ static int dahdi_ring_phone(struct dahdi
- 
- static void *ss_thread(void *data);
- 
--static struct ast_channel *dahdi_new(struct dahdi_pvt *, int, int, int, int, int);
--
- /*!
-  * \internal
-  * \brief Attempt to transfer 3-way call.
-@@ -4422,13 +5219,29 @@ static struct ast_frame *dahdi_handle_ev
- 			break;
- #endif
- 		case DAHDI_EVENT_BITSCHANGED:
-+#ifdef HAVE_OPENR2
-+			if (p->sig != SIG_MFCR2) {
-+				ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
-+			} else {
-+				ast_log(LOG_DEBUG, "bits changed in chan %d\n", p->channel);
-+				openr2_chan_handle_cas(p->r2chan);
-+			}
-+#else
- 			ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
-+#endif
- 		case DAHDI_EVENT_PULSE_START:
- 			/* Stop tone if there's a pulse start and the PBX isn't started */
- 			if (!ast->pbx)
- 				tone_zone_play_tone(p->subs[index].dfd, -1);
- 			break;	
- 		case DAHDI_EVENT_DIALCOMPLETE:
-+#ifdef HAVE_OPENR2
-+			if ((p->sig & SIG_MFCR2) && p->r2chan && ast->_state != AST_STATE_UP) {
-+				/* we don't need to do anything for this event for R2 signaling 
-+				   if the call is being setup */
-+				break;
-+			}
-+#endif
- 			if (p->inalarm) break;
- 			if ((p->radio || (p->oprmode < 0))) break;
- 			if (ioctl(p->subs[index].dfd,DAHDI_DIALING,&x) == -1) {
-@@ -4509,6 +5322,10 @@ static struct ast_frame *dahdi_handle_ev
- 				break;
- 			}
- #endif
-+#ifdef HAVE_OPENR2
-+			if (p->sig == SIG_MFCR2)
-+				break;
-+#endif
- 		case DAHDI_EVENT_ONHOOK:
- 			if (p->radio) {
- 				p->subs[index].f.frametype = AST_FRAME_CONTROL;
-@@ -5421,6 +6238,12 @@ static struct ast_frame  *dahdi_read(str
- 	else if (p->ringt > 0) 
- 		p->ringt--;
- 
-+#ifdef HAVE_OPENR2
-+	if (p->mfcr2) {
-+		openr2_chan_process_event(p->r2chan);
-+	}	
-+#endif
-+
- 	if (p->subs[index].needringing) {
- 		/* Send ringing frame if requested */
- 		p->subs[index].needringing = 0;
-@@ -5465,6 +6288,24 @@ static struct ast_frame  *dahdi_read(str
- 		ast_mutex_unlock(&p->lock);
- 		return &p->subs[index].f;
- 	}	
-+
-+#ifdef HAVE_OPENR2
-+	if (p->mfcr2 && openr2_chan_get_read_enabled(p->r2chan)) {
-+		/* openr2 took care of reading and handling any event 
-+		  (needanswer, needbusy etc), if we continue we will read()
-+		  twice, lets just return a null frame. This should only
-+		  happen when openr2 is dialing out */
-+		p->subs[index].f.frametype = AST_FRAME_NULL;
-+		p->subs[index].f.subclass = 0;
-+		p->subs[index].f.samples = 0;
-+		p->subs[index].f.mallocd = 0;
-+		p->subs[index].f.offset = 0;
-+		p->subs[index].f.data = NULL;
-+		p->subs[index].f.datalen= 0;
-+		ast_mutex_unlock(&p->lock);
-+		return &p->subs[index].f;
-+	}
-+#endif
- 	
- 	if (p->subs[index].needflash) {
- 		/* Send answer frame if requested */
-@@ -5791,8 +6632,15 @@ static int dahdi_indicate(struct ast_cha
- 	int func = DAHDI_FLASH;
- 	ast_mutex_lock(&p->lock);
- 	index = dahdi_get_index(chan, p, 0);
--	if (option_debug)
--		ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name);
-+	ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name);
-+#ifdef HAVE_OPENR2
-+	if (p->mfcr2 && !p->mfcr2_call_accepted) {
-+		ast_mutex_unlock(&p->lock);
-+		/* if this an R2 call and the call is not yet accepted we don't want the 
-+		   tone indications to mess up with the MF tones */
-+		return 0;
-+	}
-+#endif
- 	if (index == SUB_REAL) {
- 		switch (condition) {
- 		case AST_CONTROL_BUSY:
-@@ -6137,6 +6985,11 @@ static struct ast_channel *dahdi_new(str
- 	/* Configure the new channel jb */
- 	ast_jb_configure(tmp, &global_jbconf);
- 	if (startpbx) {
-+#ifdef HAVE_OPENR2
-+		if (i->mfcr2call) {
-+			pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category));
-+		}
-+#endif
- 		if (ast_pbx_start(tmp)) {
- 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
- 			ast_hangup(tmp);
-@@ -7673,7 +8526,7 @@ static void *do_monitor(void *data)
- 		count = 0;
- 		i = iflist;
- 		while (i) {
--			if ((i->subs[SUB_REAL].dfd > -1) && i->sig && (!i->radio)) {
-+			if ((i->subs[SUB_REAL].dfd > -1) && i->sig && (!i->radio) && !(i->sig & SIG_MFCR2)) {
- 				if (!i->owner && !i->subs[SUB_REAL].owner) {
- 					/* This needs to be watched, as it lacks an owner */
- 					pfds[count].fd = i->subs[SUB_REAL].dfd;
-@@ -7862,6 +8715,17 @@ static int restart_monitor(void)
- 	return 0;
- }
- 
-+#ifdef HAVE_OPENR2
-+static struct dahdi_mfcr2 *mfcr2_get_context(int id)
-+{
-+	if ((id < 0) || (id >= (sizeof(r2links)/sizeof(r2links[0])))) {
-+		ast_log(LOG_ERROR, "No more R2 links available!.\n");
-+		return NULL;
-+	}
-+	return &r2links[id];
-+}
-+#endif
-+
- #ifdef HAVE_PRI
- static int pri_resolve_span(int *span, int channel, int offset, struct dahdi_spaninfo *si)
- {
-@@ -8213,6 +9077,90 @@ static struct dahdi_pvt *mkintf(int chan
- 				tmp->prioffset = 0;
- 			}
- #endif
-+#ifdef HAVE_OPENR2
-+			if (chan_sig == SIG_MFCR2 && reloading != 1) {
-+				char logdir[OR2_MAX_PATH];
-+				struct dahdi_mfcr2 *dahdi_r2;
-+				int threshold = 0;
-+				int snres = 0;
-+				dahdi_r2 = mfcr2_get_context(mfcr2_cur_context_index);
-+				if (!dahdi_r2) {
-+					ast_log(LOG_WARNING, "Cannot get another R2 DAHDI context!\n");
-+				} else if (!dahdi_r2->protocol_context){
-+					char tmplogdir[] = "/tmp";
-+					dahdi_r2->protocol_context = openr2_context_new(NULL, &dahdi_r2_event_iface, 
-+							&dahdi_r2_transcode_iface, mfcr2_cur_variant, mfcr2_cur_max_ani, mfcr2_cur_max_dnis);
-+					if (!dahdi_r2->protocol_context) {
-+						ast_log(LOG_ERROR, "Cannot create OpenR2 protocol context.\n");
-+						destroy_dahdi_pvt(&tmp);
-+						return NULL;
-+					} 
-+					openr2_context_set_log_level(dahdi_r2->protocol_context, mfcr2_cur_loglevel);
-+					openr2_context_set_ani_first(dahdi_r2->protocol_context, mfcr2_cur_get_ani_first);
-+					openr2_context_set_skip_category_request(dahdi_r2->protocol_context, mfcr2_cur_skip_category);
-+					openr2_context_set_mf_threshold(dahdi_r2->protocol_context, threshold);
-+					openr2_context_set_mf_back_timeout(dahdi_r2->protocol_context, mfcr2_cur_mfback_timeout);
-+					openr2_context_set_metering_pulse_timeout(dahdi_r2->protocol_context, mfcr2_cur_metering_pulse_timeout);
-+					openr2_context_set_double_answer(dahdi_r2->protocol_context, mfcr2_cur_double_answer);
-+					openr2_context_set_immediate_accept(dahdi_r2->protocol_context, mfcr2_cur_immediate_accept);
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
-+					openr2_context_set_dtmf_dialing(dahdi_r2->protocol_context, mfcr2_cur_dtmf_dialing, mfcr2_cur_dtmf_time_on, mfcr2_cur_dtmf_time_off);
-+					openr2_context_set_dtmf_detection(dahdi_r2->protocol_context, mfcr2_cur_dtmf_detection);
-+#endif
-+					if (ast_strlen_zero(mfcr2_cur_logdir)) {
-+						if (openr2_context_set_log_directory(dahdi_r2->protocol_context, tmplogdir)) {
-+							ast_log(LOG_ERROR, "Failed setting default MFC/R2 log directory %s\n", tmplogdir);
-+						}
-+					} else {
-+						snres = snprintf(logdir, sizeof(logdir), "%s/%s/%s", ast_config_AST_LOG_DIR, "mfcr2", mfcr2_cur_logdir);
-+						if (snres >= sizeof(logdir)) {
-+							ast_log(LOG_ERROR, "MFC/R2 logging directory truncated, using %s\n", tmplogdir);
-+							if (openr2_context_set_log_directory(dahdi_r2->protocol_context, logdir)) {
-+								ast_log(LOG_ERROR, "Failed setting default MFC/R2 log directory %s\n", tmplogdir);
-+							}
-+						} else {
-+							if (openr2_context_set_log_directory(dahdi_r2->protocol_context, logdir)) {
-+								ast_log(LOG_ERROR, "Failed setting MFC/R2 log directory %s\n", logdir);
-+							}
-+						}	
-+					}
-+					if (!ast_strlen_zero(mfcr2_cur_r2proto_file)) {
-+						if (openr2_context_configure_from_advanced_file(dahdi_r2->protocol_context, mfcr2_cur_r2proto_file)) {
-+							ast_log(LOG_ERROR, "Failed to configure r2context from advanced configuration file %s\n", mfcr2_cur_r2proto_file);
-+						}
-+					}
-+				} 
-+				if (dahdi_r2) {
-+					/* TODO: should we check numchans overflow, or is it already done by DAHDI? */
-+					dahdi_r2->pvts[dahdi_r2->numchans++] = tmp;
-+					tmp->r2chan = openr2_chan_new_from_fd(dahdi_r2->protocol_context,
-+							tmp->subs[SUB_REAL].dfd, NULL, NULL);
-+					if (!tmp->r2chan) {
-+						openr2_liberr_t err = openr2_context_get_last_error(dahdi_r2->protocol_context);
-+						ast_log(LOG_ERROR, "Cannot create OpenR2 channel: %s\n", openr2_context_error_string(err));
-+						destroy_dahdi_pvt(&tmp);
-+						return NULL;
-+					}
-+					openr2_chan_set_client_data(tmp->r2chan, tmp);
-+					/* cast seems to be needed to get rid of the annoying warning regarding format attribute */
-+					openr2_chan_set_logging_func(tmp->r2chan, (openr2_logging_func_t)dahdi_r2_on_chan_log);
-+					openr2_chan_set_log_level(tmp->r2chan, mfcr2_cur_loglevel);
-+					if (mfcr2_cur_call_files) {
-+						openr2_chan_enable_call_files(tmp->r2chan);
-+					}
-+					tmp->mfcr2_category = mfcr2_cur_category;
-+					tmp->mfcr2 = dahdi_r2;
-+					tmp->mfcr2call = 0;
-+					tmp->mfcr2block = DAHDI_R2_REMOTE_BLOCK | DAHDI_R2_LOCAL_BLOCK;
-+					tmp->mfcr2_accept_on_offer = mfcr2_cur_accept_on_offer;
-+					tmp->mfcr2_charge_calls = mfcr2_cur_charge_calls;
-+					tmp->mfcr2_ani_index = 0;
-+					tmp->mfcr2_dnis_index = 0;
-+					tmp->mfcr2_allow_collect_calls = mfcr2_cur_allow_collect_calls;
-+					tmp->mfcr2_forced_release = mfcr2_cur_forced_release;
-+				}
-+			}
-+#endif
- 		} else {
- 			chan_sig = tmp->sig;
- 			if (tmp->subs[SUB_REAL].dfd > -1) {
-@@ -8410,7 +9358,7 @@ static struct dahdi_pvt *mkintf(int chan
- 				ast_dsp_digitmode(tmp->dsp, DSP_DIGITMODE_DTMF | tmp->dtmfrelax);
- 			update_conf(tmp);
- 			if (!here) {
--				if (chan_sig != SIG_PRI)
-+				if ((chan_sig != SIG_PRI) && (chan_sig != SIG_MFCR2))
- 					/* Hang it up to be sure it's good */
- 					dahdi_set_hook(tmp->subs[SUB_REAL].dfd, DAHDI_ONHOOK);
- 			}
-@@ -8532,6 +9480,15 @@ static inline int available(struct dahdi
- 				return 1;
- 		}
- #endif
-+#ifdef HAVE_OPENR2
-+		/* Trust MFC/R2 */
-+		if (p->mfcr2) {
-+			if (p->mfcr2call || p->mfcr2block)
-+				return 0;
-+			else
-+				return 1;
-+		}
-+#endif
- 		if (!(p->radio || (p->oprmode < 0)))
- 		{
- 			if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8827,6 +9784,23 @@ static struct ast_channel *dahdi_request
- 				}
- 			}
- #endif			
-+#ifdef HAVE_OPENR2
-+			if (p->mfcr2) {
-+				ast_mutex_lock(&p->lock);
-+				if (p->mfcr2call) {
-+					ast_mutex_unlock(&p->lock);
-+					ast_log(LOG_NOTICE, "Yay!, someone just beat us in the race for channel %d.\n", p->channel);
-+					goto next;
-+				}
-+				if (p->mfcr2block) {
-+					ast_mutex_unlock(&p->lock);
-+					ast_log(LOG_NOTICE, "Yay!, channel %d just got blocked (%d).\n", p->channel, p->mfcr2block);
-+					goto next;
-+				}
-+				p->mfcr2call = 1;
-+				ast_mutex_unlock(&p->lock);
-+			}
-+#endif
- 			if (p->channel == CHAN_PSEUDO) {
- 				p = chandup(p);
- 				if (!p) {
-@@ -8905,6 +9879,95 @@ next:
- 	return tmp;
- }
- 
-+#ifdef HAVE_OPENR2
-+static void *mfcr2_monitor(void *data)
-+{
-+	struct dahdi_pvt *p;
-+	struct dahdi_mfcr2 *mfcr2 = data;
-+	/* we should be using pthread_key_create
-+	   and allocate pollers dynamically.
-+	   I think do_monitor() could be leaking, since it
-+	   could be cancelled at any time and is not
-+	   using thread keys, why?, */
-+	struct pollfd pollers[mfcr2->numchans];
-+	int maxsleep = 20;
-+	int res = 0;
-+	int i = 0;
-+	int pollsize = 0;
-+	int oldstate = 0;
-+	int was_idle = 0;
-+	int quit_loop = 0;
-+	/* now that we're ready to get calls, unblock our side and
-+	   get current line state */
-+	for (i = 0; i < mfcr2->numchans; i++) {
-+		p = mfcr2->pvts[i];
-+		pollers[i].fd = mfcr2->pvts[i]->subs[SUB_REAL].dfd;
-+		if (openr2_chan_set_idle(p->r2chan)) {
-+			ast_log(LOG_ERROR, "Failed to set channel %d in IDLE\n", p->channel);
-+		} else {
-+			ast_mutex_lock(&p->lock);
-+			mfcr2->pvts[i]->mfcr2block &= ~DAHDI_R2_LOCAL_BLOCK;
-+			mfcr2->pvts[i]->mfcr2call = 0;
-+			ast_mutex_unlock(&p->lock);
-+		}
-+		openr2_chan_handle_cas(mfcr2->pvts[i]->r2chan);
-+	}
-+	while(1) {
-+		/* we trust here that the mfcr2 channel list will not ever change once
-+		   the module is loaded */
-+		pollsize = 0;
-+		for (i = 0; i < mfcr2->numchans; i++) {
-+			pollers[i].events = 0;
-+			pollers[i].revents = 0;
-+			if (mfcr2->pvts[i]->owner) {
-+				continue;
-+			}
-+			if (!mfcr2->pvts[i]->r2chan) {
-+				ast_log(LOG_DEBUG, "Wow, no r2chan on channel %d\n", mfcr2->pvts[i]->channel);
-+				quit_loop = 1;
-+				break;
-+			}
-+			openr2_chan_enable_read(mfcr2->pvts[i]->r2chan);
-+			pollers[i].events = POLLIN | POLLPRI;
-+			pollsize++;
-+		}
-+		if (quit_loop) {
-+			break;
-+		}
-+
-+		if (pollsize == 0) {
-+			if (!was_idle) {
-+				ast_log(LOG_NOTICE, "Monitor thread going idle since everybody has an owner\n");
-+				was_idle = 1;
-+			}
-+			poll(NULL, 0, maxsleep);
-+			continue;
-+		}
-+		was_idle = 0;
-+
-+		/* probably poll() is a valid cancel point, lets just be on the safe side
-+		   by calling pthread_testcancel */
-+		pthread_testcancel();
-+		res = poll(pollers, mfcr2->numchans, maxsleep);
-+		pthread_testcancel();
-+		if ((res < 0) && (errno != EINTR)) {
-+			ast_log(LOG_ERROR, "going out, poll failed: %s\n", strerror(errno));
-+			break;
-+		} 
-+		/* do we want to allow to cancel while processing events? */
-+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
-+		for (i = 0; i < mfcr2->numchans; i++) {
-+			if ((pollers[i].revents & POLLPRI) || (pollers[i].revents & POLLIN)) {
-+				openr2_chan_process_event(mfcr2->pvts[i]->r2chan);
-+			}
-+		}
-+		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
-+	}
-+	ast_log(LOG_NOTICE, "Quitting MFC/R2 monitor thread\n");
-+	return 0;
-+}
-+#endif
-+
- 
- #ifdef HAVE_PRI
- static struct dahdi_pvt *pri_find_crv(struct dahdi_pri *pri, int crv)
-@@ -10829,6 +11892,341 @@ static struct ast_cli_entry dahdi_pri_cl
- 
- #endif /* HAVE_PRI */
- 
-+#ifdef HAVE_OPENR2
-+
-+static int handle_mfcr2_version(int fd, int argc, char *argv[])
-+{
-+	ast_cli(fd, "OpenR2 version: %s, revision: %s\n", openr2_get_version(), openr2_get_revision());
-+	return RESULT_SUCCESS;
-+}
-+
-+static int handle_mfcr2_show_variants(int fd, int argc, char *argv[]) 
-+{
-+#define FORMAT "%4s %40s\n"
-+	int numvariants = 0;
-+	int i;
-+	const openr2_variant_entry_t *variants;
-+	if (!(variants = openr2_proto_get_variant_list(&numvariants))) {
-+		ast_cli(fd, "Failed to get list of variants.\n");
-+		return RESULT_FAILURE;
-+	}
-+	ast_cli(fd, FORMAT, "Variant Code", "Country");
-+	for (i = 0; i < numvariants; i++) {
-+		ast_cli(fd, FORMAT, variants[i].name, variants[i].country);
-+	}
-+	return RESULT_SUCCESS;
-+#undef FORMAT
-+}	
-+
-+static int handle_mfcr2_show_channels(int fd, int argc, char *argv[])
-+{
-+#define FORMAT "%4s %-7.7s %-7.7s %-8.8s %-9.9s %-16.16s %-8.8s %-8.8s\n"
-+	int filtertype = 0;
-+	int targetnum = 0;
-+	char channo[5];
-+	char anino[5];
-+	char dnisno[5];
-+	struct dahdi_pvt *p;
-+	openr2_context_t *r2context;
-+	openr2_variant_t r2variant;
-+	if (!((argc == 3) || (argc == 5))) {
-+		return RESULT_SHOWUSAGE;
-+	}
-+	if (argc == 5) {
-+		if (!strcasecmp(argv[3], "group")) {
-+			targetnum = atoi(argv[4]);
-+			if ((targetnum < 0) || (targetnum > 63))
-+				return RESULT_SHOWUSAGE;
-+			targetnum = 1 << targetnum;
-+			filtertype = 1;
-+		} else if (!strcasecmp(argv[3], "context")) {
-+			filtertype = 2;
-+		} else {
-+			return RESULT_SHOWUSAGE;
-+		}
-+	}
-+	ast_cli(fd, FORMAT, "Chan", "Variant", "Max ANI", "Max DNIS", "ANI First", "Immediate Accept", "Tx CAS", "Rx CAS");
-+	ast_mutex_lock(&iflock);
-+	p = iflist;
-+	while (p) {
-+		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
-+			p = p->next;
-+			continue;
-+		}
-+		if (filtertype) {
-+			switch(filtertype) {
-+			case 1: /* mfcr2 show channels group <group> */
-+				if (p->group != targetnum) {
-+					p = p->next;
-+					continue;
-+				}
-+				break;
-+			case 2: /* mfcr2 show channels context <context> */
-+				if (strcasecmp(p->context, argv[4])) {
-+					p= p->next;
-+					continue;
-+				}
-+				break;
-+			default:
-+				;
-+			}
-+		}
-+		r2context = openr2_chan_get_context(p->r2chan);
-+		r2variant = openr2_context_get_variant(r2context);
-+		snprintf(channo, sizeof(channo), "%d", p->channel);
-+		snprintf(anino, sizeof(anino), "%d", openr2_context_get_max_ani(r2context));
-+		snprintf(dnisno, sizeof(dnisno), "%d", openr2_context_get_max_dnis(r2context));
-+		ast_cli(fd, FORMAT, channo, openr2_proto_get_variant_string(r2variant), 
-+				anino, dnisno, openr2_context_get_ani_first(r2context) ? "Yes" : "No",  
-+				openr2_context_get_immediate_accept(r2context) ? "Yes" : "No",
-+				openr2_chan_get_tx_cas_string(p->r2chan), openr2_chan_get_rx_cas_string(p->r2chan));
-+		p = p->next;
-+	}
-+	ast_mutex_unlock(&iflock);
-+	return RESULT_SUCCESS;
-+#undef FORMAT
-+}
-+
-+static int handle_mfcr2_set_debug(int fd, int argc, char *argv[])
-+{
-+	struct dahdi_pvt *p = NULL;
-+	int channo = 0;
-+	char *toklevel = NULL;
-+	char *saveptr = NULL;
-+	char *logval = NULL;
-+	openr2_log_level_t loglevel = OR2_LOG_NOTHING;
-+	openr2_log_level_t tmplevel = OR2_LOG_NOTHING;
-+	if (argc < 4) {
-+		return RESULT_SHOWUSAGE;
-+	}
-+	channo = (argc == 5) ? atoi(argv[4]) : -1;
-+	logval = ast_strdupa(argv[3]);
-+	toklevel = strtok_r(logval, ",", &saveptr);
-+	if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
-+		ast_cli(fd, "Invalid MFC/R2 logging level '%s'.\n", argv[3]);
-+		return RESULT_FAILURE;
-+	} else if (OR2_LOG_NOTHING == tmplevel) {
-+		loglevel = tmplevel;
-+	} else {
-+		loglevel |= tmplevel;
-+		while ((toklevel = strtok_r(NULL, ",", &saveptr))) {
-+			if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
-+				ast_cli(fd, "Ignoring invalid logging level: '%s'.\n", toklevel);
-+				continue;
-+			}
-+			loglevel |= tmplevel;
-+		}
-+	}
-+	ast_mutex_lock(&iflock);
-+	p = iflist;
-+	while (p) {
-+		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
-+			p = p->next;
-+			continue;
-+		}
-+		if ((channo != -1) && (p->channel != channo )) {
-+			p = p->next;
-+			continue;
-+		}
-+		openr2_chan_set_log_level(p->r2chan, loglevel);
-+		if (channo != -1) {
-+			ast_cli(fd, "MFC/R2 debugging set to '%s' for channel %d.\n", argv[3], p->channel);
-+			break;
-+		} else {
-+			p = p->next;
-+		}
-+	}
-+	if ((channo != -1) && !p) {
-+		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
-+	}
-+	if (channo == -1) {
-+		ast_cli(fd, "MFC/R2 debugging set to '%s' for all channels.\n", argv[3]);
-+	}
-+	ast_mutex_unlock(&iflock);
-+	return RESULT_SUCCESS;
-+}
-+
-+static int handle_mfcr2_call_files(int fd, int argc, char *argv[])
-+{
-+	struct dahdi_pvt *p = NULL;
-+	int channo = 0;
-+	if (argc < 4) {
-+		return RESULT_SHOWUSAGE;
-+	}
-+	channo = (argc == 5) ? atoi(argv[4]) : -1;
-+	ast_mutex_lock(&iflock);
-+	p = iflist;
-+	while (p) {
-+		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
-+			p = p->next;
-+			continue;
-+		}
-+		if ((channo != -1) && (p->channel != channo )) {
-+			p = p->next;
-+			continue;
-+		}
-+		if (ast_true(argv[3])) {
-+			openr2_chan_enable_call_files(p->r2chan);
-+		} else {
-+			openr2_chan_disable_call_files(p->r2chan);
-+		}
-+		if (channo != -1) {
-+			if (ast_true(argv[3])) {
-+				ast_cli(fd, "MFC/R2 call files enabled for channel %d.\n", p->channel);
-+			} else {
-+				ast_cli(fd, "MFC/R2 call files disabled for channel %d.\n", p->channel);
-+			}
-+			break;
-+		} else {
-+			p = p->next;
-+		}
-+	}
-+	if ((channo != -1) && !p) {
-+		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
-+	}
-+	if (channo == -1) {
-+		if (ast_true(argv[3])) {
-+			ast_cli(fd, "MFC/R2 Call files enabled for all channels.\n");
-+		} else {
-+			ast_cli(fd, "MFC/R2 Call files disabled for all channels.\n");
-+		}	
-+	}
-+	ast_mutex_unlock(&iflock);
-+	return RESULT_SUCCESS;
-+}	
-+
-+static int handle_mfcr2_set_idle(int fd, int argc, char *argv[])
-+{
-+	struct dahdi_pvt *p = NULL;
-+	int channo = 0;
-+	channo = (argc == 4) ? atoi(argv[3]) : -1;
-+	ast_mutex_lock(&iflock);
-+	p = iflist;
-+	while (p) {
-+		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
-+			p = p->next;
-+			continue;
-+		}
-+		if ((channo != -1) && (p->channel != channo )) {
-+			p = p->next;
-+			continue;
-+		}
-+		if (!openr2_chan_set_idle(p->r2chan)) {
-+			ast_mutex_lock(&p->lock);
-+			p->mfcr2call = 0;
-+			p->mfcr2block &= ~DAHDI_R2_LOCAL_BLOCK;
-+			ast_mutex_unlock(&p->lock);
-+		}
-+		if (channo != -1) {
-+			break;
-+		} else {
-+			p = p->next;
-+		}
-+	}
-+	if ((channo != -1) && !p) {
-+		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
-+	}
-+	ast_mutex_unlock(&iflock);
-+	return RESULT_SUCCESS;
-+}
-+
-+static int handle_mfcr2_set_blocked(int fd, int argc, char *argv[])
-+{
-+	struct dahdi_pvt *p = NULL;
-+	int channo = 0;
-+	channo = (argc == 4) ? atoi(argv[3]) : -1;
-+	ast_mutex_lock(&iflock);
-+	p = iflist;
-+	while (p) {
-+		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
-+			p = p->next;
-+			continue;
-+		}
-+		if ((channo != -1) && (p->channel != channo )) {
-+			p = p->next;
-+			continue;
-+		}
-+		if (!openr2_chan_set_blocked(p->r2chan)) {
-+			ast_mutex_lock(&p->lock);
-+			p->mfcr2block |= DAHDI_R2_LOCAL_BLOCK;
-+			ast_mutex_unlock(&p->lock);
-+		} else {
-+			ast_cli(fd, "MFC/R2 channel %d could not be blocked.\n", p->channel);
-+		}
-+		if (channo != -1) {
-+			break;
-+		} else {
-+			p = p->next;
-+		}
-+	}
-+	if ((channo != -1) && !p) {
-+		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
-+	}
-+	ast_mutex_unlock(&iflock);
-+	return RESULT_SUCCESS;
-+}
-+
-+static const char dahdi_r2_version_help[] = 
-+			"Usage: mfcr2 show version\n"
-+			"       Shows the version of the OpenR2 library being used.\n";
-+static const char dahdi_r2_variants_help[] = 
-+			"Usage: mfcr2 show variants\n"
-+			"       Show supported MFC/R2 variants.\n";
-+static const char dahdi_r2_showchannels_help[] =
-+			"Usage: mfcr2 show channels [group <group> | context <context>]\n"
-+			"       Shows the zap channels configured with MFC/R2 signaling.\n";
-+static const char dahdi_r2_setdebug_help[] =
-+			"Usage: mfcr2 set debug <loglevel> <channel>\n"
-+			"       Set a new logging level for the specified channel.\n"
-+			"       If no channel is specified the logging level will be applied to all channels.\n";
-+static const char dahdi_r2_callfiles_help[] =
-+			"Usage: mfcr2 call files [on|off] <channel>\n"
-+			"       Enable call files creation on the specified channel.\n"
-+			"       If no channel is specified call files creation policy will be applied to all channels.\n";
-+static const char dahdi_r2_setidle_help[] =
-+			"Usage: mfcr2 set idle <channel>\n"
-+			"       DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.\n"
-+			"       Force the given channel into IDLE state.\n"
-+			"       If no channel is specified, all channels will be set to IDLE.\n";
-+static const char dahdi_r2_setblocked_help[] =
-+			"Usage: mfcr2 set blocked <channel>\n"
-+			"       DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.\n"
-+			"       Force the given channel into BLOCKED state.\n"
-+			"       If no channel is specified, all channels will be set to BLOCKED.\n";
-+
-+static struct ast_cli_entry dahdi_mfcr2_cli[] = {
-+	{ { "mfcr2", "show", "version", NULL },
-+	handle_mfcr2_version, "Show OpenR2 library version",
-+	dahdi_r2_version_help },
-+
-+	{ { "mfcr2", "show", "variants", NULL },
-+	handle_mfcr2_show_variants, "Show supported MFC/R2 variants",
-+	dahdi_r2_variants_help },
-+
-+	{ { "mfcr2", "show", "channels", NULL },
-+	handle_mfcr2_show_channels, "Show MFC/R2 channels",
-+	dahdi_r2_showchannels_help },
-+
-+	{ { "mfcr2", "set", "debug", NULL },
-+	handle_mfcr2_set_debug, "Set MFC/R2 channel logging level",
-+	dahdi_r2_setdebug_help },
-+
-+	{ { "mfcr2", "call", "files", NULL },
-+	handle_mfcr2_call_files, "Enable/Disable MFC/R2 call files",
-+	dahdi_r2_callfiles_help },
-+
-+	{ { "mfcr2", "set", "idle", NULL },
-+	handle_mfcr2_set_idle, "Reset MFC/R2 channel forcing it to IDLE",
-+	dahdi_r2_setidle_help },
-+
-+	{ { "mfcr2", "set", "blocked", NULL },
-+	handle_mfcr2_set_blocked, "Reset MFC/R2 channel forcing it to BLOCKED",
-+	dahdi_r2_setblocked_help }
-+
-+};
-+
-+#endif /* HAVE_OPENR2 */
-+
- static int dahdi_destroy_channel(int fd, int argc, char **argv)
- {
- 	int channel;
-@@ -10872,6 +12270,9 @@ retry:
- static int setup_dahdi(int reload);
- static int dahdi_restart(void)
- {
-+#ifdef HAVE_OPENR2
-+	int r;
-+#endif
- #if defined(HAVE_PRI)
- 	int i, j;
- #endif
-@@ -10886,6 +12287,18 @@ static int dahdi_restart(void)
- 	if (option_verbose > 3)
- 		ast_verbose("Initial softhangup of all DAHDI channels complete.\n");
- 
-+#ifdef HAVE_OPENR2
-+	for (r = 0; r < NUM_SPANS; r++) {
-+		if (r2links[r].master != AST_PTHREADT_NULL) {
-+			ast_log(LOG_DEBUG, "Killing MFC/R2 monitor thread %p\n", &r2links[r].master);
-+			pthread_cancel(r2links[r].master);
-+			pthread_join(r2links[r].master, NULL);
-+			openr2_context_delete(r2links[r].protocol_context);
-+		}
-+	}
-+	init_mfcr2_globals();
-+#endif
-+
- 	#if defined(HAVE_PRI)
- 	for (i = 0; i < NUM_SPANS; i++) {
- 		if (pris[i].master && (pris[i].master != AST_PTHREADT_NULL)) {
-@@ -11120,6 +12533,41 @@ static int dahdi_show_channel(int fd, in
- 				if (tmp->slaves[x])
- 					ast_cli(fd, "Slave Channel: %d\n", tmp->slaves[x]->channel);
- 			}
-+#ifdef HAVE_OPENR2
-+			if (tmp->mfcr2) {
-+				char calldir[OR2_MAX_PATH];
-+				openr2_context_t *r2context = openr2_chan_get_context(tmp->r2chan);
-+				openr2_variant_t r2variant = openr2_context_get_variant(r2context);
-+				ast_cli(fd, "MFC/R2 Call: %s\n", tmp->mfcr2call ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Blocked: %s\n", tmp->mfcr2block ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 MF State: %s\n", openr2_chan_get_mf_state_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 MF Group: %s\n", openr2_chan_get_mf_group_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 State: %s\n", openr2_chan_get_r2_state_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 Call State: %s\n", openr2_chan_get_call_state_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 Call Files Enabled: %s\n", openr2_chan_get_call_files_enabled(tmp->r2chan) ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Variant: %s\n", openr2_proto_get_variant_string(r2variant));
-+				ast_cli(fd, "MFC/R2 Max ANI: %d\n", openr2_context_get_max_ani(r2context));
-+				ast_cli(fd, "MFC/R2 Max DNIS: %d\n", openr2_context_get_max_dnis(r2context));
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
-+				ast_cli(fd, "MFC/R2 DTMF Dialing: %s\n", openr2_context_get_dtmf_dialing(r2context, NULL, NULL) ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 DTMF Detection: %s\n", openr2_context_get_dtmf_detection(r2context) ? "Yes" : "No");
-+#endif
-+				ast_cli(fd, "MFC/R2 Get ANI First: %s\n", openr2_context_get_ani_first(r2context) ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Skip Category: %s\n", openr2_context_get_skip_category_request(r2context) ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Immediate Accept: %s\n", openr2_context_get_immediate_accept(r2context) ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Accept On Offer: %s\n", tmp->mfcr2_accept_on_offer ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Charge Calls: %s\n", tmp->mfcr2_charge_calls ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Allow Collect Calls: %s\n", tmp->mfcr2_allow_collect_calls ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 Forced Release: %s\n", tmp->mfcr2_forced_release ? "Yes" : "No");
-+				ast_cli(fd, "MFC/R2 MF Back Timeout: %dms\n", openr2_context_get_mf_back_timeout(r2context));
-+				ast_cli(fd, "MFC/R2 R2 Metering Pulse Timeout: %dms\n", openr2_context_get_metering_pulse_timeout(r2context));
-+				ast_cli(fd, "MFC/R2 Rx CAS: %s\n", openr2_chan_get_rx_cas_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 Tx CAS : %s\n", openr2_chan_get_tx_cas_string(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 MF Tx Signal: %d\n", openr2_chan_get_tx_mf_signal(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 MF Rx Signal: %d\n", openr2_chan_get_rx_mf_signal(tmp->r2chan));
-+				ast_cli(fd, "MFC/R2 Call Files Directory: %s\n", openr2_context_get_log_directory(r2context, calldir, sizeof(calldir)));
-+			}
-+#endif
- #ifdef HAVE_PRI
- 			if (tmp->pri) {
- 				ast_cli(fd, "PRI Flags: ");
-@@ -11599,7 +13047,9 @@ static int dahdi_action_restart(struct m
- static int __unload_module(void)
- {
- 	struct dahdi_pvt *p;
--
-+#ifdef HAVE_OPENR2
-+	int r;
-+#endif
- #ifdef HAVE_PRI
- 	int i, j;
- 	for (i = 0; i < NUM_SPANS; i++) {
-@@ -11613,6 +13063,19 @@ static int __unload_module(void)
- 	}
- 	ast_unregister_application(zap_send_keypad_facility_app);
- #endif
-+#ifdef HAVE_OPENR2
-+	for (r = 0; r < NUM_SPANS; r++) {
-+		if (r2links[r].master != AST_PTHREADT_NULL) {
-+			pthread_cancel(r2links[r].master);
-+			pthread_join(r2links[r].master, NULL);
-+		}
-+	}
-+	ast_cli_unregister_multiple(dahdi_mfcr2_cli, sizeof(dahdi_mfcr2_cli) / sizeof(dahdi_mfcr2_cli[0]));
-+	if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
-+		ast_unregister_application(dahdi_accept_r2_call_app);
-+	}
-+	ast_unregister_application(zap_accept_r2_call_app);
-+#endif
- 	ast_cli_unregister_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry));
- 	local_astman_unregister("DialOffHook");
- 	local_astman_unregister("Hangup");
-@@ -11650,6 +13113,13 @@ static int __unload_module(void)
- 		}
- 	}
- #endif
-+#ifdef HAVE_OPENR2
-+	for (r = 0; r < NUM_SPANS; r++) {
-+		if (r2links[r].protocol_context) {
-+			openr2_context_delete(r2links[r].protocol_context);
-+		}
-+	}
-+#endif
- 	ast_cond_destroy(&ss_thread_complete);
- 	return 0;
- }
-@@ -11749,6 +13219,11 @@ static int build_channels(struct dahdi_c
- 				return -1;
- 			}
- 		}
-+#ifdef HAVE_OPENR2
-+		if (reload != 1 && r2links[mfcr2_cur_context_index].protocol_context) {
-+			mfcr2_cur_context_index++;
-+		}	
-+#endif
- 	}
- 
- 	return 0;
-@@ -12093,6 +13568,10 @@ static int process_dahdi(struct dahdi_ch
- 				} else if (!strcasecmp(v->value, "featb")) {
- 					confp->chan.sig = SIG_FEATB;
- 					confp->chan.radio = 0;
-+#ifdef HAVE_OPENR2
-+				} else if (!strcasecmp(v->value, "mfcr2")) {
-+					confp->chan.sig = SIG_MFCR2;
-+#endif
- #ifdef HAVE_PRI
- 				} else if (!strcasecmp(v->value, "pri_net")) {
- 					confp->chan.radio = 0;
-@@ -12303,6 +13782,97 @@ static int process_dahdi(struct dahdi_ch
- 			} else if (!strcasecmp(v->name, "facilityenable")) {
- 				confp->pri.facilityenable = ast_true(v->value);
- #endif /* HAVE_PRI */
-+#ifdef HAVE_OPENR2
-+			} else if (!strcasecmp(v->name, "mfcr2_advanced_protocol_file")) {
-+				ast_copy_string(mfcr2_cur_r2proto_file, v->value, sizeof(mfcr2_cur_r2proto_file));
-+				ast_log(LOG_WARNING, "MFC/R2 Protocol file '%s' will be used, you only should use this if you *REALLY  KNOW WHAT YOU ARE DOING*.\n", mfcr2_cur_r2proto_file);
-+			} else if (!strcasecmp(v->name, "mfcr2_logdir")) {
-+				ast_copy_string(mfcr2_cur_logdir, v->value, sizeof(mfcr2_cur_logdir));
-+			} else if (!strcasecmp(v->name, "mfcr2_variant")) {
-+				mfcr2_cur_variant = openr2_proto_get_variant(v->value);
-+				if (OR2_VAR_UNKNOWN == mfcr2_cur_variant) {
-+					ast_log(LOG_WARNING, "Unknown MFC/R2 variant '%s' at line %d.\n", v->value, v->lineno);
-+				}
-+			} else if (!strcasecmp(v->name, "mfcr2_mfback_timeout")) {
-+				mfcr2_cur_mfback_timeout = atoi(v->value);
-+				if (!mfcr2_cur_mfback_timeout) {
-+					ast_log(LOG_WARNING, "MF timeout of 0? hum, I will protect you from your ignorance. Setting default.\n");
-+					mfcr2_cur_mfback_timeout = -1;
-+				} else if (mfcr2_cur_mfback_timeout > 0 && mfcr2_cur_mfback_timeout < 500) {
-+					ast_log(LOG_WARNING, "MF timeout less than 500ms is not recommended, you have been warned!\n");
-+				}
-+			} else if (!strcasecmp(v->name, "mfcr2_metering_pulse_timeout")) {
-+				mfcr2_cur_metering_pulse_timeout = atoi(v->value);
-+				if (mfcr2_cur_metering_pulse_timeout > 500) {
-+					ast_log(LOG_WARNING, "mfcr2_metering_pulse_timeout greater than 500ms is not recommended, you have been warned!\n");
-+				}
-+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
-+			} else if (!strcasecmp(v->name, "mfcr2_dtmf_detection")) {
-+				mfcr2_cur_dtmf_detection = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_dtmf_dialing")) {
-+				mfcr2_cur_dtmf_dialing = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_dtmf_time_on")) {
-+				mfcr2_cur_dtmf_time_on = atoi(v->value);
-+			} else if (!strcasecmp(v->name, "mfcr2_dtmf_time_off")) {
-+				mfcr2_cur_dtmf_time_off = atoi(v->value);
-+#endif
-+			} else if (!strcasecmp(v->name, "mfcr2_get_ani_first")) {
-+				mfcr2_cur_get_ani_first = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_skip_category")) {
-+				mfcr2_cur_skip_category = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_double_answer")) {
-+				mfcr2_cur_double_answer = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_accept_on_offer")) {
-+				mfcr2_cur_accept_on_offer = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_charge_calls")) {
-+				mfcr2_cur_charge_calls = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_allow_collect_calls")) {
-+				mfcr2_cur_allow_collect_calls = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_forced_release")) {
-+				mfcr2_cur_forced_release= ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_immediate_accept")) {
-+				mfcr2_cur_immediate_accept = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_call_files")) {
-+				mfcr2_cur_call_files = ast_true(v->value) ? 1 : 0;
-+			} else if (!strcasecmp(v->name, "mfcr2_max_ani")) {
-+				mfcr2_cur_max_ani = atoi(v->value);
-+				if (mfcr2_cur_max_ani >= AST_MAX_EXTENSION) {
-+					mfcr2_cur_max_ani = AST_MAX_EXTENSION - 1;
-+				}
-+			} else if (!strcasecmp(v->name, "mfcr2_max_dnis")) {
-+				mfcr2_cur_max_dnis = atoi(v->value);
-+				if (mfcr2_cur_max_dnis >= AST_MAX_EXTENSION) {
-+					mfcr2_cur_max_dnis = AST_MAX_EXTENSION - 1;
-+				}
-+			} else if (!strcasecmp(v->name, "mfcr2_category")) {
-+				mfcr2_cur_category = openr2_proto_get_category(v->value);
-+				if (OR2_CALLING_PARTY_CATEGORY_UNKNOWN == mfcr2_cur_category) {
-+					mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
-+					ast_log(LOG_WARNING, "Invalid MFC/R2 caller category '%s' at line %d. Using national subscriber as default.\n", 
-+							v->value, v->lineno);
-+				}
-+			} else if (!strcasecmp(v->name, "mfcr2_logging")) {
-+				openr2_log_level_t tmplevel;
-+				char *toklevel = NULL;
-+				char *saveptr = NULL;
-+				char *logval = ast_strdupa(v->value);
-+				toklevel = strtok_r(logval, ",", &saveptr);
-+				if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
-+					ast_log(LOG_WARNING, "Invalid MFC/R2 logging level '%s' at line %d.\n", v->value, v->lineno);
-+				} else if (OR2_LOG_NOTHING == tmplevel) {
-+					mfcr2_cur_loglevel = tmplevel;
-+				} else {
-+					mfcr2_cur_loglevel |= tmplevel;
-+					while ((toklevel = strtok_r(NULL, ",", &saveptr))) {
-+						if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
-+							ast_log(LOG_WARNING, "Ignoring invalid logging level: '%s' at line %d.\n", toklevel, v->lineno);
-+							continue;
-+						}
-+						mfcr2_cur_loglevel |= tmplevel;
-+					}
-+				}
-+#endif /* HAVE_OPENR2 */
-+
- 			} else if (!strcasecmp(v->name, "cadence")) {
- 				/* setup to scan our argument */
- 				int element_count, c[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-@@ -12599,6 +14169,21 @@ static int setup_dahdi(int reload)
- 		}
- 	}
- #endif
-+#ifdef HAVE_OPENR2
-+	if (reload != 1) {
-+		int x;
-+		for (x = 0; x < NUM_SPANS; x++) {
-+			if (r2links[x].protocol_context) {
-+				if (ast_pthread_create(&r2links[x].master, NULL, mfcr2_monitor, &r2links[x])) {
-+					ast_log(LOG_ERROR, "Unable to start R2 context on span %d\n", x + 1);
-+					return -1;
-+				} else {
-+					ast_verbose(VERBOSE_PREFIX_2 "Starting R2 context on span %d\n", x + 1);
-+				}
-+			}
-+		}
-+	}
-+#endif
- 	/* And start the monitor for the first time */
- 	restart_monitor();
- 	return 0;
-@@ -12634,6 +14219,15 @@ static int load_module(void)
- 	ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
- 		zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
- #endif
-+#ifdef HAVE_OPENR2
-+	init_mfcr2_globals();
-+	if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
-+		ast_register_application(dahdi_accept_r2_call_app, dahdi_accept_r2_call_exec,
-+			dahdi_accept_r2_call_synopsis, dahdi_accept_r2_call_descrip);
-+	}
-+	ast_register_application(zap_accept_r2_call_app, zap_accept_r2_call_exec,
-+		zap_accept_r2_call_synopsis, zap_accept_r2_call_descrip);
-+#endif
- 	if ((res = setup_dahdi(0))) {
- 		return AST_MODULE_LOAD_DECLINE;
- 	}
-@@ -12652,6 +14246,9 @@ static int load_module(void)
- 	ast_string_field_set(&inuse, name, "GR-303InUse");
- 	ast_cli_register_multiple(dahdi_pri_cli, sizeof(dahdi_pri_cli) / sizeof(struct ast_cli_entry));
- #endif	
-+#ifdef HAVE_OPENR2
-+	ast_cli_register_multiple(dahdi_mfcr2_cli, sizeof(dahdi_mfcr2_cli)/sizeof(dahdi_mfcr2_cli[0]));
-+#endif
- 	ast_cli_register_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry));
- 	
- 	memset(round_robin, 0, sizeof(round_robin));
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
deleted file mode 100644
index ffea412..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- asterisk-1.4.39.1/channels/chan_sip.c	2010-12-09 14:00:30.000000000 -0800
-+++ asterisk-1.4.39.1-vici/channels/chan_sip.c	2011-02-08 18:14:49.000000000 -0800
-@@ -1557,6 +1557,7 @@ static int sip_reg_timeout(const void *d
- static void sip_send_all_registers(void);
- 
- /*--- Parsing SIP requests and responses */
-+static int check_cpd_results(struct sip_pvt *p, struct sip_request *req);
- static void append_date(struct sip_request *req);	/* Append date to SIP packet */
- static int determine_firstline_parts(struct sip_request *req);
- static const struct cfsubscription_types *find_subscription_type(enum subscriptiontype subtype);
-@@ -4613,6 +4614,37 @@ static const char *find_alias(const char
- 
- 	return _default;
- }
-+/*! \brief Check for a CPD-Result
-+		This looks for a CPD-Result in the sip_request 
-+		and throws a manager event if it finds one
-+ */
-+static int check_cpd_results(struct sip_pvt *p, struct sip_request *req) {
-+	const char *cpdr = get_header(req, "CPD-Result");\
-+	/* See if NetBorder had anything to say */
-+	if (!(ast_strlen_zero(cpdr))) {
-+		if (p->owner) {
-+			/* If so throw a manager event with the result */
-+			manager_event(
-+				EVENT_FLAG_SYSTEM, 
-+				"CPD-Result", 
-+				"ChannelDriver: SIP\r\nChannel: %s\r\nCallerIDName: %s\r\nUniqueid: %s\r\nResult: %s\r\n",
-+				p->owner->name,
-+				p->owner->cid.cid_name,
-+				p->owner->uniqueid,
-+				cpdr
-+			);
-+		} else {  
-+			/* Apparently we can have a CPD-Result and no owner, better not crash it though */
-+			manager_event(
-+				EVENT_FLAG_SYSTEM,
-+				"CPD-Result",
-+				"ChannelDriver: SIP\r\nChannel: UNKNOWN\r\nCallerIDName: UNKNOWN\r\nUniqueid: UNKNOWN\r\nResult: %s\r\n",
-+				cpdr
-+                        );
-+		}
-+	} 
-+	return 0;
-+}
- 
- static const char *__get_header(const struct sip_request *req, const char *name, int *start)
- {
-@@ -7611,6 +7643,7 @@ static void initreqprep(struct sip_reque
- 	char tmp2[SIPBUFSIZE/2];
- 	const char *l = NULL, *n = NULL, *d = NULL;
- 	const char *urioptions = "";
-+	const char *netbordercpd = ";cpd=on";  /* string used to enable NetBorder's CPD */
- 
- 	if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) {
- 	 	const char *s = p->username;	/* being a string field, cannot be NULL */
-@@ -7699,6 +7732,9 @@ static void initreqprep(struct sip_reque
- 	if (p->options && !ast_strlen_zero(p->options->uri_options))
- 		ast_build_string(&invite, &invite_max, ";%s", p->options->uri_options);
- 	
-+	/* Tell NetBorder to enable CPD */
-+	ast_build_string(&invite, &invite_max, "%s", netbordercpd);
-+	
- 	ast_string_field_set(p, uri, invite_buf);
- 
- 	if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 
-@@ -13882,6 +13918,9 @@ static void handle_response(struct sip_p
- 		return;
- 	}
- 
-+	/* Check if NetBorder had anything to say */
-+	check_cpd_results(p, req);
-+
- 	if (p->relatedpeer && p->method == SIP_OPTIONS) {
- 		/* We don't really care what the response is, just that it replied back. 
- 		   Well, as long as it's not a 100 response...  since we might
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch b/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
deleted file mode 100644
index 8714aa9..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- asterisk-1.4.39.1/configure.ac	2010-10-04 13:15:26.000000000 -0700
-+++ asterisk-1.4.39.1-vici/configure.ac	2011-02-08 18:15:16.000000000 -0800
-@@ -260,6 +260,7 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL],
- AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
- AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
- AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
-+AST_EXT_LIB_SETUP([OPENR2], [MFCR2], [openr2])
- AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
- AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
- AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
-@@ -1498,6 +1499,8 @@ AST_EXT_LIB_CHECK([PRI_VERSION], [pri],
- 
- AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])
- 
-+AST_EXT_LIB_CHECK([OPENR2], [openr2], [openr2_chan_new], [openr2.h])
-+
- if test "${USE_PWLIB}" != "no"; then
- 	if test -n "${PWLIB_DIR}"; then
- 		PWLIBDIR="${PWLIB_DIR}"
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch b/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
deleted file mode 100644
index f875ab1..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.39.1/contrib/scripts/get_ilbc_source.sh	2009-04-22 07:29:28.000000000 -0700
-+++ asterisk-1.4.39.1-vici/contrib/scripts/get_ilbc_source.sh	2013-04-28 05:14:16.000000000 -0700
-@@ -22,7 +22,7 @@ read tmp
- 
- wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
- 
--wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | tr -d '\r' > codecs/ilbc/extract-cfile.awk
-+wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.txt | tr -d '\r' > codecs/ilbc/extract-cfile.awk
- 
- (cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)
- 
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
deleted file mode 100644
index dfc85f8..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- asterisk-1.4.39.1/include/asterisk/channel.h	2010-11-22 10:46:26.000000000 -0800
-+++ asterisk-1.4.39.1-vici/include/asterisk/channel.h	2011-02-08 18:16:22.000000000 -0800
-@@ -645,6 +645,15 @@ enum {
- 	 * instead of actually hanging up.
- 	 */
- 	AST_SOFTHANGUP_UNBRIDGE =  (1 << 6),
-+
-+
-+	/*!
-+	 * \brief All softhangup flags.
-+	 *
-+	 * This can be used as an argument to ast_channel_softhangup_clear
-+	 * to clear all softhangup flags from a channel.
-+	 */
-+	AST_SOFTHANGUP_ALL =       (0xFFFFFFFF)
- };
- 
- 
-@@ -834,6 +843,20 @@ int ast_softhangup(struct ast_channel *c
-  * \param reason an AST_SOFTHANGUP_* reason code */
- int ast_softhangup_nolock(struct ast_channel *chan, int cause);
- 
-+/*!
-+ * \brief Clear a set of softhangup flags from a channel
-+ *
-+ * Never clear a softhangup flag from a channel directly.  Instead,
-+ * use this function.  This ensures that all aspects of the softhangup
-+ * process are aborted.
-+ *
-+ * \param chan the channel to clear the flag on
-+ * \param flag the flag or flags to clear
-+ *
-+ * \return Nothing.
-+ */
-+void ast_channel_clear_softhangup(struct ast_channel *chan, int flag);
-+
- /*! \brief Check to see if a channel is needing hang up 
-  * \param chan channel on which to check for hang up
-  * This function determines if the channel is being requested to be hung up.
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
deleted file mode 100644
index 47cb495..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- asterisk-1.4.39.1/include/asterisk/dahdi_compat.h	2009-02-13 13:53:16.000000000 -0800
-+++ asterisk-1.4.39.1-vici/include/asterisk/dahdi_compat.h	2011-02-08 18:15:16.000000000 -0800
-@@ -320,6 +320,9 @@
- #if defined(ZT_SETTONEZONE)
- #define DAHDI_SETTONEZONE ZT_SETTONEZONE
- #endif
-+#if defined(ZT_SIG_CAS)
-+#define DAHDI_SIG_CAS ZT_SIG_CAS
-+#endif
- #if defined(ZT_SIG_CLEAR)
- #define DAHDI_SIG_CLEAR ZT_SIG_CLEAR
- #endif
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
deleted file mode 100644
index eae3840..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- asterisk-1.4.39.1/main/channel.c	2010-12-07 14:57:48.000000000 -0800
-+++ asterisk-1.4.39.1-vici/main/channel.c	2011-02-08 18:16:22.000000000 -0800
-@@ -1571,6 +1571,31 @@ struct ast_datastore *ast_channel_datast
- 	return datastore;
- }
- 
-+void ast_channel_clear_softhangup(struct ast_channel *chan, int flag)
-+{
-+	ast_channel_lock(chan);
-+
-+	chan->_softhangup &= ~flag;
-+
-+	if (!chan->_softhangup) {
-+		struct ast_frame *fr;
-+
-+		/* If we have completely cleared the softhangup flag,
-+		 * then we need to fully abort the hangup process.  This requires
-+		 * pulling the END_OF_Q frame out of the channel frame queue if it
-+		 * still happens to be there. */
-+
-+		fr = AST_LIST_LAST(&chan->readq);
-+		if (fr && fr->frametype == AST_FRAME_CONTROL &&
-+				fr->subclass == AST_CONTROL_END_OF_Q) {
-+			AST_LIST_REMOVE(&chan->readq, fr, frame_list);
-+			ast_frfree(fr);
-+		}
-+	}
-+
-+	ast_channel_unlock(chan);
-+}
-+
- /*! \brief Softly hangup a channel, don't lock */
- int ast_softhangup_nolock(struct ast_channel *chan, int cause)
- {
-@@ -4598,10 +4623,10 @@ static enum ast_bridge_result ast_generi
- 				ast_jb_get_and_deliver(c0, c1);
- 			if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
- 				if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
--					c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
-+					ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
- 				}
- 				if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
--					c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
-+					ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
- 				}
- 				c0->_bridge = c1;
- 				c1->_bridge = c0;
-@@ -4844,10 +4869,10 @@ enum ast_bridge_result ast_channel_bridg
- 
- 		if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
- 			if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
--				c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
-+				ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
- 			}
- 			if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
--				c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
-+				ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
- 			}
- 			c0->_bridge = c1;
- 			c1->_bridge = c0;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
deleted file mode 100644
index 8c10f06..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- asterisk-1.4.39.1/main/manager.c	2010-10-02 01:50:05.000000000 -0700
-+++ asterisk-1.4.39.1-vici/main/manager.c	2012-05-16 19:10:51.000000000 -0700
-@@ -224,6 +224,7 @@ struct mansession_session {
- 	struct eventqent *eventq;
- 	/* Timeout for ast_carefulwrite() */
- 	int writetimeout;
-+	int needclose;             /*!< Boolean, indicating that the client has closed, but we still have things to write */
- 	int pending_event;         /*!< Pending events indicator in case when waiting_thread is NULL */
- 	AST_LIST_ENTRY(mansession_session) list;
- };
-@@ -2221,8 +2222,9 @@ static int process_events(struct mansess
- 		if ((s->session->authenticated && (s->session->readperm & eqe->category) == eqe->category) &&
- 				   ((s->session->send_events & eqe->category) == eqe->category)) {
- 			if (s->fd > -1) {
--				if (!ret && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->session->writetimeout) < 0)
--					ret = -1;
-+				if (!ret && !s->session->needclose && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->session->writetimeout) < 0) {
-+					s->session->needclose = 1;
-+				}
- 			} else if (!s->session->outputstr && !(s->session->outputstr = ast_calloc(1, sizeof(*s->session->outputstr)))) 
- 				ret = -1;
- 			else 
-@@ -2384,7 +2386,14 @@ static int get_input(struct mansession_s
- 		s->waiting_thread = pthread_self();
- 		ast_mutex_unlock(&s->__lock);
- 
--		res = ast_poll(fds, 1, -1);
-+		/* If the pipe is closed, read only those events still queued */
-+		if (s->needclose) {
-+			if ((res = poll(fds, 1, s->writetimeout)) == 0) {
-+				res = -1;
-+			}
-+		} else {
-+			res = poll(fds, 1, -1);
-+		}
- 
- 		ast_mutex_lock(&s->__lock);
- 		s->waiting_thread = AST_PTHREADT_NULL;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
deleted file mode 100644
index b9686f9..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- asterisk-1.4.39.1/main/pbx.c	2010-11-22 10:46:26.000000000 -0800
-+++ asterisk-1.4.39.1-vici/main/pbx.c	2011-02-08 18:16:22.000000000 -0800
-@@ -2383,7 +2383,7 @@ static int collect_digits(struct ast_cha
- 		   keep reading digits until we can't possibly get a right answer anymore.  */
- 		digit = ast_waitfordigit(c, waittime * 1000);
- 		if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
--			c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
-+			ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
- 		} else {
- 			if (!digit)	/* No entry */
- 				break;
-@@ -2474,7 +2474,7 @@ static int __ast_pbx_run(struct ast_chan
- 				if (option_verbose > 1)
- 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
- 				if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
--					c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
-+					ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
- 				} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT) {
- 					/* atimeout, nothing bad */
- 				} else {
-@@ -2485,12 +2485,12 @@ static int __ast_pbx_run(struct ast_chan
- 				}
- 			}
- 			if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
--				c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
-+				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
- 			} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT && ast_exists_extension(c,c->context,"T",1,c->cid.cid_num)) {
- 				set_ext_pri(c, "T", 0); /* 0 will become 1 with the c->priority++; at the end */
- 				/* If the AbsoluteTimeout is not reset to 0, we'll get an infinite loop */
- 				c->whentohangup = 0;
--				c->_softhangup &= ~AST_SOFTHANGUP_TIMEOUT;
-+				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
- 			} else if (c->_softhangup) {
- 				if (option_debug)
- 					ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
-@@ -2522,7 +2522,7 @@ static int __ast_pbx_run(struct ast_chan
- 			}
- 		} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT) {
- 			/* If we get this far with AST_SOFTHANGUP_TIMEOUT, then we know that the "T" extension is next. */
--			c->_softhangup &= ~AST_SOFTHANGUP_TIMEOUT;
-+			ast_channel_clear_softhangup(c, AST_SOFTHANGUP_TIMEOUT);
- 		} else {	/* keypress received, get more digits for a full extension */
- 			int waittime = 0;
- 			if (digit)
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
deleted file mode 100644
index acd1763..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- asterisk-1.4.39.1/main/utils.c	2011-01-17 10:57:55.000000000 -0800
-+++ asterisk-1.4.39.1-vici/main/utils.c	2012-05-16 19:18:38.000000000 -0700
-@@ -951,18 +951,18 @@ int ast_carefulwrite(int fd, char *s, in
- 					}
- 					/* This was an acceptable error, go back into poll() */
- 					continue;
-+				} else if (errno != EPIPE) {
-+					/* Fatal error, bail. */
-+					ast_log(LOG_ERROR, "poll returned error: %s\n", strerror(errno));
- 				}
- 
--				/* Fatal error, bail. */
--				ast_log(LOG_ERROR, "poll returned error: %s\n", strerror(errno));
--
- 				return -1;
- 			}
- 		}
- 
- 		res = write(fd, s, len);
- 
--		if (res < 0 && errno != EAGAIN && errno != EINTR) {
-+		if (res < 0 && errno != EAGAIN && errno != EINTR && errno != EPIPE) {
- 			/* fatal error from write() */
- 			ast_log(LOG_ERROR, "write() returned error: %s\n", strerror(errno));
- 			return -1;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch b/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
deleted file mode 100644
index 306ad6e..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- asterisk-1.4.39.1/makeopts.in	2010-09-05 23:54:18.000000000 -0700
-+++ asterisk-1.4.39.1-vici/makeopts.in	2011-02-08 18:15:16.000000000 -0800
-@@ -138,6 +138,9 @@ POPT_LIB=@POPT_LIB@
- PRI_INCLUDE=@PRI_INCLUDE@
- PRI_LIB=@PRI_LIB@
- 
-+OPENR2_INCLUDE=@OPENR2_INCLUDE@
-+OPENR2_LIB=@OPENR2_LIB@
-+
- PWLIB_INCLUDE=@PWLIB_INCLUDE@
- PWLIB_LIB=@PWLIB_LIB@
- 
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch b/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
deleted file mode 100644
index 2cbe098..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
+++ /dev/null
@@ -1,292 +0,0 @@
---- asterisk-1.4.39.1/menuselect-tree	2011-01-17 11:08:23.000000000 -0800
-+++ asterisk-1.4.39.1-vici/menuselect-tree	2013-05-13 21:48:22.000000000 -0700
-@@ -2,182 +2,182 @@
- 
- <menu name="Asterisk Module and Build Option Selection">
- <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
--<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
--	<depend>res_adsi</depend>
--</member>
--<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
-+<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
- </member>
--<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
-+<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
-+	<depend>dahdi</depend>
-+	<depend>tonezone</depend>
-+	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
-+<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
- </member>
--<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
-+<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
- </member>
--<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
-+<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
- </member>
--<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
-+<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
- </member>
--<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
-+<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
- </member>
--<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
-+<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
- </member>
--<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
--	<depend>dahdi</depend>
-+<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
-+	<depend>res_indications</depend>
- </member>
--<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
--	<depend>dahdi</depend>
--	<depend>working_fork</depend>
-+<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
- </member>
--<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
--	<depend>dahdi</depend>
-+<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
- </member>
--<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
-+<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
- </member>
--<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
--        <depend>chan_local</depend>
-+<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
- </member>
- <member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
- </member>
--<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-+<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-+	<depend>dahdi</depend>
-+	<depend>app_meetme</depend>
- </member>
--<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
-+<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
- </member>
--<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-+<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
- </member>
--<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
-+<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
- </member>
--<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
-+<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
--<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
-+<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
- </member>
--<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
--	<depend>working_fork</depend>
-+<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
- </member>
--<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
--	<depend>working_fork</depend>
-+<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
- </member>
--<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
--	<depend>dahdi</depend>
-+<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
-+<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
- </member>
--<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
-+<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
- </member>
--<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
-+<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
- </member>
--<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
-+<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
-+	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
--	<depend>working_fork</depend>
-+<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-+</member>
-+<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
-+</member>
-+<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
-+	<depend>res_adsi</depend>
-+	<depend>res_smdi</depend>
- </member>
- <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
- </member>
--<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
--	<defaultenabled>no</defaultenabled>
-+<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-+        <depend>chan_local</depend>
- </member>
--<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
-+<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
- </member>
--<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
-+<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
- </member>
--<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
-+<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
- </member>
--<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-+<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
--	<depend>res_indications</depend>
-+<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
- </member>
--<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
-+<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
-+        <depend>chan_local</depend>
- </member>
--<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
-+<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-+</member>
-+<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
-+</member>
-+<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
- </member>
- <member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
- 	<depend>working_fork</depend>
- </member>
--<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-+<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-+</member>
-+<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
- 	<depend>working_fork</depend>
- </member>
--<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
--	<depend>osptk</depend>
--	<depend>ssl</depend>
-+<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
- </member>
--<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-+<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
- 	<depend>dahdi</depend>
--	<depend>app_meetme</depend>
--</member>
--<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
--</member>
--<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
- </member>
--<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
--</member>
--<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
--        <depend>res_monitor</depend>
--</member>
--<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
-+<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
- </member>
--<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
-+<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
- </member>
--<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
-+<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
-+	<depend>dahdi</depend>
-+	<depend>working_fork</depend>
- </member>
--<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
-+<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
-+<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
-+	<depend>osptk</depend>
-+	<depend>ssl</depend>
- </member>
--<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
--	<depend>dahdi</depend>
--	<depend>tonezone</depend>
-+<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
- 	<defaultenabled>no</defaultenabled>
- </member>
--<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
--</member>
--<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
-+<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
-+	<depend>dahdi</depend>
- </member>
--<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
-+<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
- </member>
- <member name="app_setcallerid" displayname="Set CallerID Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
- </member>
--<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
-+<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
-+	<depend>res_adsi</depend>
- </member>
--<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
-+<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
- </member>
--<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
--	<defaultenabled>no</defaultenabled>
-+<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
- </member>
--<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
-+<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
- </member>
--<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
-+<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
- </member>
--<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
-+<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
- </member>
--<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
-+<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
-+<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
- </member>
--<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
-+<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
-+	<depend>working_fork</depend>
- </member>
--<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
-+<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
- </member>
--<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
-+<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
- </member>
--<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-+<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
-+        <depend>res_monitor</depend>
- </member>
--<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
-+<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
- </member>
--<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
-+<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
- </member>
--<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
--	<depend>res_adsi</depend>
--	<depend>res_smdi</depend>
-+<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-+	<depend>dahdi</depend>
- </member>
--<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
-+<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
- </member>
--<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
-+<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
- </member>
--<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-+<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
- </member>
--<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
-+<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-+</member>
-+<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
- </member>
- </category>
- <category name="MENUSELECT_CDR" displayname="Call Detail Recording" remove_on_change="cdr/modules.link">
-@@ -217,6 +217,7 @@
- 	<depend>tonezone</depend>
- 	<depend>res_features</depend>
- 	<use>pri</use>
-+	<use>openr2</use>
- </member>
- <member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
-         <defaultenabled>no</defaultenabled>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
deleted file mode 100644
index 0f03ff2..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- asterisk-1.4.39.1/res/res_features.c	2010-11-04 14:28:12.000000000 -0700
-+++ asterisk-1.4.39.1-vici/res/res_features.c	2011-02-08 18:16:22.000000000 -0800
-@@ -258,6 +258,7 @@ static void check_goto_on_transfer(struc
- 	xferchan->_state = AST_STATE_UP;
- 	ast_clear_flag(xferchan, AST_FLAGS_ALL);	
- 	xferchan->_softhangup = 0;
-+	ast_channel_clear_softhangup(xferchan, AST_SOFTHANGUP_ALL);
- 	if ((f = ast_read(xferchan))) {
- 		ast_frfree(f);
- 		f = NULL;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
deleted file mode 100644
index 63cd639..0000000
--- a/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- asterisk-1.4.39.1/res/res_musiconhold.c	2010-09-09 10:20:17.000000000 -0700
-+++ asterisk-1.4.39.1-vici/res/res_musiconhold.c	2011-02-08 18:14:57.000000000 -0800
-@@ -49,6 +49,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include <dirent.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <sys/dir.h>
-+#include <sys/param.h>
- #ifdef SOLARIS
- #include <thread.h>
- #endif
-@@ -830,57 +833,89 @@ static int moh_add_file(struct mohclass
- 	return 0;
- }
- 
--static int moh_scan_files(struct mohclass *class) {
--
--	DIR *files_DIR;
--	struct dirent *files_dirent;
-+static int moh_scan_files(struct mohclass *class)
-+{
-+	int file_count;
-+	int i, j;
- 	char path[PATH_MAX];
- 	char filepath[PATH_MAX];
- 	char *ext;
- 	struct stat statbuf;
--	int dirnamelen;
--	int i;
--	
--	files_DIR = opendir(class->dir);
--	if (!files_DIR) {
--		ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist\n", class->dir);
--		return -1;
--	}
-+	struct direct **files;
- 
-+	/* free the current file list */
- 	for (i = 0; i < class->total_files; i++)
- 		free(class->filearray[i]);
- 
-+	/* reset the file count */
- 	class->total_files = 0;
--	dirnamelen = strlen(class->dir) + 2;
-+
-+	/* save the current directory */
- 	if (!getcwd(path, sizeof(path))) {
- 		ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
- 		return -1;
- 	}
-+
-+	/* go to the directory in question*/
- 	if (chdir(class->dir) < 0) {
--		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
-+		ast_log(LOG_WARNING, "chdir(%s) failed: %s\n", class->dir, strerror(errno));
- 		return -1;
- 	}
--	while ((files_dirent = readdir(files_DIR))) {
-+
-+	if (option_verbose > 2)
-+		ast_verbose(VERBOSE_PREFIX_3 "Loading musiconhold files from directory '%s'\n",class->dir);
-+
-+	/* get the file listing for the directory and sort it alphabetically */
-+	file_count = scandir(class->dir, &files, NULL, alphasort);
-+
-+	/* scandir returned and error */
-+	if (file_count <= -1) {
-+		ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist\n", class->dir);
-+		return -1;
-+	}
-+
-+	/* loop through the files */
-+	for (j=1; j < file_count+1; ++j) {
-+
- 		/* The file name must be at least long enough to have the file type extension */
--		if ((strlen(files_dirent->d_name) < 4))
-+		if ((strlen(files[j-1]->d_name) < 4)) {
-+			if (option_verbose > 2)
-+				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename is too short to have an acceptable extension.\n", files[j-1]->d_name);
- 			continue;
-+		}
- 
- 		/* Skip files that starts with a dot */
--		if (files_dirent->d_name[0] == '.')
-+		if (files[j-1]->d_name[0] == '.') {
-+			if (option_verbose > 2)
-+				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename begins with a dot.\n", files[j-1]->d_name);
- 			continue;
-+		}
- 
- 		/* Skip files without extensions... they are not audio */
--		if (!strchr(files_dirent->d_name, '.'))
-+		if (!strchr(files[j-1]->d_name, '.')) {
-+			if (option_verbose > 2)
-+				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename has no extension.\n", files[j-1]->d_name);
- 			continue;
-+		}
- 
--		snprintf(filepath, sizeof(filepath), "%s/%s", class->dir, files_dirent->d_name);
-+		/* get the full path to the file */
-+		snprintf(filepath, sizeof(filepath), "%s/%s", class->dir, files[j-1]->d_name);
- 
--		if (stat(filepath, &statbuf))
-+		/* if we cannot stat the file skip it */
-+		if (stat(filepath, &statbuf)) {
-+			if (option_verbose > 2)
-+				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Cannot stat the file.\n", files[j-1]->d_name);
- 			continue;
-+		}
- 
--		if (!S_ISREG(statbuf.st_mode))
-+		/* if the file is not a regular file skip it */
-+		if (!S_ISREG(statbuf.st_mode)) {
-+			if (option_verbose > 2)
-+				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. File is not a regular file.\n", files[j-1]->d_name);
- 			continue;
-+		}
- 
-+		/* remove the file extension */
- 		if ((ext = strrchr(filepath, '.'))) {
- 			*ext = '\0';
- 			ext++;
-@@ -888,18 +923,27 @@ static int moh_scan_files(struct mohclas
- 
- 		/* if the file is present in multiple formats, ensure we only put it into the list once */
- 		for (i = 0; i < class->total_files; i++)
--			if (!strcmp(filepath, class->filearray[i]))
-+			if (!strcmp(filepath, class->filearray[i])) {
-+				if (option_verbose > 2)
-+					ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Base filename already exists from another format.\n", files[j-1]->d_name);
- 				break;
-+			}
- 
-+		/* add the file */
- 		if (i == class->total_files) {
--			if (moh_add_file(class, filepath))
-+			if (moh_add_file(class, filepath)) {
-+				ast_log(LOG_WARNING, "Unable to add file %s.", filepath);
- 				break;
-+			} else {
-+				if (option_verbose > 2)
-+					ast_verbose(VERBOSE_PREFIX_3 "Adding file '%s' as '%s'.\n", files[j-1]->d_name, filepath);
-+			}
- 		}
- 	}
- 
--	closedir(files_DIR);
-+	/* go back where we came from */
- 	if (chdir(path) < 0) {
--		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
-+		ast_log(LOG_WARNING, "chdir(%s) failed: %s\n", path, strerror(errno));
- 		return -1;
- 	}
- 	return class->total_files;
diff --git a/net-misc/asterisk/files/1.6.0/asterisk.confd b/net-misc/asterisk/files/1.6.0/asterisk.confd
deleted file mode 100644
index 576c322..0000000
--- a/net-misc/asterisk/files/1.6.0/asterisk.confd
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.6.0/asterisk.confd,v 1.1 2009/03/10 23:33:27 chainsaw Exp $
-
-#
-# Additional options for asterisk
-#
-# see "asterisk -h" for a list of options
-#
-ASTERISK_OPTS=""
-
-#
-# User and group to run asterisk as
-#
-# Value: double-colon separated list of user and group, or empty to run as root:
-#
-#
-# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
-#
-#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
-#
-#         ":asterisk" to run as user "root" and group "asterisk"
-#
-#                  "" to run as user "root" and group "root"
-#
-ASTERISK_USER="asterisk"
-
-#
-# Nicelevel
-#
-# Set the priority of the asterisk process
-#
-# Value: (highest) -20..19 (lowest)
-#
-#ASTERISK_NICE="19"
-
-#
-# Wrapper script
-#
-# Value: yes or no/empty
-#
-ASTERISK_WRAPPER="no"
-
-############# Wrapper script settings #############
-
-#
-# Send crash notifications emails to this address
-# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
-#
-# Value: Email address or empty to disable
-#
-#ASTERISK_NOTIFY_EMAIL="root"
-
-#
-# Send asterisk's output to this terminal
-#
-# Value: Full path to device node or a number
-#
-#ASTERISK_TTY="/dev/tty9"
-
-#
-# Start an asterisk console on the terminal specified by ASTERISK_TTY
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# Value: yes or no/empty
-#
-ASTERISK_CONSOLE="no"
-
-#
-# Maximum size of core files. 
-#
-# Value: Size in bytes, unlimited for no limit or empty to disable.
-# 
-#ASTERISK_CORE_SIZE="unlimited"
-
-#
-# ASTERISK_CORE_DIR
-#
-# Value: Directory (will be created if non-existant), default is /tmp
-#
-ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
-
-#
-# Max number of filedescriptors
-#
-# Value: Number of descriptors
-#
-#ASTERISK_MAX_FD="1024"
-
-#
-# Kill these tasks after asterisk crashed (ASTERISK_WRAPPER=yes only!)
-#
-# Warning! This will kill _ALL_ tasks with the specified names!
-#
-# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
-#
-#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
deleted file mode 100644
index 69296c9..0000000
--- a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
+++ /dev/null
@@ -1,25 +0,0 @@
-/var/log/asterisk/messages /var/log/asterisk/queue_log {
-	missingok
-	notifempty
-
-	postrotate
-		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
-	endscript
-}
-
-/var/log/asterisk/debug /var/log/asterisk/full {
-	missingok
-	notifempty
-	daily
-
-	postrotate
-		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
-	endscript
-}
-
-/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
-	missingok
-	notifempty
-	weekly
-	rotate 52
-}
diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt
deleted file mode 100644
index ba9cbbb..0000000
--- a/net-misc/asterisk/files/1.6.2/call_data.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-It's sometimes useful to look at SIP conversations in retrospect.  If you have
-a troublesome system, enable sip debug (in the CLI: sip set debug on), set up
-logger.conf to log it to some file and then you can use the two scripts here to
-extract the SIP converssations as seen by asterisk.
-
-find_call_ids.sh:
-
-This script will locate Call-ID values given an A and B number. Just invoke it with:
-
-find_call_ids.sh /path/to/log A-num B-num
-
-eg:
-
-find_call_ids.sh /var/log/asterisk/debug 102 105
-
-To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your
-exact setup and the actual values being passed in the SIP INVITE packets)
-
-find_call_sip_trace.sh
-
-This script will extract a SIP conversation from the log for one or more
-Call-ID values.  Invoke with:
-
-find_call_sip_trace.sh /path/to/log Call-ID [...]
-
-Eg:
-
-find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3
-
-This will find the SIP packets for those two conversations from the log
-(interleaving the packets in the order asterisk output them - useful for
-analysing the two SIP legs of the same call).
diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
deleted file mode 100644
index c4689bd..0000000
--- a/net-misc/asterisk/files/1.6.2/find_call_ids.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/bash
-
-logfile=$1
-anum=$2
-bnum=$3
-
-function usage()
-{
-	echo "USAGE: $1 logfile anum bnum"
-	exit -1
-}
-
-[ -r "${logfile}" ] || usage $0
-[ -n "${anum}" ] || usage $0
-[ -n "${bnum}" ] || usage $0
-
-grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}'
diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
deleted file mode 100644
index 5b2e69e..0000000
--- a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash
-
-logfile=$1
-callid=$2
-
-function usage()
-{
-	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
-	exit -1
-}
-
-[ -r "${logfile}" ] || usage $0
-[ -n "${callid}" ] || usage $0
-
-shift; shift;
-while [ $# -gt 0 ]; do
-	callid="${callid}|$1"
-	shift
-done
-
-dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$'
diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth
deleted file mode 100644
index 3f050ad..0000000
--- a/net-misc/asterisk/files/1.6.2/sip_calc_auth
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1
-
-un=$1
-realm=$2
-pw=$3
-method=$4
-uri=$5
-alg=$6
-nonce=$7
-
-echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)"
-
-a1=$un:$realm:$pw
-a2=$method:$uri
-ha1=$(echo -n "$a1" | openssl $alg)
-ha2=$(echo -n "$a2" | openssl $alg)
-resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg)
-
-echo "a1=$a1"
-echo "a2=$a2"
-echo "ha1=$ha1"
-echo "ha2=$ha2"
-echo "resp=$resp"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd
deleted file mode 100644
index e46ad23..0000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.confd
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.confd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
-
-#
-# Additional options for asterisk
-#
-# see "asterisk -h" for a list of options
-#
-ASTERISK_OPTS=""
-
-#
-# User and group to run asterisk as
-#
-# Value: double-colon separated list of user and group, or empty to run as root:
-#
-#
-# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
-#
-#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
-#
-#         ":asterisk" to run as user "root" and group "asterisk"
-#
-#                  "" to run as user "root" and group "root"
-#
-ASTERISK_USER="asterisk"
-
-#
-# Nicelevel
-#
-# Set the priority of the asterisk process
-#
-# Value: (highest) -20..19 (lowest)
-#
-#ASTERISK_NICE="19"
-
-# Send crash notifications emails to this address
-# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
-#
-# Value: Email address or empty to disable
-#
-#ASTERISK_NOTIFY_EMAIL="root"
-
-#
-# Send asterisk's output to this terminal
-#
-# Value: Full path to device node or a number
-#
-#ASTERISK_TTY="/dev/tty9"
-
-#
-# Start an asterisk console on the terminal specified by ASTERISK_TTY
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# Value: yes or no/empty
-#
-ASTERISK_CONSOLE="no"
-
-#
-# Maximum size of core files. 
-#
-# Value: Size in bytes, unlimited for no limit or empty to disable.
-# 
-ASTERISK_CORE_SIZE="unlimited"
-
-#
-# ASTERISK_CORE_DIR
-#
-# Value: Directory (will be created if non-existant), default is /tmp
-#
-ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
-
-#
-# Max number of filedescriptors
-#
-# Value: Number of descriptors
-#
-ASTERISK_MAX_FD="4096"
-
-#
-# Delay time before restarting asterisk after a crash.
-#
-# Value: Number of seconds to sleep after a crash before restarting.
-#
-ASTERISK_RESTART_DELAY=5
-
-#
-# Kill these tasks after asterisk crashed
-#
-# Warning! This will kill _ALL_ tasks with the specified names!
-#
-# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
-#
-#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd4 b/net-misc/asterisk/files/1.8.0/asterisk.initd4
deleted file mode 100644
index f54aec3..0000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd4
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd4,v 1.1 2012/12/01 22:07:59 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	if [ -z "`pidof asterisk`" ]; then
-		return 1
-	else
-		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in `pidof asterisk`; do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing asterisk wrapper"
-	OPTS="$*"
-
-	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
-	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
-
-	while :; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=`expr $result - 128`
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 `pidof ${X}`;
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID NICE=""
-	local tmp x
-
-	local OPTS ARGS 
-		
-	ebegin "Starting asterisk PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
-	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
-		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
-		if [ -n "${USER}" ]; then
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
-		for element in `find /var/{log,run}/asterisk`; do
-			if [ `stat -c %U $element` != "${USER}" ]; then
- 				ewarn "${USER} is not the owner of $element, fixing."
-				chown -R ${USER} /var/{log,run}/asterisk
-				chmod -R u+r /var/{log,run}/asterisk
-				chmod u+x /var/{log,run}/asterisk
-			fi;
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eoutdent
-	eend $result
-}
-
-forcestop() {
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd5 b/net-misc/asterisk/files/1.8.0/asterisk.initd5
deleted file mode 100644
index 9f5334e..0000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd5
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/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/asterisk/files/1.8.0/asterisk.initd5,v 1.1 2013/01/24 13:10:46 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r /var/run/asterisk/asterisk.pid ] || return 1
-	local ast_pid="`pidof asterisk`"
-	if [ -z "${ast_pid}" ]; then
-		return 1
-	else
-		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in ${ast_pid}; do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing asterisk wrapper"
-	OPTS="$*"
-
-	trap "rm -f /var/run/asterisk/wrapper_loop.running" EXIT
-	touch "/var/run/asterisk/wrapper_loop.running"
-
-	while [ -r "/var/run/asterisk/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=`expr $result - 128`
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 `pidof ${X}`;
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID NICE=""
-	local tmp x
-
-	local OPTS ARGS 
-		
-	ebegin "Starting asterisk PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
-	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
-		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
-		if [ -n "${USER}" ]; then
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
-		for element in `find /var/{log,run}/asterisk`; do
-			if [ `stat -c %U $element` != "${USER}" ]; then
- 				ewarn "${USER} is not the owner of $element, fixing."
-				chown -R ${USER} /var/{log,run}/asterisk
-				chmod -R u+r /var/{log,run}/asterisk
-				chmod u+x /var/{log,run}/asterisk
-			fi;
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eoutdent
-	eend $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r /var/run/asterisk/wrapper_loop.running ]; then
-		ebegin "Signalling wrapper script to terminate"
-		rm /var/run/asterisk/wrapper_loop.running
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	wrapperstop
-
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd6 b/net-misc/asterisk/files/1.8.0/asterisk.initd6
deleted file mode 100644
index 35bb8bb..0000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd6
+++ /dev/null
@@ -1,345 +0,0 @@
-#!/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/asterisk/files/1.8.0/asterisk.initd6,v 1.1 2013/07/23 09:21:04 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-# ast_spooldir: 
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/var/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME/.//}
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename+="(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-
-	return 0
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing ${ast_instancename} wrapper"
-	OPTS="$*"
-
-	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
-	touch "${ast_rundir}/wrapper_loop.running"
-
-	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F "${TTY}" sane
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ "$result" -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ "$result" -gt 128 ]; then
-				signal="$(expr "$result" - 128)"
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 "$(pidof "${X}")";
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >"${TTY}" \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID
-	local tmp x
-
-	local OPTS ARGS 
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
-	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
-
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	else
-		NICE=""
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
-		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
-		if [ -n "${USER}" ]; then
-			if ! getent passwd "${USER}" &>/dev/null; then
-				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
-				return 1
-			fi
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			if ! getent group "${GROUP}" &>/dev/null; then
-				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
-				return 1
-			fi
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}"
-		find "${ast_logdir}" "${ast_rundir}" ! -user "${USER}" | while read element; do
- 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
-			chown ${USER} "${element}"
-			chmod u+rX "${element}"
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
-		ebegin "Waiting for ${ast_instancename} to fully boot"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
-		eend $?
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
-		ebegin "Killing wrapper script"
-		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-	
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 1)"
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7
deleted file mode 100644
index a4a27eb..0000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd7
+++ /dev/null
@@ -1,347 +0,0 @@
-#!/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/asterisk/files/1.8.0/asterisk.initd7,v 1.1 2013/08/28 10:15:35 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-# ast_spooldir: 
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/var/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_spooldir=/var/spool/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME/.//}
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename+="(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-
-	return 0
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing ${ast_instancename} wrapper"
-	OPTS="$*"
-
-	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
-	touch "${ast_rundir}/wrapper_loop.running"
-
-	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F "${TTY}" sane
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ "$result" -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ "$result" -gt 128 ]; then
-				signal="$(expr "$result" - 128)"
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 "$(pidof "${X}")";
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >"${TTY}" \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID
-	local tmp x
-
-	local OPTS ARGS 
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
-	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
-
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	else
-		NICE=""
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
-		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
-		if [ -n "${USER}" ]; then
-			if ! getent passwd "${USER}" &>/dev/null; then
-				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
-				return 1
-			fi
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			if ! getent group "${GROUP}" &>/dev/null; then
-				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
-				return 1
-			fi
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
-		find "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" ! -user "${USER}" | while read element; do
- 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
-			chown ${USER} "${element}"
-			chmod u+rX "${element}"
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
-		ebegin "Waiting for ${ast_instancename} to fully boot"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
-		eend $?
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
-		ebegin "Killing wrapper script"
-		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-	
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 1)"
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/find_call_ids.sh b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
deleted file mode 100644
index 321f3da..0000000
--- a/net-misc/asterisk/files/1.8.0/find_call_ids.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/bash
-
-logfile=$1
-anum=$2
-bnum=$3
-
-function usage()
-{
-	echo "USAGE: $1 logfile anum bnum"
-	exit -1
-}
-
-[ -r "${logfile}" ] || usage $0
-[ -n "${anum}" ] || usage $0
-[ -n "${bnum}" ] || usage $0
-
-#echo "Finding calls from '${anum}' to '${bnum}' in ${logfile}."
-
-# modes:
-# 0 - not processing an INVITE.
-# 1 - processing an INVITE.
-# 2 - from matched (processing).
-dos2unix < "${logfile}" | awk '
-	BEGIN { mode = 0 }
-	mode==0 && $4~"^VERBOSE" {
-		dt=$1" "$2" "$3
-	}
-
-	mode==0 && $1=="INVITE" && $2 ~ "^sip:'"${bnum}"'@" {
-		#print
-
-		mode=1
-
-		split($2, a, "[:@]")
-		bnum=a[2]
-	}
-
-	mode==1 && $1=="From:" {
-		#print
-		if ($3 ~ "^<sip:'"${anum}"'@.*>") {
-			mode=2
-			split($3, a, "[:@]")
-			anum=a[2]
-		} else {
-			#print "From does not match ... leaving block."
-			mode = 0
-		}
-	}
-
-	mode!=0 && $1=="Call-ID:" {
-		callid=$2
-
-		if (NF!=2) {
-			print "WTF @ Call-ID header having NF!=2"
-		}
-	}
-
-	mode==1 && $0=="" {
-		#print "Leaving block (no match)"
-		mode = 0
-	}
-
-	mode==2 && $0=="" {
-		#print "Leaving block (match)"
-		print dt " " anum " " bnum " " callid
-		mode = 0
-	}
-'
diff --git a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
deleted file mode 100644
index 06ae824..0000000
--- a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/bash
-
-logfile=$1
-callid=$2
-
-function usage()
-{
-	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
-	exit -1
-}
-
-[ -r "${logfile}" ] || usage $0
-[ -n "${callid}" ] || usage $0
-
-shift; shift;
-while [ $# -gt 0 ]; do
-	callid="${callid}|$1"
-	shift
-done
-
-# modes:
-# 0 - searching for SIP start block ...
-# 1 - transmit of sorts
-# 2 - receive
-
-dos2unix < "${logfile}" | awk '
-	BEGIN { mode = 0 }
-	mode==0 && $4~"^VERBOSE" {
-		dt=$1" "$2" "$3
-	}
-
-	mode!=0 && $1 == "Call-ID:" {
-		#print
-
-		if ($2 ~ /('"${callid}"')/) {
-			callidmatch=1
-		} else {
-			#print $2" does not match ^('"${callid}"')$"
-			mode=0
-		}
-	}
-
-	(mode==1 && $0=="---") || (mode==2 && $0=="<------------->") {
-		if (callidmatch) {
-			print dt" "sipmode"\n"pckt"---"
-		}
-
-		mode=0
-	}
-
-	mode!=0 {
-		pckt = pckt $0 "\n"
-	}
-
-	mode==0 && $0 ~ "chan_sip[.]c: .*[tT]ransmitting" {
-		#print
-
-		if ($6 == "Retransmitting") {
-			sipmode = $6" "$7" to "$NF
-		} else {
-			sipmode = "Transmitting to "$NF
-		}
-
-		mode=1
-		pckt=""
-		callidmatch=0
-	}
-
-	mode==0 && $0 ~ "SIP read from" {
-		#print
-		mode=2
-		pckt=""
-		callidmatch=0
-		sipmode="Received from "$5":"
-	}
-'
diff --git a/net-misc/asterisk/files/get_ilbc_source.sh b/net-misc/asterisk/files/get_ilbc_source.sh
deleted file mode 100644
index f2d0fd0..0000000
--- a/net-misc/asterisk/files/get_ilbc_source.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
-
-wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.txt | tr -d '\r' > codecs/ilbc/extract-cfile.awk
-
-(cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)
-
-echo "***"
-echo "The iLBC source code download is complete."
-echo "***"
-
-exit 0
diff --git a/net-misc/freeswitch-cyneric/files/cyneric.cron b/net-misc/freeswitch-cyneric/files/cyneric.cron
new file mode 100644
index 0000000..43f6cc4
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/cyneric.cron
@@ -0,0 +1,33 @@
+# cyneric log rotation stuff
+# m h  dom mon dow   command
+01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/FSLogRotate.pl > /dev/null 2>&1
+
+# disk space
+01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/freeswitch.df.pl > /dev/null 2>&1
+
+# crontab sync
+* *    * * *    root    /usr/bin/screen -d -m -S crontab_sync /usr/bin/ionice -c3 /usr/bin/nice -n 19 /usr/local/sbin/crontab_sync.php > /dev/null 2>&1
+
+# delete old log files
+10 1   * * *   root    find /opt/freeswitch/log/a/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+10 1   * * *   root    find /opt/freeswitch/log/b/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+10 1   * * *   root    find /opt/freeswitch/log/c/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+10 1   * * *   root    find /opt/freeswitch/log/d/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+10 1   * * *   root    find /opt/freeswitch/log/e/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+10 1   * * *   root    find /opt/freeswitch/log/f/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+
+# backup cdr records
+10 1    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
+10 1    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
+10 1    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
+10 1    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
+10 1    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
+10 1    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
+
+# moved left over records
+10 *    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
+10 *    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
+10 *    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
+10 *    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
+10 *    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
+10 *    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.rc6 b/net-misc/freeswitch-cyneric/files/freeswitch.rc6
index 99c1ea6..9bc3752 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.rc6
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.rc6
@@ -1,4 +1,4 @@
-!/sbin/runscript
+#!/sbin/runscript
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Header: $
@@ -10,40 +10,65 @@ INSTANCE="$( cut -d '.' -f 2 <<< "${SVCNAME}" )";
 
 
 depend() {
-        need net
-        use dahdi
+	need net
+	use dahdi
 }
 
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
 
 start() {
-        local OPTS
+	local OPTS
 
-        [ -n "${FREESWITCH_USER}" ] && \
-                OPTS="${OPTS} -u ${FREESWITCH_USER}"
+	[ -n "${FREESWITCH_USER}" ] && \
+		OPTS="${OPTS} -u ${FREESWITCH_USER}"
 
-        [ -n "${FREESWITCH_GROUP}" ] && \
-                OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+	[ -n "${FREESWITCH_GROUP}" ] && \
+		OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
 
-        [ -n "${FREESWITCH_OPTS}" ] && \
-                OPTS="${OPTS} ${FREESWITCH_OPTS}"
+	[ -n "${FREESWITCH_OPTS}" ] && \
+		OPTS="${OPTS} ${FREESWITCH_OPTS}"
 
 
-        ebegin "Starting Freeswitch instance ${INSTANCE}"
-        cd /opt/freeswitch/scripts/
-        start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
-                --pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
-                -conf /opt/freeswitch/conf/${INSTANCE} \
-                -log /opt/freeswitch/log/${INSTANCE} \
-                -db /opt/freeswitch/db/${INSTANCE} \
-                -nc ${OPTS}
-        eend $?
+	ebegin "Starting Freeswitch instance ${INSTANCE}"
+
+	# set permissions
+	chown -R freeswitch:freeswitch /opt/freeswitch
+	cd /opt/freeswitch/scripts/
+
+	# start freeswitch mon
+	kill -9 $(pidof -x cynerwebmon.sh)
+	/opt/freeswitch/scripts/cynerwebmon.sh
+
+	# set limits
+	do_setlimits
+
+	start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
+		-conf /opt/freeswitch/conf/${INSTANCE} \
+		-log /opt/freeswitch/log/${INSTANCE} \
+		-db /opt/freeswitch/db/${INSTANCE} \
+		-nc ${OPTS}
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping Freeswitch instance ${INSTANCE}"
-        start-stop-daemon --stop \
-                --signal SIGILL \
-                --retry 5 --quiet \
-                --pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
+
+	ebegin "Stopping Freeswitch instance ${INSTANCE}"
+	start-stop-daemon --stop \
+		--signal SIGILL \
+		--retry 5 --quiet \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
         eend $?
 }
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
index a065352..8c1ddee 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
@@ -1128,15 +1128,11 @@ pkg_postinst() {
 	rm -rf /var/tmp/portage/cyneric/*
 
 	echo
-	einfo "copying configurations"
+	einfo "updating configurations"
 	echo
 
-	curl http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/freeswitch-cyneric-cnf.tar.gz -o /var/tmp/portage/cyneric/freeswitch-cyneric-cnf.tar.gz
-	cd /var/tmp/portage/cyneric; tar -zxvf freeswitch-cyneric-cnf.tar.gz
-
-	rm -rf /opt/freeswitch/conf/*
-	rm -rf /var/tmp/portage/cyneric/freeswitch-cyneric-cnf.tar.gz
-	cp -R /var/tmp/portage/cyneric/* /opt/freeswitch/conf/
+	rm -rf /etc/freeswitch
+	cp -R /opt/freeswitch/conf/ /etc/freeswitch
 
 	echo
 	einfo "completed Cyneric code"

From 9da7802e7a4324701c7d44609c122df2c61a94d8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 8 Sep 2014 15:01:04 -0700
Subject: [PATCH 031/261] package for music changed

---
 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
index 8c1ddee..99a43fe 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
@@ -128,7 +128,7 @@ DEPEND="${RDEPEND}
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
 
 PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
-	 >=net-misc/freeswitch-music-1.0.8"
+	 >=net-misc/freeswitch-sounds-music-1.0.8"
 
 ###
 # IUSE merging

From 689b712b91f70fe9da8532177453b5a8c1612c24 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 8 Sep 2014 18:10:42 -0700
Subject: [PATCH 032/261] imported freeswitch repo from a specific snapshot
 found on backup

---
 COPYRIGHT                                     |    3 +
 metadata/.gitignore                           |    3 +
 metadata/layout.conf                          |   17 -
 net-dialup/capi4k-utils/Manifest              |    4 +
 .../capi4k-utils/capi4k-utils-3.25.ebuild     |  114 ++
 net-dialup/misdnuser/Manifest                 |    5 +
 net-dialup/misdnuser/files/mISDNcapid.initd   |   17 +
 .../files/misdnuser-2.0.13-udev-rulesd.patch  |   11 +
 net-dialup/misdnuser/misdnuser-2.0.13.ebuild  |   62 +
 net-dialup/misdnuser/misdnuser-2.0.17.ebuild  |   67 +
 net-dialup/misdnuser/misdnuser-2.0.2.ebuild   |   41 +
 net-libs/libSquirrelFish/Manifest             |    1 +
 .../libSquirrelFish-9999.ebuild               |   58 +
 net-libs/libisdn/Manifest                     |    3 +
 net-libs/libisdn/libisdn-0.0.1.ebuild         |   64 +
 net-libs/libisdn/libisdn-9999.ebuild          |   73 +
 net-libs/libsng-isdn/Manifest                 |   18 +
 .../libsng-isdn/libsng-isdn-7.11.2.ebuild     |   45 +
 .../libsng-isdn/libsng-isdn-7.12.2.ebuild     |   45 +
 .../libsng-isdn/libsng-isdn-7.18.2.ebuild     |   45 +
 .../libsng-isdn/libsng-isdn-7.22.2.ebuild     |   47 +
 .../libsng-isdn/libsng-isdn-7.27.2.ebuild     |   47 +
 net-libs/libsng-isdn/libsng-isdn-7.8.2.ebuild |   45 +
 net-libs/libsng-ss7/Manifest                  |   21 +
 net-libs/libsng-ss7/libsng-ss7-2.0.0.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-2.1.1.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-2.3.3.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-3.0.0.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-3.1.1.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-4.0.0.ebuild   |   52 +
 net-libs/libsng-ss7/libsng-ss7-4.1.1.ebuild   |   52 +
 net-libs/libwat/Manifest                      |    4 +
 net-libs/libwat/libwat-1.0.22.ebuild          |   20 +
 net-libs/libwat/libwat-1.0.24.ebuild          |   22 +
 net-libs/opal/Manifest                        |    1 +
 net-libs/opal/opal-9999.ebuild                |   82 ++
 net-libs/osptoolkit/Manifest                  |    2 +
 net-libs/osptoolkit/osptoolkit-4.0.3.ebuild   |   94 ++
 net-libs/ptlib/Manifest                       |    1 +
 net-libs/ptlib/ptlib-9999.ebuild              |  278 ++++
 .../freeswitch-cyneric-1.2.12.ebuild          |    5 +-
 net-misc/freeswitch-esl/Manifest              |    4 +
 .../freeswitch-esl-1.0.4.ebuild               |  242 ++++
 .../freeswitch-esl/freeswitch-esl-9999.ebuild |  243 ++++
 net-misc/freeswitch-esl/metadata.xml          |    8 +
 net-misc/freeswitch-music/Manifest            |   22 +
 .../freeswitch-music-1.0.3.ebuild             |   50 +
 .../freeswitch-music-1.0.5.ebuild             |   50 +
 .../freeswitch-music-1.0.6.ebuild             |   50 +
 .../freeswitch-music-1.0.7.ebuild             |   51 +
 .../freeswitch-music-1.0.8.ebuild             |   51 +
 net-misc/freeswitch-sounds-en/Manifest        |   50 +
 .../freeswitch-sounds-en-1.0.11.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.12.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.13.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.14.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.16.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.18.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.20.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.22.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.24.ebuild        |   46 +
 .../freeswitch-sounds-en-1.0.25.ebuild        |   46 +
 net-misc/freeswitch-sounds-es/Manifest        |    2 +
 .../freeswitch-sounds-es-1.0.14.ebuild        |   47 +
 net-misc/freeswitch-sounds-fr/Manifest        |   20 +
 .../freeswitch-sounds-fr-1.0.14.ebuild        |   46 +
 .../freeswitch-sounds-fr-1.0.15.ebuild        |   46 +
 .../freeswitch-sounds-fr-1.0.16.ebuild        |   46 +
 .../freeswitch-sounds-fr-1.0.18.ebuild        |   46 +
 net-misc/freeswitch-sounds-pt/Manifest        |    2 +
 .../freeswitch-sounds-pt-1.0.14.ebuild        |   47 +
 net-misc/freeswitch-sounds-ru/Manifest        |   15 +
 .../freeswitch-sounds-ru-1.0.11.ebuild        |   47 +
 .../freeswitch-sounds-ru-1.0.12.ebuild        |   47 +
 .../freeswitch-sounds-ru-1.0.13.ebuild        |   47 +
 net-misc/freeswitch-sounds/Manifest           |   10 +
 .../freeswitch-sounds-1.0.11.ebuild           |   34 +
 .../freeswitch-sounds-1.0.12.ebuild           |   34 +
 .../freeswitch-sounds-1.0.13.ebuild           |   37 +
 .../freeswitch-sounds-1.0.14.ebuild           |   37 +
 .../freeswitch-sounds-1.0.16.ebuild           |   43 +
 .../freeswitch-sounds-1.0.18.ebuild           |   43 +
 .../freeswitch-sounds-1.0.20.ebuild           |   43 +
 .../freeswitch-sounds-1.0.22.ebuild           |   43 +
 .../freeswitch-sounds-1.0.24.ebuild           |   43 +
 .../freeswitch-sounds-1.0.25.ebuild           |   43 +
 net-misc/freeswitch/Manifest                  |    8 +
 net-misc/freeswitch/files/freeswitch.confd    |   24 +
 net-misc/freeswitch/files/freeswitch.rc6      |   35 +
 net-misc/freeswitch/freeswitch-1.2.12.ebuild  | 1136 ++++++++++++++++
 .../freeswitch/freeswitch-1.2.9999.ebuild     | 1136 ++++++++++++++++
 net-misc/freeswitch/freeswitch-9999-r1.ebuild | 1169 +++++++++++++++++
 net-misc/freeswitch/freeswitch-9999.ebuild    | 1136 ++++++++++++++++
 net-misc/freeswitch/metadata.xml              |  131 ++
 net-misc/freetdm/Manifest                     |    2 +
 net-misc/freetdm/freetdm-1.0.1.ebuild         |   39 +
 net-misc/ftmod_isdn/Manifest                  |    1 +
 net-misc/ftmod_isdn/ftmod_isdn-9999.ebuild    |   57 +
 net-misc/mod_com_g729/Manifest                |    3 +
 .../mod_com_g729/files/freeswitch_license.rc6 |   29 +
 net-misc/mod_com_g729/mod_com_g729-136.ebuild |  102 ++
 net-misc/mod_snmp/Manifest                    |    1 +
 net-misc/mod_snmp/mod_snmp-9999.ebuild        |   46 +
 net-misc/mod_squirrelfish/Manifest            |    1 +
 .../mod_squirrelfish-9999.ebuild              |   46 +
 net-misc/mod_ssh/Manifest                     |    1 +
 net-misc/mod_ssh/mod_ssh-9999.ebuild          |   50 +
 net-misc/wanpipe/Manifest                     |   94 ++
 net-misc/wanpipe/files/extract_symver.sh      |  127 ++
 .../files/wanpipe-3.5.10-Makefile.patch       |   38 +
 ...pe-3.5.10-QA-fix-const-char-warnings.patch |   93 ++
 ....5.10-QA-fix-format-literal-warnings.patch |  617 +++++++++
 .../wanpipe-3.5.10-QA-fix-libstelephony.patch |   13 +
 .../wanpipe-3.5.10-QA-fix-parallel-make.patch |  254 ++++
 .../files/wanpipe-3.5.10-linux-2.6.31.patch   |  777 +++++++++++
 .../wanpipe-3.5.10-silence-QA-warnings.patch  |   10 +
 .../files/wanpipe-3.5.10_p10-Makefile.patch   |   47 +
 .../files/wanpipe-3.5.11-linux-2.6.35.patch   |   58 +
 .../wanpipe-3.5.12-QA-fix-parallel-make.patch |  262 ++++
 .../wanpipe-3.5.14-QA-fix-parallel-make.patch |  265 ++++
 .../files/wanpipe-3.5.14-dahdi-location.patch |  117 ++
 .../wanpipe-3.5.15-QA-fix-parallel-make.patch |  265 ++++
 .../files/wanpipe-3.5.15-dahdi-2.4.0.patch    |  413 ++++++
 .../files/wanpipe-3.5.15-linux-2.6.36.patch   |  142 ++
 .../files/wanpipe-3.5.16-Makefile.patch       |   51 +
 ....5.16-QA-fix-format-literal-warnings.patch |  605 +++++++++
 .../wanpipe-3.5.16-QA-fix-parallel-make.patch |  265 ++++
 .../files/wanpipe-3.5.16-dahdi-location.patch |  120 ++
 .../files/wanpipe-3.5.17-linux-2.6.37.patch   |   14 +
 .../wanpipe-3.5.18-QA-fix-parallel-make.patch |  267 ++++
 .../wanpipe-3.5.19-disable-ldconfig.patch     |   13 +
 .../wanpipe-3.5.20-QA-fix-parallel-make.patch |  265 ++++
 ...wanpipe-3.5.20-libstelephony-cleanup.patch |   75 ++
 .../files/wanpipe-3.5.20-linux-2.6.39.patch   |   31 +
 .../files/wanpipe-3.5.20-linux-3.0.patch      |   11 +
 .../files/wanpipe-3.5.22-Makefile.patch       |   51 +
 .../wanpipe-3.5.22-QA-fix-parallel-make.patch |  264 ++++
 .../files/wanpipe-3.5.22-dahdi-location.patch |  111 ++
 ...anpipe-3.5.22-wancfg_legacy-Makefile.patch |   11 +
 .../wanpipe-3.5.23-QA-fix-parallel-make.patch |  269 ++++
 .../files/wanpipe-3.5.24-Makefile.patch       |   46 +
 ...pe-3.5.24-QA-fix-const-char-warnings.patch |  215 +++
 ....5.24-QA-fix-format-literal-warnings.patch |  617 +++++++++
 .../wanpipe-3.5.24-QA-fix-parallel-make.patch |  265 ++++
 ....24-QA-fix-warn_unused_result-legacy.patch |  177 +++
 ...ipe-3.5.24-QA-fix-warn_unused_result.patch |  309 +++++
 .../files/wanpipe-3.5.24-linux-3.1.patch      |   39 +
 ...pe-3.5.27-QA-fix-const-char-warnings.patch |  160 +++
 .../files/wanpipe-3.5.27-linux-3.4.patch      |   26 +
 .../files/wanpipe-3.5.28-linux-3.7.patch      |   14 +
 .../files/wanpipe-7.0.0-linux-3.9.patch       |   33 +
 net-misc/wanpipe/files/wanpipe.rules          |    2 +
 net-misc/wanpipe/files/wanrouter.rc6          |   60 +
 net-misc/wanpipe/wanpipe-3.5.12.ebuild        |  152 +++
 net-misc/wanpipe/wanpipe-3.5.14.ebuild        |  154 +++
 net-misc/wanpipe/wanpipe-3.5.15-r1.ebuild     |  164 +++
 net-misc/wanpipe/wanpipe-3.5.15.ebuild        |  162 +++
 net-misc/wanpipe/wanpipe-3.5.16.ebuild        |  179 +++
 net-misc/wanpipe/wanpipe-3.5.17.ebuild        |  185 +++
 net-misc/wanpipe/wanpipe-3.5.17_p9.ebuild     |  192 +++
 net-misc/wanpipe/wanpipe-3.5.18.ebuild        |  196 +++
 net-misc/wanpipe/wanpipe-3.5.19.ebuild        |  196 +++
 net-misc/wanpipe/wanpipe-3.5.20.ebuild        |  213 +++
 net-misc/wanpipe/wanpipe-3.5.22.ebuild        |  215 +++
 net-misc/wanpipe/wanpipe-3.5.23.ebuild        |  222 ++++
 net-misc/wanpipe/wanpipe-3.5.24.ebuild        |  226 ++++
 net-misc/wanpipe/wanpipe-3.5.25.ebuild        |  247 ++++
 net-misc/wanpipe/wanpipe-3.5.26.ebuild        |  247 ++++
 net-misc/wanpipe/wanpipe-3.5.27.ebuild        |  250 ++++
 net-misc/wanpipe/wanpipe-3.5.28.ebuild        |  253 ++++
 net-misc/wanpipe/wanpipe-7.0.0.ebuild         |  237 ++++
 net-misc/wanpipe/wanpipe-7.0.1.ebuild         |  237 ++++
 net-misc/wanpipe/wanpipe-7.0.10.ebuild        |  241 ++++
 net-misc/wanpipe/wanpipe-7.0.3.ebuild         |  241 ++++
 net-misc/wanpipe/wanpipe-7.0.5.ebuild         |  241 ++++
 net-misc/wanpipe/wanpipe-7.0.6.ebuild         |  241 ++++
 net-misc/wanpipe/wanpipe-7.0.8.ebuild         |  241 ++++
 net-misc/wanpipe/wanpipe-7.0.9.ebuild         |  241 ++++
 net-voip/yate/Manifest                        |    5 +
 net-voip/yate/yate-3.0.0.ebuild               |   77 ++
 net-voip/yate/yate-3.3.2.ebuild               |   77 ++
 net-voip/yate/yate-9999.ebuild                |   77 ++
 profiles/desc/freeswitch_modules.desc         |  112 ++
 profiles/desc/freetdm_modules.desc            |    9 +
 profiles/package.mask                         |   14 +-
 profiles/repo_name                            |    2 +-
 profiles/use.local.desc                       |   19 +
 187 files changed, 22745 insertions(+), 29 deletions(-)
 create mode 100644 COPYRIGHT
 create mode 100644 metadata/.gitignore
 create mode 100644 net-dialup/capi4k-utils/Manifest
 create mode 100644 net-dialup/capi4k-utils/capi4k-utils-3.25.ebuild
 create mode 100644 net-dialup/misdnuser/Manifest
 create mode 100755 net-dialup/misdnuser/files/mISDNcapid.initd
 create mode 100644 net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
 create mode 100644 net-dialup/misdnuser/misdnuser-2.0.13.ebuild
 create mode 100644 net-dialup/misdnuser/misdnuser-2.0.17.ebuild
 create mode 100644 net-dialup/misdnuser/misdnuser-2.0.2.ebuild
 create mode 100644 net-libs/libSquirrelFish/Manifest
 create mode 100644 net-libs/libSquirrelFish/libSquirrelFish-9999.ebuild
 create mode 100644 net-libs/libisdn/Manifest
 create mode 100644 net-libs/libisdn/libisdn-0.0.1.ebuild
 create mode 100644 net-libs/libisdn/libisdn-9999.ebuild
 create mode 100644 net-libs/libsng-isdn/Manifest
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.11.2.ebuild
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.12.2.ebuild
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.18.2.ebuild
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.22.2.ebuild
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.27.2.ebuild
 create mode 100644 net-libs/libsng-isdn/libsng-isdn-7.8.2.ebuild
 create mode 100644 net-libs/libsng-ss7/Manifest
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-2.0.0.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-2.1.1.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-2.3.3.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-3.0.0.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-3.1.1.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-4.0.0.ebuild
 create mode 100644 net-libs/libsng-ss7/libsng-ss7-4.1.1.ebuild
 create mode 100644 net-libs/libwat/Manifest
 create mode 100644 net-libs/libwat/libwat-1.0.22.ebuild
 create mode 100644 net-libs/libwat/libwat-1.0.24.ebuild
 create mode 100644 net-libs/opal/Manifest
 create mode 100644 net-libs/opal/opal-9999.ebuild
 create mode 100644 net-libs/osptoolkit/Manifest
 create mode 100644 net-libs/osptoolkit/osptoolkit-4.0.3.ebuild
 create mode 100644 net-libs/ptlib/Manifest
 create mode 100644 net-libs/ptlib/ptlib-9999.ebuild
 create mode 100644 net-misc/freeswitch-esl/Manifest
 create mode 100644 net-misc/freeswitch-esl/freeswitch-esl-1.0.4.ebuild
 create mode 100644 net-misc/freeswitch-esl/freeswitch-esl-9999.ebuild
 create mode 100644 net-misc/freeswitch-esl/metadata.xml
 create mode 100644 net-misc/freeswitch-music/Manifest
 create mode 100644 net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild
 create mode 100644 net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild
 create mode 100644 net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild
 create mode 100644 net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild
 create mode 100644 net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/Manifest
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
 create mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
 create mode 100644 net-misc/freeswitch-sounds-es/Manifest
 create mode 100644 net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
 create mode 100644 net-misc/freeswitch-sounds-fr/Manifest
 create mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
 create mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
 create mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
 create mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
 create mode 100644 net-misc/freeswitch-sounds-pt/Manifest
 create mode 100644 net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
 create mode 100644 net-misc/freeswitch-sounds-ru/Manifest
 create mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
 create mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
 create mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
 create mode 100644 net-misc/freeswitch-sounds/Manifest
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
 create mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild
 create mode 100644 net-misc/freeswitch/Manifest
 create mode 100644 net-misc/freeswitch/files/freeswitch.confd
 create mode 100755 net-misc/freeswitch/files/freeswitch.rc6
 create mode 100644 net-misc/freeswitch/freeswitch-1.2.12.ebuild
 create mode 100644 net-misc/freeswitch/freeswitch-1.2.9999.ebuild
 create mode 100644 net-misc/freeswitch/freeswitch-9999-r1.ebuild
 create mode 100644 net-misc/freeswitch/freeswitch-9999.ebuild
 create mode 100644 net-misc/freeswitch/metadata.xml
 create mode 100644 net-misc/freetdm/Manifest
 create mode 100644 net-misc/freetdm/freetdm-1.0.1.ebuild
 create mode 100644 net-misc/ftmod_isdn/Manifest
 create mode 100644 net-misc/ftmod_isdn/ftmod_isdn-9999.ebuild
 create mode 100644 net-misc/mod_com_g729/Manifest
 create mode 100644 net-misc/mod_com_g729/files/freeswitch_license.rc6
 create mode 100644 net-misc/mod_com_g729/mod_com_g729-136.ebuild
 create mode 100644 net-misc/mod_snmp/Manifest
 create mode 100644 net-misc/mod_snmp/mod_snmp-9999.ebuild
 create mode 100644 net-misc/mod_squirrelfish/Manifest
 create mode 100644 net-misc/mod_squirrelfish/mod_squirrelfish-9999.ebuild
 create mode 100644 net-misc/mod_ssh/Manifest
 create mode 100644 net-misc/mod_ssh/mod_ssh-9999.ebuild
 create mode 100644 net-misc/wanpipe/Manifest
 create mode 100644 net-misc/wanpipe/files/extract_symver.sh
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-const-char-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-format-literal-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-libstelephony.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-linux-2.6.31.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10-silence-QA-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.10_p10-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.11-linux-2.6.35.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.12-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.14-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.14-dahdi-location.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.15-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.15-dahdi-2.4.0.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.15-linux-2.6.36.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.16-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-format-literal-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.16-dahdi-location.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.17-linux-2.6.37.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.18-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.19-disable-ldconfig.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.20-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.20-libstelephony-cleanup.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.20-linux-2.6.39.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.20-linux-3.0.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.22-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.22-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.22-dahdi-location.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.22-wancfg_legacy-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.23-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-Makefile.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-const-char-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-format-literal-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-parallel-make.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result-legacy.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.24-linux-3.1.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.27-QA-fix-const-char-warnings.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.27-linux-3.4.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-3.5.28-linux-3.7.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe-7.0.0-linux-3.9.patch
 create mode 100644 net-misc/wanpipe/files/wanpipe.rules
 create mode 100755 net-misc/wanpipe/files/wanrouter.rc6
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.12.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.14.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.15-r1.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.15.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.16.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.17.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.17_p9.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.18.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.19.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.20.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.22.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.23.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.24.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.25.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.26.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.27.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-3.5.28.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.0.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.1.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.10.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.3.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.5.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.6.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.8.ebuild
 create mode 100644 net-misc/wanpipe/wanpipe-7.0.9.ebuild
 create mode 100644 net-voip/yate/Manifest
 create mode 100644 net-voip/yate/yate-3.0.0.ebuild
 create mode 100644 net-voip/yate/yate-3.3.2.ebuild
 create mode 100644 net-voip/yate/yate-9999.ebuild
 create mode 100644 profiles/desc/freeswitch_modules.desc
 create mode 100644 profiles/desc/freetdm_modules.desc
 create mode 100644 profiles/use.local.desc

diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..c106da3
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,3 @@
+Everything, unless stated otherwise is:
+
+Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
diff --git a/metadata/.gitignore b/metadata/.gitignore
new file mode 100644
index 0000000..0915495
--- /dev/null
+++ b/metadata/.gitignore
@@ -0,0 +1,3 @@
+# ignore paludis caches
+/names/
+/write/
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 5491859..d43e61c 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,18 +1 @@
 masters = gentoo
-thin-manifests = true
-
-# This went live Wednesday, July 4, 2012 at 10:00 UTC
-# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
-# and/or GLEP 59.
-manifest-hashes = SHA256 SHA512 WHIRLPOOL
-
-# Bug #337853 - gentoo's council says to enable
-# --echangelog by default for the "gentoo" repo
-update-changelog = true
-
-# Make egencache generate newer (more reliable)
-# md5-dict cache format (see bug #409445).
-# NOTE: list md5-dict first so clients prefer it
-# INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
-# 2012 was the removal date)
-cache-formats = md5-dict
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
new file mode 100644
index 0000000..cd2a26c
--- /dev/null
+++ b/net-dialup/capi4k-utils/Manifest
@@ -0,0 +1,4 @@
+DIST capi4k-utils-3-11-03-b1.t4 254657 SHA256 0d991f2e0b109840657ae1965eb5b620c32b880beb41439e82a9649beea6d847 SHA512 d422573e7029eb7e670062905b84da615d9292fe6e1d534f573b8d667079588e87f5a49755e41877f9c4030642a3080668f00d8b5357f01919f5aa4107ac7030 WHIRLPOOL adcc5e002d5c42cb92c07c09172a2e61b4d8c4a062d2f25cdd7b1842512de50940977199acfb9c0d1e5df458a4c220439421e6affba0de642e8728e047bda262
+DIST capi4k-utils-3-11-06-c2.bin 1164816 SHA256 72f16d361b925632db1b7c973a0bf0dc2ffcd06a2f7322a7436908435619db25 SHA512 0a0c2067adb5d97ea4f213f3078cf98ad5ecb42bbefec120bccab644a4cd433120812684305e9e0df68460025f998dd89b9389989d43116e5f35eeb6eaefc7b7 WHIRLPOOL 66d9bc66a6516327cb645a0fe36d2bc62cbf79668769c4da7abd726227f3e776468a969038030c3abfeb3e86a7b79f68762eb23ad0b3216d80e4bb6db0691d49
+DIST capi4k-utils-3-11-06-c4.bin 1210684 SHA256 f00ad87022bd4e371d70bae3fde017a53f6cfbaa15fae6ea3aa02368dbd6f8e7 SHA512 f304367485d257bae53b813d5629151493441f7deca8d5b590b209717e8628237b32096da480f2409fee7b3b1dce869aebdda3ace17f2c6015edcb77b94a1b72 WHIRLPOOL 33b52ac3e7375a51a5a94fc6b761e5d1115c9c7b0658c2dbd6d222f91b4a9b57f71bc9efdf84dda3462941bedb88687358169482ecea198fdcecc1868917680c
+EBUILD capi4k-utils-3.25.ebuild 2737 SHA256 afd921c7930a94e441f74471813a43fdb03995fe6c9180af2cfab628e820674f SHA512 7c862b88ed6940b794ece5ac57c6bacb4ab1fc9a8b62875b1ac126aa7e17f878c0103ed0c2d920bae28761f084b01a4c254d0d64709b6e666dd6515820f11539 WHIRLPOOL acab8a9ecdc913314fa76602c5a5b33ff88d9fcfb659b685086968db42a925d89847cdb4046b0f732483ea6014709286801832bf861fd5f40f19de9274261be1
diff --git a/net-dialup/capi4k-utils/capi4k-utils-3.25.ebuild b/net-dialup/capi4k-utils/capi4k-utils-3.25.ebuild
new file mode 100644
index 0000000..49cc921
--- /dev/null
+++ b/net-dialup/capi4k-utils/capi4k-utils-3.25.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+IUSE="bindist rcapid static-libs"
+
+inherit eutils autotools git-2 flag-o-matic
+
+FIRMWARE_BASE="ftp://ftp.in-berlin.de/pub/capi4linux/firmware"
+FIRMWARE_B1_V="3-11-03"
+FIRMWARE_CX_V="3-11-06"
+
+DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
+HOMEPAGE="http://www.mISDN.eu/"
+SRC_URI="!bindist? (
+	${FIRMWARE_BASE}/b1/${FIRMWARE_B1_V}/b1.t4  -> ${PN}-${FIRMWARE_B1_V}-b1.t4
+	${FIRMWARE_BASE}/c2/${FIRMWARE_CX_V}/c2.bin -> ${PN}-${FIRMWARE_CX_V}-c2.bin
+	${FIRMWARE_BASE}/c4/${FIRMWARE_CX_V}/c4.bin -> ${PN}-${FIRMWARE_CX_V}-c4.bin
+)"
+
+EGIT_REPO_URI="git://git.misdn.eu/isdn4k-utils.git"
+EGIT_COMMIT="e23cdd55623a7c4f91a4b01912bb07bd0bf83fdb"
+EGIT_BRANCH="master"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+# base directory
+S="${WORKDIR}/isdn4k-utils"
+S_SUBDIRS="capi20 capiinfo capiinit avmb1"
+
+src_prepare() {
+	for x in ${S_SUBDIRS}; do
+		cd "${S}/${x}" || die
+		eautoreconf || die "failed to recreate \"${x}\" autotools files"
+	done
+
+	if use rcapid; then
+		cd "${S}/rcapid" || die
+		eautoreconf || die "failed to recreate \"rcapid\" autotools files"
+	fi
+}
+
+src_configure() {
+#	append-cppflags -I"${S}/capi20"
+#	append-ldflags  -L"${S}/capi20"
+
+	cd "${S}/capi20" || die
+	econf \
+		$(use_enable static-libs static) || die "configuration of \"capi20\" failed"
+
+	if use rcapid; then
+		cd "${S}/rcapid" || die
+		econf || die "configuration of \"rcapid\" failed"
+	fi
+
+	cd "${S}/capiinfo" || die
+	econf || die "configuration of \"capiinfo\" failed"
+
+	cd "${S}/capiinit" || die
+	econf || die "configuration of \"capiinit\" failed"
+
+	cd "${S}/avmb1" || die
+	econf || die "configuration of \"avmb1\" failed"
+}
+
+src_compile() {
+	for x in ${S_SUBDIRS}; do
+		cd "${S}/${x}" || die
+		emake || die "building \"${x}\" failed"
+	done
+
+	if use rcapid; then
+		cd "${S}/rcapid" || die
+		emake || die "building \"rcapid\" failed"
+	fi
+}
+
+src_install() {
+	for x in ${S_SUBDIRS}; do
+		cd "${S}/${x}" || die
+		emake DESTDIR="${D}" install || die "installing \"${x}\" failed"
+	done
+
+	if use rcapid; then
+		cd "${S}/rcapid" || die
+		emake DESTDIR="${D}" install || die "installing \"rcapid\" failed"
+
+		docinto rcapid
+		dodoc README
+	fi
+
+	if ! use bindist; then
+		einfo "Installing AVM firmware..."
+		insinto /lib/isdn
+
+		for x in ${PN}-{${FIRMWARE_B1_V}-b1.t4,${FIRMWARE_CX_V}-c2.bin,${FIRMWARE_CX_V}-c4.bin}; do
+			newins "${DISTDIR}/${x}" "${x##*-}"
+		done
+	fi
+
+	# TODO: fix in avmb1 sources
+	mv "${D}/sbin/avmcapictrl" "${D}/usr/sbin"
+	doman "${D}/usr/man/man8/avmcapictrl.8"
+	rm -rf "${D}/usr/man"
+
+	# remove .la files
+	prune_libtool_files
+}
diff --git a/net-dialup/misdnuser/Manifest b/net-dialup/misdnuser/Manifest
new file mode 100644
index 0000000..2478261
--- /dev/null
+++ b/net-dialup/misdnuser/Manifest
@@ -0,0 +1,5 @@
+AUX mISDNcapid.initd 372 SHA256 e701aedcd4c93ad819ec95ed84d9a970aa897cd8a93a70e751c8f41a10a9f7b2 SHA512 e66d5c0625962afec476d054dbddf1d15229e071e5cd0e1ecbc19e33bc4ccb5e76a6168db66711f6cbd6cdeee076f066bc29df442ffc60f8e2dbf65829dd820e WHIRLPOOL 5a090cff73c6981dff4abd8b7dc19c6e04e6346aac0c3303327859aa390480042cd5195add4e51ddf394996c815c2ac86f288f42fbfadbb8b095710828aa2312
+AUX misdnuser-2.0.13-udev-rulesd.patch 411 SHA256 dd977c5545eeb31b56b215dea6f51101e4f937fc4943b28269a8457cf6a6f81c SHA512 8634dce2be09a6df3d2f12e4a66bd2bb5c1ba66a61a9aecb09947797b285cc723c347fc80ad7a48c677f3e71a577498f3131083ad56ae87d3641380da0293728 WHIRLPOOL 625686df395f86b96c4222bff485a6dcc421f59d29a5054fcdedaad529d3a6588f722e5d8a3f4dd9d97a837e1e9ab1e1ef15faeba054ff16d1684b86f59b0d41
+EBUILD misdnuser-2.0.13.ebuild 1383 SHA256 438ac1eb53de66ad1f51c5ee8c883265a2f0731ab3745ced956fc96458df2201 SHA512 b513732e90c82ac40342d5dc768fef5433ab693371b517eb8444900ec4e4ae23dfff8ad65c1f64b35a1aeb22ed465debaa4cb279dbd73706f1bc3422bcda5472 WHIRLPOOL 859c6e353348a0f99851db8a6fd42d848a95420976de487a58bdc509cb8d0b1036ac70091531b17e1052dc54de4ddc98afff15060a8cc309086b404090f256ff
+EBUILD misdnuser-2.0.17.ebuild 1548 SHA256 e084addcee6c4db040966bc090d652b4fa154c859a673a1a00f61a0320663181 SHA512 c3700c87e114f2a15798db19b27453336843f43b51d6e2aafdd01322575b5e25652b724d3b7805813b9419c823e677e0e98d3f1874a78765b2b1f599230ef493 WHIRLPOOL 93114ab3cc1c4166b6b42d79d1346df85ab69fb8ef781a47bd5ebb171ebebcc3f2ea725a735c36d9a5db439ccbce19e930b2a38c006e963a7270925bfa15ec39
+EBUILD misdnuser-2.0.2.ebuild 938 SHA256 cd4605f91b739a94c8efacaeb136587220e43d506331e8c245842c87fe3ad9ef SHA512 9fac86d41317cd02fcdee328378ff19f2e48bbd1cf6191756bd6b1ed19e19cd5643d36ce02759313291e7de0bc38b161fb3c4b3ef84501427047296b6247f163 WHIRLPOOL 50919aee00e2586ac747b8989d250a3cf0cde26479dcd9e859b56a32a42c8724193ec1277f1a9a90cc36a241f9a1d43335e194de35575a14b91d2c456d1dfbcf
diff --git a/net-dialup/misdnuser/files/mISDNcapid.initd b/net-dialup/misdnuser/files/mISDNcapid.initd
new file mode 100755
index 0000000..d521561
--- /dev/null
+++ b/net-dialup/misdnuser/files/mISDNcapid.initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+
+start() {
+	ebegin "Starting mISDNcapid"
+	start-stop-daemon --start --quiet --exec /usr/sbin/mISDNcapid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mISDNcapid"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/mISDNcapid
+	eend $?
+}
diff --git a/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch b/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
new file mode 100644
index 0000000..fb72731
--- /dev/null
+++ b/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
@@ -0,0 +1,11 @@
+--- mISDNuser/Makefile.am.orig	2012-05-15 22:18:19.955087141 +0200
++++ mISDNuser/Makefile.am	2012-05-15 22:18:33.063944079 +0200
+@@ -38,6 +38,6 @@
+ endif
+ 
+ install-data-local:
+-	install -d $(DESTDIR)/etc/udev/rules.d
+-	install -m 644 45-misdn.rules $(DESTDIR)/etc/udev/rules.d/45-misdn.rules
++	install -d $(DESTDIR)/lib/udev/rules.d
++	install -m 644 45-misdn.rules $(DESTDIR)/lib/udev/rules.d/45-misdn.rules
+ 
diff --git a/net-dialup/misdnuser/misdnuser-2.0.13.ebuild b/net-dialup/misdnuser/misdnuser-2.0.13.ebuild
new file mode 100644
index 0000000..b77a3d6
--- /dev/null
+++ b/net-dialup/misdnuser/misdnuser-2.0.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+IUSE="+capi static-libs"
+
+inherit base eutils autotools git-2
+
+DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
+HOMEPAGE="http://www.mISDN.org/"
+
+EGIT_REPO_URI="git://git.misdn.eu/mISDNuser.git"
+EGIT_COMMIT="376ab1d56d654c8a5700dfaafe4e129854279b16"
+EGIT_BRANCH="socket"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses
+	capi? ( >=net-dialup/capi4k-utils-3.2.0
+		!!>=net-dialup/capi4k-utils-20050718
+		>=media-libs/spandsp-0.0.6_pre12 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mISDNuser"
+
+PATCHES=( "${FILESDIR}/${P}-udev-rulesd.patch" )
+DOCS=( "AUTHORS" "COPYING.LIB" "LICENSE" "NEWS" "README" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# install example applications too, contains some useful stuff like misdntestlayer1
+	econf \
+		$(use_enable capi) \
+		$(use_enable static-libs static) \
+		--with-mISDN_group=dialout \
+		--enable-example || die "econf failed"
+}
+
+src_install() {
+	base_src_install
+
+	use capi && \
+		newinitd "${FILESDIR}/mISDNcapid.initd" mISDNcapid
+
+	if ! use static-libs ; then
+		# remove all .la files
+		find "${D}" -name "*.la" -delete
+	elif use capi ; then
+		# remove capi plugin .la files
+		find "${D}/usr/$(get_libdir)/capi/" -name "*.la" -delete
+	fi
+
+}
diff --git a/net-dialup/misdnuser/misdnuser-2.0.17.ebuild b/net-dialup/misdnuser/misdnuser-2.0.17.ebuild
new file mode 100644
index 0000000..3edd769
--- /dev/null
+++ b/net-dialup/misdnuser/misdnuser-2.0.17.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+IUSE="+capi static-libs"
+
+inherit base eutils autotools git-2 flag-o-matic
+
+DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
+HOMEPAGE="http://www.mISDN.org/"
+
+EGIT_REPO_URI="git://git.misdn.eu/mISDNuser.git"
+EGIT_COMMIT="7e5e9df238772138756d506b4ac24b4fd5725635"
+EGIT_BRANCH="socket"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses
+	capi? ( >=net-dialup/capi4k-utils-3.2.25
+		!!>=net-dialup/capi4k-utils-20050718
+		>=media-libs/spandsp-0.0.6_pre12 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mISDNuser"
+
+#PATCHES=( "${FILESDIR}/${P}-fix-printf-format.patch" )
+DOCS=( "AUTHORS" "COPYING.LIB" "LICENSE" "NEWS" "README" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -Wno-unused-result
+	# install example applications too, contains some useful stuff like misdntestlayer1
+	econf \
+		$(use_enable capi) \
+		$(use_enable static-libs static) \
+		--with-mISDN_group=dialout \
+		--enable-example || die "econf failed"
+}
+
+src_install() {
+	base_src_install
+
+	use capi && \
+		newinitd "${FILESDIR}/mISDNcapid.initd" mISDNcapid
+
+	# move udev rules file
+	dodir "/lib"
+	mv "${D}/etc/udev" "${D}/lib/" || die "Failed to move udev rules file"
+
+	if ! use static-libs ; then
+		# remove all .la files
+		find "${D}" -name "*.la" -delete
+	elif use capi ; then
+		# remove capi plugin .la files
+		find "${D}/usr/$(get_libdir)/capi/" -name "*.la" -delete
+	fi
+
+}
diff --git a/net-dialup/misdnuser/misdnuser-2.0.2.ebuild b/net-dialup/misdnuser/misdnuser-2.0.2.ebuild
new file mode 100644
index 0000000..c401698
--- /dev/null
+++ b/net-dialup/misdnuser/misdnuser-2.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+IUSE=""
+
+inherit eutils autotools git
+
+#MY_P="mISDNuser-${PV//./_}"
+
+DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
+HOMEPAGE="http://www.mISDN.org/"
+#SRC_URI="http://www.linux-call-router.de/download/lcr-1.7/${MY_P}.tar.gz"
+
+EGIT_REPO_URI="git://git.misdn.org/mISDNuser.git"
+EGIT_COMMIT="8d01cd531d4422b1368ecc76f7852bb40317a1a0"
+EGIT_BOOTSTRAP="eautoreconf"
+EGIT_BRANCH="socket"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mISDNuser"
+
+src_configure() {
+	# install example applications too, contains some useful stuff like misdntestlayer1
+	econf \
+		--enable-example || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS COPYING.LIB LICENSE NEWS README
+}
diff --git a/net-libs/libSquirrelFish/Manifest b/net-libs/libSquirrelFish/Manifest
new file mode 100644
index 0000000..2196286
--- /dev/null
+++ b/net-libs/libSquirrelFish/Manifest
@@ -0,0 +1 @@
+EBUILD libSquirrelFish-9999.ebuild 1082 RMD160 a584acd33e3b1f188c6a0b6cc958a19d3a46c5b5 SHA1 1dd15b802047c2710658b22f7eeb21025cd03f7e SHA256 b9e58cc7c1ef1c3afdd163ab61b3bb24459d28d92efe7badbb6792d890f9c728
diff --git a/net-libs/libSquirrelFish/libSquirrelFish-9999.ebuild b/net-libs/libSquirrelFish/libSquirrelFish-9999.ebuild
new file mode 100644
index 0000000..50080a3
--- /dev/null
+++ b/net-libs/libSquirrelFish/libSquirrelFish-9999.ebuild
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+
+inherit autotools
+
+IUSE=""
+
+DESCRIPTION="Stand-alone version of the WebKit JavaScript engine"
+HOMEPAGE="http://oss.axsentis.de/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="http://oss.axsentis.de/git/libSquirrelFish.git"
+else
+	SRC_URI="http://oss.axsentis.de/"
+fi
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="LGPL-2"
+
+RDEPEND="virtual/libc
+	 dev-libs/icu"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	if [[ "${PV}" = "9999" ]]; then
+		git-2_src_unpack
+	else
+		default_src_unpack
+	fi
+
+	cd "${S}"
+	# eautoreconf doesn't work here,
+	# aclocal dies with a circular dependency error
+	AT_M4DIR="Source/autotools" eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dodoc Source/JavaScriptCore/{COPYING.LIB,AUTHORS,THANKS}
+}
diff --git a/net-libs/libisdn/Manifest b/net-libs/libisdn/Manifest
new file mode 100644
index 0000000..8b5f848
--- /dev/null
+++ b/net-libs/libisdn/Manifest
@@ -0,0 +1,3 @@
+DIST libisdn-0.0.1.tar.bz2 411722 SHA256 20256b15a03e9eb193acdeb98070b726e89fb97663ae81d67783a94e0887538f SHA512 c3272c103f51df1725820f937a2b4c31b45701b0ffd7b3e63f0edababdcb6fdf91288a95231cfc0502ec5e14ef562e5b2c58483585c92e93e255b575ffbacebe WHIRLPOOL ce73dbc8eedc0384a6341b7076372027b67f8b45c55b85c6cee38c934d150cb80ddcfebcae9a9864da426ba85138f71447f4c3dd879619e65ea4cd6fa9b86876
+EBUILD libisdn-0.0.1.ebuild 1218 SHA256 a14e0498e138109ce1e57cdb7336b595b7e1e1f52d6bea89601f2fb4b73bbed5 SHA512 65770ec44111e99abafbff0f7dbc1df6e3033e26ef71a2d4187c32f12fb246dbd576cd232e1789b60dbbd3a92682d5777b2df84e1937366de68bdb5da44f3975 WHIRLPOOL bd52de6dc7234b56639dac230f33301d65b373f45a56aec8a279b9056165327cf4bbc642690b1678cd1a25ac89355762e7772f5738f9ee77af0ed3ae8eb90ddd
+EBUILD libisdn-9999.ebuild 1428 SHA256 fb1d0cc3f008ea3d3242f72a06989fcdc628216791a6bd6d1d6d8d782991a3ee SHA512 065da2c410382c26a6409f2b71f8008d9401bcd1b42e7b3382234ae299853526efe20bfe04a9c6e6e56458a18976136fa2ff5459d9d872ab1ff9c89d399fe80e WHIRLPOOL f1cc8c718a36d86d88069cc16d74f24c2223caf5743b4070d455814b0fd3648250e72998f050a2ca8afc134bc15b1b2e4c0ca95a2391b6e7f5ba0a3dce95966c
diff --git a/net-libs/libisdn/libisdn-0.0.1.ebuild b/net-libs/libisdn/libisdn-0.0.1.ebuild
new file mode 100644
index 0000000..d5b2637
--- /dev/null
+++ b/net-libs/libisdn/libisdn-0.0.1.ebuild
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2012 Stefan Knoblich <stkn@openisdn.net>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+
+IUSE="doc static-libs"
+
+if [[ "${PV}" = "9999" ]]
+then
+	EGIT_REPO_URI="http://git.openisdn.net/libisdn.git/"
+	EGIT_BOOTSTRAP="./autogen.sh"
+	SCM="git-2"
+else
+	SRC_URI="http://files.openisdn.net/nightly/source/${P}.tar.bz2"
+fi
+
+inherit flag-o-matic ${SCM}
+
+DESCRIPTION="ISDN (Q.931; PRI/BRI) protocol stack"
+HOMEPAGE="http://www.openisdn.net/"
+
+SLOT="0"
+
+LICENSE="BSD"
+KEYWORDS=""
+
+DOCS=( "${S}/CREDITS" "${S}/TODO" )
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local myconf=""
+
+	econf \
+		$(use_enable static-libs static) \
+		${myconf} || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc ; then
+		einfo "Building API documentation..."
+		emake doxygen || die "building API docs failed"
+	fi
+}
+
+src_install() {
+	default_src_install
+
+	if use doc ; then
+		einfo "Installing ${PN} API documentation into \"${ROOT}usr/share/doc/${PVF}/html\""
+		dohtml -r docs/html/
+	fi
+}
diff --git a/net-libs/libisdn/libisdn-9999.ebuild b/net-libs/libisdn/libisdn-9999.ebuild
new file mode 100644
index 0000000..7c4f2f4
--- /dev/null
+++ b/net-libs/libisdn/libisdn-9999.ebuild
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+
+IUSE="doc lua +pcap static-libs"
+
+if [[ "${PV}" = "9999" ]]
+then
+	EGIT_REPO_URI="http://git.openisdn.net/libisdn.git/"
+	EGIT_BOOTSTRAP="./autogen.sh"
+	SCM="git-2"
+else
+	SRC_URI="http://files.openisdn.net/releases/${P}.tar.xz"
+fi
+
+inherit flag-o-matic ${SCM}
+
+DESCRIPTION="ISDN (Q.931; PRI/BRI) protocol stack"
+HOMEPAGE="http://www.openisdn.net/"
+
+SLOT="0"
+
+LICENSE="BSD"
+KEYWORDS=""
+
+DOCS=( "${S}/CREDITS" "${S}/TODO" )
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10
+	doc? ( app-doc/doxygen )
+	lua? ( dev-lang/lua )
+	pcap? ( >=net-libs/libpcap-1.0 )"
+
+src_configure() {
+	local myconf=""
+
+	if [ -n "${FREETDM_SOURCE_DIR}" ]
+	then
+		myconf="${myconf} --with-freetdm=${FREETDM_SOURCE_DIR}"
+	fi
+
+	econf \
+		$(use_with lua) \
+		$(use_with pcap) \
+		$(use_enable static-libs static) \
+		${myconf} || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc ; then
+		einfo "Building API documentation..."
+		emake doxygen || die "building API docs failed"
+	fi
+}
+
+src_install() {
+	default_src_install
+
+	if use doc ; then
+		einfo "Installing ${PN} API documentation into \"${ROOT}usr/share/doc/${PVF}/html\""
+		dohtml -r docs/html/
+	fi
+}
diff --git a/net-libs/libsng-isdn/Manifest b/net-libs/libsng-isdn/Manifest
new file mode 100644
index 0000000..9458b22
--- /dev/null
+++ b/net-libs/libsng-isdn/Manifest
@@ -0,0 +1,18 @@
+DIST libsng_isdn-7.11.2.i686.tgz 766363 SHA256 22294cc1987daa0bdbe55fce87f75a6114c08fac6102adc8592ed536f008e22a
+DIST libsng_isdn-7.11.2.x86_64.tgz 854931 SHA256 55add8cbc51114bc260ccd7c39bceac1e2a25e85e29bb5bb1b35286f8ea39b66
+DIST libsng_isdn-7.12.2.i686.tgz 765585 SHA256 3f176a5585283d231196c440ab5b7ca46d29516af04bc30f7a3ea643214b9659
+DIST libsng_isdn-7.12.2.x86_64.tgz 854417 SHA256 321427141c1c9ec9e6e9198a67377087da7b224ec8d21f7963d764e7f17ad70a
+DIST libsng_isdn-7.18.2.i686.tgz 766560 SHA256 16bfa193809407453d5408af660ab44ee08ab66f674086d01351de31dfc5afd4 SHA512 70ec579b6bc03361f3a9a5ab4a54be55e4d7483af8d49ff177cd229c4f6f04fd31cc583cccae7f1b547943d0dc282880fbfd788330f0e5e4fa5447b9360aaa4b WHIRLPOOL 85e388fc806e226ab8b72e1b2ca6d002dd7ab367ff3f119e1bf31a539eba035d714ef4a7f881ef05525aafad4ea5dcf90f200ab2334cf6247500fa0794253727
+DIST libsng_isdn-7.18.2.x86_64.tgz 857008 SHA256 93e456e03f9b18b5954b120d195fab650d1d1d37b32e7a494349988a7142e9e2 SHA512 15154132200900e3fe00981f77e73ab37e2d48dd8226173e45eb852c43ba6ca7ae39828f2f2ae1b2223df890620b4034179cd0ca25f829e67815d5cff9afb3fc WHIRLPOOL 89fdbbd6106bdc85e4f94e1c953d1632a852e3ae993068e46dcbfd233b1b5c7427ab923e54381d79c6ed017d6a0447dd8130db32ea9c4509014b18d8d7d97783
+DIST libsng_isdn-7.22.2.i686.tgz 771528 SHA256 d960375b718b6280d8c6b25d79334c9732fb047a385b4e1e5834a002a732dd4d SHA512 bd9a1a27c00a2ce7dbf63120e0a4fde7599dd8d8a7695a9a025b31176b6cd1b44d161e5a7a986588ee5f6b6ebbb5a1f9d76be0c20a7f4ad9ac3e32b78679b7ca WHIRLPOOL 804ff31f3b9bd1e1afd23cdbf05a213b80078fb47aeb169373f5909a59c7577e696d87cced11bd4bf31b0affd2902c612218dd233412054dfd280275cb75fc02
+DIST libsng_isdn-7.22.2.x86_64.tgz 863629 SHA256 3c025bb3d9fe115594f9acbdf7d9d9adb02ca9eadb96e85ecbbec54048ecf250 SHA512 40678920fc969da049c85569cfd400761142de90f7ea4a87bc3c30212ca84c1f9b9274cbf06547aba5645e0770e2875d375659818505010eb8ada67f947b3cc9 WHIRLPOOL a79425b838dae041e4c24e74a4f532eaa9eba332d1bf944855e5b2f9c6d6abf90cd15918eb5fa49d9745aef2f3c95c6ea5880c6b6e936c8c2bd592699aacaa11
+DIST libsng_isdn-7.27.2.i686.tgz 771806 SHA256 b4c286162f6b7d6c4c53cd68839388da0d21acee92b2517b20cf903a973e5631 SHA512 90f5ca6e1aae91daca3f9080459cca684da2b5e53d9bdac96203d198cdaca6f33288e247c29614824384ce1dec1b372255dd07f8f95bc0afec68f39f9decc69e WHIRLPOOL 733e25834218025ca0266126b601f77beec026dd1dd9d116b972f7a8f9b41710598bc0d319360be3ecc9ef01157b62b5f3f8e527c2ddc403e6ea84349481ba34
+DIST libsng_isdn-7.27.2.x86_64.tgz 862890 SHA256 b6a8e00a7fbb786b0c1b2a11fa1591daab17c908c3d9b3908a84b8d54ef129a7 SHA512 3b826ca01b2f4d19e920b0431c0bef8c7f30f6e4d954028d7f96a9d6025439f4b06a901f98d79d646ac74b443aee387e6b6af2245011ce8b3cf65ff0d524a3f7 WHIRLPOOL ea73fc41a02be20c8b33ab7cc8648b338cb9497b43af0a425e1d1662c1e1da77a74eac47c4b08b3a8be5842a510b8350c196e2025cd1d0bf1c7556bf44df75ea
+DIST libsng_isdn-7.8.2.i686.tgz 765355 SHA256 5158fcfea88605fea8a94461a226dd371cb591e2ab76b189ca10cb02f24d36b0
+DIST libsng_isdn-7.8.2.x86_64.tgz 854104 SHA256 7b1f420fff4cbb997009fea133d86361a014a3d9a06adb6e18bac9e908202437
+EBUILD libsng-isdn-7.11.2.ebuild 845 SHA256 9ad30297783ce35cfaf705f45dbf3cd6c02d401bf1e6c6d2dd88606f05027c27 SHA512 7ee39d6c286bd7ae7207abe59eff3fab9118ecb6886cbee2f5126e5604b740e739d108058826e93eb74453bb1aed21c3a24b65a0bbdc38b55bb21080a3df6489 WHIRLPOOL 4af0208c34a3b576b9e933f7de05207b79c8e3ebd417d8e24ab3bf0b393809f0f9589ce40fe7883b3b4b4c069e326510aea358af1f306e16f572a25589b5eb52
+EBUILD libsng-isdn-7.12.2.ebuild 845 SHA256 9ad30297783ce35cfaf705f45dbf3cd6c02d401bf1e6c6d2dd88606f05027c27 SHA512 7ee39d6c286bd7ae7207abe59eff3fab9118ecb6886cbee2f5126e5604b740e739d108058826e93eb74453bb1aed21c3a24b65a0bbdc38b55bb21080a3df6489 WHIRLPOOL 4af0208c34a3b576b9e933f7de05207b79c8e3ebd417d8e24ab3bf0b393809f0f9589ce40fe7883b3b4b4c069e326510aea358af1f306e16f572a25589b5eb52
+EBUILD libsng-isdn-7.18.2.ebuild 845 SHA256 9ad30297783ce35cfaf705f45dbf3cd6c02d401bf1e6c6d2dd88606f05027c27 SHA512 7ee39d6c286bd7ae7207abe59eff3fab9118ecb6886cbee2f5126e5604b740e739d108058826e93eb74453bb1aed21c3a24b65a0bbdc38b55bb21080a3df6489 WHIRLPOOL 4af0208c34a3b576b9e933f7de05207b79c8e3ebd417d8e24ab3bf0b393809f0f9589ce40fe7883b3b4b4c069e326510aea358af1f306e16f572a25589b5eb52
+EBUILD libsng-isdn-7.22.2.ebuild 863 SHA256 c2c69d4eef44e77f59529cb42c5aa083b876c18c3057a13348b25461152beed5 SHA512 e7df5a6d7f53cc36e70b41bc15870f7fef951a849d84766c4597c436d883fb3c7fa27b1d6622e62e47528fd567cab6e26e782dd2dafd72f0e9a9e96bd774962d WHIRLPOOL 982ac9bd25e3f0318cab64aa3e594a73627569ba8a1be73ae573331ea26a5bcffc9dfb47860388a9a8db32c5a28b63f2cf770c3d026dbb37d168252e9df3ec4f
+EBUILD libsng-isdn-7.27.2.ebuild 863 SHA256 c2c69d4eef44e77f59529cb42c5aa083b876c18c3057a13348b25461152beed5 SHA512 e7df5a6d7f53cc36e70b41bc15870f7fef951a849d84766c4597c436d883fb3c7fa27b1d6622e62e47528fd567cab6e26e782dd2dafd72f0e9a9e96bd774962d WHIRLPOOL 982ac9bd25e3f0318cab64aa3e594a73627569ba8a1be73ae573331ea26a5bcffc9dfb47860388a9a8db32c5a28b63f2cf770c3d026dbb37d168252e9df3ec4f
+EBUILD libsng-isdn-7.8.2.ebuild 853 SHA256 8af232cf9d51c6ac2954084428a03798758b9926732f26dcfa1ce84a2a28d58e SHA512 8f48b34b799b3215b03a2d999c429d02c400032fb72f3bff859eac8dfc7478bab0b782301511a3592c28975a7875b454c0fd9038fc00a1bc348536487fe9e545 WHIRLPOOL ad994e7ae35c445f9bb1d55ddd938d33754565a3f76905509ed80f787126953861ee4239bddeb6855181b0cef966036cdea6a9e348078cbb9f0850181987798d
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.11.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.11.2.ebuild
new file mode 100644
index 0000000..dc1fa07
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.11.2.ebuild
@@ -0,0 +1,45 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+}
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.12.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.12.2.ebuild
new file mode 100644
index 0000000..dc1fa07
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.12.2.ebuild
@@ -0,0 +1,45 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+}
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.18.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.18.2.ebuild
new file mode 100644
index 0000000..dc1fa07
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.18.2.ebuild
@@ -0,0 +1,45 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+}
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.22.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.22.2.ebuild
new file mode 100644
index 0000000..c7546c3
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.22.2.ebuild
@@ -0,0 +1,47 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	dodoc ChangeLog
+}
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.27.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.27.2.ebuild
new file mode 100644
index 0000000..c7546c3
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.27.2.ebuild
@@ -0,0 +1,47 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	dodoc ChangeLog
+}
diff --git a/net-libs/libsng-isdn/libsng-isdn-7.8.2.ebuild b/net-libs/libsng-isdn/libsng-isdn-7.8.2.ebuild
new file mode 100644
index 0000000..dc0eca7
--- /dev/null
+++ b/net-libs/libsng-isdn/libsng-isdn-7.8.2.ebuild
@@ -0,0 +1,45 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/old/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/old/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# disable ldconfig
+	sed -i -e 's:ldconfig:#ldconfig:' install.sh || die "sed failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+}
diff --git a/net-libs/libsng-ss7/Manifest b/net-libs/libsng-ss7/Manifest
new file mode 100644
index 0000000..759e4ba
--- /dev/null
+++ b/net-libs/libsng-ss7/Manifest
@@ -0,0 +1,21 @@
+DIST libsng_ss7-2.0.0.i686.tgz 1008328 RMD160 e897845f48f3dbd458ac25fe471aadb85928a4bb SHA1 17ad86560b3f3ab9dc33fd56d759effa1bd783b8 SHA256 5e3e74cca362a90c90f18ac459cc0c980b13a90afc9d72b7790884abead0d7bb
+DIST libsng_ss7-2.0.0.x86_64.tgz 1179233 RMD160 b7bfd017d02ea3a0cf7dc578b8d19bcb05a01e9a SHA1 fbc6104f56eef6fd38aa5514ad1bed75b0666f0e SHA256 05735149a173d2916f2181575035d2c3e0cf6971e2e85ef4ee6de6e63a0e3fec
+DIST libsng_ss7-2.1.1.i686.tgz 1008818 RMD160 2e90b531289538e3a25f5d451195c67c2c0e045c SHA1 66ca0f2e27c2958270481eb613d48ea9038c2040 SHA256 bf6d8f9ef70211a862422c980beedc4a507eb109031ed269db9ed5c49c283f14
+DIST libsng_ss7-2.1.1.x86_64.tgz 1179458 RMD160 f0f20adc51bf8f288827660abbae6e8efe7383d0 SHA1 d49eded8281f5b4786d17e5bca944b8fabb3bdf8 SHA256 aa6a3107a442962bec164927d2f00ae545f01a304686d5f8e950beb0b395add8
+DIST libsng_ss7-2.3.3.i686.tgz 1008956 RMD160 668913fa12ee35a8e778f8070c5b4e40efdbd473 SHA1 1ef03b5ef9dbc88ac0e50b3f61dea24cb8a4d92e SHA256 da12d7e2839a96f39361fbf03127eaa788e7fc1e433114894c21ca5531dbdc76
+DIST libsng_ss7-2.3.3.x86_64.tgz 1180008 RMD160 084cb5b6b9bcf3f88264888abb691ca9569e7cd5 SHA1 dad79ad208d41ca918b65ad9e8bd2b5f0949304a SHA256 903c59bf0c937a3ab49e69c2a898ccae679c401e7efe8876252f0288a8c6b281
+DIST libsng_ss7-3.0.0.i686.tgz 1058341 RMD160 e1aceb6b33afbb9680df8437db9613910d0301e7 SHA1 3221ed367b6c8399a9680dcf25529cb7b06bac3a SHA256 065a53aa35b01fe4e0ccfce536f503744fe49d9aa1e582f0e9e2039074cb7c30
+DIST libsng_ss7-3.0.0.x86_64.tgz 1237426 RMD160 bff4a2e4ba6b685dc458a3a05928032f1b8ee1d5 SHA1 ca2a2c8b0c38951e39e6abdacc5d91401079900c SHA256 5c6764cddf76278e1b5a720612c5836e6610e96d81376974fa179123c56acdc4
+DIST libsng_ss7-3.1.1.i686.tgz 1058643 RMD160 f73dd5d14860bc9582ad183bb60d338cf735c448 SHA1 89671d05723fd7d0561fc5d80d51d8cf9cd66a9f SHA256 6539b1bb4ca9652cff596f93af5cd0753db2277af432e20e0d554711663b22b0
+DIST libsng_ss7-3.1.1.x86_64.tgz 1238116 RMD160 0ec00a3d2f8fc89d8378aafc7bbd09569a21c324 SHA1 cafd25fd25d1f3b9b832e1bfe45a502a9fb4d237 SHA256 0f3dc9d5d86a4de283601ae882f0c40b1f387584004af422c02bea983f750a87
+DIST libsng_ss7-4.0.0.i686.tgz 1060948 RMD160 6488b21608dd21a788f1a6f781712b0c049ad3ed SHA1 90a09c5ea5a4432d0bc63fc6c6aeeb761fd17533 SHA256 8ddba21d73ec19362cf13b745c2b1b97b9c24ca0fc261dff7e969a153909c3ff
+DIST libsng_ss7-4.0.0.x86_64.tgz 1245292 RMD160 3080cbc92f800ba65e391be3f102da9e4e9662a3 SHA1 0ebb4dc7186b1d0ed1e6015f953e7cfba9c6d75c SHA256 22ae9e85482d9da545861a41aa913a017de06048e6950d760ee7b2a859a02d63
+DIST libsng_ss7-4.1.1.i686.tgz 1065314 RMD160 6816be6b899e5b62f02636ebf1aeced8618bbcb2 SHA1 75ed455a40b6e0489d77c0d50334490b40e68270 SHA256 29e5bf10e0e7eb73b0486c974fac2940a88bc559d0a195894706df7520660d7e
+DIST libsng_ss7-4.1.1.x86_64.tgz 1248799 RMD160 cd62e9bff96b448aa3414e8833d2dd1aaff1db1b SHA1 c6b329be174c165d207a38bfc54b17ead9d8a322 SHA256 7ed1f98194fdaddec7294479a685a7469a1c991830293a6a274b238d4883781e
+EBUILD libsng-ss7-2.0.0.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-2.1.1.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-2.3.3.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-3.0.0.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-3.1.1.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-4.0.0.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
+EBUILD libsng-ss7-4.1.1.ebuild 1172 RMD160 1f1c7e39e71e9c13c8c1ff54ebd339cf2f535867 SHA1 86d769e2aab152f4e0ea240f62eb4adb9e78dfe9 SHA256 86632e81b0a1a673634a8c15a8e341a6ea74afbad9eb6783302caf00cbedd650
diff --git a/net-libs/libsng-ss7/libsng-ss7-2.0.0.ebuild b/net-libs/libsng-ss7/libsng-ss7-2.0.0.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-2.0.0.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-2.1.1.ebuild b/net-libs/libsng-ss7/libsng-ss7-2.1.1.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-2.1.1.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-2.3.3.ebuild b/net-libs/libsng-ss7/libsng-ss7-2.3.3.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-2.3.3.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-3.0.0.ebuild b/net-libs/libsng-ss7/libsng-ss7-3.0.0.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-3.0.0.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-3.1.1.ebuild b/net-libs/libsng-ss7/libsng-ss7-3.1.1.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-3.1.1.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-4.0.0.ebuild b/net-libs/libsng-ss7/libsng-ss7-4.0.0.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-4.0.0.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libsng-ss7/libsng-ss7-4.1.1.ebuild b/net-libs/libsng-ss7/libsng-ss7-4.1.1.ebuild
new file mode 100644
index 0000000..5688775
--- /dev/null
+++ b/net-libs/libsng-ss7/libsng-ss7-4.1.1.ebuild
@@ -0,0 +1,52 @@
+
+EAPI="2"
+IUSE=""
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="amd64? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.x86_64.tgz )
+	 x86? ( ftp://ftp.sangoma.com/linux/${MY_PN}/${MY_P}.i686.tgz )"
+
+RESTRICT="mirror strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="unknown"
+
+RDEPEND="net-misc/wanpipe"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64 ; then
+		ln -s "${S}.x86_64" "${S}" || die "Failed to create symlink"
+	else
+		ln -s "${S}.i686"   "${S}" || die "Failed to create symlink"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/@ldconfig/d" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)"
+
+	emake DESTDIR="${D}/usr" install || die "emake install failed"
+
+	# generate libsng_ss7.so.X -> libsng_ss7.so symlink
+	ldconfig -n "${D}/usr/$(get_libdir)" || die "failed to generate versioned .so symlinks"
+
+	[ ! -e "${ROOT}/usr/$(get_libdir)/libssl.so.6" ] && {
+		einfo "Creating libssl.so.6 compat symlink"
+		ln -s "libssl.so" "${D}/usr/$(get_libdir)/libssl.so.6" || die "Failed to create libssl.so.6 compat symlink"
+	}
+}
diff --git a/net-libs/libwat/Manifest b/net-libs/libwat/Manifest
new file mode 100644
index 0000000..c2dfa19
--- /dev/null
+++ b/net-libs/libwat/Manifest
@@ -0,0 +1,4 @@
+DIST libwat-1.0.22.tgz 141929 SHA256 9b135630a1ed3ac43f6c693d2bd4d4126dc29ba8c6021dd0e34e76b74592165b SHA512 ce9e721960263cdf1b967ae5d28cde8ed60cbf44c4de88f8e389bfe18cc40a4b992c3dc6e9ee3c8b3657497c53848a42aab5c0d4af11b01ae99079b08b9b8741 WHIRLPOOL 162e950deb1157a6abd83c0bc576815eef09d19e60a95de8b48e754713a5c09e42b2815a75e2f883b84e883005138062ca6a57b6a5c159061998ff242265a563
+DIST libwat-1.0.24.tgz 165051 SHA256 b5d5c50abec57f75445129fd9886094033a222840e9e0f3f6b0a7ded78aaea26 SHA512 d9fb35ed159dd1be544df0dcff5aa5311c5fea977b3d9052c0446bb268f5154257fafac24f03486f6f204b747591862ee0996386e31bbd5ec20b7971eba5c9c5 WHIRLPOOL 2f97175598b46887dbd86a6d827ee890380495b719b37c9d51bb7af982e33c579c0fdf46cc387d378ff7ce2714a468f993c43932481eae29f4d159ae24ef18ba
+EBUILD libwat-1.0.22.ebuild 311 SHA256 62d92e1c7111fba8d273727072a32bc5ad571f920a49d3517d9980ebe46fd3c1 SHA512 37d03c074541c614a6d9cd821a5a4e9409a63f965ab1e163cd21ab867563b252aeb60c5066e845c32d2bbb3a1f6d41a6b219ac1ab2da13e2195ead93b1c282b0 WHIRLPOOL 7ebfe432daa150c7f374d4efba88cf888831c63f6c3805114ceeaa14e6bc782513065d3735f008d12bbf0127beab737d9c91b8d30c4431219ae4be3134bf3007
+EBUILD libwat-1.0.24.ebuild 357 SHA256 53f128d116f07ab32e3a6bfdcfe9195e985762e6f867da2eeb30e3daf79e4c66 SHA512 aebe7757faa152afb9674d08d29c6750e54966840f3c243069781e9312d576e997d1cc8d8ea41babf6712a1bd734ba00981009cc691a325ef7736a366f9af0f6 WHIRLPOOL 9193f8218d805464fbb9299b7f5da4e0ac6239216996967e0df209faf05ee6df338a84de13fb7e8dd32d237013d9df25b29609a5880f503ec742ad1663988c96
diff --git a/net-libs/libwat/libwat-1.0.22.ebuild b/net-libs/libwat/libwat-1.0.22.ebuild
new file mode 100644
index 0000000..83cf830
--- /dev/null
+++ b/net-libs/libwat/libwat-1.0.22.ebuild
@@ -0,0 +1,20 @@
+
+EAPI="4"
+IUSE=""
+
+inherit cmake-utils
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/${PN}/${P}.tgz"
+
+RESTRICT="mirror"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}"
+
+DOCS=( "README" "Changelog" "AUTHORS" )
diff --git a/net-libs/libwat/libwat-1.0.24.ebuild b/net-libs/libwat/libwat-1.0.24.ebuild
new file mode 100644
index 0000000..a103f21
--- /dev/null
+++ b/net-libs/libwat/libwat-1.0.24.ebuild
@@ -0,0 +1,22 @@
+
+EAPI="4"
+IUSE="dahdi"
+
+inherit cmake-utils
+
+DESCRIPTION="Sangoma ISDN library"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/${PN}/${P}.tgz"
+
+RESTRICT="mirror"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE=""
+
+RDEPEND="virtual/libc
+	net-misc/wanpipe[dahdi=]"
+DEPEND="${RDEPEND}
+	dahdi? ( net-misc/dahdi )"
+
+DOCS=( "README" "AUTHORS" )
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
new file mode 100644
index 0000000..f543a15
--- /dev/null
+++ b/net-libs/opal/Manifest
@@ -0,0 +1 @@
+EBUILD opal-9999.ebuild 1802 RMD160 dfb82d73e31210d849b9b5566bc7ed1bde592d93 SHA1 8d2b0920cd96d1b9d96871fe571c7c67cbbe63aa SHA256 8bf7518a01e2904b116453773b026273f927a40861ee77ab2e898a9ace4a6858
diff --git a/net-libs/opal/opal-9999.ebuild b/net-libs/opal/opal-9999.ebuild
new file mode 100644
index 0000000..ed1d0d2
--- /dev/null
+++ b/net-libs/opal/opal-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic subversion autotools
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+
+ESVN_REPO_URI="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc java"
+
+S="${WORKDIR}/opal"
+
+RDEPEND=">=net-libs/ptlib-9999
+	>=media-video/ffmpeg-0.4.7
+	media-libs/speex
+	java? ( virtual/jdk )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	if use debug && ! built_with_use net-libs/ptlib debug; then
+		eerror "You need to build net-libs/ptlib with USE=debug enabled."
+		die "net-libs/ptlib has to be built with USE=debug"
+	fi
+
+	if ! use debug && built_with_use net-libs/ptlib debug; then
+		eerror "You need to build net-libs/ptlib without USE=debug."
+		die "net-libs/ptlib has not to be built with USE=debug"
+	fi
+
+	# opal can't build with --as-needed
+	append-ldflags -Wl,--no-as-needed
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	# recreate configure etc.
+	eautoreconf
+}
+
+src_compile() {
+	local makeopts
+
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# http://zfoneproject.com/ that is not in portage
+	econf \
+		$(use_enable debug) \
+		$(use_enable java) \
+		--enable-plugins \
+		--disable-localspeex \
+		--disable-zrtp \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="debug"
+	else
+		makeopts="opt"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* docs/* || die "documentation installation failed"
+	fi
+}
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
new file mode 100644
index 0000000..b8bbf5d
--- /dev/null
+++ b/net-libs/osptoolkit/Manifest
@@ -0,0 +1,2 @@
+DIST OSPToolkit-4.0.3.tar.gz 406705 RMD160 86b05646c11ff97cea592debdcb5946eef8ebec2 SHA1 107f9ed6572a2df1169d578e7fccf69e4d427f16 SHA256 59231bc1b059fb6c2153021d82431c5c17019694e538cf9c4ce289d317ca4b47
+EBUILD osptoolkit-4.0.3.ebuild 2948 RMD160 191ed10a8bf00ced788bb18203ae6700efaa5167 SHA1 7ac5d87ecd37f8ed102124af0199975836b09d70 SHA256 cba84c8bb98d73c090acff711393cd8bccdbc76af28c04ba472be5f5118c51f4
diff --git a/net-libs/osptoolkit/osptoolkit-4.0.3.ebuild b/net-libs/osptoolkit/osptoolkit-4.0.3.ebuild
new file mode 100644
index 0000000..78db6ff
--- /dev/null
+++ b/net-libs/osptoolkit/osptoolkit-4.0.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.5.0.ebuild,v 1.4 2011/08/24 19:12:28 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+S_DATE="20120120"
+
+DESCRIPTION="Open Settlement Protocol development kit"
+HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm"
+SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/TK-${PV//./_}-${S_DATE}
+
+# TODO:
+# generate a shared lib
+
+# NOTES:
+# osptest isn't a test that can be used for src_test, it's part of the toolkit
+
+src_prepare() {
+	# remove -O and use users CFLAGS, see bug 241034
+	sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \
+		enroll/Makefile || die "patching Makefiles failed"
+
+	# use users LDFLAGS
+	sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \
+		|| die "patching test/Makefile failed"
+	sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \
+		|| die "patching enroll/Makefile failed"
+
+	# change lib dir to $(get_libdir)
+	sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \
+		src/Makefile || die "patching src/Makefile failed"
+
+	# test.cfg is located in /etc/${PN}/test.cfg
+	sed -i -e \
+		"s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \
+		test/test_app.c || die "patching test/test_app.c failed"
+
+	# configure enroll.sh
+	sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \
+		-e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \
+		bin/enroll.sh || die "patching bin/enroll.sh failed"
+
+	# change enroll path
+	sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \
+		bin/enroll.sh || die "patching bin/enroll.sh failed"
+}
+
+src_compile() {
+	local my_cc=$(tc-getCC)
+
+	emake -C src CC="${my_cc}" build || die "emake libosp failed"
+	emake -C enroll CC="${my_cc}" linux || die "emake enroll failed"
+	emake -C test CC="${my_cc}" linux || die "emake test failed"
+}
+
+src_install() {
+	local ospdir="/usr/$(get_libdir)/${PN}"
+
+	emake -C src INSTALL_PATH="${D}"/usr install || die "emake install failed"
+
+	insinto /etc/${PN}
+	doins bin/test.cfg bin/.rnd bin/openssl.cnf || die "doins failed"
+
+	# install enroll and enroll.sh in lib dir to prevent executing them
+	dodir ${ospdir}
+	exeinto ${ospdir}
+	doexe bin/enroll bin/enroll.sh || die "doexe failed"
+
+	# use the symlink to execute enroll.sh
+	dosym ${ospdir}/enroll.sh /usr/bin/ospenroll || die "dosym failed"
+
+	newbin bin/test_app osptest || die "newbin failed"
+
+	dodoc README.txt RELNOTES.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "OSP test application is now available with 'osptest' command"
+	elog "OSP enroll application is now available with 'ospenroll' command"
+	elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration"
+}
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
new file mode 100644
index 0000000..f78417a
--- /dev/null
+++ b/net-libs/ptlib/Manifest
@@ -0,0 +1 @@
+EBUILD ptlib-9999.ebuild 7405 RMD160 643bd2ec2769077aed016cced77098d90133e43e SHA1 fbabe67806ab86a73555b65b1036269156d12a82 SHA256 fa0f85288f405938ce43163f7708b327b9b20212b9fbd600c5bff7f33f9c2fa4
diff --git a/net-libs/ptlib/ptlib-9999.ebuild b/net-libs/ptlib/ptlib-9999.ebuild
new file mode 100644
index 0000000..45a38a3
--- /dev/null
+++ b/net-libs/ptlib/ptlib-9999.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.5.ebuild,v 1.2 2009/12/17 16:31:41 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic subversion autotools
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+ESVN_REPO_URI="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS=""
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
+jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
+socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
+
+CDEPEND="
+	audio? ( alsa? ( media-libs/alsa-lib )
+		esd? ( media-sound/esound ) )
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	video? ( ieee1394? ( media-libs/libdc1394:1
+				media-libs/libdv
+				sys-libs/libavc1394
+				sys-libs/libraw1394 )
+		v4l2? ( media-libs/libv4l ) )
+	xml? ( dev-libs/expat )"
+RDEPEND="${CDEPEND}
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	video? ( v4l? ( sys-kernel/linux-headers )
+		v4l2? ( sys-kernel/linux-headers ) )
+	!!dev-libs/pwlib"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# looks to have an auto-magic dep with medialibs, but not in the tree so...
+#	upstream bug 2794736
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+# TODO:
+# manage in a better way the conditional use flags (with eapi-3 ?)
+# libv4l is an automagic dep for v4l2 plugin, see upstream bug 2867383
+
+conditional_use_warn_msg() {
+	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
+	ewarn "Please, enable ${2} or disable ${1}"
+}
+
+pkg_setup() {
+	local use_warn=false
+
+	if use sdl && ! use video; then
+		conditional_use_warn_msg "sdl" "video"
+		use_warn=true
+	fi
+
+	if use jabber && ! use xml; then
+		conditional_use_warn_msg "jabber" "xml"
+		use_warn=true
+	fi
+
+	if use vxml; then
+		if ! use xml; then
+			conditional_use_warn_msg "vxml" "xml"
+			use_warn=true
+		fi
+		if ! use http; then
+			conditional_use_warn_msg "vxml" "http"
+			use_warn=true
+		fi
+	fi
+
+	if use xmlrpc; then
+		if ! use xml; then
+			conditional_use_warn_msg "xmlrpc" "xml"
+			use_warn=true
+		fi
+		# configure script tells it needs http but it fails, see bug 277385
+		# the bug has been reported at upstream bug 2820814
+		if ! use http; then
+			conditional_use_warn_msg "xmlrpc" "http"
+			use_warn=true
+		fi
+	fi
+
+	if use soap; then
+		if ! use xml; then
+			conditional_use_warn_msg "soap" "xml"
+			use_warn=true
+		fi
+		# fix bug 280850, see upstream bug 2844915
+		if ! use http; then
+			conditional_use_warn_msg "soap" "http"
+			use_warn=true
+		fi
+	fi
+
+	if ${use_warn}; then
+		echo
+		ewarn "Please look at previous messages and re-emerge accordingly if needed."
+		ebeep
+		epause 5
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	# regenerate configure etc.
+	eautoreconf
+}
+
+src_prepare() {
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+#	# bug 283675, upstream bug 2857750
+#	if use vxml && ! use dtmf; then
+#		epatch "${FILESDIR}"/${PN}-2.6.4-vxml-ptones.patch
+#	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	# plugins are disabled only if ! audio and ! video
+	if ! use audio && ! use video; then
+		myconf="${myconf} --disable-plugins"
+	else
+		myconf="${myconf} --enable-plugins"
+	fi
+
+	# minsize, openh323, opal: presets of features (overwritten by use flags)
+	# ansi-bool, atomicity: there is no reason to disable those features
+	# internalregex: we want to use system one
+	# sunaudio and bsdvideo are respectively for SunOS and BSD's
+	# appshare, vfw: only for windows
+	# samples: no need to build samples
+	# avc: disabled, bug 276514, upstream bug 2821744
+	# pipechan, configfile, resolver, url: force enabling
+	econf ${myconf} \
+		--disable-minsize \
+		--disable-openh323 \
+		--disable-opal \
+		--enable-ansi-bool \
+		--enable-atomicity \
+		--disable-internalregex \
+		--disable-sunaudio \
+		--disable-bsdvideo \
+		--disable-appshare \
+		--disable-vfw \
+		--disable-samples \
+		--disable-avc \
+		--enable-configfile \
+		--enable-pipechan \
+		--enable-resolver \
+		--enable-url \
+		$(use_enable audio) \
+		$(use_enable alsa) \
+		$(use_enable asn) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable debug tracing) \
+		$(use_enable dtmf) \
+		$(use_enable esd) \
+		$(use_enable ffmpeg ffvdev) \
+		$(use_enable ftp) \
+		$(use_enable http) \
+		$(use_enable http httpforms) \
+		$(use_enable http httpsvc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable jabber) \
+		$(use_enable ldap openldap) \
+		$(use_enable mail pop3smtp) \
+		$(use_enable odbc) \
+		$(use_enable oss) \
+		$(use_enable pch) \
+		$(use_enable qos) \
+		$(use_enable remote remconn) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable serial) \
+		$(use_enable shmvideo) \
+		$(use_enable snmp) \
+		$(use_enable soap) \
+		$(use_enable socks) \
+		$(use_enable ssl openssl) \
+		$(use_enable stun) \
+		$(use_enable telnet) \
+		$(use_enable tts) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable video) $(use_enable video vidfile) \
+		$(use_enable vxml) \
+		$(use_enable wav wavfile) \
+		$(use_enable xml expat) \
+		$(use_enable xmlrpc)
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts=""
+
+	use debug && makeopts="DEBUG=1"
+
+	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
+	fi
+
+	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
+
+	if use audio || use video; then
+		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
+	fi
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls samples --hide=Makefile`"
+
+		# first, install Makefile
+		insinto ${exampledir}/
+		doins ${basedir}/Makefile || die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags."
+		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
+	fi
+
+	if ! use audio || ! use video; then
+		ewarn "You have disabled audio or video USE flags."
+		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
+		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
+	fi
+
+	ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
+	ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
+	ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
+	ewarn "or help us to make them live together."
+}
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
index 99a43fe..ea024f5 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
@@ -127,8 +127,9 @@ RDEPEND="virtual/libc
 DEPEND="${RDEPEND}
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
 
-PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
-	 >=net-misc/freeswitch-sounds-music-1.0.8"
+PDEPEND="media-sound/freeswitch-sounds
+        media-sound/freeswitch-sounds-music
+"
 
 ###
 # IUSE merging
diff --git a/net-misc/freeswitch-esl/Manifest b/net-misc/freeswitch-esl/Manifest
new file mode 100644
index 0000000..4e42251
--- /dev/null
+++ b/net-misc/freeswitch-esl/Manifest
@@ -0,0 +1,4 @@
+DIST freeswitch-1.0.4.tar.bz2 25583205 RMD160 fdfd01decf405d3c1559da6aa6ca2588337fe13a SHA1 5f811d2a19881875a7ff67da2d56432840e9aa55 SHA256 9527b9d8847987dfc009ac4548e42b2fd084599b9046a9fa1a3fbb64869b70ce
+EBUILD freeswitch-esl-1.0.4.ebuild 5053 RMD160 21407988dea35d116e5fa78387f95e230f051558 SHA1 21feed42087eda202e0a5caaa0a2e5ef65663f2e SHA256 878308c1a9debaf5cbd943c4103823a5ced54a4869ff2e6b058447b5b6f0f3e5
+EBUILD freeswitch-esl-9999.ebuild 5043 RMD160 f6ede3d7be2465db358a08421068542e28afeaf3 SHA1 a43bf48848c023c19526b9f156072d8e906c3e54 SHA256 8eda8638727a46b55fe2cbed39521ff014a69916ffa83ac2de17efb69729bebe
+MISC metadata.xml 226 RMD160 6f8ca6b0d09443f8ecc946e25294bb1bc215e405 SHA1 0e30c051815a189ade7c6854bb5f7ff085c4852d SHA256 aeedfce2568a9d42cb3c654b772fbe9514534c981cd16838c16d5e8292efaa10
diff --git a/net-misc/freeswitch-esl/freeswitch-esl-1.0.4.ebuild b/net-misc/freeswitch-esl/freeswitch-esl-1.0.4.ebuild
new file mode 100644
index 0000000..f030498
--- /dev/null
+++ b/net-misc/freeswitch-esl/freeswitch-esl-1.0.4.ebuild
@@ -0,0 +1,242 @@
+#
+# Copyright (C) 2009 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="2"
+
+inherit subversion autotools flag-o-matic python
+
+DESCRIPTION="FreeSWITCH Event-Socket client library and language bindings"
+HOMEPAGE="http://www.freeswitch.org/"
+
+if [ "${PV}" = "9999" ]; then
+	ESVN_REPO_URI="http://svn.freeswitch.org/svn/freeswitch/trunk"
+	ESVN_PROJECT="freeswitch"
+#	ESVN_BOOTSTRAP="bootstrap.sh"
+else
+	SRC_URI="http://files.freeswitch.org/freeswitch-${PV}.tar.bz2"
+	S="${WORKDIR}/freeswitch-${PV}"
+fi
+
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_LANG="ruby php +perl +python lua"
+
+IUSE="${IUSE_LANG}"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	lua? ( dev-lang/lua )
+	php? ( dev-lang/php )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	python? ( dev-lang/python )"
+
+# needed for fs_cli
+#	dev-libs/libedit
+#	sys-libs/ncurses
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10"
+
+
+###
+# Helper functions
+#
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ "${PV}" = "9999" ]; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	if [ "${PV}" = "9999" ]; then
+		subversion_src_prepare
+	fi
+
+	#
+	# 1. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use python; then
+		python_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 2. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks openzap
+	filter-flags -fvisibility-inlines-hidden
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks openzap
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. build esl modules
+	#
+	for esl_lang in ${IUSE_LANG//+/}; do
+		use ${esl_lang} || continue
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	einfo "Building libesl..."
+	emake -C libs/esl libesl.a || die "Failed to build libesl"
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. install esl modules
+	#
+	if use ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	einfo "Installing libesl..."
+	dolib libs/esl/libesl.a
+
+	insinto /usr/include/esl
+	doins libs/esl/src/include/esl*.h
+}
+
+pkg_postinst() { return; }
+pkg_preinst()  { return; }
diff --git a/net-misc/freeswitch-esl/freeswitch-esl-9999.ebuild b/net-misc/freeswitch-esl/freeswitch-esl-9999.ebuild
new file mode 100644
index 0000000..9f66346
--- /dev/null
+++ b/net-misc/freeswitch-esl/freeswitch-esl-9999.ebuild
@@ -0,0 +1,243 @@
+#
+# Copyright (C) 2009 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="2"
+
+inherit subversion autotools flag-o-matic python
+
+DESCRIPTION="FreeSWITCH Event-Socket client library and language bindings"
+HOMEPAGE="http://www.freeswitch.org/"
+
+if [ "${PV}" = "9999" ]; then
+	ESVN_REPO_URI="http://svn.freeswitch.org/svn/freeswitch/trunk"
+	ESVN_PROJECT="freeswitch"
+#	ESVN_BOOTSTRAP="bootstrap.sh"
+else
+	SRC_URI="http://files.freeswitch.org/freeswitch-${PV}.tar.bz2"
+	S="${WORKDIR}/freeswitch-${PV}"
+fi
+
+LICENSE="MPL-1.1"
+KEYWORDS=""
+SLOT="0"
+
+IUSE_LANG="ruby php +perl +python lua"
+
+IUSE="${IUSE_LANG}"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	lua? ( dev-lang/lua )
+	php? ( dev-lang/php )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	python? ( dev-lang/python )"
+
+# needed for fs_cli
+#	dev-libs/libedit
+#	sys-libs/ncurses
+
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10"
+
+
+###
+# Helper functions
+#
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ "${PV}" = "9999" ]; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	if [ "${PV}" = "9999" ]; then
+		subversion_src_prepare
+	fi
+
+	#
+	# 1. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use python; then
+		python_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 2. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks openzap
+	filter-flags -fvisibility-inlines-hidden
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks openzap
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. build esl modules
+	#
+	for esl_lang in ${IUSE_LANG//+/}; do
+		use ${esl_lang} || continue
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	einfo "Building libesl..."
+	emake -C libs/esl libesl.a || die "Failed to build libesl"
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. install esl modules
+	#
+	if use ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	einfo "Installing libesl..."
+	dolib libs/esl/libesl.a
+
+	insinto /usr/include/esl
+	doins libs/esl/src/include/esl*.h
+}
+
+pkg_postinst() { return; }
+pkg_preinst()  { return; }
diff --git a/net-misc/freeswitch-esl/metadata.xml b/net-misc/freeswitch-esl/metadata.xml
new file mode 100644
index 0000000..19bb33c
--- /dev/null
+++ b/net-misc/freeswitch-esl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>s.knoblich@axsents.de</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/freeswitch-music/Manifest b/net-misc/freeswitch-music/Manifest
new file mode 100644
index 0000000..149325e
--- /dev/null
+++ b/net-misc/freeswitch-music/Manifest
@@ -0,0 +1,22 @@
+DIST freeswitch-sounds-music-16000-1.0.3.tar.gz 27238466 RMD160 1e186938171f013315f82dc0dc6db4791ebadad4 SHA1 e6c1f46e3384eabee4e3fd56f240893c8d183a75 SHA256 467405c65f0d1c1126c41812cdb171cdd2eb10294ab5055cc4e621bf08202442
+DIST freeswitch-sounds-music-16000-1.0.5.tar.gz 27238463 RMD160 e11c7b72456c187cbe7bab408cff386b0c65a60b SHA1 4efed580c7984eb488964e343c5e6a1d540b105f SHA256 c63033f6ac6f090dc1c9ce74770a16f236f3a0871c53f2db3782d9ab9010972b
+DIST freeswitch-sounds-music-16000-1.0.6.tar.gz 27238477 RMD160 1db8ef66119ed8b232e726dca5a39f7aac2e10cd SHA1 501da13e4d6d13033ef0dbddaf71e0662526dcb9 SHA256 8d442c6fb2ad218ddb665176eb7e96eda4f7493e9e0f37f400976dde4427e6e5
+DIST freeswitch-sounds-music-16000-1.0.7.tar.gz 27239440 RMD160 d35523f92f2a5332815b4ab8d3312868080af8cf SHA1 60af486438a363853a1d2e425f653a290540264a SHA256 82373340d93872d779ca11b8da251d35dbda25b8101473d84769b63eb8a5f5ab
+DIST freeswitch-sounds-music-16000-1.0.8.tar.gz 27233654 RMD160 1fb87961e860e98ad657d5739a1e8de7729c4f55 SHA1 b4df2bab432deefb52ec83731243490190efb156 SHA256 d1e1dbaec323691f7630f834e5bddc3683303f297bdbbc3694dd2d51430f58d2
+DIST freeswitch-sounds-music-32000-1.0.3.tar.gz 52277070 RMD160 026acd33f3419d84286d07f814356f49ba745352 SHA1 c0477fe28e76c6222519f57d10861fac5fcbec64 SHA256 d9769406bea2e00677bf51da2bd3dfab4ef5c3bb5cf4ffcc58dc44ea420dc4f7
+DIST freeswitch-sounds-music-32000-1.0.5.tar.gz 52277076 RMD160 7fd7e9df59a0c558fb92351be7e8dac2014e014f SHA1 fa1cb1ad489f538eb9e5b48fbed4844c284261cd SHA256 c704e490e879aed3d6909827ef461832a9d17f6b572b0b57e0884e970b0965dc
+DIST freeswitch-sounds-music-32000-1.0.6.tar.gz 52277073 RMD160 12872a3fc82961f8d23a6b5aab611e9ed8622adf SHA1 67663a804593162e173054a25ddc2bd5993ad7f8 SHA256 0c2872f2d9f54a5e87b9de4d69fa5fb8c35f226f8a5a920ecf3b4a6bfa9d639c
+DIST freeswitch-sounds-music-32000-1.0.7.tar.gz 52278207 RMD160 205dd4c927144949ce1be2d8fdafe3ed8076eea5 SHA1 25ea22d3cace1406716bb0439b8e916fa35cccca SHA256 7239785c56426c57d1ce14c19bdf0c5b9449c38f198503c57695e05f0622377e
+DIST freeswitch-sounds-music-32000-1.0.8.tar.gz 52284585 RMD160 09234fd86fe8b9df9a6bc130b7fa68820ae084fa SHA1 877b7ce4a6dd19e93befd9e13ec52003b674ced6 SHA256 68c7b1e8254438e622dbce7db321009a68b3c1620241354655440a0904423e12
+DIST freeswitch-sounds-music-48000-1.0.7.tar.gz 75216130 RMD160 4ff34fe5b9ed4559e202329348c4204e00bf1d6a SHA1 3751dfe7d41a1f0c5b8872358189ceecc000f5e1 SHA256 9373ea6424a08f4137f09383b56167d1501b2164560001332102d289d7307616
+DIST freeswitch-sounds-music-48000-1.0.8.tar.gz 75215628 RMD160 510e16c8366a27f6a3d0d02409350968a098339d SHA1 8eab4abab14322ce84940f86f0e921c053b19081 SHA256 ebca40460bcbe4ec6e17a62a9b4dbde5b8facfaf5ae66575484f33c5d09dde6a
+DIST freeswitch-sounds-music-8000-1.0.3.tar.gz 14126821 RMD160 4c91b274e21b0321a88c37e6efe1b4078fcaf761 SHA1 fe09b124145e0503c8d53d04ef18edad295c60b1 SHA256 70656e17cb2607d75545a0ede232819150fec98d4957e55a9bc82e702d4fc6d0
+DIST freeswitch-sounds-music-8000-1.0.5.tar.gz 14126828 RMD160 c0186bb8e11d1f632d5369e74042b5e1357a9c46 SHA1 4908604b69bf4db8b6aea6b9acd835b28a3da5ab SHA256 7511caae1c6be9c89956a363f17c79b714fb08b6105136e3ac6e5699541058db
+DIST freeswitch-sounds-music-8000-1.0.6.tar.gz 14126825 RMD160 2dc0432348f66886a1d04a8d8fb47f049647c43c SHA1 3ea7a9ff292aeb298e870643152fa145ccfc2d78 SHA256 8d205727ec35e2c7d46b8ce77cbb748fb6c6fa804ca9431b182f4d9fdce6386d
+DIST freeswitch-sounds-music-8000-1.0.7.tar.gz 14123146 RMD160 f5e08f0b591ca228aee9d853f3f35457f515dd82 SHA1 280bb2525e8e88297bb94f6c4f2724b4d4ce290c SHA256 71da092ecb87c3d233060c006603f7e21762dacb3c17951f9857dbb8cabf90d2
+DIST freeswitch-sounds-music-8000-1.0.8.tar.gz 14122644 RMD160 c126cdf62bc9d7b3037b556c6bc69fd0124dd710 SHA1 eaf2b05ca1583234169afde35b1a790b8cdf42eb SHA256 02de6a0a4617c36b3ae3b8ad4f8d78aa39d5856d153d7da54cfd1fa6792a8837
+EBUILD freeswitch-music-1.0.3.ebuild 999 RMD160 c2fe204099612b2b8ef27f880a6ed8f90f023141 SHA1 8d2ab451d58d39eec0e7832422d112e9ee51058a SHA256 a9ce5b26dac880ff68fbf9ad9d361cfc41271b92c8c90825a8cd1b0940257d35
+EBUILD freeswitch-music-1.0.5.ebuild 999 RMD160 c2fe204099612b2b8ef27f880a6ed8f90f023141 SHA1 8d2ab451d58d39eec0e7832422d112e9ee51058a SHA256 a9ce5b26dac880ff68fbf9ad9d361cfc41271b92c8c90825a8cd1b0940257d35
+EBUILD freeswitch-music-1.0.6.ebuild 999 RMD160 c2fe204099612b2b8ef27f880a6ed8f90f023141 SHA1 8d2ab451d58d39eec0e7832422d112e9ee51058a SHA256 a9ce5b26dac880ff68fbf9ad9d361cfc41271b92c8c90825a8cd1b0940257d35
+EBUILD freeswitch-music-1.0.7.ebuild 1046 RMD160 2dac6f2a010bad1a2d4b56505aa4faca511be357 SHA1 027305fc59d459dfcd35e4a81064b81e0473bea6 SHA256 ed9fb830174c9d28b5018b80540590218b5f0927486a503a99a8fef3fd74721d
+EBUILD freeswitch-music-1.0.8.ebuild 1046 RMD160 2dac6f2a010bad1a2d4b56505aa4faca511be357 SHA1 027305fc59d459dfcd35e4a81064b81e0473bea6 SHA256 ed9fb830174c9d28b5018b80540590218b5f0927486a503a99a8fef3fd74721d
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild b/net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild
new file mode 100644
index 0000000..5e45910
--- /dev/null
+++ b/net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k +32k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds-music"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="
+	${URI_BASE}-8000-${MY_PV}.tar.gz
+	16k? ( ${URI_BASE}-16000-${MY_PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${MY_PV}.tar.gz )
+        "
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild b/net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild
new file mode 100644
index 0000000..5e45910
--- /dev/null
+++ b/net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k +32k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds-music"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="
+	${URI_BASE}-8000-${MY_PV}.tar.gz
+	16k? ( ${URI_BASE}-16000-${MY_PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${MY_PV}.tar.gz )
+        "
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild b/net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild
new file mode 100644
index 0000000..5e45910
--- /dev/null
+++ b/net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k +32k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds-music"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="
+	${URI_BASE}-8000-${MY_PV}.tar.gz
+	16k? ( ${URI_BASE}-16000-${MY_PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${MY_PV}.tar.gz )
+        "
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild b/net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild
new file mode 100644
index 0000000..e6cf946
--- /dev/null
+++ b/net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds-music"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="
+	${URI_BASE}-8000-${MY_PV}.tar.gz
+	16k? ( ${URI_BASE}-16000-${MY_PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${MY_PV}.tar.gz )
+	48k? ( ${URI_BASE}-48000-${MY_PV}.tar.gz )
+        "
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild b/net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild
new file mode 100644
index 0000000..e6cf946
--- /dev/null
+++ b/net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds-music"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="
+	${URI_BASE}-8000-${MY_PV}.tar.gz
+	16k? ( ${URI_BASE}-16000-${MY_PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${MY_PV}.tar.gz )
+	48k? ( ${URI_BASE}-48000-${MY_PV}.tar.gz )
+        "
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/Manifest b/net-misc/freeswitch-sounds-en/Manifest
new file mode 100644
index 0000000..65c15ee
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/Manifest
@@ -0,0 +1,50 @@
+DIST freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz 16907516 SHA256 634dcda420dbe4c112eb9e2ccccb5a9f47b8c2fc2db82efc0047dfd9884e4158
+DIST freeswitch-sounds-en-us-callie-16000-1.0.12.tar.gz 17595076 SHA256 035b88e5951c3ea976cfb4cd80a4dda8e07a1e68c34cc9474987ac5aeac48960
+DIST freeswitch-sounds-en-us-callie-16000-1.0.13.tar.gz 20221380 SHA256 23886e64c27d75b0bf9c3dc3e59ea5b77726f2ea08cea00caeb345e3997fb1e4
+DIST freeswitch-sounds-en-us-callie-16000-1.0.14.tar.gz 23524382 SHA256 3bba3532a6792865d80c4170316b510e5e9e228074640435829eee329c5ec54d
+DIST freeswitch-sounds-en-us-callie-16000-1.0.16.tar.gz 25739233 SHA256 bf0e3f38ff2e1fd3ba0414f6983ed7ef9871bc86c75775235f6077471a5e8ea1 SHA512 4eb3208b603d0e4af2b9c77814038595009c6905123d967b8977c04d1498b642234f7f9138f98ce6d44680648639aabc4b66421b7c0f06fe6b2e461eba5265d7 WHIRLPOOL 0fceaff63a01b698b390aa33ea7331b19a6b91775919d2d6ca0eadb5368d361634852aace6a6cea058a6f7677753f4bafcb1cf7ed1f17d66acd770d5d0b97d09
+DIST freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz 28161362 SHA256 c1c6d4405055db31eeb47d3a90ffaf9fb5ca5eecc962749f1409780223fd761a SHA512 7fb798bf04188482481b471d2ea9cd8ac58b9f4c426d322d1a351f40072d7da2843dfc6eec108a75ce568db40dcce6f85221de601ab7b87bba9b8d8d88665de6 WHIRLPOOL c965223cd5e7e363548bcb8e4b469b7838de895991d176f20094d9f4f4658aeb111a89a58099007e2999c6975e4dda63f464c35fb0adbf5429ab4d61942cb89f
+DIST freeswitch-sounds-en-us-callie-16000-1.0.20.tar.gz 31160818 SHA256 af788e98a8a638366a2dc7510aa56a4a82507b606f63f982b288ebad7e571a0c SHA512 ba2b04a006e5f2889bdc869501d19163f4710a6dca740d07425865816f323f1a296b0fe5066fa593fe75c208ae6a9d942d0d4ced7bf0db18e551ee09504437ad WHIRLPOOL 73f57aef83436069391a4314484bf5ba57360efbb2d97b3f3fd3fe6c2e5d44801bd7eccdbcd1d0bbca1e55017cb936c89aaf2df38df64e9d3fd2c9c4c6c88c1b
+DIST freeswitch-sounds-en-us-callie-16000-1.0.22.tar.gz 32760710 SHA256 6d8ef9b4bdb19995f69b04623c3ed6db04178da23cb9f3611dc5bd36f5e7eb8f SHA512 e12f8bff995ffe29659b842cd36e89b85350275a5b848746c60aa7227559c41459ee10e9963f133b85157a43ff159fdae5b2e34f9f9ad9eb2778bd9d5c337385 WHIRLPOOL a856a166fbec17f863e43ec701db5f4cc3fda46c27d8914ebb3cef07da71a6ab7f575177c17481856b2604930371e4ff9ffbe0c13361642ce8af8709f63fcf60
+DIST freeswitch-sounds-en-us-callie-16000-1.0.24.tar.gz 35337077 SHA256 d668ee34c17851b8762bc6d7bec55071b12b2d933f157a4d4d9b775e008fe386 SHA512 ac49d0d904d9fd9cba3771279a8e0a16cf8436a389f8b05af8f957ed3151f590a93f28ea2f20a862d6a7de08243bea03ef1acd6ff343987d842bffb3fb8484c2 WHIRLPOOL c3f20be12611003660265de12f7f7fe5b95930f3be91e7883b937496646ed44957f05e8ca3795f5436305770409905d50af287da935d6061a01d6bde55bcde73
+DIST freeswitch-sounds-en-us-callie-16000-1.0.25.tar.gz 36671995 SHA256 ecdf1f30e8003a955f57566a538c27fd7ad262cef3f211ba6ee8debf6ce733f6 SHA512 0e2e888856e859ca927ac74cb0566b961bd3b9e9e3781818eacf5a66973fba2cd9681c85bb5f536c33eba97090172d11aa90eedcf761996295aea36691b868fd WHIRLPOOL f7a48923780f022901a9d7c5e95072060079d1fa86adaf054fcc64efb91cdbc195bd453606c271c5ba85dd985242d633c8dcb332ff703ebdf0ba2c97e5e2ee97
+DIST freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz 33364530 SHA256 4ec8eaab21e84267542efe2fe2d82b9738fa888de5a6f5553abec954747d2e2a
+DIST freeswitch-sounds-en-us-callie-32000-1.0.12.tar.gz 34729377 SHA256 7fcb005a6c7c44f1f2c9cc9d5ad8be8a6c00f551ea0d3ad64cc787b5ba296a9f
+DIST freeswitch-sounds-en-us-callie-32000-1.0.13.tar.gz 39933869 SHA256 4969f0b8375d732cc91f881cb675cc6ed83104c0c1915304959fe79d983581de
+DIST freeswitch-sounds-en-us-callie-32000-1.0.14.tar.gz 46286239 SHA256 287c74738403e319e923f501030b32b2f22f2905af326f478a26399e09e06ba2
+DIST freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz 50567956 SHA256 63eb497b86fa5e6da353970cdf76da17df43f246d3ea9979fa76083eacc9a449
+DIST freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz 55081458 SHA256 cbd55b6355829bb559741700d2a310718a95800f8cf8b229e1d15eb99b94d3a4 SHA512 033a0b7d5ec6f35e872a5291cd5eb8c7a27d4138cb368d34b7367f3504c902402288de065750e178b67e5f3298d1f2b6849d77377ab5da1130b7afa28bdd9ce8 WHIRLPOOL 56c766c5af2c5615d95e7ff8e1757fb6bcdaa86261d8b1b5b0ba028b183ff1ac801315708eecdd75eaef1a2ae58589cafc51b6a9a0af05ca7c6f370b0de243c4
+DIST freeswitch-sounds-en-us-callie-32000-1.0.20.tar.gz 61199871 SHA256 66a192dcf5ebf2b57c5c01ee9e8e2a04d8c50614ce7000698984d5ca8252735c SHA512 3a4a38ea5c323ec459646661f18ff6903873a2ebbce0c108f2127eed1630fc7b3f110a7ccb0984c05c684d38ef86725cd0dcaa7456ae8a014c2b679fcb3ddd5a WHIRLPOOL 6dc7b65b8176f2bed3628c3b627c0264e664eec2215e2c60ad3f46e42b6a2a4e352405ae8509fdeb05ac2e881859ad0372f5bee88564cee3caa655fdfbb89f15
+DIST freeswitch-sounds-en-us-callie-32000-1.0.22.tar.gz 64352708 SHA256 31dd2a3016f9d3401ac7a4cec5568a16e101adebed9a139c47c86b41ab04ebdc SHA512 948ad5924d020196562f58211bc1aa89ddc18d73550840f1d3250fafdd1943c4e96ed8b4d7fc14218be0df1d08224ccdf0be1ccbd06d4df2ef2e36cc496801f8 WHIRLPOOL 6a7b0555dd7eab1e96ac69f79d81430ebbd49de4b4ada99ffae5e19751362de71b1cfd612e3b7f26c15c7f1e59efcea309331d6461a454d301c047681af41b92
+DIST freeswitch-sounds-en-us-callie-32000-1.0.24.tar.gz 69411929 SHA256 691e817e5385eaba8534b36051cd6054e0c3289067a7e23d8890b10870189020 SHA512 1ab2764f584db99ef02a0e37a4d37ec538a7a2e0b5882e86157a9f0763098118e8549dbdc986e63307dffa4188b4dc00c8b372ccd1150628d9b9ecbd9df5f4e5 WHIRLPOOL 4f7a3e31945ea0b6b8f969a2c58ac6f30b48a0dc91af1e31559c50d26dcc649b2ffeee3f03d58f62c5c9c1dce5c38a83895385a23c0f6a1e9a783ca313a29a91
+DIST freeswitch-sounds-en-us-callie-32000-1.0.25.tar.gz 72019603 SHA256 e7b3a8fcfa15b2567c184c074bbacbb00970d1cb03872eff4019090bb065e3b5 SHA512 97bf04ed4fc7cc7a28aa44909db67ca6367bb1d47ad03eccd3405155571272edebca3e4342b0007fcd108a6fd8abdf030b624d21cd66601f97fe92d33b6a0f4e WHIRLPOOL 26773ffef3972b7ccfefe22efd9734227a908856a4ec0b6e95e5f7a0621d36231c0a405dc1b2656c95703c04459f55232a2b0d37b1ae8a68855e521dd98826f9
+DIST freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz 48988220 SHA256 9ba37bd6c221affec903ce87d56670f1b0a0c7de9bcd0aa3edc7d48e88aebc7b
+DIST freeswitch-sounds-en-us-callie-48000-1.0.12.tar.gz 51004130 SHA256 fa8c76ad0c9af48286cd8dcae69dc18e0ec7aa093a94532e465bfc2a8f68cf2a
+DIST freeswitch-sounds-en-us-callie-48000-1.0.13.tar.gz 58647498 SHA256 6920dfdf15b2d089688c1f069e6570a4485eee70eb6bd4f1e3ffe52a6a8e0d7a
+DIST freeswitch-sounds-en-us-callie-48000-1.0.14.tar.gz 67971195 SHA256 cdfdada68476a2fed095b873183fef9d0470a5e60726720586d6521b9c6f6ed1
+DIST freeswitch-sounds-en-us-callie-48000-1.0.16.tar.gz 87130408 SHA256 51d84024d6091c13521fea4397e5d8d21c087770aa4984308d7157a10b034505
+DIST freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz 80491982 SHA256 a060fc118090b679408f8e712af9e556816e0d7f4c59422f7504066c693d71e9 SHA512 c37e4f1ee1f6796786b38afea89f0dce71701ca8ffe25c9be22ff392f1d1c96b872a61b4b6bf1a08b14286e5488ac6572ce92f8dc5e86c76f47e046745570ee3 WHIRLPOOL e5c61ba139573d2d1ff497deb2b00b7f00a6ae6ddb155f56998540ae886ccb07b48f3fff429f83f603af7e5b78e2d24c289de2d7e549bc693b3afd2fdab45f7f
+DIST freeswitch-sounds-en-us-callie-48000-1.0.20.tar.gz 87945358 SHA256 4f5522ccac0167cd6b0de79e1f386a57ba57c3a157910901b0dc28989624678c SHA512 21eb7ceffcc8186e2288c0468bd731f5eee184d241e2f5d0c2b063c6379cd66698623c2365fbc93dcd21d6fb34eccd750a4fa4eb1a611464945d86fcb8aae3b8 WHIRLPOOL c624582c8c1c436a75783b949752de62d76731de87cbfa9a650f0ec7d6ecc4186f8fed160a847ca2d64797d223f75220a8327b172d216b93c3f186c87006003c
+DIST freeswitch-sounds-en-us-callie-48000-1.0.22.tar.gz 92587928 SHA256 75e84d12a998e505adfc300ce2b4c2624ed21dfdc7c72eecd533896df4629138 SHA512 ba27e7dc7b7c39bf31745443031afb08d7b6767e219150fd9a717d785b39f84073c877d55246191a3d7e65e552b81fdd941b1326b3cdbe6d4aad3e3a78d6b430 WHIRLPOOL 579aee3b164f36232afb875b4029224a5bcd8be71d795df0a28e281584a2a5d2ce37ed26a1e2797dea44455558106d9188e91509bcf2be5fbf264bc339f7fc53
+DIST freeswitch-sounds-en-us-callie-48000-1.0.24.tar.gz 100018897 SHA256 d84230c7d7502ca18e9738e39fe05ad69651551035200d671bbda2e6d834294d SHA512 037d86f6afe9134a3316609e196ec7ddb514aeb0d45f9ec69165cc6e09224565a5fcfb08bdc6dd71bc2dcedd7370b26343a801f350b7d421dd90b52b86cff43b WHIRLPOOL 3b10c739d4b5628d7f50c754dc385d6390f36d8acaa2f21b228a4088553130211e34ac851d540f90c2afddcfc54b906c167c84ac8a87a1d9aff352f0c8848574
+DIST freeswitch-sounds-en-us-callie-48000-1.0.25.tar.gz 103860329 SHA256 673f37d35818cc33dee857f5912dbf6c965b6b1f871d46c2592f417939735dc9 SHA512 5afbc97e154d301fe525afc0d99b14ab4a4c08c1c88e98d47a0065fc04b5ff53bc0dbeda5afd5ed52dfbc37709bcc9b3a73570c5855c1b48a4bb5947367f3645 WHIRLPOOL 7b06bb63690edb879db2bf959c3564c84b3b5160393810ec49735ec04ecd5d9799fcdb16b261f0590ab1b639339f28bd450643e71f19d02f3a9c4ddbdb3a2e93
+DIST freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz 8483213 SHA256 053fd4abaf07f57232ce30fb41e1d4da50718064f060c2e456dbcc653afd8b43
+DIST freeswitch-sounds-en-us-callie-8000-1.0.12.tar.gz 8823973 SHA256 0d7ef143532c330050f27ffa537ced7e81437232d47ce11eee9596925da2c564
+DIST freeswitch-sounds-en-us-callie-8000-1.0.13.tar.gz 10139468 SHA256 6babf8bc376a81031eb28197393f39ab91be03f7addd2f87908a6e66f64749b0
+DIST freeswitch-sounds-en-us-callie-8000-1.0.14.tar.gz 11790398 SHA256 793cc1602878ac01b4475d8014944700b4278df57a9f8326a459c951ace88a64
+DIST freeswitch-sounds-en-us-callie-8000-1.0.16.tar.gz 12910395 SHA256 c88c360f4cf234597ba7ecbb9693be8ed42b31882ffc7ba02d10d180b2369899 SHA512 5ab66406a2651e28fca535cc903cf5f44bf346bf63f6d9b22a697626887ebd4d118bd1c3a5c087f83a6f8b03ac0b35ecbce80e26d72773bdd07f366e1d51ad6b WHIRLPOOL decacbb7d6e819cbb146408295e815239da4ac08569fc2ad4e965ea37e7d0a07452370e2e7cb90fee7b3f22a383fba772f79613b6d0ee23b7a274aaa638f75a3
+DIST freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz 14180974 SHA256 131b87a4c190d40ce3c5a67c2d2096158f11e85a1659eeb2bbf38e08bf7be812 SHA512 3e07d3d1d60fab1b61ca51b3c0b68d14161e79647d5c04ede0ff5c7c03e463215a9985e5626721c7f5f36bba11c3c5049556d8f656ff5466868be256ef82f89e WHIRLPOOL cd613b88e36c02d647df89828a4094a807b3cda75c048938cf2cec535dbd5b525114df3c150460993b77fdf5a6e5c9ba9462cb2669e31efbca7efa76fec353c8
+DIST freeswitch-sounds-en-us-callie-8000-1.0.20.tar.gz 15643920 SHA256 663b72ebf4f2b99202daf9783aafa3e056a67c1ec803f2b2f1d1e71207e3b2ec SHA512 8cc9d7c20507d1c07c7f707de8d97505896e0cb108837fb75493f2dec146fef04a1a543923a83be81d259c0141f3156a88c941967559e399e7e0e8286c6bacb8 WHIRLPOOL fa1fb9f09d918d623abfdad4bc5897fc264211fd88801b51aaba980b2de8fc948e6542d52a1893746b4a10419cdd645960a784a869424f79c2f649b28b8a5e28
+DIST freeswitch-sounds-en-us-callie-8000-1.0.22.tar.gz 16443424 SHA256 a7b2c0167cdd7d33a7b27fee3fd9df8cc8397c589596d2dea6013d0c404e65ea SHA512 68d02fded9a5d19a852b1ffad429ab7dcfdf34b58db2dce6e581bc5c501667cf7b17fd22ac7af7a1782824ff0bf8889ae066977ae9821ae4aa193f7fc2608880 WHIRLPOOL b23e22731294465024bb08fa71bd3c12f970640e1a6c626704e051d920571c25a1b54af5e143db026996d44bd6954d319fc8680b293c84dd4b5e0ffa34cabfd0
+DIST freeswitch-sounds-en-us-callie-8000-1.0.24.tar.gz 17741850 SHA256 52ef0747a13469696491c7ec16b3850a401af4b2dd19a146ff7996b2804f7866 SHA512 fce404fe4bd22beae093832450349ed95c43280e7bf0806aa062a90c2c177832448ca5f831b81cddbfddf302b9a2dbb90bee0140c251566dd3b7a4a671a0c87d WHIRLPOOL a1bad121224ce67bda13b25241ba4cef7b567a75c543f561c42a68ab6796148346b71a5699e1c2e7aac99000c28550f98853b4518fe72ff50ad4b10005091bc2
+DIST freeswitch-sounds-en-us-callie-8000-1.0.25.tar.gz 18409163 SHA256 02ac956d10b9005d02f15b7556f97a7705f17bd2f65187be7b01258e9ffde40b SHA512 17a0a470cde95f6bd90e980c6bcf769a77b05b643995e3fa6ee2cae723f6e38eeb5d611c0d64678787d424d2fde52708e11c6a1c9276b01542c324b38d3948c6 WHIRLPOOL 9a8d3db5b3b27367fb00e8a0d3079733d89d5c6777d246600c498f992ae092526d29eee0d7f898dd54b07d21c4963cea178433775fd644e0b4808428aec35f2e
+EBUILD freeswitch-sounds-en-1.0.11.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.12.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.13.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.14.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.16.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.18.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.20.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.22.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.24.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
+EBUILD freeswitch-sounds-en-1.0.25.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
new file mode 100644
index 0000000..0fd17f2
--- /dev/null
+++ b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="English soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-es/Manifest b/net-misc/freeswitch-sounds-es/Manifest
new file mode 100644
index 0000000..fbf6695
--- /dev/null
+++ b/net-misc/freeswitch-sounds-es/Manifest
@@ -0,0 +1,2 @@
+DIST freeswitch-sounds-es-ES-cristina-48000-1.0.14.tar.gz 76454861 RMD160 f03e09984667b747d72361a033025c80ae998fce SHA1 484c5b1f39bad7c9ab02c72af58c1512aa33fd47 SHA256 890a474fbb012d470a4e76f2f3dde625cb296dad582a0a48b516124b17cf1e8c
+EBUILD freeswitch-sounds-es-1.0.14.ebuild 1151 RMD160 7479eed5ed58beea5534afc61062712d8cdb3942 SHA1 748e35260849f09388ab121611b2762361f8e3e6 SHA256 a0f72e6258367e653666b67d2d0816e445cefbb6233f034a47d079da44eb1c1a
diff --git a/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild b/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
new file mode 100644
index 0000000..b066948
--- /dev/null
+++ b/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+#IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://www.wirelessmundi.com/freeswitch-sounds"
+
+DESCRIPTION="Spanish soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.wirelessmundi.com/"
+SRC_URI="${URI_BASE}-es-ES-cristina-48000-${MY_PV}.tar.gz"
+#	${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
+#	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+#	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+#	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
+
+LICENSE="CCPL-Attribution-3.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-fr/Manifest b/net-misc/freeswitch-sounds-fr/Manifest
new file mode 100644
index 0000000..bbb432c
--- /dev/null
+++ b/net-misc/freeswitch-sounds-fr/Manifest
@@ -0,0 +1,20 @@
+DIST freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz 18198669 SHA256 0dc4351534547994daf7b3bfdbb8df9b4bf75e8e4f576819468e6c708578b0a2
+DIST freeswitch-sounds-fr-ca-june-16000-1.0.15.tar.gz 21916469 SHA256 ce84313c4bd01a6f83e723bcf9d198f4f0297a8aff1508bcc0ef705764dccc31 SHA512 69d56262b30908e9a7641c06e233b2014f559a09a41a192084418980979e975828296d86611e05416b86872f42e12f29b820d7b4cba4bfa8e0954e949ee86ed4 WHIRLPOOL 94e9f1e4087bed4ef5d7698a0dad23fba24c8c296dde1896dec8e0efa33f8d084a79791018bcda7ce5fb0f69994430d057be672e34184186884dba31b8813510
+DIST freeswitch-sounds-fr-ca-june-16000-1.0.16.tar.gz 22007198 SHA256 4e00722c5487c25f403e432c21a7be72eded0347496490167b82494edc6b4682 SHA512 e5814f355546bc46e255feb383ea8210fe086992b2facbc8d33b185013595d716cf1255dec3f63ec5dfade54df35f4c7fd551cea77d47716a70fa316e198e484 WHIRLPOOL 3a2be93f2532b39d6b6135ea24d63b277537ea7b99c092e49a43d25fc2588a9d17f1c8fab7fb764be9f16bda2442a8366a06c478581167cdc3b213be1da9487b
+DIST freeswitch-sounds-fr-ca-june-16000-1.0.18.tar.gz 26607279 SHA256 5c4e45be5988e7763b196a453722f3a5dd41f79b280a37a8960cf65d390318a7 SHA512 d3306ad81ac9f3da3da6a526abbe1c315a0c50f89750ac3f930086dcd088a0de64a5dd6c06f0d58d28ba12f59abe871701cc2dcf838bb43a1d8d2ed85b5bff0a WHIRLPOOL e98097a7382ca268e1f39b48b180b3f6eb5973df1ae09ba9361bdfe9efee32b49164a7a06a3b470eab8e748031eaa86d54781e5425b06616278cdc14f116c7bb
+DIST freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz 35601264 SHA256 efb3842a638dcfa9376f602b80ef00416bfa4fc5922f05aea772009690a6792f
+DIST freeswitch-sounds-fr-ca-june-32000-1.0.15.tar.gz 42867314 SHA256 691803b82b48a5da2ebfb32f6b0371fc88128516b4f308725843549d5e2a44b9 SHA512 ff3de8c53813c2a343035ec4f7d7a7a926335f86a18f2370c37fcdf57dac54a45861b6bfde85b34d84645646a2dad1684077df04dea7fb3b86ee06ca6eeeab88 WHIRLPOOL 712290e049cc148da25fbaa38caa391d21514cf517f7309a23b8c90054db9853274b362c2dab69551978d078c90fec91f1ba81d8c572deae5eb072823ac93d4a
+DIST freeswitch-sounds-fr-ca-june-32000-1.0.16.tar.gz 43083229 SHA256 c5d986db76369062671bdd1c7adfbd26613ea42ec14f2ace3f007b54a18e4f7a SHA512 2cb4375716a269fa6e4d10e50872a1b791e654e7bd7ded1a672cbd5d23c3f1f184852f892f670d5a604e81afb3b905c19cb03366de6514ae1d3eafde944bd2fc WHIRLPOOL fcd83465eda4e402f29cdf0dd01248467579ae085870a01b0a7ddffe49450d0bffa61162739cf486e40bc72d3d89d45a1fd03c39090e6ffc2f3f6edc2e6bb748
+DIST freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz 52075212 SHA256 b0c30f112bfd40e0422a93b30d251072e9847274a39d3407a06f3528d8935bfe SHA512 5c49cfc7cd7ab28e947f5ce3e26270f9e2d939caeec928da48760c93b295eb03fe50c7b113a23df9d6f019f788431d0b445e6fc5af172fae239ee08cd288ba42 WHIRLPOOL 84d5b57849dbe4bd8f49302f18a586f84a0d2df880e693c9c7e67c7bdd71cbea4985e8a165ec66714fb409b3fb320659ef294ab9fa322369370d80b4927d507f
+DIST freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz 52402291 SHA256 a53f53604b38e5313637cb057f3f61e48bea335b312ad822165dde9bc8cfc6ff
+DIST freeswitch-sounds-fr-ca-june-48000-1.0.15.tar.gz 63103340 SHA256 ffa6b068088658dfe60a4ca7efda1db1b67058209d130bf0e41cb4d63199f218 SHA512 c915e55ea240fa4bb0cae6acb39e46569536ff36e3219e5d0ea89397812750f5644f8867ff1c194a9c3a01ec73c87f953db1b64643d28567c7a8467075a2ef21 WHIRLPOOL 33dec356464875e3cd998be885c3a5091d146965315b43ea1aca564686a2e5e3476cee38a75b1cf9b9a9208d01d99166f089b51e5a618e304dc57ba98cb266aa
+DIST freeswitch-sounds-fr-ca-june-48000-1.0.16.tar.gz 63475346 SHA256 5b689c85e08bc83d3c40c1829d250580e92c673587b14b7e20768efcd1afe55f SHA512 ad31ae44855ff561e3cc4c817b070a000101b7511525f0226ca1fd50e16355450e99dfcc39c04f1493cfb84b260421afca61edce4ddb25378f84c3a03ca6dc8e WHIRLPOOL b7e8ccb4dbde559f002d0edf5a0e629500aaa4f609c1b96b8ba277d6a8a6d90d35ca024555b60e78235019cb8cf3e5480d37f514ee9fd15b9c4bb2e54e27f61a
+DIST freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz 76712496 SHA256 4c7f6d373b72b5af5bad028b3b193d1b862abcee4466bb6f398f1d3f20befd0b SHA512 351fcec1fdd8f201af99d9ec63adacfbb2e16595287eca24c262cde853811669d52486c15eea3346a1c409a84aa837782aadea83ea269267a612592337f7bee4 WHIRLPOOL 9e48b52c04017e5bd07ed8c906ac07f4b2ae627526df6c61b157dcaa57b9dc05d4649870fd6b65153717304523f442c00941c33c13743a0cd308a36bd2d4db66
+DIST freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz 9203881 SHA256 2a10fdae75cdd6cbb12c5e99a854b01433221ebe99c49d6db024164fdc72d252
+DIST freeswitch-sounds-fr-ca-june-8000-1.0.15.tar.gz 11091802 SHA256 8e45543cad8025b0f977db1479157cbed3ac94c9f7ca27b5c35b2921af93e3ed SHA512 7df4e709a291da72c5d68a630bbfcda818929dce11e13febcfb2e95d2011bd397d28cbf3a9ae85982c2b3afc7983ff9c9f9f78ebc6991cb000bfe022aeece497 WHIRLPOOL b8bdb1cbf078170a6976eac35e291dad539b984e5e3cc1696e244a88dfc5c4578ed0b2eb6c209d7cab851fe83fafb3c11745c7eaccaff60a98e5b9f9fa342234
+DIST freeswitch-sounds-fr-ca-june-8000-1.0.16.tar.gz 11132039 SHA256 65f6a1bd385c6075e4203a637ecb85bbf97ec3b3ebe308cb2228920dc7b218d1 SHA512 1e9b71ac34f0ac2fb5f720a53eb159156d611b19fff85ab7fb3523f132232c05ec8943e1f2b491bad316717020e7bdc972c17499a48480fc86d76939460cd80c WHIRLPOOL aa947b63dfe1c25144e19f75ad472932192c9decfc082ce605203b8b96fbc2c29f6b60446cf91b41cf1a85437faa50d0f181ea595733db1e7e0f0cfed19ab76f
+DIST freeswitch-sounds-fr-ca-june-8000-1.0.18.tar.gz 13468498 SHA256 f7fd5c84ff9b1c1929167a4b33f38d6770a44c5bcad4e5f96b86e3165bfd05d4 SHA512 82640dda13288d911b21fd1beb83f08d5a8497d35e2cdb6438c072bdf81981b1836f91be098cfeb42eb10278170a923cfa120113e8d6329bc94742a1b184396b WHIRLPOOL c017a2710d2ea6a15a5b6a3b963ebda1dab524b0c53514cae23929d96b2efc19f3508b5ed240c3c1aa3e0d9805c63362f95d270b3b221b2859cf60e5057a30e4
+EBUILD freeswitch-sounds-fr-1.0.14.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
+EBUILD freeswitch-sounds-fr-1.0.15.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
+EBUILD freeswitch-sounds-fr-1.0.16.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
+EBUILD freeswitch-sounds-fr-1.0.18.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
new file mode 100644
index 0000000..918470c
--- /dev/null
+++ b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="French soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
new file mode 100644
index 0000000..918470c
--- /dev/null
+++ b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="French soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
new file mode 100644
index 0000000..918470c
--- /dev/null
+++ b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="French soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
new file mode 100644
index 0000000..918470c
--- /dev/null
+++ b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="French soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-pt/Manifest b/net-misc/freeswitch-sounds-pt/Manifest
new file mode 100644
index 0000000..25268de
--- /dev/null
+++ b/net-misc/freeswitch-sounds-pt/Manifest
@@ -0,0 +1,2 @@
+DIST freeswitch-sounds-pt-BR-karina-48000-1.0.14.tar.gz 87795500 RMD160 f8d8e22a8b5818daa9449b72f905653f0eed1071 SHA1 eb7d2e8076b5afd89c71479182f0636f1bbbdd60 SHA256 33928bb325d9c3ab3f5e59b23027b30d618f4cc52d21cacf57d726269e382fd4
+EBUILD freeswitch-sounds-pt-1.0.14.ebuild 1160 RMD160 fe18ff8f1bad58a187bf2aa05d2b801bb8dfec32 SHA1 1f28d868b6c9f4d1c97d21a88d08db6eb3ccbdf0 SHA256 eb76afb8e6ad230b0e3cef8efb65cc9072466e1ca486568c4b2a479f11e52e03
diff --git a/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild b/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
new file mode 100644
index 0000000..1f04437
--- /dev/null
+++ b/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+#IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://www.wirelessmundi.com/freeswitch-sounds"
+
+DESCRIPTION="Portuguese soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.wirelessmundi.com/"
+SRC_URI="${URI_BASE}-pt-BR-karina-48000-${MY_PV}.tar.gz"
+#	${URI_BASE}-pt-BR-karina-8000-${MY_PV}.tar.gz
+#	 16k? ( ${URI_BASE}-pt-BR-karina-16000-${MY_PV}.tar.gz )
+#	 32k? ( ${URI_BASE}-pt-BR-karina-32000-${MY_PV}.tar.gz )
+#	 48k? ( ${URI_BASE}-pt-BR-karina-48000-${MY_PV}.tar.gz )"
+
+LICENSE="CCPL-Attribution-3.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-ru/Manifest b/net-misc/freeswitch-sounds-ru/Manifest
new file mode 100644
index 0000000..fbc9c15
--- /dev/null
+++ b/net-misc/freeswitch-sounds-ru/Manifest
@@ -0,0 +1,15 @@
+DIST freeswitch-sounds-ru-RU-elena-16000-1.0.11.tar.gz 16673907 RMD160 929325a64115d85d33767a430e64581851bf6d2e SHA1 086050d78c02ad7bd234d6d1a5db068b7fb8588e SHA256 d9c8b0c98b4ccfbe67bac069cfea7b4f5c793ac12089eb9fc23d237331b64e83
+DIST freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz 17952582 RMD160 45bacc2fe1888a6b950c37749fa4ccf8f8b1c848 SHA1 4505cecc343ab018d2068a17d4e6dab2eea514cd SHA256 aef0d3dc7fed657bc9c9d5ebbb458bc28e55c62af0087623ad060f1b4de3c74c
+DIST freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz 28650196 RMD160 fdf15330ca1ab76507f24d311ddcfc37b4df0b18 SHA1 bff5ed02816b0d7e193503a980bc3dc7655e6564 SHA256 f68bf958625d7fec95ffdec374b197bdddceff372e43c01d6502f39a362a0e15
+DIST freeswitch-sounds-ru-RU-elena-32000-1.0.11.tar.gz 32661501 RMD160 780323d8907ba6ec449b7bdcb829654f4fa9992f SHA1 5d79f9a2be9bb3db2e7a7b6156fc3eef5cc3bd30 SHA256 36c63a0952930af1e56fa0881b9bd9bbdaaf4441c9b79146ec7b85da080a0d90
+DIST freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz 35345749 RMD160 ca5a8f3e49ce2f1ead3128bf8591100716717511 SHA1 9682a16d546e1c8aae3babb9b1f14515a05d368f SHA256 3be071456c03d8eac191f1a417ffcc48eb7100633cbb8d8cc62fde1c328ede08
+DIST freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz 56843560 RMD160 8ec35413af595e5b6f82c9ccab0ace10abb05c6b SHA1 4c1e0d8fecd999afac75170e5a2636e0d7acd7c0 SHA256 621fbe1d6d4c7bafc407aac9898676fe2807a74e5f907a27870095804f6f5652
+DIST freeswitch-sounds-ru-RU-elena-48000-1.0.11.tar.gz 47735322 RMD160 5ac4037e980d8b11f3861642f5e7a413ce24332d SHA1 977a8875c91e73ae3a8737782244229e402ff02d SHA256 c9708f92e5419788529455f04ea3a1b3436c2d0c6923cb49496e415df1da38be
+DIST freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz 51864057 RMD160 1fecd155957c2b5f7d628e1418450df2a01e7a2f SHA1 8741b07f7ab3fda00ae7e84f1a5729d386407d52 SHA256 12e164bbc99729a87d9a57bff557b6a190b5349b30cad71dcae458d92288aa3b
+DIST freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz 84394475 RMD160 f7a7481d6df7a0217dda8ba94d2f940686d94db1 SHA1 27dc9d953f41c351323a2068dfa22f98dfc31ea2 SHA256 f2db5f456e94e10f262ee08407484e4faf538a28e38c67867a8598636cca0d4a
+DIST freeswitch-sounds-ru-RU-elena-8000-1.0.11.tar.gz 8517299 RMD160 5ab7e93f985a5ab68060585fca8290cb94bbe31f SHA1 f6b0eb044373895a244d4eaab63b22f3416c9986 SHA256 d5c2fd2b0de7510d6b505b7716f5f52955bf7f13279aae3685b17b0882821065
+DIST freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz 9115259 RMD160 e7dd71f827e4c84c5801ba485a15ab10756bcc19 SHA1 31d17694661caa77c70bf9d07b02ed0d0b9f3ee7 SHA256 44db35574216af8ccbb48a7f1a08065df253adb4cebed8bc7ece7d0a4da920e7
+DIST freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz 14363334 RMD160 2e6902bdd848b0b5cd70463d217e717c4eb4e9fe SHA1 cff2da72b0dc53df781ac7526f3e035192f9065c SHA256 a04f0d33462a782c9fe8e81331a7c0928950c3fcc83f90cdf774974114bf1e53
+EBUILD freeswitch-sounds-ru-1.0.11.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
+EBUILD freeswitch-sounds-ru-1.0.12.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
+EBUILD freeswitch-sounds-ru-1.0.13.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
new file mode 100644
index 0000000..5aa8adf
--- /dev/null
+++ b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="Russian soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
new file mode 100644
index 0000000..5aa8adf
--- /dev/null
+++ b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="Russian soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
new file mode 100644
index 0000000..5aa8adf
--- /dev/null
+++ b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE="+16k 32k 48k"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+DESCRIPTION="Russian soundfiles for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
+	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
+	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
+	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
+
+
+src_install() {
+	#
+	# 1. Copy files
+	#
+	dodir /opt/freeswitch/sounds
+	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
+
+	#
+	# 2. Fix permissions
+	#
+	einfo "Setting file and directory permissions..."
+
+	# prefix
+	chown -R root:freeswitch "${D}/opt/freeswitch"
+	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+}
diff --git a/net-misc/freeswitch-sounds/Manifest b/net-misc/freeswitch-sounds/Manifest
new file mode 100644
index 0000000..5447e60
--- /dev/null
+++ b/net-misc/freeswitch-sounds/Manifest
@@ -0,0 +1,10 @@
+EBUILD freeswitch-sounds-1.0.11.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
+EBUILD freeswitch-sounds-1.0.12.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
+EBUILD freeswitch-sounds-1.0.13.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
+EBUILD freeswitch-sounds-1.0.14.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
+EBUILD freeswitch-sounds-1.0.16.ebuild 996 SHA256 bfee8f1ed3bde09964c82b2d74378455f021c539ff2036cb1f5402fd4e0d05a5 SHA512 49c0b54b83b652b4a57bac49e65853ca5ad1a3f02b5f637d1eb3d32dd84bc20923787cb591f63ed9c068a74c124bfbfd123096a1819c71a67f2805c1399468d9 WHIRLPOOL 141bc4d8d99bc0af97a4a1e9e2cc7f78ce23bac3287e553f6a32f516a0246afcd5c177c1e7e417de8137b94a4d761a3087ffb116ee35731bfa354256f30fb403
+EBUILD freeswitch-sounds-1.0.18.ebuild 996 SHA256 a57bf64ba18ffddc51aff79064044d395f7852f51ace295ec6296eef81a12cc1 SHA512 29d50b87ed8d3c8cdf54a8ea4c058703be22d35ed481175c2ecad2220924fa90774e059f86b553427df445937c33b3ace178b84270189e382db231d8b2e50095 WHIRLPOOL 7eb8458eabbcd76a58dcd044be10648773a12d29ac3dd0104be6263d14a93919f84bb071d4e8ff7bda9ba56a060a3b5577a2dcaed4db10a8b10b5cc00f3a63fa
+EBUILD freeswitch-sounds-1.0.20.ebuild 996 SHA256 3d074edd3e1a1cbbfd6424df123293855aa084446b90a9e1dd295ba14317fc89 SHA512 ce7ad0e7f5b3979c8e2b15e44d311274f9019377be271ca71b21d61e510da6cc317785f46f10637eb4134e1234eff1f08a4217e0279339b09abf47e241b725a0 WHIRLPOOL bafe5929e2c30751cc28baccc494482cffd577e2b2be3cc8b2a6af1a1503b32f8f6cf41d3c29824be67c9efbb6a3cf0068c266241e5bda4b29b7361cdc01ca08
+EBUILD freeswitch-sounds-1.0.22.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
+EBUILD freeswitch-sounds-1.0.24.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
+EBUILD freeswitch-sounds-1.0.25.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
new file mode 100644
index 0000000..a3c62a8
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_ru"
+
+RU_VERSION="${PV}"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
new file mode 100644
index 0000000..a3c62a8
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_ru"
+
+RU_VERSION="${PV}"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-misc/freeswitch"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
new file mode 100644
index 0000000..d575532
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.12"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
new file mode 100644
index 0000000..d575532
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.12"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
new file mode 100644
index 0000000..1b80a30
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.12"
+FR_VERSION="1.0.14"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
new file mode 100644
index 0000000..e33506f
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.13"
+FR_VERSION="1.0.15"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
new file mode 100644
index 0000000..323cd60
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.13"
+FR_VERSION="1.0.16"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
new file mode 100644
index 0000000..fd90592
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.13"
+FR_VERSION="1.0.18"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
new file mode 100644
index 0000000..fd90592
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.13"
+FR_VERSION="1.0.18"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild
new file mode 100644
index 0000000..fd90592
--- /dev/null
+++ b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+EAPI="1"
+
+IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
+
+URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
+
+RU_VERSION="1.0.13"
+FR_VERSION="1.0.18"
+ES_VERSION="1.0.14"
+PT_VERSION="1.0.14"
+EN_VERSION="${PV}"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI=""
+
+
+DEPEND="
+	|| (
+		(
+		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
+		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
+		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
+		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
+		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
+		)
+		>=${CATEGORY}/${PN}-en-${EN_VERSION}
+	)"
+
+
+LICENSE="MPL-1.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-misc/freeswitch"
diff --git a/net-misc/freeswitch/Manifest b/net-misc/freeswitch/Manifest
new file mode 100644
index 0000000..2ed17fe
--- /dev/null
+++ b/net-misc/freeswitch/Manifest
@@ -0,0 +1,8 @@
+AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
+AUX freeswitch.rc6 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
+DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
+EBUILD freeswitch-1.2.12.ebuild 28623 SHA256 4ce53d6e789a987d8dea70644a62b4a7a473bc74807ee7ffe983c7cd866ca25e SHA512 f54d36e8ac72de2ee1a55dc5558cd0fa0ad826c51bbf6b91a83c52269c601b398660e6001a542441b256a5d6f285bc47b9c7e0d0928049371c85e3028bd1aae2 WHIRLPOOL 553482448cee8b785408bed4a6c53231ad398f34e01ef88a0de4fc5fbc821f8cae2fcb21d1ed4ce708d49601e67b52adff47d11c6beddc421e931fbc7820bace
+EBUILD freeswitch-1.2.9999.ebuild 28607 SHA256 dccc283cfd45e4c4ad181250be888355b0d568c39f862f2a0e481704904cbb62 SHA512 70ecff7f3a7b6fcdb61799ebcbd96456f53dc999e9feec57840766ea873f7de03ff08a1d9f35c549cc326758dd6c84fcc50e7fec74af48cb75d4b2ee12ef5423 WHIRLPOOL 3fed7632f75d013cc40fc7cd868f6c905617785733b96c78dc3cd825fa94373c543b6dea41ba7b75847e612c2493b97be60e0948b272648efcdff616d036a7fb
+EBUILD freeswitch-9999-r1.ebuild 29708 SHA256 dbed2a47cd588acac3d9850fa4d5175af1deaf036a86e8f99a3bef3c4f37f9b2 SHA512 7af9b25f895959ce579994259a769b01cba27c44f6289efcd7848243b3c30ecbab3cd5beda760edc9cc230465f8ea75fec78248a06dd76e048bbba79d63a070d WHIRLPOOL 3fddd04bec7a7d1b54f959554623f1cea28b4e9f84f55203b079b3b9bec6a3023f28490c2ed05435626960a4d212f9e90b54ecbac0ab93de8382fe1779d02a7b
+EBUILD freeswitch-9999.ebuild 28603 SHA256 ba4f40c300237488d18eae011cfc93e4d96f51dbce6737256dd470ce681dd3f4 SHA512 5c19d94a326f40169991cb80f53b7e618f9ce7674dc33c4abe9c3a23eb5d0266f70973b9f19fa090ac76123d1ea4039c2012656893a7cae1e7d39e37011ffbcc WHIRLPOOL fcd75a0c23894ae379ca98fa05fda6b2b700d6240cd3e8db5e3ec5ef7f3a2601609019f8c7b5af964d4a0f09ff3d4622a1574a4092606fcbe08e747e84ba195d
+MISC metadata.xml 11401 SHA256 90d2c22ac2d7d4487cc566f9a974676c242388150fd226a86a2dc0fc4a65b2a8 SHA512 1f2bb45df38ced0fc31d9dc31661c6429a5eca499731b87699dfceb27b72dc2c58df65846f75f1613b0435d5beb38cee95308493a9087ba0bd040b7ccf5f3e0f WHIRLPOOL fab963b34e0fa9a8fd14a05215d96622797eaa6f2535a3cf2023ab295937999ddd0b77dd064b8f5f3e57bb8f4af6867e09ab84ccd3d6e718a0399554a92ce086
diff --git a/net-misc/freeswitch/files/freeswitch.confd b/net-misc/freeswitch/files/freeswitch.confd
new file mode 100644
index 0000000..6f1f286
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch.confd
@@ -0,0 +1,24 @@
+#
+# FreeSWITCH startup configuration
+#
+
+# freeswitch will be running with this userid
+FREESWITCH_USER="freeswitch"
+
+
+# optional: group the freeswitch process should be running with
+#
+# (note: without this option freeswitch will be using all groups
+#  the user in FREESWITCH_USER is a member of)
+#
+#FREESWITCH_GROUP="freeswitch"
+
+
+
+# optional: other options, e.g.
+#
+# -hp	Use realtime priority and protect freeswitch
+#       process from being swapped to disk
+#       (warning: dangerous on machines with little ram!)
+#
+#FREESWITCH_OPTS=""
diff --git a/net-misc/freeswitch/files/freeswitch.rc6 b/net-misc/freeswitch/files/freeswitch.rc6
new file mode 100755
index 0000000..89f23f0
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch.rc6
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+FREESWITCH_BIN="${FREESWITCH_BIN:-/opt/freeswitch/bin/freeswitch}"
+
+depend() {
+	need net
+	use dahdi
+}
+
+start() {
+	local OPTS
+
+	[ -n "${FREESWITCH_USER}" ] && \
+		OPTS="${OPTS} -u ${FREESWITCH_USER}"
+
+	[ -n "${FREESWITCH_GROUP}" ] && \
+		OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+
+	[ -n "${FREESWITCH_OPTS}" ] && \
+		OPTS="${OPTS} ${FREESWITCH_OPTS}"
+
+	ebegin "Starting Freeswitch"
+	start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
+		--pidfile /var/run/freeswitch.pid -- -nc ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Freeswitch"
+	${FREESWITCH_BIN} -stop
+	eend $?
+}
diff --git a/net-misc/freeswitch/freeswitch-1.2.12.ebuild b/net-misc/freeswitch/freeswitch-1.2.12.ebuild
new file mode 100644
index 0000000..33da860
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.2.12.ebuild
@@ -0,0 +1,1136 @@
+#
+# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+# The automagic default "latest" only works for eautoreconf and friends,
+# so force these versions until we don't have to use (re)bootstrap.sh anymore.
+WANT_AUTOMAKE="1.11"
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils flag-o-matic python user
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~arm ~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+case ${PV} in
+9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+${PV%.*}.9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BRANCH="v${PV%.*}.stable"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+*_rc*)
+	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
+	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	;;
+*)
+	SRC_URI="http://files.freeswitch.org/${P/_/}.tar.bz2"
+	S="${WORKDIR}/${P/_/}"
+	;;
+esac
+
+
+IUSE="esl nosamples odbc +resampler sctp zrtp"
+
+IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
+IUSE_FREETDM="libpri misdn"
+
+IUSE_MODULES="alsa amr amrwb avmd bv +cdr_csv cdr_pg_csv cdr_sqlite celt cepstral cidlookup +console curl
+	+db dialplan_directory dingaling distributor easyroute erlang_event
+	flite freetdm fsk +g723_1 g729 gsmopen h26x +hash +ilbc java lcr ldap +limit +local_stream +logfile +lua
+	managed memcache mp4v nibblebill opal osp perl pocketsphinx portaudio portaudio_stream python radius_cdr redis rtmp
+	shell_stream shout silk siren skinny skypopen snapshot +sndfile snom +sofia +spandsp +speex spidermonkey spy +syslog
+	+tone_stream tts_commandline unimrcp valet_parking vmd +voicemail
+	xml_cdr xml_curl xml_ldap xml_rpc
+"
+
+# mod_say_X
+IUSE_LINGUAS="de +en es fr he it nl ru zh"
+
+# inter-module dependencies
+INTER_MODULE_DEPENDS="
+	limit:db
+	limit:hash
+"
+
+# modules need these core functions
+CORE_MODULE_DEPENDS="
+	nibblebill:odbc
+	easyroute:odbc
+	lcr:odbc
+"
+
+# external dependencies of modules
+MODULES_RDEPEND="
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
+	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
+				   >=net-libs/ptlib-9999 )
+	freeswitch_modules_python? ( =dev-lang/python-2* )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
+	freeswitch_modules_easyroute? ( dev-db/unixODBC )
+	freeswitch_modules_lcr? ( dev-db/unixODBC )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
+	freeswitch_modules_freetdm? (
+		libpri? ( >=net-libs/libpri-1.4.0 )
+		misdn? ( >=net-dialup/misdnuser-2.0.0 )
+	)
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
+"
+#	freeswitch_modules_gsmopen? ( net-libs/libctb ... ) 
+
+# external core dependencies
+CORE_RDEPEND="
+	odbc? ( dev-db/unixODBC )
+	esl-lua? ( dev-lang/lua dev-lang/swig )
+	esl-php? ( dev-lang/php dev-lang/swig )
+	esl-perl? ( dev-lang/perl dev-lang/swig )
+	esl-ruby? ( dev-lang/ruby dev-lang/swig )
+	esl-python? ( dev-lang/python dev-lang/swig )
+"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	 ${CORE_RDEPEND}
+	 ${MODULES_RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
+
+PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
+	 >=net-misc/freeswitch-music-1.0.8"
+
+###
+# IUSE merging
+#
+for x in ${IUSE_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
+done
+
+IUSE="${IUSE} ${IUSE_ESL} ${IUSE_FREETDM}"
+
+
+###
+# pre-flight checks
+#
+pkg_setup() {
+	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
+
+	#
+	# 1. safety check
+	#
+	for mod in ${IUSE_MODULES}; do
+		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
+		eerror "This isn't a good idea, usually..."
+		eerror ""
+		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "FREESWITCH_MODULES empty / no modules selected for build"
+	fi
+
+	#
+	# 2. check prerequisites
+	#
+	if use freeswitch_modules_cepstral; then
+
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	if use freeswitch_modules_python ; then
+
+		if built_with_use --missing false dev-lang/python nothreads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
+			echo
+			(( error_cnt++ ))
+
+		elif ! built_with_use --missing true dev-lang/python threads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"threads\" useflag enabled"
+			echo
+			(( error_cnt++ ))
+		fi
+	fi
+
+	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
+		echo
+		eerror "perl: FreeSWITCH needs perl with threads support"
+		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
+		echo
+		eerror "ldap: OpenLDAP with sasl support is required"
+		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Build-time requirements not met!"
+		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Build-time requirements not met: ${error_cnt} errors"
+	fi
+
+	#
+	# 3. check inter-module dependencies
+	#
+	einfo "Checking inter-module dependencies..."
+	for x in ${INTER_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
+			# check if this module has an external dependency
+			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
+				eerror "Module \"${mod}\" requires module \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
+			fi
+		fi
+	done
+
+	#
+	# 4. check core dependencies
+	#
+	einfo "Checking core dependencies..."
+	for x in ${CORE_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
+			# check if this core option has an external dependency
+			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
+				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
+			fi
+		fi
+	done
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
+		eerror "external dependencies! This is for your own security, sorry..."
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Please read the error messages above and fix the listed issues"
+	fi
+
+	#
+	# 5. language checks
+	#
+	einfo "Checking selected languages..."
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		use linguas_${mod} && (( lang_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" ]; then
+		echo
+		ewarn "No languages selected, enabling \"en\" as a fallback"
+
+		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
+	fi
+
+	#
+	# 6. create user + group
+	#
+	enewgroup freeswitch
+	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
+
+	#
+	# 7. set active python version
+	#
+	python_set_active_version 2
+	python_pkg_setup
+
+	#
+	# DONE
+	#
+	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
+}
+
+
+###
+# ABI compat safety check functions
+#
+
+fs_abi_generate_symbols_array() {
+	local libfile="$1" syms
+
+	if [ ! -f "${libfile}" ]; then
+		eerror "Library ${libfile} does not exist"
+		return 1
+	fi
+
+	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
+	if [ -z "${syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	echo "${syms}"
+	return 0
+}
+
+fs_check_core_abi_compat() {
+	local libfreeswitch libfreeswitch_syms
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ -z "${REPLACING_VERSIONS}" ] && return 0
+
+	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate old libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check_abi.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$4
+            sym_len=\$2
+
+	    if (! sym in symbols)
+	        print sym
+
+	    if (symbols[sym] != sym_len)
+	        print sym
+	}
+	EOF
+
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate new libfreeswitch"
+		return 1
+	fi
+
+	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
+	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
+	if [ -n "${changed_syms}" ]; then
+		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
+	fi
+
+	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
+}
+
+fs_check_modules_api_compat() {
+	local x mod name libfreeswitch libfreeswitch_syms
+	local sym need_upgrade module_syms
+	local mod_warn_list="" mod_error_list=""
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
+
+	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
+	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
+	# (raw nm output)
+	#
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$2
+
+	    if (! sym in symbols)
+	        exit 1
+	}
+	EOF
+
+	einfo "Checking for incompatible modules..."
+	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
+		mod="$(basename "${x}")"
+		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
+		need_upgrade="no"
+
+		# no need to check modules that will be overwritten
+		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
+
+
+		# skip modules that are in our list but disabled (= will be uninstalled)
+		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
+			continue
+		fi
+
+		# check module
+		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
+		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
+			# needed symbol is not in the list of available ones, mark module broken
+			need_upgrade="yes"
+		else
+			# check if one of the used functions has been modified in the core,
+			# this may be an indication that the ABI has been changed too
+			# NOTE: This check isn't perfect...
+			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
+
+				if $(echo "${module_syms}" | grep -q "^${sym}"); then
+					# symbol is in the list of functions that _may_ have been changed in a
+					# ABI incompatible way, mark module broken
+					need_upgrade="maybe"
+					break
+				fi
+			done
+		fi
+
+		case "${need_upgrade}" in
+		maybe)
+			mod_warn_list="${mod_warn_list} ${mod}"
+			;;
+		yes)
+			mod_error_list="${mod_error_list} ${mod}"
+			;;
+		*)
+			;;
+		esac
+	done
+
+	if [ -n "${mod_warn_list}" ]; then
+		ewarn "The following modules use functions that have been changed since the last version,"
+		ewarn "you may need to upgrade:"
+		ewarn "  ${mod_warn_list}"
+		echo
+	fi
+
+	if [ -n "${mod_error_list}" ]; then
+		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
+		eerror "  ${mod_error_list}"
+		echo
+	fi
+
+	return 0
+}
+
+
+###
+# modules setup functions
+#
+
+fs_set_module() {
+	local config="build/modules.conf.in"
+	local mod="$2"
+
+	[ -f "modules.conf" ] && config="modules.conf"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		mod="mod_freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && die "unable to determine category for module \"${mod}\" (from: `pwd`)"
+
+	case $1 in
+	enable)
+		if grep -q "/${mod}$" ${config}
+		then
+			einfo "  ++ Enabling ${mod}"
+			sed -i -e "/\/${mod}$/s:.*:${category}/${mod}:" \
+				${config} || die "Failed to enable module \"${mod}\""
+		else
+			# module not in list, add it
+			einfo "  **  Adding ${mod}"
+			echo "${category}/${mod}" >> ${config}
+		fi
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		sed -i -e "/\/${mod}$/s:.*:#${category}/${mod}:" \
+			${config} || die "Failed to disable module \"${mod}\""
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod enablemod
+
+	einfo "Optional modules:"
+	for x in ${IUSE_MODULES}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use freeswitch_modules_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_${mod}" \
+			|| fs_set_module "disable" "mod_${mod}"
+	done
+
+	einfo "Language modules:"
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use linguas_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_say_${mod}" \
+			|| fs_set_module "disable" "mod_say_${mod}"
+	done
+}
+
+###
+# src_configure() helpers
+#
+
+fs_use() {
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		return 0
+	fi
+	return 1
+}
+
+fs_use_any_of() {
+	for x in $@ ; do
+		fs_use ${x} && return 0
+	done
+	return 1
+}
+
+fs_enable() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if fs_use $1; then
+		echo "--enable-${option}${value}"
+	else
+		echo "--disable-${option}"
+	fi
+}
+
+fs_with() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		echo "--with-${option}${value}"
+	else
+		echo "--without-${option}"
+	fi
+}
+
+###
+# other helpers
+#
+
+fs_is_upgrade() {
+	# svn install is always an upgrade
+	[ -n "${EGIT_REPO_URI}" ] && return 0
+
+	# regular up/-downgrade
+	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
+		return 0
+	fi
+
+	# not an up-/downgrade
+	return 1
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+###
+# Set file and directory permissions
+#
+fs_set_permissions() {
+	local prefix="$1"
+
+	[ -z "${prefix}" ] && {
+		die "Usage: set_permissions <prefix>"
+	}
+
+	einfo "Setting file and directory permissions..."
+
+	# sysconfdir
+	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
+
+	# prefix
+	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
+	# allow read access for things like building external modules
+	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
+	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
+
+	# directories owned by the fs user
+	for x in db run log cores storage recordings; do
+		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
+	done
+}
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+	#
+	# 1. custom user patches
+	#
+	epatch_user
+}
+
+src_prepare() {
+	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
+
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		BOOTSTRAP_CMD="${S}/bootstrap.sh"
+	elif [ -x "${S}/rebootstrap.sh" ]; then
+		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
+	fi
+
+	if [ -n "${BOOTSTRAP_CMD}" ]; then
+		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
+		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
+			einfo "Using parallel bootstrap..."
+			BOOTSTRAP_OPTS="-j"
+		}
+		einfo "Bootstrapping FreeSWITCH"
+		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
+
+		# Bootstrap FreeTDM
+		#if use freeswitch_modules_freetdm
+		#then
+		#	einfo "Bootstrapping FreeTDM"
+		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+		#fi
+	fi
+
+	#
+	# 1. enable / disable optional modules
+	#
+	setup_modules
+
+	#
+	# 2. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use esl-python; then
+		python_get_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 3. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	local java_opts ftdm_opts config_opts
+
+	#
+	# option handling
+	#
+	fs_use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+
+	# FreeTDM specific options
+	ftdm_opts="$(fs_with libpri) $(fs_with misdn)"
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. configure (can't use econf thanks to b0rked buildsystem)
+	#
+	einfo "Configuring FreeSWITCH..."
+	./configure -C \
+		--host=${CHOST} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CTARGET:+--target=${CTARGET}} \
+		--prefix=/opt/freeswitch \
+		--libdir=/opt/freeswitch/lib \
+		--sysconfdir=/opt/freeswitch/conf \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--enable-core-libedit-support \
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		$(fs_enable sctp) \
+		$(fs_enable zrtp) \
+		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(fs_enable resampler resample) \
+		$(fs_enable odbc core-odbc-support) \
+		${java_opts} ${ftdm_opts} ${config_opts} \
+		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
+
+	#
+	# 3. configure FreeTDM
+	#
+	#if use freeswitch_modules_freetdm
+	#then
+	#	cd "${S}/libs/freetdm"
+	#	einfo "Configuring FreeTDM..."
+	#	econf \
+	#		--prefix=/opt/freeswitch \
+	#		--libdir=/opt/freeswitch/lib \
+	#		--sysconfdir=/opt/freeswitch/conf \
+	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+	#		${config_opts} || die "failed to configure FreeTDM"
+	#fi
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# build FreeTDM
+	#
+	if use freeswitch_modules_freetdm
+	then
+		einfo "Building FreeTDM..."
+		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+
+	#
+	# 2. build everything
+	#
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+
+	#
+	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
+	#
+	if fs_use_any_of ${IUSE_ESL}; then
+		einfo "Running esl reswig..."
+		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
+	fi
+
+	#
+	# 4. build esl modules
+	#
+	for esl_lang in ${IUSE_ESL}; do
+		use ${esl_lang} || continue
+
+		esl_lang="${esl_lang#*-}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	if use esl; then
+		einfo "Building libesl..."
+		emake -j1 -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. Install core
+	#
+	einfo "Installing freeswitch core and modules..."
+	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+
+	#
+	# 2. Documentation, sample config files, ...
+	#
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto /opt/freeswitch/scripts/rss
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /opt/freeswitch/{htdocs,log,log/{xml_cdr,cdr-csv},db,grammar,cores,storage,scripts,recordings}
+
+	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	# save a copy of the default config
+	einfo "Saving a copy of the default configuration..."
+	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
+	while read fn; do
+		docinto "$(dirname "${fn}")"
+		dodoc   "${D}/opt/freeswitch/${fn}"
+	done
+
+	# remove sample configuration if the user wishes so,
+	# but only if this isn't a fresh installation
+	if use nosamples; then
+		if ! has_version "net-misc/freeswitch"; then
+			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
+		else
+			einfo "Removing sample configuration files..."
+			rm -r "${D}"/opt/freeswitch/conf/*
+		fi
+	fi
+
+	# move configuration to /etc/freeswitch and
+	# create symlink to /opt/freeswitch/conf
+	dodir /etc
+	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
+	dosym /etc/freeswitch /opt/freeswitch/conf
+
+	# keep managed subdir
+	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
+
+	# TODO: install contributed stuff
+
+	# mod_skypopen sample config & helper files
+	if fs_use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	#
+	# 3. Remove .a and .la files
+	#
+	prune_libtool_files --modules
+
+	#
+	# 4. install esl modules
+	#
+	if use esl-ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use esl-python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl-lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl-php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use esl-perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/opt/freeswitch/lib"
+		doins libs/esl/libesl.a
+	fi
+
+	#
+	# 5. Fix permissions
+	#
+	fs_set_permissions "${D}"
+}
+
+pkg_preinst() {
+	#
+	# 1. upgrade api check
+	#
+	if fs_is_upgrade; then
+		einfo "Performing core ABI compatibility check..."
+
+		# compare exported symbols of new and old libfreeswitch to make sure
+		# external modules will still work
+		fs_check_core_abi_compat
+
+		# check if external modules will still work after upgrade
+		# to new libfreeswitch
+		fs_check_modules_api_compat
+	fi
+
+	#
+	# 2. preserve existing config files
+	#
+	if use nosamples; then
+		if has_version "net-misc/freeswitch"; then
+			einfo "Preserving existing configuration..."
+			rm -r "${D}/etc/freeswitch"
+			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#
+	# 1. Info
+	#
+	echo
+	einfo "FreeSWITCH has been successfully emerged!"
+	echo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	echo
+
+	# skypopen setup guide
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		echo
+	fi
+
+	einfo "A copy of the default configuration has been saved to"
+	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
+	echo
+}
+
+pkg_config() {
+	local answer="N"
+
+	[ "$(id -u)" != "0" ] && {
+		eerror "This action needs root privileges"
+		die "Can not run as non-root user"
+	}
+
+	einfo "Reset permissions to installation defaults (y/N)?"
+	read answer
+
+	if [ "${answer/y/Y}" = "Y" ]; then
+		#
+		# Fix permissions
+		#
+		fs_set_permissions "${EROOT:-/}"
+
+		einfo "Done"
+	else
+		ewarn "Aborted"
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-1.2.9999.ebuild b/net-misc/freeswitch/freeswitch-1.2.9999.ebuild
new file mode 100644
index 0000000..669e941
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.2.9999.ebuild
@@ -0,0 +1,1136 @@
+#
+# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+# The automagic default "latest" only works for eautoreconf and friends,
+# so force these versions until we don't have to use (re)bootstrap.sh anymore.
+WANT_AUTOMAKE="1.11"
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils flag-o-matic python user
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS=""
+LICENSE="MPL-1.1"
+SLOT="0"
+
+case ${PV} in
+9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+${PV%.*}.9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BRANCH="v${PV%.*}.stable"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+*_rc*)
+	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
+	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	;;
+*)
+	SRC_URI="http://files.freeswitch.org/${P/_/}.tar.bz2"
+	S="${WORKDIR}/${P/_/}"
+	;;
+esac
+
+
+IUSE="esl nosamples odbc +resampler sctp zrtp"
+
+IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
+IUSE_FREETDM="libpri misdn"
+
+IUSE_MODULES="alsa amr amrwb avmd bv +cdr_csv cdr_pg_csv cdr_sqlite celt cepstral cidlookup +console curl
+	+db dialplan_directory dingaling distributor easyroute erlang_event
+	flite freetdm fsk +g723_1 g729 gsmopen h26x +hash +ilbc java lcr ldap +limit +local_stream +logfile +lua
+	managed memcache mp4v nibblebill opal osp perl pocketsphinx portaudio portaudio_stream python radius_cdr redis rtmp
+	shell_stream shout silk siren skinny skypopen snapshot +sndfile snom +sofia +spandsp +speex spidermonkey spy +syslog
+	+tone_stream tts_commandline unimrcp valet_parking vmd +voicemail
+	xml_cdr xml_curl xml_ldap xml_rpc
+"
+
+# mod_say_X
+IUSE_LINGUAS="de +en es fr he it nl ru zh"
+
+# inter-module dependencies
+INTER_MODULE_DEPENDS="
+	limit:db
+	limit:hash
+"
+
+# modules need these core functions
+CORE_MODULE_DEPENDS="
+	nibblebill:odbc
+	easyroute:odbc
+	lcr:odbc
+"
+
+# external dependencies of modules
+MODULES_RDEPEND="
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
+	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
+				   >=net-libs/ptlib-9999 )
+	freeswitch_modules_python? ( =dev-lang/python-2* )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
+	freeswitch_modules_easyroute? ( dev-db/unixODBC )
+	freeswitch_modules_lcr? ( dev-db/unixODBC )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
+	freeswitch_modules_freetdm? (
+		libpri? ( >=net-libs/libpri-1.4.0 )
+		misdn? ( >=net-dialup/misdnuser-2.0.0 )
+	)
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
+"
+#	freeswitch_modules_gsmopen? ( net-libs/libctb ... ) 
+
+# external core dependencies
+CORE_RDEPEND="
+	odbc? ( dev-db/unixODBC )
+	esl-lua? ( dev-lang/lua dev-lang/swig )
+	esl-php? ( dev-lang/php dev-lang/swig )
+	esl-perl? ( dev-lang/perl dev-lang/swig )
+	esl-ruby? ( dev-lang/ruby dev-lang/swig )
+	esl-python? ( dev-lang/python dev-lang/swig )
+"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	 ${CORE_RDEPEND}
+	 ${MODULES_RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
+
+PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
+	 >=net-misc/freeswitch-music-1.0.8"
+
+###
+# IUSE merging
+#
+for x in ${IUSE_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
+done
+
+IUSE="${IUSE} ${IUSE_ESL} ${IUSE_FREETDM}"
+
+
+###
+# pre-flight checks
+#
+pkg_setup() {
+	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
+
+	#
+	# 1. safety check
+	#
+	for mod in ${IUSE_MODULES}; do
+		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
+		eerror "This isn't a good idea, usually..."
+		eerror ""
+		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "FREESWITCH_MODULES empty / no modules selected for build"
+	fi
+
+	#
+	# 2. check prerequisites
+	#
+	if use freeswitch_modules_cepstral; then
+
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	if use freeswitch_modules_python ; then
+
+		if built_with_use --missing false dev-lang/python nothreads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
+			echo
+			(( error_cnt++ ))
+
+		elif ! built_with_use --missing true dev-lang/python threads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"threads\" useflag enabled"
+			echo
+			(( error_cnt++ ))
+		fi
+	fi
+
+	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
+		echo
+		eerror "perl: FreeSWITCH needs perl with threads support"
+		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
+		echo
+		eerror "ldap: OpenLDAP with sasl support is required"
+		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Build-time requirements not met!"
+		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Build-time requirements not met: ${error_cnt} errors"
+	fi
+
+	#
+	# 3. check inter-module dependencies
+	#
+	einfo "Checking inter-module dependencies..."
+	for x in ${INTER_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
+			# check if this module has an external dependency
+			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
+				eerror "Module \"${mod}\" requires module \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
+			fi
+		fi
+	done
+
+	#
+	# 4. check core dependencies
+	#
+	einfo "Checking core dependencies..."
+	for x in ${CORE_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
+			# check if this core option has an external dependency
+			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
+				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
+			fi
+		fi
+	done
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
+		eerror "external dependencies! This is for your own security, sorry..."
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Please read the error messages above and fix the listed issues"
+	fi
+
+	#
+	# 5. language checks
+	#
+	einfo "Checking selected languages..."
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		use linguas_${mod} && (( lang_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" ]; then
+		echo
+		ewarn "No languages selected, enabling \"en\" as a fallback"
+
+		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
+	fi
+
+	#
+	# 6. create user + group
+	#
+	enewgroup freeswitch
+	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
+
+	#
+	# 7. set active python version
+	#
+	python_set_active_version 2
+	python_pkg_setup
+
+	#
+	# DONE
+	#
+	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
+}
+
+
+###
+# ABI compat safety check functions
+#
+
+fs_abi_generate_symbols_array() {
+	local libfile="$1" syms
+
+	if [ ! -f "${libfile}" ]; then
+		eerror "Library ${libfile} does not exist"
+		return 1
+	fi
+
+	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
+	if [ -z "${syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	echo "${syms}"
+	return 0
+}
+
+fs_check_core_abi_compat() {
+	local libfreeswitch libfreeswitch_syms
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ -z "${REPLACING_VERSIONS}" ] && return 0
+
+	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate old libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check_abi.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$4
+            sym_len=\$2
+
+	    if (! sym in symbols)
+	        print sym
+
+	    if (symbols[sym] != sym_len)
+	        print sym
+	}
+	EOF
+
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate new libfreeswitch"
+		return 1
+	fi
+
+	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
+	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
+	if [ -n "${changed_syms}" ]; then
+		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
+	fi
+
+	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
+}
+
+fs_check_modules_api_compat() {
+	local x mod name libfreeswitch libfreeswitch_syms
+	local sym need_upgrade module_syms
+	local mod_warn_list="" mod_error_list=""
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
+
+	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
+	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
+	# (raw nm output)
+	#
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$2
+
+	    if (! sym in symbols)
+	        exit 1
+	}
+	EOF
+
+	einfo "Checking for incompatible modules..."
+	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
+		mod="$(basename "${x}")"
+		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
+		need_upgrade="no"
+
+		# no need to check modules that will be overwritten
+		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
+
+
+		# skip modules that are in our list but disabled (= will be uninstalled)
+		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
+			continue
+		fi
+
+		# check module
+		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
+		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
+			# needed symbol is not in the list of available ones, mark module broken
+			need_upgrade="yes"
+		else
+			# check if one of the used functions has been modified in the core,
+			# this may be an indication that the ABI has been changed too
+			# NOTE: This check isn't perfect...
+			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
+
+				if $(echo "${module_syms}" | grep -q "^${sym}"); then
+					# symbol is in the list of functions that _may_ have been changed in a
+					# ABI incompatible way, mark module broken
+					need_upgrade="maybe"
+					break
+				fi
+			done
+		fi
+
+		case "${need_upgrade}" in
+		maybe)
+			mod_warn_list="${mod_warn_list} ${mod}"
+			;;
+		yes)
+			mod_error_list="${mod_error_list} ${mod}"
+			;;
+		*)
+			;;
+		esac
+	done
+
+	if [ -n "${mod_warn_list}" ]; then
+		ewarn "The following modules use functions that have been changed since the last version,"
+		ewarn "you may need to upgrade:"
+		ewarn "  ${mod_warn_list}"
+		echo
+	fi
+
+	if [ -n "${mod_error_list}" ]; then
+		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
+		eerror "  ${mod_error_list}"
+		echo
+	fi
+
+	return 0
+}
+
+
+###
+# modules setup functions
+#
+
+fs_set_module() {
+	local config="build/modules.conf.in"
+	local mod="$2"
+
+	[ -f "modules.conf" ] && config="modules.conf"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		mod="mod_freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && die "unable to determine category for module \"${mod}\" (from: `pwd`)"
+
+	case $1 in
+	enable)
+		if grep -q "/${mod}$" ${config}
+		then
+			einfo "  ++ Enabling ${mod}"
+			sed -i -e "/\/${mod}$/s:.*:${category}/${mod}:" \
+				${config} || die "Failed to enable module \"${mod}\""
+		else
+			# module not in list, add it
+			einfo "  **  Adding ${mod}"
+			echo "${category}/${mod}" >> ${config}
+		fi
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		sed -i -e "/\/${mod}$/s:.*:#${category}/${mod}:" \
+			${config} || die "Failed to disable module \"${mod}\""
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod enablemod
+
+	einfo "Optional modules:"
+	for x in ${IUSE_MODULES}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use freeswitch_modules_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_${mod}" \
+			|| fs_set_module "disable" "mod_${mod}"
+	done
+
+	einfo "Language modules:"
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use linguas_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_say_${mod}" \
+			|| fs_set_module "disable" "mod_say_${mod}"
+	done
+}
+
+###
+# src_configure() helpers
+#
+
+fs_use() {
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		return 0
+	fi
+	return 1
+}
+
+fs_use_any_of() {
+	for x in $@ ; do
+		fs_use ${x} && return 0
+	done
+	return 1
+}
+
+fs_enable() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if fs_use $1; then
+		echo "--enable-${option}${value}"
+	else
+		echo "--disable-${option}"
+	fi
+}
+
+fs_with() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		echo "--with-${option}${value}"
+	else
+		echo "--without-${option}"
+	fi
+}
+
+###
+# other helpers
+#
+
+fs_is_upgrade() {
+	# svn install is always an upgrade
+	[ -n "${EGIT_REPO_URI}" ] && return 0
+
+	# regular up/-downgrade
+	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
+		return 0
+	fi
+
+	# not an up-/downgrade
+	return 1
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+###
+# Set file and directory permissions
+#
+fs_set_permissions() {
+	local prefix="$1"
+
+	[ -z "${prefix}" ] && {
+		die "Usage: set_permissions <prefix>"
+	}
+
+	einfo "Setting file and directory permissions..."
+
+	# sysconfdir
+	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
+
+	# prefix
+	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
+	# allow read access for things like building external modules
+	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
+	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
+
+	# directories owned by the fs user
+	for x in db run log cores storage recordings; do
+		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
+	done
+}
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+	#
+	# 1. custom user patches
+	#
+	epatch_user
+}
+
+src_prepare() {
+	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
+
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		BOOTSTRAP_CMD="${S}/bootstrap.sh"
+	elif [ -x "${S}/rebootstrap.sh" ]; then
+		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
+	fi
+
+	if [ -n "${BOOTSTRAP_CMD}" ]; then
+		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
+		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
+			einfo "Using parallel bootstrap..."
+			BOOTSTRAP_OPTS="-j"
+		}
+		einfo "Bootstrapping FreeSWITCH"
+		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
+
+		# Bootstrap FreeTDM
+		#if use freeswitch_modules_freetdm
+		#then
+		#	einfo "Bootstrapping FreeTDM"
+		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+		#fi
+	fi
+
+	#
+	# 1. enable / disable optional modules
+	#
+	setup_modules
+
+	#
+	# 2. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use esl-python; then
+		python_get_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 3. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	local java_opts ftdm_opts config_opts
+
+	#
+	# option handling
+	#
+	fs_use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+
+	# FreeTDM specific options
+	ftdm_opts="$(fs_with libpri) $(fs_with misdn)"
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. configure (can't use econf thanks to b0rked buildsystem)
+	#
+	einfo "Configuring FreeSWITCH..."
+	./configure -C \
+		--host=${CHOST} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CTARGET:+--target=${CTARGET}} \
+		--prefix=/opt/freeswitch \
+		--libdir=/opt/freeswitch/lib \
+		--sysconfdir=/opt/freeswitch/conf \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--enable-core-libedit-support \
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		$(fs_enable sctp) \
+		$(fs_enable zrtp) \
+		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(fs_enable resampler resample) \
+		$(fs_enable odbc core-odbc-support) \
+		${java_opts} ${ftdm_opts} ${config_opts} \
+		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
+
+	#
+	# 3. configure FreeTDM
+	#
+	#if use freeswitch_modules_freetdm
+	#then
+	#	cd "${S}/libs/freetdm"
+	#	einfo "Configuring FreeTDM..."
+	#	econf \
+	#		--prefix=/opt/freeswitch \
+	#		--libdir=/opt/freeswitch/lib \
+	#		--sysconfdir=/opt/freeswitch/conf \
+	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+	#		${config_opts} || die "failed to configure FreeTDM"
+	#fi
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# build FreeTDM
+	#
+	if use freeswitch_modules_freetdm
+	then
+		einfo "Building FreeTDM..."
+		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+
+	#
+	# 2. build everything
+	#
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+
+	#
+	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
+	#
+	if fs_use_any_of ${IUSE_ESL}; then
+		einfo "Running esl reswig..."
+		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
+	fi
+
+	#
+	# 4. build esl modules
+	#
+	for esl_lang in ${IUSE_ESL}; do
+		use ${esl_lang} || continue
+
+		esl_lang="${esl_lang#*-}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	if use esl; then
+		einfo "Building libesl..."
+		emake -j1 -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. Install core
+	#
+	einfo "Installing freeswitch core and modules..."
+	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+
+	#
+	# 2. Documentation, sample config files, ...
+	#
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto /opt/freeswitch/scripts/rss
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /opt/freeswitch/{htdocs,log,log/{xml_cdr,cdr-csv},db,grammar,cores,storage,scripts,recordings}
+
+	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	# save a copy of the default config
+	einfo "Saving a copy of the default configuration..."
+	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
+	while read fn; do
+		docinto "$(dirname "${fn}")"
+		dodoc   "${D}/opt/freeswitch/${fn}"
+	done
+
+	# remove sample configuration if the user wishes so,
+	# but only if this isn't a fresh installation
+	if use nosamples; then
+		if ! has_version "net-misc/freeswitch"; then
+			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
+		else
+			einfo "Removing sample configuration files..."
+			rm -r "${D}"/opt/freeswitch/conf/*
+		fi
+	fi
+
+	# move configuration to /etc/freeswitch and
+	# create symlink to /opt/freeswitch/conf
+	dodir /etc
+	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
+	dosym /etc/freeswitch /opt/freeswitch/conf
+
+	# keep managed subdir
+	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
+
+	# TODO: install contributed stuff
+
+	# mod_skypopen sample config & helper files
+	if fs_use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	#
+	# 3. Remove .a and .la files
+	#
+	prune_libtool_files --modules
+
+	#
+	# 4. install esl modules
+	#
+	if use esl-ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use esl-python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl-lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl-php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use esl-perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/opt/freeswitch/lib"
+		doins libs/esl/libesl.a
+	fi
+
+	#
+	# 5. Fix permissions
+	#
+	fs_set_permissions "${D}"
+}
+
+pkg_preinst() {
+	#
+	# 1. upgrade api check
+	#
+	if fs_is_upgrade; then
+		einfo "Performing core ABI compatibility check..."
+
+		# compare exported symbols of new and old libfreeswitch to make sure
+		# external modules will still work
+		fs_check_core_abi_compat
+
+		# check if external modules will still work after upgrade
+		# to new libfreeswitch
+		fs_check_modules_api_compat
+	fi
+
+	#
+	# 2. preserve existing config files
+	#
+	if use nosamples; then
+		if has_version "net-misc/freeswitch"; then
+			einfo "Preserving existing configuration..."
+			rm -r "${D}/etc/freeswitch"
+			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#
+	# 1. Info
+	#
+	echo
+	einfo "FreeSWITCH has been successfully emerged!"
+	echo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	echo
+
+	# skypopen setup guide
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		echo
+	fi
+
+	einfo "A copy of the default configuration has been saved to"
+	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
+	echo
+}
+
+pkg_config() {
+	local answer="N"
+
+	[ "$(id -u)" != "0" ] && {
+		eerror "This action needs root privileges"
+		die "Can not run as non-root user"
+	}
+
+	einfo "Reset permissions to installation defaults (y/N)?"
+	read answer
+
+	if [ "${answer/y/Y}" = "Y" ]; then
+		#
+		# Fix permissions
+		#
+		fs_set_permissions "${EROOT:-/}"
+
+		einfo "Done"
+	else
+		ewarn "Aborted"
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-9999-r1.ebuild b/net-misc/freeswitch/freeswitch-9999-r1.ebuild
new file mode 100644
index 0000000..60cf4b3
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-9999-r1.ebuild
@@ -0,0 +1,1169 @@
+#
+# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+# The automagic default "latest" only works for eautoreconf and friends,
+# so force these versions until we don't have to use (re)bootstrap.sh anymore.
+WANT_AUTOMAKE="1.11"
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils flag-o-matic python user
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS=""
+LICENSE="MPL-1.1"
+SLOT="0"
+
+case ${PV} in
+9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+${PV%.*}.9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BRANCH="v${PV%.*}.stable"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+*_rc*)
+	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
+	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	;;
+*)
+	SRC_URI="http://files.freeswitch.org/${P/_/}.tar.bz2"
+	S="${WORKDIR}/${P/_/}"
+	;;
+esac
+
+
+IUSE="esl nosamples odbc +resampler sctp zrtp"
+
+IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
+
+IUSE_FREETDM="+libpri misdn r2 sng_isdn sng_ss7 wanpipe"
+
+# codecs
+IUSE_MOD_CODECS="+amr amrwb +bv celt codec2 +g723_1 +g729 +h26x +ilbc isac opus silk siren"
+
+# endpoint modules
+IUSE_MOD_ENDP="alsa dingaling freetdm gsmopen opal portaudio rtmp skinny skypopen +sofia"
+
+# file format
+IUSE_MOD_FORMATS="+local_stream +native_file portaudio_stream shell_stream shout +sndfile +tone_stream vlc"
+
+# embedded languages
+IUSE_MOD_LANGS="erlang_event +lua java perl python managed spidermonkey v8"
+
+# limit interface
+IUSE_MOD_LIMIT="+db +hash +limit"
+
+# event interface
+IUSE_MOD_EVENT="+cdr_csv cdr_mongodb cdr_pg_csv cdr_sqlite event_multicast +event_socket event_zmq radius_cdr snmp"
+
+# xml interface
+IUSE_MOD_XMLINT="xml_cdr xml_curl xml_ldap xml_rpc xml_scgi"
+
+# ASR/TTS interface
+IUSE_MOD_ASRTTS="cepstral flite pocketsphinx tts_commandline unimrcp"
+
+# applications / misc
+IUSE_MOD_APPS="abstraction avmd blacklist callcenter cidlookup +conference curl directory distributor easyroute +enum +esf esl +fifo fsk fsv
+	+httapi http_cache ladspa lcr ldap memcache mongo nibblebill osp random redis rss +sms snapshot snipe_hunt snom +spandsp spy +valet_parking vmd +voicemail voicemail_ivr
+"
+
+
+# merge
+IUSE_MODULES="${IUSE_MOD_APPS} ${IUSE_MOD_ASRTTS} ${IUSE_MOD_CODECS} ${IUSE_MOD_ENDP} ${IUSE_MOD_EVENT} ${IUSE_MOD_FORMATS} ${IUSE_MOD_LANGS} ${IUSE_MOD_LIMIT} ${IUSE_MOD_XMLINT}"
+
+# mod_say_X
+IUSE_LINGUAS="de +en es fr he it nl ru zh"
+
+# mandatory
+MANDATORY_MODULES="commands console dialplan_directory dialplan_xml dptools expr logfile loopback syslog"
+
+# inter-module dependencies
+INTER_MODULE_DEPENDS="
+	limit:db
+	limit:hash
+	portaudio_stream:portaudio
+	gsmopen:spandsp
+"
+
+# modules need these core functions
+CORE_MODULE_DEPENDS="
+	nibblebill:odbc
+	easyroute:odbc
+	lcr:odbc
+"
+
+# external dependencies of modules
+MODULES_RDEPEND="
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
+	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
+				   >=net-libs/ptlib-9999 )
+	freeswitch_modules_python? ( dev-lang/python:2.7 )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
+	freeswitch_modules_easyroute? ( dev-db/unixODBC )
+	freeswitch_modules_lcr? ( dev-db/unixODBC )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
+	freeswitch_modules_ladspa? ( media-libs/ladspa-sdk )
+"
+#	freeswitch_modules_gsmopen? ( net-libs/libctb ... )
+#	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+#	freeswitch_modules_ldap? ( net-nds/openldap )
+
+# FreeTDM external dependencies
+FREETDM_RDEPEND="
+	freeswitch_modules_freetdm? (
+		freetdm_modules_misdn? ( >=net-dialup/misdnuser-2.0.0 )
+		freetdm_modules_libpri? ( >=net-libs/libpri-1.4.0 )
+		freetdm_modules_wanpipe? ( net-misc/wanpipe )
+		freetdm_modules_sng_isdn? ( net-libs/libsng-isdn )
+		freetdm_modules_sng_ss7? ( net-libs/libsng-ss7 )
+		freetdm_modules_r2? ( net-misc/openr2 )
+	)
+"
+
+# external core dependencies
+CORE_RDEPEND="
+	odbc? ( dev-db/unixODBC )
+	esl-lua? ( dev-lang/lua dev-lang/swig )
+	esl-php? ( dev-lang/php dev-lang/swig )
+	esl-perl? ( dev-lang/perl dev-lang/swig )
+	esl-ruby? ( dev-lang/ruby dev-lang/swig )
+	esl-python? ( dev-lang/python dev-lang/swig )
+"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	${CORE_RDEPEND}
+	${MODULES_RDEPEND}
+	${FREETDM_RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
+
+PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
+	 >=net-misc/freeswitch-music-1.0.8"
+
+###
+# IUSE merging
+#
+for x in ${IUSE_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
+done
+for x in ${IUSE_FREETDM}; do
+	IUSE="${IUSE} ${x//[^+]/}freetdm_modules_${x/+}"
+done
+
+IUSE="${IUSE} ${IUSE_ESL}"
+
+
+###
+# pre-flight checks
+#
+pkg_setup() {
+	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
+
+	#
+	# 1. safety check
+	#
+	for mod in ${IUSE_MODULES}; do
+		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
+		eerror "This isn't a good idea, usually..."
+		eerror ""
+		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "FREESWITCH_MODULES empty / no modules selected for build"
+	fi
+
+	#
+	# 2. check prerequisites
+	#
+	if use freeswitch_modules_cepstral; then
+
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	if use freeswitch_modules_python ; then
+
+		if built_with_use --missing false dev-lang/python nothreads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
+			echo
+			(( error_cnt++ ))
+
+		elif ! built_with_use --missing true dev-lang/python threads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"threads\" useflag enabled"
+			echo
+			(( error_cnt++ ))
+		fi
+	fi
+
+	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
+		echo
+		eerror "perl: FreeSWITCH needs perl with threads support"
+		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+#	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
+#		echo
+#		eerror "ldap: OpenLDAP with sasl support is required"
+#		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
+#		echo
+#
+#		(( error_cnt++ ))
+#	fi
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Build-time requirements not met!"
+		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Build-time requirements not met: ${error_cnt} errors"
+	fi
+
+	#
+	# 3. check inter-module dependencies
+	#
+	einfo "Checking inter-module dependencies..."
+	for x in ${INTER_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
+			# check if this module has an external dependency
+			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
+				eerror "Module \"${mod}\" requires module \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
+			fi
+		fi
+	done
+
+	#
+	# 4. check core dependencies
+	#
+	einfo "Checking core dependencies..."
+	for x in ${CORE_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
+			# check if this core option has an external dependency
+			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
+				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
+			fi
+		fi
+	done
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
+		eerror "external dependencies! This is for your own security, sorry..."
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Please read the error messages above and fix the listed issues"
+	fi
+
+	#
+	# 5. language checks
+	#
+	einfo "Checking selected languages..."
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		use linguas_${mod} && (( lang_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" ]; then
+		echo
+		ewarn "No languages selected, enabling \"en\" as a fallback"
+
+		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
+	fi
+
+	#
+	# 6. create user + group
+	#
+	enewgroup freeswitch
+	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
+
+	#
+	# 7. set active python version
+	#
+	python_set_active_version 2
+	python_pkg_setup
+
+	#
+	# DONE
+	#
+	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
+}
+
+
+###
+# ABI compat safety check functions
+#
+
+fs_abi_generate_symbols_array() {
+	local libfile="$1" syms
+
+	if [ ! -f "${libfile}" ]; then
+		eerror "Library ${libfile} does not exist"
+		return 1
+	fi
+
+	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
+	if [ -z "${syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	echo "${syms}"
+	return 0
+}
+
+fs_check_core_abi_compat() {
+	local libfreeswitch libfreeswitch_syms
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ -z "${REPLACING_VERSIONS}" ] && return 0
+
+	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate old libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check_abi.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$4
+            sym_len=\$2
+
+	    if (! sym in symbols)
+	        print sym
+
+	    if (symbols[sym] != sym_len)
+	        print sym
+	}
+	EOF
+
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate new libfreeswitch"
+		return 1
+	fi
+
+	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
+	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
+	if [ -n "${changed_syms}" ]; then
+		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
+	fi
+
+	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
+}
+
+fs_check_modules_api_compat() {
+	local x mod name libfreeswitch libfreeswitch_syms
+	local sym need_upgrade module_syms
+	local mod_warn_list="" mod_error_list=""
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
+
+	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
+	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
+	# (raw nm output)
+	#
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$2
+
+	    if (! sym in symbols)
+	        exit 1
+	}
+	EOF
+
+	einfo "Checking for incompatible modules..."
+	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
+		mod="$(basename "${x}")"
+		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
+		need_upgrade="no"
+
+		# no need to check modules that will be overwritten
+		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
+
+
+		# skip modules that are in our list but disabled (= will be uninstalled)
+		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
+			continue
+		fi
+
+		# check module
+		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
+		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
+			# needed symbol is not in the list of available ones, mark module broken
+			need_upgrade="yes"
+		else
+			# check if one of the used functions has been modified in the core,
+			# this may be an indication that the ABI has been changed too
+			# NOTE: This check isn't perfect...
+			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
+
+				if $(echo "${module_syms}" | grep -q "^${sym}"); then
+					# symbol is in the list of functions that _may_ have been changed in a
+					# ABI incompatible way, mark module broken
+					need_upgrade="maybe"
+					break
+				fi
+			done
+		fi
+
+		case "${need_upgrade}" in
+		maybe)
+			mod_warn_list="${mod_warn_list} ${mod}"
+			;;
+		yes)
+			mod_error_list="${mod_error_list} ${mod}"
+			;;
+		*)
+			;;
+		esac
+	done
+
+	if [ -n "${mod_warn_list}" ]; then
+		ewarn "The following modules use functions that have been changed since the last version,"
+		ewarn "you may need to upgrade:"
+		ewarn "  ${mod_warn_list}"
+		echo
+	fi
+
+	if [ -n "${mod_error_list}" ]; then
+		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
+		eerror "  ${mod_error_list}"
+		echo
+	fi
+
+	return 0
+}
+
+
+###
+# modules setup functions
+#
+
+fs_set_module() {
+	local config="modules.conf"
+	local mod="$2"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && {
+		die "Unable to determine category for module \"${mod}\"."
+	}
+
+	case $1 in
+	enable)
+		einfo "  ++ Enabling ${mod}"
+		echo "${category}/${mod}" >>"${config}"
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		echo "#${category}/${mod}" >>"${config}"
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod action
+
+	[ -f "modules.conf" ] && {
+		rm -f "modules.conf" || die "Failed to remove existing modules.conf"
+	}
+
+	einfo "Mandatory modules:"
+	for x in ${MANDATORY_MODULES}; do
+		fs_set_module "enable" "mod_${x}"
+	done
+
+	einfo "Optional modules:"
+	for x in ${IUSE_MODULES}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			fs_use freeswitch_modules_${mod} || action="disable"
+			fs_set_module "${action}" "mod_${mod}"
+		}
+	done
+
+	einfo "Language modules:"
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			fs_use linguas_${mod} || action="disable"
+			fs_set_module "${action}" "mod_say_${mod}"
+		}
+	done
+}
+
+###
+# src_configure() helpers
+#
+
+fs_use() {
+	has ${1} ${FREESWITCH_AUTO_USE} ${USE}
+	return $?
+}
+
+fs_use_any_of() {
+	for x in $@ ; do
+		fs_use ${x} && return 0
+	done
+	return 1
+}
+
+fs_enable() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	[ -n "${3}" ] && value="=${3}"
+
+	option="${2}"
+	[ -z "${option}" ] && option="${1}"
+
+	if fs_use $1; then
+		echo "--enable-${option}${value}"
+	else
+		echo "--disable-${option}"
+	fi
+}
+
+fs_with() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		echo "--with-${option}${value}"
+	else
+		echo "--without-${option}"
+	fi
+}
+
+###
+# other helpers
+#
+
+fs_is_upgrade() {
+	# svn install is always an upgrade
+	[ -n "${EGIT_REPO_URI}" ] && return 0
+
+	# regular up/-downgrade
+	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
+		return 0
+	fi
+
+	# not an up-/downgrade
+	return 1
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+###
+# Set file and directory permissions
+#
+fs_set_permissions() {
+	local prefix="$1"
+
+	[ -z "${prefix}" ] && {
+		die "Usage: set_permissions <prefix>"
+	}
+
+	einfo "Setting file and directory permissions..."
+
+	# sysconfdir
+	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
+
+	# prefix
+	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
+	# allow read access for things like building external modules
+	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
+	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
+
+	# directories owned by the fs user
+	for x in db run log cores storage recordings; do
+		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
+	done
+}
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+	#
+	# 1. custom user patches
+	#
+	epatch_user
+}
+
+src_prepare() {
+	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
+
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		BOOTSTRAP_CMD="${S}/bootstrap.sh"
+	elif [ -x "${S}/rebootstrap.sh" ]; then
+		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
+	fi
+
+	if [ -n "${BOOTSTRAP_CMD}" ]; then
+		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
+		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
+			einfo "Using parallel bootstrap..."
+			BOOTSTRAP_OPTS="-j"
+		}
+		einfo "Bootstrapping FreeSWITCH"
+		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
+
+		# Bootstrap FreeTDM
+		#if use freeswitch_modules_freetdm
+		#then
+		#	einfo "Bootstrapping FreeTDM"
+		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+		#fi
+	fi
+
+	#
+	# 1. enable / disable optional modules
+	#
+	setup_modules
+
+	#
+	# 2. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use esl-python; then
+		python_get_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 3. workarounds (remove as soon as the fix has been comitted)
+	#
+}
+
+src_configure() {
+	local java_opts ftdm_opts config_opts
+
+	#
+	# option handling
+	#
+	fs_use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+
+	# FreeTDM options
+	ftdm_opts="$(fs_with freetdm_modules_libpri libpri) \
+		   $(fs_with freetdm_modules_misdn misdn)"
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. configure (econf + overrides/fixups for /opt/freeswitch prefix)
+	#
+	einfo "Configuring FreeSWITCH..."
+	econf -C \
+		--prefix=/opt/freeswitch \
+		--libdir=/opt/freeswitch/lib \
+		--sysconfdir=/opt/freeswitch/conf \
+		--localstatedir=/opt/freeswitch/var \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--enable-core-libedit-support \
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		--with-rundir=/opt/freeswitch/run \
+		--with-logfiledir=/opt/freeswitch/log \
+		$(fs_enable sctp) \
+		$(fs_enable zrtp) \
+		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(fs_enable resampler resample) \
+		$(fs_enable odbc core-odbc-support) \
+		${java_opts} ${ftdm_opts} ${config_opts} \
+		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
+
+	#
+	# 3. configure FreeTDM
+	#
+	#if use freeswitch_modules_freetdm
+	#then
+	#	cd "${S}/libs/freetdm"
+	#	einfo "Configuring FreeTDM..."
+	#	econf \
+	#		--prefix=/opt/freeswitch \
+	#		--libdir=/opt/freeswitch/lib \
+	#		--sysconfdir=/opt/freeswitch/conf \
+	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+	#		${ftdm_opts} || die "failed to configure FreeTDM"
+	#fi
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# build FreeTDM
+	#
+	if use freeswitch_modules_freetdm
+	then
+		einfo "Building FreeTDM..."
+		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+
+	#
+	# 2. build everything
+	#
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+
+	#
+	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
+	#
+	if fs_use_any_of ${IUSE_ESL}; then
+		einfo "Running esl reswig..."
+		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
+	fi
+
+	#
+	# 4. build esl modules
+	#
+	for esl_lang in ${IUSE_ESL}; do
+		use ${esl_lang} || continue
+
+		esl_lang="${esl_lang#*-}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	if use esl; then
+		einfo "Building libesl..."
+		emake -j1 -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. Install core
+	#
+	einfo "Installing freeswitch core and modules..."
+	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+
+	#
+	# 2. Documentation, sample config files, ...
+	#
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto /opt/freeswitch/scripts/rss
+	doins scripts/rss/rss2ivr.pl
+
+	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	# create and protect directories
+	keepdir /opt/freeswitch/{htdocs,grammar,storage,scripts,recordings}
+	keepdir /opt/freeswitch/{cores,db,run,log,log/{xml_cdr,cdr-csv}}
+
+	# save a copy of the default config
+	einfo "Saving a copy of the default configuration..."
+	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
+	while read fn; do
+		docinto "$(dirname "${fn}")"
+		dodoc   "${D}/opt/freeswitch/${fn}"
+	done
+
+	# remove sample configuration if the user wishes so,
+	# but only if this isn't a fresh installation
+	if use nosamples; then
+		if ! has_version "net-misc/freeswitch"; then
+			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
+		else
+			einfo "Removing sample configuration files..."
+			rm -r "${D}"/opt/freeswitch/conf/*
+		fi
+	fi
+
+	# move configuration to /etc/freeswitch and
+	# create symlink to /opt/freeswitch/conf
+	dodir /etc
+	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
+	dosym /etc/freeswitch /opt/freeswitch/conf
+
+	# keep managed subdir
+	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
+
+	# TODO: install contributed stuff
+
+	# mod_skypopen sample config & helper files
+	if fs_use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	#
+	# 3. Remove .a and .la files
+	#
+	prune_libtool_files --modules
+
+	#
+	# 4. install esl modules
+	#
+	if use esl-ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use esl-python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl-lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl-php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use esl-perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/opt/freeswitch/lib"
+		doins libs/esl/libesl.a
+	fi
+
+	#
+	# 5. Fix permissions
+	#
+	fs_set_permissions "${D}"
+}
+
+pkg_preinst() {
+	#
+	# 1. upgrade api check
+	#
+	if fs_is_upgrade; then
+		einfo "Performing core ABI compatibility check..."
+
+		# compare exported symbols of new and old libfreeswitch to make sure
+		# external modules will still work
+		fs_check_core_abi_compat
+
+		# check if external modules will still work after upgrade
+		# to new libfreeswitch
+		fs_check_modules_api_compat
+	fi
+
+	#
+	# 2. preserve existing config files
+	#
+	if use nosamples; then
+		if has_version "net-misc/freeswitch"; then
+			einfo "Preserving existing configuration..."
+			rm -r "${D}/etc/freeswitch"
+			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#
+	# 1. Info
+	#
+	echo
+	einfo "FreeSWITCH has been successfully emerged!"
+	echo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	echo
+
+	# skypopen setup guide
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		echo
+	fi
+
+	einfo "A copy of the default configuration has been saved to"
+	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
+	echo
+}
+
+pkg_config() {
+	local answer="N"
+
+	[ "$(id -u)" != "0" ] && {
+		eerror "This action needs root privileges"
+		die "Can not run as non-root user"
+	}
+
+	einfo "Reset permissions to installation defaults (y/N)?"
+	read answer
+
+	if [ "${answer/y/Y}" = "Y" ]; then
+		#
+		# Fix permissions
+		#
+		fs_set_permissions "${EROOT:-/}"
+
+		einfo "Done"
+	else
+		ewarn "Aborted"
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-9999.ebuild b/net-misc/freeswitch/freeswitch-9999.ebuild
new file mode 100644
index 0000000..76292ce
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-9999.ebuild
@@ -0,0 +1,1136 @@
+#
+# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+# The automagic default "latest" only works for eautoreconf and friends,
+# so force these versions until we don't have to use (re)bootstrap.sh anymore.
+WANT_AUTOMAKE="1.11"
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils flag-o-matic python user
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS=""
+LICENSE="MPL-1.1"
+SLOT="0"
+
+case ${PV} in
+9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+${PV%.*}.9999*)
+	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
+	EGIT_BRANCH="v${PV%.*}.stable"
+	EGIT_BOOTSTRAP=""
+	inherit git-2
+	;;
+*_rc*)
+	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
+	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	;;
+*)
+	SRC_URI="http://files.freeswitch.org/${P/_/}.tar.bz2"
+	S="${WORKDIR}/${P/_/}"
+	;;
+esac
+
+
+IUSE="esl nosamples odbc +resampler sctp zrtp"
+
+IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
+IUSE_FREETDM="libpri misdn"
+
+IUSE_MODULES="alsa amr amrwb avmd bv +cdr_csv cdr_pg_csv cdr_sqlite celt cepstral cidlookup +console curl
+	+db dialplan_directory dingaling distributor easyroute erlang_event
+	flite freetdm fsk +g723_1 g729 gsmopen h26x +hash +ilbc java lcr ldap +limit +local_stream +logfile +lua
+	managed memcache mp4v nibblebill opal osp perl pocketsphinx portaudio portaudio_stream python radius_cdr redis rtmp
+	shell_stream shout silk siren skinny skypopen snapshot +sndfile snom +sofia +spandsp spidermonkey spy +syslog
+	+tone_stream tts_commandline unimrcp v8 valet_parking vmd +voicemail
+	xml_cdr xml_curl xml_ldap xml_rpc
+"
+
+# mod_say_X
+IUSE_LINGUAS="de +en es fr he it nl ru zh"
+
+# inter-module dependencies
+INTER_MODULE_DEPENDS="
+	limit:db
+	limit:hash
+"
+
+# modules need these core functions
+CORE_MODULE_DEPENDS="
+	nibblebill:odbc
+	easyroute:odbc
+	lcr:odbc
+"
+
+# external dependencies of modules
+MODULES_RDEPEND="
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
+	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
+				   >=net-libs/ptlib-9999 )
+	freeswitch_modules_python? ( =dev-lang/python-2* )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
+	freeswitch_modules_easyroute? ( dev-db/unixODBC )
+	freeswitch_modules_lcr? ( dev-db/unixODBC )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
+	freeswitch_modules_freetdm? (
+		libpri? ( >=net-libs/libpri-1.4.0 )
+		misdn? ( >=net-dialup/misdnuser-2.0.0 )
+	)
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
+"
+#	freeswitch_modules_gsmopen? ( net-libs/libctb ... ) 
+
+# external core dependencies
+CORE_RDEPEND="
+	odbc? ( dev-db/unixODBC )
+	esl-lua? ( dev-lang/lua dev-lang/swig )
+	esl-php? ( dev-lang/php dev-lang/swig )
+	esl-perl? ( dev-lang/perl dev-lang/swig )
+	esl-ruby? ( dev-lang/ruby dev-lang/swig )
+	esl-python? ( dev-lang/python dev-lang/swig )
+"
+
+#
+#
+#
+RDEPEND="virtual/libc
+	 ${CORE_RDEPEND}
+	 ${MODULES_RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
+
+PDEPEND=">=net-misc/freeswitch-sounds-1.0.22
+	 >=net-misc/freeswitch-music-1.0.8"
+
+###
+# IUSE merging
+#
+for x in ${IUSE_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
+done
+
+IUSE="${IUSE} ${IUSE_ESL} ${IUSE_FREETDM}"
+
+
+###
+# pre-flight checks
+#
+pkg_setup() {
+	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
+
+	#
+	# 1. safety check
+	#
+	for mod in ${IUSE_MODULES}; do
+		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
+		eerror "This isn't a good idea, usually..."
+		eerror ""
+		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "FREESWITCH_MODULES empty / no modules selected for build"
+	fi
+
+	#
+	# 2. check prerequisites
+	#
+	if use freeswitch_modules_cepstral; then
+
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	if use freeswitch_modules_python ; then
+
+		if built_with_use --missing false dev-lang/python nothreads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
+			echo
+			(( error_cnt++ ))
+
+		elif ! built_with_use --missing true dev-lang/python threads ; then
+			echo
+			eerror "python: FreeSWITCH needs python with threads support"
+			eerror "python: please reemerge python with \"threads\" useflag enabled"
+			echo
+			(( error_cnt++ ))
+		fi
+	fi
+
+	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
+		echo
+		eerror "perl: FreeSWITCH needs perl with threads support"
+		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
+		echo
+		eerror "ldap: OpenLDAP with sasl support is required"
+		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
+		echo
+
+		(( error_cnt++ ))
+	fi
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Build-time requirements not met!"
+		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Build-time requirements not met: ${error_cnt} errors"
+	fi
+
+	#
+	# 3. check inter-module dependencies
+	#
+	einfo "Checking inter-module dependencies..."
+	for x in ${INTER_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
+			# check if this module has an external dependency
+			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
+				eerror "Module \"${mod}\" requires module \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
+			fi
+		fi
+	done
+
+	#
+	# 4. check core dependencies
+	#
+	einfo "Checking core dependencies..."
+	for x in ${CORE_MODULE_DEPENDS}; do
+		mod="${x%:*}"
+		dep="${x#*:}"
+
+		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
+			# check if this core option has an external dependency
+			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
+				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
+				eerror "can not auto-enable this feature because it has an unmet external dependency!"
+				(( error_cnt++ ))
+			else
+				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
+				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
+			fi
+		fi
+	done
+
+	if [ "${error_cnt}" != "0" ]; then
+		echo
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
+		eerror "external dependencies! This is for your own security, sorry..."
+		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		die "Please read the error messages above and fix the listed issues"
+	fi
+
+	#
+	# 5. language checks
+	#
+	einfo "Checking selected languages..."
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		use linguas_${mod} && (( lang_cnt++ ))
+	done
+	if [ "${mod_cnt}" = "0" ]; then
+		echo
+		ewarn "No languages selected, enabling \"en\" as a fallback"
+
+		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
+	fi
+
+	#
+	# 6. create user + group
+	#
+	enewgroup freeswitch
+	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
+
+	#
+	# 7. set active python version
+	#
+	python_set_active_version 2
+	python_pkg_setup
+
+	#
+	# DONE
+	#
+	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
+}
+
+
+###
+# ABI compat safety check functions
+#
+
+fs_abi_generate_symbols_array() {
+	local libfile="$1" syms
+
+	if [ ! -f "${libfile}" ]; then
+		eerror "Library ${libfile} does not exist"
+		return 1
+	fi
+
+	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
+	if [ -z "${syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	echo "${syms}"
+	return 0
+}
+
+fs_check_core_abi_compat() {
+	local libfreeswitch libfreeswitch_syms
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ -z "${REPLACING_VERSIONS}" ] && return 0
+
+	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate old libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check_abi.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$4
+            sym_len=\$2
+
+	    if (! sym in symbols)
+	        print sym
+
+	    if (symbols[sym] != sym_len)
+	        print sym
+	}
+	EOF
+
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate new libfreeswitch"
+		return 1
+	fi
+
+	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
+	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
+	if [ -n "${changed_syms}" ]; then
+		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
+	fi
+
+	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
+}
+
+fs_check_modules_api_compat() {
+	local x mod name libfreeswitch libfreeswitch_syms
+	local sym need_upgrade module_syms
+	local mod_warn_list="" mod_error_list=""
+
+	if [ "${EBUILD_PHASE}" != "preinst" ]; then
+		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
+		return 1
+	fi
+
+	# no need to check anything if there's no previous install...
+	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
+
+	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
+	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
+	# (raw nm output)
+	#
+	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
+	if [ ! -f "${libfreeswitch}" ]; then
+		eerror "Failed to locate libfreeswitch"
+		return 1
+	fi
+
+	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
+	if [ -z "${libfreeswitch_syms}" ]; then
+		eerror "Failed to create list of exported libfreeswitch symbols"
+		return 1
+	fi
+
+	cat > "${T}/symbols_check.awk" <<-EOF
+	BEGIN{
+	${libfreeswitch_syms}
+	}
+
+	/switch_.+/{
+	    sym=\$2
+
+	    if (! sym in symbols)
+	        exit 1
+	}
+	EOF
+
+	einfo "Checking for incompatible modules..."
+	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
+		mod="$(basename "${x}")"
+		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
+		need_upgrade="no"
+
+		# no need to check modules that will be overwritten
+		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
+
+
+		# skip modules that are in our list but disabled (= will be uninstalled)
+		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
+			continue
+		fi
+
+		# check module
+		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
+		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
+			# needed symbol is not in the list of available ones, mark module broken
+			need_upgrade="yes"
+		else
+			# check if one of the used functions has been modified in the core,
+			# this may be an indication that the ABI has been changed too
+			# NOTE: This check isn't perfect...
+			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
+
+				if $(echo "${module_syms}" | grep -q "^${sym}"); then
+					# symbol is in the list of functions that _may_ have been changed in a
+					# ABI incompatible way, mark module broken
+					need_upgrade="maybe"
+					break
+				fi
+			done
+		fi
+
+		case "${need_upgrade}" in
+		maybe)
+			mod_warn_list="${mod_warn_list} ${mod}"
+			;;
+		yes)
+			mod_error_list="${mod_error_list} ${mod}"
+			;;
+		*)
+			;;
+		esac
+	done
+
+	if [ -n "${mod_warn_list}" ]; then
+		ewarn "The following modules use functions that have been changed since the last version,"
+		ewarn "you may need to upgrade:"
+		ewarn "  ${mod_warn_list}"
+		echo
+	fi
+
+	if [ -n "${mod_error_list}" ]; then
+		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
+		eerror "  ${mod_error_list}"
+		echo
+	fi
+
+	return 0
+}
+
+
+###
+# modules setup functions
+#
+
+fs_set_module() {
+	local config="build/modules.conf.in"
+	local mod="$2"
+
+	[ -f "modules.conf" ] && config="modules.conf"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		mod="mod_freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && die "unable to determine category for module \"${mod}\" (from: `pwd`)"
+
+	case $1 in
+	enable)
+		if grep -q "/${mod}$" ${config}
+		then
+			einfo "  ++ Enabling ${mod}"
+			sed -i -e "/\/${mod}$/s:.*:${category}/${mod}:" \
+				${config} || die "Failed to enable module \"${mod}\""
+		else
+			# module not in list, add it
+			einfo "  **  Adding ${mod}"
+			echo "${category}/${mod}" >> ${config}
+		fi
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		sed -i -e "/\/${mod}$/s:.*:#${category}/${mod}:" \
+			${config} || die "Failed to disable module \"${mod}\""
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod enablemod
+
+	einfo "Optional modules:"
+	for x in ${IUSE_MODULES}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use freeswitch_modules_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_${mod}" \
+			|| fs_set_module "disable" "mod_${mod}"
+	done
+
+	einfo "Language modules:"
+	for x in ${IUSE_LINGUAS}; do
+		mod="${x/+}"
+		enablemod=1
+
+		[ -z "${x}" ] && continue
+
+		fs_use linguas_${mod} || enablemod=0
+
+		[ ${enablemod} -eq 1 ] \
+			&& fs_set_module "enable"  "mod_say_${mod}" \
+			|| fs_set_module "disable" "mod_say_${mod}"
+	done
+}
+
+###
+# src_configure() helpers
+#
+
+fs_use() {
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		return 0
+	fi
+	return 1
+}
+
+fs_use_any_of() {
+	for x in $@ ; do
+		fs_use ${x} && return 0
+	done
+	return 1
+}
+
+fs_enable() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if fs_use $1; then
+		echo "--enable-${option}${value}"
+	else
+		echo "--disable-${option}"
+	fi
+}
+
+fs_with() {
+	local option value
+
+	if [ -z "${1}" ]; then
+		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
+		return 1
+	fi
+
+	if [ -n "${3}" ]; then
+		value="=${3}"
+	fi
+
+	option="${2}"
+	if [ -z "${option}" ]; then
+		option="${1}"
+	fi
+
+	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
+		echo "--with-${option}${value}"
+	else
+		echo "--without-${option}"
+	fi
+}
+
+###
+# other helpers
+#
+
+fs_is_upgrade() {
+	# svn install is always an upgrade
+	[ -n "${EGIT_REPO_URI}" ] && return 0
+
+	# regular up/-downgrade
+	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
+		return 0
+	fi
+
+	# not an up-/downgrade
+	return 1
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dorubymod() {
+        ( # dont want to pollute calling env
+                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_dopymod() {
+        ( # dont want to pollute calling env
+                insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644 
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+	                doins "${x}" || die "failed to install ${x}"
+		done
+        ) || die "failed to install $@"
+}
+
+esl_doluamod() {
+        ( # dont want to pollute calling env
+                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
+		insopts -m755
+                doins "$@"
+        ) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+        ( # dont want to pollute calling env
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+        ) || die "failed to install $@"
+}
+
+###
+# Set file and directory permissions
+#
+fs_set_permissions() {
+	local prefix="$1"
+
+	[ -z "${prefix}" ] && {
+		die "Usage: set_permissions <prefix>"
+	}
+
+	einfo "Setting file and directory permissions..."
+
+	# sysconfdir
+	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
+
+	# prefix
+	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
+	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
+	# allow read access for things like building external modules
+	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
+	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
+
+	# directories owned by the fs user
+	for x in db run log cores storage recordings; do
+		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
+	done
+}
+
+
+###
+# main ebuild functions
+#
+
+src_unpack() {
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+	#
+	# 1. custom user patches
+	#
+	epatch_user
+}
+
+src_prepare() {
+	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
+
+	if [ -n "${EGIT_REPO_URI}" ]; then
+		BOOTSTRAP_CMD="${S}/bootstrap.sh"
+	elif [ -x "${S}/rebootstrap.sh" ]; then
+		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
+	fi
+
+	if [ -n "${BOOTSTRAP_CMD}" ]; then
+		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
+		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
+			einfo "Using parallel bootstrap..."
+			BOOTSTRAP_OPTS="-j"
+		}
+		einfo "Bootstrapping FreeSWITCH"
+		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
+
+		# Bootstrap FreeTDM
+		#if use freeswitch_modules_freetdm
+		#then
+		#	einfo "Bootstrapping FreeTDM"
+		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+		#fi
+	fi
+
+	#
+	# 1. enable / disable optional modules
+	#
+	setup_modules
+
+	#
+	# 2. patches for esl modules (*sigh*)
+	#
+	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
+		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
+
+	if use esl-python; then
+		python_get_version || die "Failed to determine current python version"
+
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+
+	#
+	# 3. workarounds remove as soon as the fix has been comitted
+	#
+}
+
+src_configure() {
+	local java_opts ftdm_opts config_opts
+
+	#
+	# option handling
+	#
+	fs_use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+
+	# FreeTDM specific options
+	ftdm_opts="$(fs_with libpri) $(fs_with misdn)"
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# 2. configure (can't use econf thanks to b0rked buildsystem)
+	#
+	einfo "Configuring FreeSWITCH..."
+	./configure -C \
+		--host=${CHOST} \
+		${CBUILD:+--build=${CBUILD}} \
+		${CTARGET:+--target=${CTARGET}} \
+		--prefix=/opt/freeswitch \
+		--libdir=/opt/freeswitch/lib \
+		--sysconfdir=/opt/freeswitch/conf \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--enable-core-libedit-support \
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		$(fs_enable sctp) \
+		$(fs_enable zrtp) \
+		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(fs_enable resampler resample) \
+		$(fs_enable odbc core-odbc-support) \
+		${java_opts} ${ftdm_opts} ${config_opts} \
+		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
+
+	#
+	# 3. configure FreeTDM
+	#
+	#if use freeswitch_modules_freetdm
+	#then
+	#	cd "${S}/libs/freetdm"
+	#	einfo "Configuring FreeTDM..."
+	#	econf \
+	#		--prefix=/opt/freeswitch \
+	#		--libdir=/opt/freeswitch/lib \
+	#		--sysconfdir=/opt/freeswitch/conf \
+	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+	#		${config_opts} || die "failed to configure FreeTDM"
+	#fi
+}
+
+src_compile() {
+	local esl_lang
+
+	#
+	# 1. filter some flags known to break things
+	#
+
+	# breaks linking freeswitch core lib (missing libdl symbols)
+	filter-ldflags -Wl,--as-needed
+
+	# breaks freetdm
+	filter-flags -fvisibility-inlines-hidden
+
+	#
+	# build FreeTDM
+	#
+	if use freeswitch_modules_freetdm
+	then
+		einfo "Building FreeTDM..."
+		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+
+	#
+	# 2. build everything
+	#
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+
+	#
+	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
+	#
+	if fs_use_any_of ${IUSE_ESL}; then
+		einfo "Running esl reswig..."
+		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
+	fi
+
+	#
+	# 4. build esl modules
+	#
+	for esl_lang in ${IUSE_ESL}; do
+		use ${esl_lang} || continue
+
+		esl_lang="${esl_lang#*-}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+
+	if use esl; then
+		einfo "Building libesl..."
+		emake -j1 -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+
+src_install() {
+	local esl_lang
+
+	#
+	# 1. Install core
+	#
+	einfo "Installing freeswitch core and modules..."
+	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+
+	#
+	# 2. Documentation, sample config files, ...
+	#
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto /opt/freeswitch/scripts/rss
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /opt/freeswitch/{htdocs,log,log/{xml_cdr,cdr-csv},db,grammar,cores,storage,scripts,recordings}
+
+	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	# save a copy of the default config
+	einfo "Saving a copy of the default configuration..."
+	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
+	while read fn; do
+		docinto "$(dirname "${fn}")"
+		dodoc   "${D}/opt/freeswitch/${fn}"
+	done
+
+	# remove sample configuration if the user wishes so,
+	# but only if this isn't a fresh installation
+	if use nosamples; then
+		if ! has_version "net-misc/freeswitch"; then
+			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
+		else
+			einfo "Removing sample configuration files..."
+			rm -r "${D}"/opt/freeswitch/conf/*
+		fi
+	fi
+
+	# move configuration to /etc/freeswitch and
+	# create symlink to /opt/freeswitch/conf
+	dodir /etc
+	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
+	dosym /etc/freeswitch /opt/freeswitch/conf
+
+	# keep managed subdir
+	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
+
+	# TODO: install contributed stuff
+
+	# mod_skypopen sample config & helper files
+	if fs_use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	#
+	# 3. Remove .a and .la files
+	#
+	prune_libtool_files --modules
+
+	#
+	# 4. install esl modules
+	#
+	if use esl-ruby; then
+		einfo "Installing esl module for ruby..."
+		esl_dorubymod libs/esl/ruby/ESL.so
+	fi
+
+	if use esl-python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl-lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl-php; then
+		einfo "Installing esl module for php..."
+		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
+	fi
+
+	if use esl-perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/opt/freeswitch/lib"
+		doins libs/esl/libesl.a
+	fi
+
+	#
+	# 5. Fix permissions
+	#
+	fs_set_permissions "${D}"
+}
+
+pkg_preinst() {
+	#
+	# 1. upgrade api check
+	#
+	if fs_is_upgrade; then
+		einfo "Performing core ABI compatibility check..."
+
+		# compare exported symbols of new and old libfreeswitch to make sure
+		# external modules will still work
+		fs_check_core_abi_compat
+
+		# check if external modules will still work after upgrade
+		# to new libfreeswitch
+		fs_check_modules_api_compat
+	fi
+
+	#
+	# 2. preserve existing config files
+	#
+	if use nosamples; then
+		if has_version "net-misc/freeswitch"; then
+			einfo "Preserving existing configuration..."
+			rm -r "${D}/etc/freeswitch"
+			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#
+	# 1. Info
+	#
+	echo
+	einfo "FreeSWITCH has been successfully emerged!"
+	echo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	echo
+
+	# skypopen setup guide
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		echo
+	fi
+
+	einfo "A copy of the default configuration has been saved to"
+	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
+	echo
+}
+
+pkg_config() {
+	local answer="N"
+
+	[ "$(id -u)" != "0" ] && {
+		eerror "This action needs root privileges"
+		die "Can not run as non-root user"
+	}
+
+	einfo "Reset permissions to installation defaults (y/N)?"
+	read answer
+
+	if [ "${answer/y/Y}" = "Y" ]; then
+		#
+		# Fix permissions
+		#
+		fs_set_permissions "${EROOT:-/}"
+
+		einfo "Done"
+	else
+		ewarn "Aborted"
+	fi
+}
diff --git a/net-misc/freeswitch/metadata.xml b/net-misc/freeswitch/metadata.xml
new file mode 100644
index 0000000..5bb58d0
--- /dev/null
+++ b/net-misc/freeswitch/metadata.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>s.knoblich@axsents.de</email>
+</maintainer>
+<upstream>
+  <doc lang="en">http://wiki.freeswitch.org/</doc>
+  <bugs-to>http://jira.freeswitch.org/</bugs-to>
+</upstream>
+<use>
+  <flag name="nosamples">Do not install sample configuration files</flag>
+  <flag name="resampler">Enable support for up-/downsampling of audio (e.g. 48KHz -> 8KHz)</flag>
+  <flag name="sctp">Enable SCTP (Stream-Control-Transport-Protocol) support (mod_sofia, ...)</flag>
+  <flag name="libpri">Build OpenZAP/FreeTDM with libpri module</flag>
+
+  <!-- ESL -->
+  <flag name="esl">Event-Socket Library</flag>
+  <flag name="esl-lua">LUA bindings for ESL</flag>
+  <flag name="esl-php">PHP bindings for ESL</flag>
+  <flag name="esl-perl">Perl bindings for ESL</flag>
+  <flag name="esl-ruby">Ruby bindings for ESL</flag>
+  <flag name="esl-python">Python bindings for ESL</flag>
+
+  <!-- FREESWITCH_MODULES -->
+  <flag name="freeswitch_modules_alsa">Alsa endpoint module (mod_alsa)</flag>
+  <flag name="freeswitch_modules_amr">AMR-NB (Narrowband) pass-through codec module (mod_amr)</flag>
+  <flag name="freeswitch_modules_amr_wb">AMR-WB (Wideband) pass-through codec module (mod_amrwb)</flag>
+  <flag name="freeswitch_modules_vmd">Advanced voicemail detection application module (mod_avmd)</flag>
+  <flag name="freeswitch_modules_bv">Broadvoice HD (Wideband) codec (mod_bv)</flag>
+  <flag name="freeswitch_modules_cdr_csv">CSV (Comma-Separated-Value) CDR (Call-Detail-Record) module</flag>
+  <flag name="freeswitch_modules_celt">CELT ultra-low delay wideband codec module (mod_celt)</flag>
+  <flag name="freeswitch_modules_cepstral">Cepstral SWIFT TTS (Text-To-Speech) engine module (mod_cepstral)</flag>
+  <flag name="freeswitch_modules_cidlookup">API commands to query CallerID lookup services (mod_cidlookup)</flag>
+  <flag name="freeswitch_modules_conference">Conferencing application (mod_conference)</flag>
+  <flag name="freeswitch_modules_console">Console logger module (mod_console)</flag>
+  <flag name="freeswitch_modules_curl">Curl-based HTTP client api command, replacing mod_http  (mod_curl)</flag>
+  <flag name="freeswitch_modules_db">Database-based resource limit module (mod_db)</flag>
+  <flag name="freeswitch_modules_dialplan_asterisk">Asterisk-like dialplan module (mod_dialplan_asterisk)</flag>
+  <flag name="freeswitch_modules_dialplan_directory">Directory interface dialplan module (mod_dialplan_directory)</flag>
+  <flag name="freeswitch_modules_dialplan_xml">Default XML dialplan module (mod_dialplan_xml)</flag>
+  <flag name="freeswitch_modules_dingaling">Jingle (XMPP / GoogleTalk) endpoint module (mod_dingaling)</flag>
+  <flag name="freeswitch_modules_distributor">Distribute calls between multiple routes (mod_distributor)</flag>
+  <flag name="freeswitch_modules_dptools">Dialplan tools (mod_dptools)</flag>
+  <flag name="freeswitch_modules_easyroute">DB-based routing application module (mod_easyroute)</flag>
+  <flag name="freeswitch_modules_enum">ENUM application module (mod_enum)</flag>
+  <flag name="freeswitch_modules_erlang_event">Erlang event handler / remote control module (mod_event_erlang)</flag>
+  <flag name="freeswitch_modules_event_multicast">Multicast event handler module (mod_event_multicast)</flag>
+  <flag name="freeswitch_modules_event_socket">Socket event handler / remote control module (mod_event_socket)</flag>
+  <flag name="freeswitch_modules_expr">Dialplan expressions (mod_expr)</flag>
+  <flag name="freeswitch_modules_fax">Fax receive/transmit application module (mod_fax)(DEPRECATED: see mod_spandsp)</flag>
+  <flag name="freeswitch_modules_fifo">First-in-First-out call queue module (mod_fifo)</flag>
+  <flag name="freeswitch_modules_file_string">Stream audio from a file(?) (mod_file_string)</flag>
+  <flag name="freeswitch_modules_flite">Flite TTS (Text-to-Speech) module (mod_flite)</flag>
+  <flag name="freeswitch_modules_freetdm">FreeTDM (SS7BOOST, PRI, BRI, Analog) endpoint module (mod_freetdm)</flag>
+  <flag name="freeswitch_modules_fsv">Simple video recording application (mod_fsv)</flag>
+  <flag name="freeswitch_modules_g723_1">G.723.1 codec module (mod_g723_1)</flag>
+  <flag name="freeswitch_modules_g729">G.729 (pass-through only) codec module (mod_g729)</flag>
+  <flag name="freeswitch_modules_gsmopen">GSM modem/handset endpoint module (mod_gsmopen)</flag>
+  <flag name="freeswitch_modules_h26x">H.261, H.263, H.264 pass-through codec module (mod_h26x)</flag>
+  <flag name="freeswitch_modules_hash">Hash-based resource limit module (mod_hash)</flag>
+  <flag name="freeswitch_modules_http">HTTP client api command (mod_http)</flag>
+  <flag name="freeswitch_modules_iax">Inter-Asterisk eXchange (IAX2) endpoint module (mod_iax)</flag>
+  <flag name="freeswitch_modules_ilbc">iLBC codec module (mod_ilbc)</flag>
+  <flag name="freeswitch_modules_java">Java language module (mod_java)</flag>
+  <flag name="freeswitch_modules_lcr">LCR (Least-Cost-Routing) application module (mod_lcr)</flag>
+  <flag name="freeswitch_modules_limit">Resource limit module (mod_limit) (DEPRECATED: see mod_db + mod_hash)</flag>
+  <flag name="freeswitch_modules_local_stream">Local file streaming module (mod_local_stream)</flag>
+  <flag name="freeswitch_modules_logfile">File logger module (mod_logfile)</flag>
+  <flag name="freeswitch_modules_lua">LUA language module (mod_lua)</flag>
+  <flag name="freeswitch_modules_managed">.NET managed mode language module (mod_managed)</flag>
+  <flag name="freeswitch_modules_memcache">Memcache API interface module (mod_memcache)</flag>
+  <flag name="freeswitch_modules_mp4v">MPEG4 / H.264 Video ES (Elementary Stream) pass-through codec module (mod_mp4v)</flag>
+  <flag name="freeswitch_modules_nibblebill">Real-time debit module (mod_nibblebill)</flag>
+  <flag name="freeswitch_modules_opal">H.323 endpoint module based on the Opal library (experimental) (mod_opal)</flag>
+  <flag name="freeswitch_modules_openmrcp">OpenMRCP module (mod_openmrcp)</flag>
+  <flag name="freeswitch_modules_openzap">OpenZAP (SS7BOOST, PRI, BRI, Analog) endpoint module (mod_openzap)</flag>
+  <flag name="freeswitch_modules_osp">Open Settlement Protocol (OSP) module (mod_osp)</flag>
+  <flag name="freeswitch_modules_perl">Perl language module (mod_perl)</flag>
+  <flag name="freeswitch_modules_pocketsphinx">Pocketsphinx ASR (Speech-recognition) module (mod_pocketsphinx)</flag>
+  <flag name="freeswitch_modules_portaudio">Portaudio endpoint module (mod_portaudio)</flag>
+  <flag name="freeswitch_modules_portaudio_stream">Stream audio from a portaudio source (mod_portaudio_stream)</flag>
+  <flag name="freeswitch_modules_python">Python language module (mod_python)</flag>
+  <flag name="freeswitch_modules_radius_cdr">Radius CDR (Call-Detail-Record) module (mod_radius_cdr)</flag>
+  <flag name="freeswitch_modules_redis">Redis (advanced key-value store: http://code.google.com/p/redis/)-based resource limit module (mod_redis)</flag>
+  <flag name="freeswitch_modules_rss">RSS feed application (mod_rss)</flag>
+  <flag name="freeswitch_modules_say_de">German TTS functions (mod_say_de)</flag>
+  <flag name="freeswitch_modules_say_en">English TTS functions (mod_say_en)</flag>
+  <flag name="freeswitch_modules_say_es">Spanish TTS functions (mod_say_es)</flag>
+  <flag name="freeswitch_modules_say_fr">French TTS functions (mod_say_fr)</flag>
+  <flag name="freeswitch_modules_say_it">Italian TTS functions (mod_say_it)</flag>
+  <flag name="freeswitch_modules_say_nl">Dutch TTS functions (mod_say_nl)</flag>
+  <flag name="freeswitch_modules_say_ru">Russian TTS functions (mod_say_ru)</flag>
+  <flag name="freeswitch_modules_say_zh">Simplified Chinese TTS functions (mod_say_zh)</flag>
+  <flag name="freeswitch_modules_shell_stream">Stream audio from an external application (mod_shell_stream)</flag>
+  <flag name="freeswitch_modules_shout">Shoutcast streaming module (mod_shout)</flag>
+  <flag name="freeswitch_modules_silk">SILK wideband codec module (mod_silk)</flag>
+  <flag name="freeswitch_modules_siren">G.722.1 (aka "Siren") codec module (mod_siren)</flag>
+  <flag name="freeswitch_modules_skypiax">Skype endpoint module, using the Skype client remote control API (mod_skypiax)(deprecated, see: mod_skypopen)</flag>
+  <flag name="freeswitch_modules_skypopen">Skype endpoint module, using the Skype client remote control API (mod_skypopen)</flag>
+  <flag name="freeswitch_modules_snapshot">Record sliding window (e.g. last 10 seconds) of audio (mod_snapshot)</flag>
+  <flag name="freeswitch_modules_sndfile">Module to add support for various sound file formats (mod_sndfile)</flag>
+  <flag name="freeswitch_modules_snom">SNOM VoIP phone helper applications (mod_snom)</flag>
+  <flag name="freeswitch_modules_sofia">SIP (Session-Initiation-Protocol) endpoint module (mod_sofia)</flag>
+  <flag name="freeswitch_modules_spandsp">SpanDSP fax applications and VoIP codecs (mod_spandsp)</flag>
+  <flag name="freeswitch_modules_speex">Speex codec module (mod_speex)</flag>
+  <flag name="freeswitch_modules_spidermonkey">Spidermonkey javascript language module (mod_spidermonkey)</flag>
+  <flag name="freeswitch_modules_spidermonkey_curl">Spidermonkey curl extension (mod_spidermonkey_curl)</flag>
+  <flag name="freeswitch_modules_spidermonkey_core_db">Spidermonkey db extension (mod_spidermonkey_core_db)</flag>
+  <flag name="freeswitch_modules_spidermonkey_odbc">Spidermonkey ODBC extension (mod_spidermonkey_odbc)</flag>
+  <flag name="freeswitch_modules_spidermonkey_socket">Spidermonkey socket extension (mod_spidermonkey_socket)</flag>
+  <flag name="freeswitch_modules_spidermonkey_teletone">Spidermonkey tone detection/generation extension (mod_spidermonkey_teletone)</flag>
+  <flag name="freeswitch_modules_spy">Spy on a user constantly (mod_spy)</flag>
+  <flag name="freeswitch_modules_syslog">Syslog logger module (mod_syslog)</flag>
+  <flag name="freeswitch_modules_tone_stream">(Scriptable) Tone generator module (mod_tone_stream)</flag>
+  <flag name="freeswitch_modules_tts_commandline">System command TTS (Text-To-Speech) interface (mod_tts_commandline)</flag>
+  <flag name="freeswitch_modules_unimrcp">MRCP (Media Resource Control Protocol) ASR/TTS client module (mod_unimrcp)</flag>
+  <flag name="freeswitch_modules_v8">JavaScript language module (mod_v8)</flag>
+  <flag name="freeswitch_modules_valet_parking">Valet parking (mod_valet_parking)</flag>
+  <flag name="freeswitch_modules_vmd">Voicemail detection application module (mod_vmd)</flag>
+  <flag name="freeswitch_modules_voicemail">Voicemail application module (mod_voicemail)</flag>
+  <flag name="freeswitch_modules_voipcodecs">Collection of most-used codecs (G.711, G.722, G.726, GSM, LPC10) (mod_voipcodecs)(DEPRECATED: see mod_spandsp)</flag>
+  <flag name="freeswitch_modules_xml_cdr">XML CDR (Call-Detail-Record) module (mod_xml_cdr)</flag>
+  <flag name="freeswitch_modules_xml_curl">CURL XML Gateway module (mod_xml_curl)</flag>
+  <flag name="freeswitch_modules_xml_ldap">LDAP XML Gateway module (mod_xml_ldap)</flag>
+  <flag name="freeswitch_modules_xml_rpc">XML RPC module (mod_xml_rpc)</flag>
+  <flag name="freeswitch_modules_yaml">YaML (Yet-another-Markup-Language) dialplan module (mod_yaml)</flag>
+  <flag name="freeswitch_modules_zeroconf">Zeroconf event handler module (mod_zeroconf)</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/freetdm/Manifest b/net-misc/freetdm/Manifest
new file mode 100644
index 0000000..f0de822
--- /dev/null
+++ b/net-misc/freetdm/Manifest
@@ -0,0 +1,2 @@
+DIST freetdm-1.0.1.tar.gz 12905134 RMD160 c5931c75d13f2156f6d492f5ef83784c49100801 SHA1 2e0dd739dce71b269cb98344850147f708b26c0e SHA256 5558045855d5c6b906b465d34fcc4da17a5285e2bbfbb4e52d6d479d47eec4ee
+EBUILD freetdm-1.0.1.ebuild 801 RMD160 47df3f27ba860a89cdf0cc5d060921d73cd6a50c SHA1 85ddc695e2f962e54f5dd0e65814a69bd3b6eee6 SHA256 a443603366c34912b7c7feab19f733bca2c55d417503187a7d40778288ec2f77
diff --git a/net-misc/freetdm/freetdm-1.0.1.ebuild b/net-misc/freetdm/freetdm-1.0.1.ebuild
new file mode 100644
index 0000000..dc1e361
--- /dev/null
+++ b/net-misc/freetdm/freetdm-1.0.1.ebuild
@@ -0,0 +1,39 @@
+EAPI="2"
+IUSE="pcap"
+
+inherit eutils
+
+DESCRIPTION=""
+HOMEPAGE="http://www.freeswitch.org/"
+SRC_URI="ftp://ftp.sangoma.com/linux/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="BSD"
+
+RDEPEND="virtual/libc
+	pcap? ( >=net-libs/libpcap-1.0.0 )"
+#	libpri? ( >=net-libs/libpri-1.4.0 )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--with-modinstdir="/usr/$(get_libdir)/${PN}" \
+		$(use_with pcap pcap /usr) || die "econf failed"
+
+# fix --without-libpri b0rkage
+#		$(use_with pcap pcap /usr) \
+#		$(use_with libpri) || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+
+	# remove static module files
+	for x in "${D}/usr/$(get_libdir)/${PN}/"*.{a,la}; do
+		rm -f "${x}" || die "failed to remove \"${x}\""
+	done
+}
diff --git a/net-misc/ftmod_isdn/Manifest b/net-misc/ftmod_isdn/Manifest
new file mode 100644
index 0000000..dca02c4
--- /dev/null
+++ b/net-misc/ftmod_isdn/Manifest
@@ -0,0 +1 @@
+EBUILD ftmod_isdn-9999.ebuild 1240 SHA256 68a6fb073c301286e68521430d64da6e7d88088c282944def3dfaf79df75fdff SHA512 6cf396b13d603103fc7c541d3cf34805626c75263e304f9e787073263175958efb74592be290ce2d83a0e3689987b498cf1dac340ba96d0f074d485add186614 WHIRLPOOL 3fa93cabdc3d3d35a557531b96a7706c48910c65e6f2b501128028ceb9e579524cb16bbf6c8431c7457167b33a7acf6d612a1fd14c327f3df332255e898ce7a7
diff --git a/net-misc/ftmod_isdn/ftmod_isdn-9999.ebuild b/net-misc/ftmod_isdn/ftmod_isdn-9999.ebuild
new file mode 100644
index 0000000..6105e89
--- /dev/null
+++ b/net-misc/ftmod_isdn/ftmod_isdn-9999.ebuild
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="2"
+
+inherit git-2
+
+IUSE="pcap"
+
+DESCRIPTION="ISDN (Q.931; PRI/BRI) protocol module for FreeTDM"
+HOMEPAGE="http://oss.axsentis.de/gitweb/?p=ftmod_isdn.git;a=summary"
+#SRC_URI="http://oss.axsentis.de/"
+
+EGIT_REPO_URI="http://oss.axsentis.de/git/ftmod_isdn.git"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+SLOT="0"
+
+LICENSE="BSD"
+KEYWORDS=""
+
+RDEPEND="virtual/libc
+	 ~net-libs/libisdn-${PV}
+	 net-misc/freeswitch[freeswitch_modules_freetdm]
+	 pcap? ( net-libs/libpcap )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10"
+
+src_configure() {
+	# NOTE: temporarily using --with-freetdm
+	#       will be replaced by pkgconfig detection
+	econf \
+		--with-freetdm="/opt/freeswitch" \
+		--with-freetdm-modules-dir="/opt/freeswitch/mod" \
+		$(use_with pcap) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dodoc README COPYING
+
+	# remove .la files
+	find "${D}" -type f -name "*.la" -exec rm {} \;
+}
diff --git a/net-misc/mod_com_g729/Manifest b/net-misc/mod_com_g729/Manifest
new file mode 100644
index 0000000..bd0012a
--- /dev/null
+++ b/net-misc/mod_com_g729/Manifest
@@ -0,0 +1,3 @@
+AUX freeswitch_license.rc6 781 RMD160 98b63348f5272a90258841e618a39a8850c99eca SHA1 aa21427fc6d9adf361d1cf3defe72cccaf468256 SHA256 8beafd9c72b5f5154dd829dbf9591f319737a67934f3a3c28ba273507997724d
+DIST fsg729-136-installer 1257361 RMD160 a6ff6926f54932419954b4edeada37cdc2ba2612 SHA1 4c5211ae78268ce28cb866fa360f419dbfe3bd86 SHA256 7b6c6f3f0540f938c106f31c7839a6b98eb17396b998aa08b2cc4870e96f806f
+EBUILD mod_com_g729-136.ebuild 2402 RMD160 57e64a494440507e1fd9cb8ef365b4cadc3c37dc SHA1 26cd8c41cc0e7d424c3c118a4ba69e60e9ae8910 SHA256 b004946bfd57f1931779aeee50f13835cc64e9f48f0dd1a9720b6c40c81bc44b
diff --git a/net-misc/mod_com_g729/files/freeswitch_license.rc6 b/net-misc/mod_com_g729/files/freeswitch_license.rc6
new file mode 100644
index 0000000..0bfc2d1
--- /dev/null
+++ b/net-misc/mod_com_g729/files/freeswitch_license.rc6
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright (C) 2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+FS_LICENSE_BIN="/opt/freeswitch/bin/freeswitch_licence_server"
+FS_LICENSE_PID="/var/run/freeswitch_license_server.pid"
+
+depend() {
+	before freeswitch
+}
+
+start() {
+	ebegin "Starting FreeSWITCH G.729 license server..."
+	start-stop-daemon --start --exec "${FS_LICENSE_BIN}" \
+		--startas freeswitch_licence_server 2>/dev/null
+	pidof -s "${FS_LICENSE_BIN}" > "${FS_LICENSE_PID}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping FreeSWITCH G.729 license server..."
+	start-stop-daemon --stop --exec "${FS_LICENSE_BIN}" \
+		--pidfile "${FS_LICENSE_PID}"
+	eend $?
+}
diff --git a/net-misc/mod_com_g729/mod_com_g729-136.ebuild b/net-misc/mod_com_g729/mod_com_g729-136.ebuild
new file mode 100644
index 0000000..a1efc3a
--- /dev/null
+++ b/net-misc/mod_com_g729/mod_com_g729-136.ebuild
@@ -0,0 +1,102 @@
+#
+# Copyright (C) 2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="1"
+
+IUSE=""
+
+DESCRIPTION="G.729 codec module for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/node/235"
+SRC_URI="http://files.freeswitch.org/g729/fsg729-${PV}-installer"
+PROPERTIES="interactive"
+
+SLOT="0"
+
+LICENSE="EULA"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/libc
+	 net-misc/freeswitch"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cd "${WORKDIR}"
+
+	# 1. custom unpack function, we do not want to run the installer
+	sed -e '0,/^__ARCHIVE_BELOW__/d' "${DISTDIR}/fsg729-${PV}-installer" \
+		| tar -xz || die "Failed to unpack installer archive"
+
+	# 2. unpack architecture specific part
+	if use x86 ; then
+		tar -xzf fsg729_i386.tar.gz || die "Failed to unpack x86 codec archive"
+	elif use amd64 ; then
+		tar -xzf fsg729_x86_64.tar.gz || die "Failed to unpack amd64 codec archive"
+	else
+		die "Unsupported architecture"
+	fi
+}
+
+src_compile() {
+	local response cnt=0
+
+	# display EULA
+	less EULA.txt || die "Failed to display EULA"
+
+	while [ $cnt -lt 4 ] ; do
+		echo
+		ewarn "Do You accept the license [y/n]?"
+		read -n1 response
+		case "${response}" in 
+		y|Y)
+			break;
+			;;
+		n|N)
+			die "License has not been accepted"
+			;;
+		*)
+			eerror "Invalid response, press \"y\" or \"n\""
+			;;
+		esac
+		(( cnt++ ))
+	done
+	if [ $cnt -ge 4 ]; then
+		die "Failed to accept the license"
+	fi
+}
+
+src_install() {
+	into /opt/freeswitch
+	dobin fsg729/validator
+	dobin fsg729/freeswitch_licence_server
+
+	insinto /opt/freeswitch/lib
+	doins fsg729/libg729.so.1.0.0
+	dosym libg729.so.1.0.0 /opt/freeswitch/lib/libg729.so.1
+
+	insinto /opt/freeswitch/mod
+	doins   fsg729/mod_com_g729.so
+
+	newinitd "${FILESDIR}"/freeswitch_license.rc6 freeswitch_license
+
+        einfo "Setting file and directory permissions..."
+        # prefix
+        chown -R root:freeswitch "${D}/opt/freeswitch"
+        chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
+        # allow read access for things like building external modules
+        chmod -R u=rwx,g=rx,o=rx "${D}/opt/freeswitch/"{lib*,bin}
+        chmod    u=rwx,g=rx,o=rx "${D}/opt/freeswitch"
+}
+
+pkg_postinst() {
+	echo
+	einfo "See \"http://files.freeswitch.org/g729/INSTALL.txt\" for instructions"
+	einfo "on how to buy licenses and install them"
+}
diff --git a/net-misc/mod_snmp/Manifest b/net-misc/mod_snmp/Manifest
new file mode 100644
index 0000000..54631b7
--- /dev/null
+++ b/net-misc/mod_snmp/Manifest
@@ -0,0 +1 @@
+EBUILD mod_snmp-9999.ebuild 932 RMD160 fec733daffc94500d6984cb16403b3618f66d180 SHA1 43a94e2ff8595ad7b5cb5fbe916980913c1b1206 SHA256 94f0d55bb7b5fa80c3fc9a6ce59bd9e0487a09c81813f24b5c5c3062ca9d785a
diff --git a/net-misc/mod_snmp/mod_snmp-9999.ebuild b/net-misc/mod_snmp/mod_snmp-9999.ebuild
new file mode 100644
index 0000000..4890727
--- /dev/null
+++ b/net-misc/mod_snmp/mod_snmp-9999.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+inherit git flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="Experimental SNMP module for FreeSWITCH"
+HOMEPAGE="http://oss.axsentis.de/"
+#SRC_URI="http://oss.axsentis.de/"
+
+EGIT_REPO_URI="http://oss.axsentis.de/git/mod_snmp.git"
+EGIT_BOOTSTRAP="./bootstrap.sh"
+
+SLOT="0"
+
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/libc
+	 net-analyzer/net-snmp
+	 net-misc/freeswitch"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10"
+
+src_compile() {
+	# wrong order of libs in configure script
+	filter-ldflags -Wl,--as-needed
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dodoc README COPYING
+}
diff --git a/net-misc/mod_squirrelfish/Manifest b/net-misc/mod_squirrelfish/Manifest
new file mode 100644
index 0000000..86fcdc5
--- /dev/null
+++ b/net-misc/mod_squirrelfish/Manifest
@@ -0,0 +1 @@
+EBUILD mod_squirrelfish-9999.ebuild 949 RMD160 b6f852aee979cca3bdbb3d9b15707b10d42bf187 SHA1 a64334cd5d4598a124d19a18dbfefae52d8d74bc SHA256 7ecf5d121e4519ee6c4ff50fdb4571d55da8679cf5edcb66e8eb9210a332098d
diff --git a/net-misc/mod_squirrelfish/mod_squirrelfish-9999.ebuild b/net-misc/mod_squirrelfish/mod_squirrelfish-9999.ebuild
new file mode 100644
index 0000000..475d8ed
--- /dev/null
+++ b/net-misc/mod_squirrelfish/mod_squirrelfish-9999.ebuild
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+inherit git flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="Experimental JavaScript module for FreeSWITCH"
+HOMEPAGE="http://oss.axsentis.de/"
+#SRC_URI="http://oss.axsentis.de/"
+
+EGIT_REPO_URI="http://oss.axsentis.de/git/mod_squirrelfish.git"
+EGIT_BOOTSTRAP="./bootstrap.sh"
+
+SLOT="0"
+
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/libc
+	 net-libs/libSquirrelFish
+	 net-misc/freeswitch"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10"
+
+src_compile() {
+	# wrong order of libs in configure script
+	filter-ldflags -Wl,--as-needed
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dodoc README COPYING
+}
diff --git a/net-misc/mod_ssh/Manifest b/net-misc/mod_ssh/Manifest
new file mode 100644
index 0000000..59d7ef3
--- /dev/null
+++ b/net-misc/mod_ssh/Manifest
@@ -0,0 +1 @@
+EBUILD mod_ssh-9999.ebuild 1030 RMD160 927a59453772cba8dbde57b077335ccf72743ea4 SHA1 4b78746c33627968731a65c74eb60d50f2838808 SHA256 1b7d5a22a9329ff0754145c27c06ef1dd6221c64858784f64dd15ebb5c29ed44
diff --git a/net-misc/mod_ssh/mod_ssh-9999.ebuild b/net-misc/mod_ssh/mod_ssh-9999.ebuild
new file mode 100644
index 0000000..47daed3
--- /dev/null
+++ b/net-misc/mod_ssh/mod_ssh-9999.ebuild
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+inherit git flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="SSH Console module for FreeSWITCH"
+HOMEPAGE="http://oss.axsentis.de/"
+#SRC_URI="http://oss.axsentis.de/"
+
+EGIT_REPO_URI="http://oss.axsentis.de/git/mod_ssh.git"
+EGIT_BOOTSTRAP="./bootstrap.sh"
+
+SLOT="0"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/libc
+	 dev-libs/openssl
+	 net-misc/freeswitch"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10"
+
+#S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	# wrong order of libs in configure script
+	filter-ldflags -Wl,--as-needed
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dodoc README config/ssh.conf.xml
+	newdoc COPYING COPYING.mod_ssh
+	newdoc libssh/COPYING COPYING.libssh
+}
diff --git a/net-misc/wanpipe/Manifest b/net-misc/wanpipe/Manifest
new file mode 100644
index 0000000..ae3af79
--- /dev/null
+++ b/net-misc/wanpipe/Manifest
@@ -0,0 +1,94 @@
+AUX extract_symver.sh 2997 SHA256 f9257cbfe5bb2a21232e1c0ddf20a7a290b421106875ee9b76340984d32db8e2 SHA512 7d3c839e0da6fc738716936d4d056ab886fb17774e2cc10c47595b3b9e0e3804ea695eaf50ec38cae6cc756d3ecaf25a13831d34ef1c3f4a97c652d8ed1d099c WHIRLPOOL a9cb7359e90fb0ee5575590f4ab8889632de65bbd09357182b76134e76094c6c29d2f28e5a03b8d4a43d976ed4bb45ff64c1d194a3d84704e0152a2bd92dc142
+AUX wanpipe-3.5.10-Makefile.patch 1706 SHA256 1776399e27df1df17d6ee181201293ac9f7c8d1d6daf683ec3dbe4e85a7835d6 SHA512 19cd6ec5ba9b990c857b943f160a51c49065e945375475ae92dd1c526e7bc2dbed0d03c86302c2eda931eb00278fb52b96ef41188b6f01b163147acc86801514 WHIRLPOOL e376549931299ace86d9bdb2c661d99159f09314fe1251a86fe452cdccdf7476f58290df2f2d0d12965e2feb292b03f473f959dbc37e96e4bcb4aa8d0fe21a8c
+AUX wanpipe-3.5.10-QA-fix-const-char-warnings.patch 4787 SHA256 78b7a4d21280bc4fed3f560a3fe7eba04ec9d888d96e7cdad3017c7a3e94d8cd SHA512 50fcb8ded820dbfbef1ffcebb29ce5a409ea3d3672a2949162137be59aeb8b61c5c016eebebe28843bb324ca29f9e59990d3f6e5b45f6d3b3b1c8915a8b5afa2 WHIRLPOOL 57c8e3a9054c93c4a1402b047d6bffa6588523b04b0cf6b9cd4c5c5c17181fe8fd417455b1670814fd6cd05c760d80e2a55a0ab83e24a1852e60c9cdb4a99198
+AUX wanpipe-3.5.10-QA-fix-format-literal-warnings.patch 28376 SHA256 fdabfdb7431ff189351dc20e24b643884616fa94a7e8d651fdd4a24a5a323840 SHA512 0decb3db4f741d38564e23b47ede8bc6d5a168013e6e72283861795ff14cb1d2086deefd02cf524225fd7d59e9012218f2754c7873c4c617cee0501645084389 WHIRLPOOL 3906cec7ecc730ad4ace98d1e2d8a029e9b686eea76c6afd1368ebd9b64c54ac55ea1a642adf77c66a6213be43f34d3a6627badba3aebc43c455ec0edd37bbdb
+AUX wanpipe-3.5.10-QA-fix-libstelephony.patch 505 SHA256 19030d67dffb73cd736ad5291a06efa699527fbd88041e123bcdd99025c28ea0 SHA512 82fdd06df322ad3fd6f216b82bd084ee814a7fbbe4a1fc932b7bb3e95296e0b818572c2c644d857d9ef7785f10781687c5b6c07bf6f73c2c722d70b62056a814 WHIRLPOOL 1e0c1107cbb7a8d86d7d55f1963be64f835ea1f2392afcf81ffbe6d68f8cf1aa953344fc9c5fc68b293dd70b1bef34e761a8c39e80914e79dce64cd7549814d5
+AUX wanpipe-3.5.10-QA-fix-parallel-make.patch 11528 SHA256 a88eae1dc4ef0dfb3fe378f5cb79a3f4462b6d4430db003ce4948c06936606a3 SHA512 4e5554a8b8d401c3080722d7b9dd128c9cd6c892a5ed8badae3af6081cdea3aa05612513260c7fbb35af1a9f61c777fd32257b0b5b0ed61e93ee5f0492d50bfe WHIRLPOOL a4d6b4461f090d262497df4365f228a409ee03e54ffa175e77483041f2e9f5df8be4c3cca339a2d89e98b220c012e14a4c54a899f8d709d1d1aa6e39e47d9e5d
+AUX wanpipe-3.5.10-linux-2.6.31.patch 25301 SHA256 1976697b233f903aa03a6b88eb19f94ae53c65f68bb6eb4e46c3b05cb4ed5b8e SHA512 af85e860416b05f4c7b371324bc577867a4c719a0404872230e27600720eae9c79b25b1b70028ec6f62052efa003623ff46596675bb70abfd76cda2af71b3875 WHIRLPOOL 895ffe5df397d8d65e099cef8e92a35cbb02b3c267ad00a503882693a85851603f4ac2d73fb45e965ac26ebbcddd52128683a4017a16e626986b1f59f2ac6de9
+AUX wanpipe-3.5.10-silence-QA-warnings.patch 327 SHA256 5118b4d4450df22918950efb973e1519a810c363e6b66f4d3fa062a1771449bb SHA512 0294f519e077de07cbe393cf677c17930c7e9de796d1b2f89f0d090cc7471cb77ec3f7fc038a41e8ca07ac49b331850486c46fdd7a5507e50dbb444c2b33439d WHIRLPOOL ec24281c153ed94f89f60e9bf3e2391823e26caae86a89344ab97a5a1162a5b52899b4da55d03f0c05f94c8219594da3a1609e838693db0df88117b5650ed098
+AUX wanpipe-3.5.10_p10-Makefile.patch 2181 SHA256 5ef5cb65e7606ad0628072fe1adecd06b22e3f74074fc1d6d652a4bf2ee79dc6 SHA512 c5c6347dfbf18469579dc87f16af252a2720dccb5ddbc0a62cea5c06bff0e7b4e1b13e903b6e1be750bc34a77fd74cd86f1d21792b3a662e96d47a951ca7bb90 WHIRLPOOL 9be9c3576bfa0673e4efc1f0bf3bee99485d1d359af4808951fa30fc5721508939f226cb18c63a255af2a0c049e170799d2b6812295d152d4f1dd9bee501bddb
+AUX wanpipe-3.5.11-linux-2.6.35.patch 1890 SHA256 0fbbe5de4f74dcd5489bcbb939ba341d735fe737463817b191abd5e7d8e01e61 SHA512 4dbaef69dd9d938e5c8bdfac4cdb21644eaced7e3fb92e98942b39287d55587ec75fd3b08eaebff5cd69e1943ff1d4366a68f8cfc02d4b3160ec27b63f60420e WHIRLPOOL 4792871b7859e877070c457a28112f89ee8f4006f090cde28ddd8a55769b875df2ac14f484a7383d7124ea3510bf0bf79acb323d3d53556d6607f3844bca8574
+AUX wanpipe-3.5.12-QA-fix-parallel-make.patch 11914 SHA256 c05a02d272e8f7825504d2b4611c29ba079fc3eb813a4f8809daea28a80c940c SHA512 eefea511becbd55468ed71df710851450f6c84a9b4eb6ac737ab2a21817c25a3ae02e98f3dbd4cc12db84d1bd58ca4680fde4ea14f29e269cc878fb537388e24 WHIRLPOOL b767c1f74d0d0c89da14341b7a4d4edc432016634831d4f8d00a6417538176cd0ef86dd9245832ae78284378b166814a889c55fa443b6a0ec30e187a2538d68d
+AUX wanpipe-3.5.14-QA-fix-parallel-make.patch 11965 SHA256 4ad04eccc82af32d4def1493f3219ffb1e701eb3c0bc479fd5c8e57032859e38 SHA512 ab288c61e2c1975ac75d073218431c6640f91966347239bec9b1a1307adf2ed0acb18c5163b1c04e8517162386bdee454492ac2c5c33c98490b817238d1c768c WHIRLPOOL f2e5e39dbb64533d809ddf3ba257914ca9f51014613dd02cccfc2f790ee31e07074fcf62afb82b54bdfa9dda0de715729ae3503c218dce13cfbfae79c9c6413b
+AUX wanpipe-3.5.14-dahdi-location.patch 4686 SHA256 d6e2e2fddb8a982a0d21ffe8410ed2ed2cd6530c434d3e7b8f7e48c3e713cce1 SHA512 b97189c8e8986fa6fd4d612749b64fa5424b39ccef8dcc6da2e0f3d647f538ef949eb7ac1ff7a50aa2f24372c6144b4be6b1f4b07a0749dcdd55040dc9d27b23 WHIRLPOOL 7d57d46d85e32ea58b71919f01800e55d6e565bb8d2d15ea61bc10b2079138c5aff888e5ceaf3b6d2fa77e6840f4434388febc66aaa3561cb11a96894a723f39
+AUX wanpipe-3.5.15-QA-fix-parallel-make.patch 11963 SHA256 57ce930e550c2983b7d72bd3e0e00c19fc0f9e604ffaa26f2d1d67788edee825 SHA512 38cd6fb31f27046c0be752977f1921f14fdb21cd37c6b32d902b38414542d2e6392b591492952cef132a03856c9bf3de844a079376e79164793530193d7baf45 WHIRLPOOL 8cdd2f7ffdce344959700daf8a8955b42c191a23787fd93874ab01bae5bc839bcbcdf4f62f1b04ea277e148299255dd9bd6db77af16371368059efe11075f8ff
+AUX wanpipe-3.5.15-dahdi-2.4.0.patch 12260 SHA256 6bde5ea037c916a2de877c8f1c7e471e72563b18fce5b90b26d081b5c98c4046 SHA512 53ca6363d0837c78592f5289fd5603c835984c65064a2e36ffaea9c73e65b9fcce8e4d1073cb3dabfd8d4127142653294a98c25fa661af39ba680e314b683847 WHIRLPOOL fff71d4a4ff02a7d91a6c39e13f81bdde185208e322e2159f78ab47e5a8812df100e6803b6c901346b5ba5e09a5f4fd702fbb56c25d30833855d205dd500b483
+AUX wanpipe-3.5.15-linux-2.6.36.patch 5529 SHA256 7344d0099879dd0dda63b31f7098a1c43965573fd083e6329f1a0c04248e8214 SHA512 da7af529f809de5f255b48fb6f38286f0e77f1d4ca09e8b4668d5c070c080c971a0825fdba6b04d92f3dd7162bf82fcdad42de3fcf034cb85c607e30fc25a100 WHIRLPOOL eaa68fb8cdc7aefda70012f7f0aadac7c7bc0882fe7e405e3e7417b0ae03ccfb52d12f831be923c13a3ee13f797592d4940154e185ad6314e093fffa1ae68943
+AUX wanpipe-3.5.16-Makefile.patch 2470 SHA256 f9ccf2483a312967ae65ba6c6bdb1310fe9162deb1cb50d2f89a42f6a2abe850 SHA512 0ebad033cff7078752e3d368348c8370caf55951b7d6e1c65812136a9f588cf39e1c48f8915b695f1d3692045ba29c2c7f47132c25b619609041da39fa42da4f WHIRLPOOL 7c65dd5a445b22ac8ffe932766aa3b7658d7e77033a8e013bdde613e9073f285b941da9759a59d9f90e9e411fa5aa89fdfa0799721aa1fd6c90437f8ef3616de
+AUX wanpipe-3.5.16-QA-fix-format-literal-warnings.patch 27921 SHA256 51c3d4fb71b32589510b678a7bcb6e3b0c0dff77722b6df4b22877a99e062610 SHA512 fd58113c6890fbfe20e4a9f0ef72a959b75940a606afba75244f1c45f505a99afbd31226a73b2353e45ff9415e16b227c9354be10bb6161dcb64cb79ac45fafe WHIRLPOOL ca4fa15d4141a1fdb4e72be42925c66930348456e9f31dedea310f1ec7eb92106764d65047833a55f5628e118be158ab2fe6841e386b5f1839e5470e60f040a8
+AUX wanpipe-3.5.16-QA-fix-parallel-make.patch 12197 SHA256 cf986397dc4bd4753a999ed7fd6b031afb951a0d1686f590c85aeb676f764ecb SHA512 31bc084c72960cab84ea7d5ff5ece6d3737edd34a6935e057b70872ccc9fe6f300386825ca52dda067cf1d7a6ec7b001f66fb509e78c52781dbdfc78be902f8b WHIRLPOOL 915ab716ca1628c3745061808ebfcef64c9fd3901364095ae040737da5494e20b1e641ae75436a7c7c40ed1ef3f216d9a354039fbf7497a0460f5fa64efa01ab
+AUX wanpipe-3.5.16-dahdi-location.patch 4005 SHA256 7a94045be71267afc3dbca88556edb2b72bbb70a9ce468c8d73a2be6f4c9654a SHA512 36ff389faf2707724abeb72063527d0951228cd1752ab5d1ad0cac236f20b2887aa24cddd3e7c5840bb2b4667f6777f6a04bd3e0f0e183f164da3b2d33143894 WHIRLPOOL 50ccff7313c0dcd1191f03dde70183c2c992be5a2de4e7c6c722ea031505a15d4996f8cefea33cd4fbfb2546c2883cc7fc2075b57ee01cb3db6bddbde3729f5c
+AUX wanpipe-3.5.17-linux-2.6.37.patch 528 SHA256 924f2cc120bd943dc69c3d3860ac057afef20c017bbb6bd74686cc17b5826260 SHA512 2e4bd0159bc5dbe7898489a2daaa060631a67467e5a313e74071c89985ce1f2d73bd80159c6d91a79b3933a2978ea3902ed8097935503144234211c5cfe22b73 WHIRLPOOL 9ada9bae3057c1907ef127e69e65ed76ce117064633da2765be176c38d7a1e736cda671285ca70c9f067df7f6102f7fbc9ba6225d34e3c69cea0efea9f12c139
+AUX wanpipe-3.5.18-QA-fix-parallel-make.patch 12314 SHA256 46ad11b62b03058080fafa69b177607754671d2b3d88eb91bce2fbb997aa5393 SHA512 59f41c1bb9aa0dc938e5711ab061e7e9ed299b9192ddb1cc1a5dcb1eb070909d2bef36220ac1bccdc25a52f9a0a8319d14de20c38839fdc1dc5e58b0f884b396 WHIRLPOOL 52bec9a50e91c4b75c10aa823eee8bc6f9032b0059d1d8ece1e1fe8fc7226b5df58543f2f2e1ee7810f236180a7ba2e986084269f5dfbf727d609e5ecce4c8b2
+AUX wanpipe-3.5.19-disable-ldconfig.patch 436 SHA256 7f046883fd3d3d5583cab67854ffc5939e1b6b6711135dcf2361999a7c335977 SHA512 5348b9affa9531242ce9bf06ddede45616ad8d1b7825c02e22a46c5a61e71f22abf3bbbdab067da93e1523399b3c14f1c2dc1397e15f3b7f502f1132b5aeb0ab WHIRLPOOL 32d2d304982289c5a722116716cebfe08717b69b2d7091141e7513138766f8e96e43e4d175147c12e530d2f77be434399cdbe4983fdfac55837aac19bcd43a9d
+AUX wanpipe-3.5.20-QA-fix-parallel-make.patch 12113 SHA256 59ee42ff1fc6a77ad932d3922a66671bf56b828577ea6ddbf35883975c869d6b SHA512 bb009512dd71ac8f8d0fa37aacc35040fd8366c7d861227db48cc059a6c10b19e498546c3d3956652b8858b3ad2b534f24ab126564110d065b15d3fd1a6c1a70 WHIRLPOOL 7da85e598c9ea76048f8f0745a28daa282315429befbc887825723b863d348ac02cbbf8d48b08c509b9af7870651a0ad8152614133331912f3a40eceff9b6df1
+AUX wanpipe-3.5.20-libstelephony-cleanup.patch 3132 SHA256 a46abdf2ec777c0d8c88b40deee4a84e823bfd8d3e4e828afd8075fd17b45299 SHA512 e10a0c342ed010662ca43d1c726d677055c9b3818fcb0c7a78d27aa3e669457167389a9e6f4bdac0b461b2a617bc52e404816916d0e15ebdf5d7539e9934a6bb WHIRLPOOL 510f251291f19a57d5490ae75811384230bbc103379112d3a5c51e2e2adcc6628ed2df2503cc5ecc33c3993a8d1a56b086774a4fdb4304925f56ab437670989f
+AUX wanpipe-3.5.20-linux-2.6.39.patch 1327 SHA256 c2215e92bcf4608cf7915bc399011e8d5c050a9eb48d29f3992c6dcc2647a858 SHA512 e0405a41dc60cf5ae6583d253c26cd12a06766dff3ed066f243822144591dc7acb0f55a5b11018ba0ccab1ea6adc40bc149f800022b3db72261a7278e330ce12 WHIRLPOOL 7c53491ea3b62233cd839c19fbd7356d46f091b78be885765eaa30e8d4a08696186c1d713ed210c30e6d759d3a0f2c738a0457ac0c66f5016d81b35f6b6a025f
+AUX wanpipe-3.5.20-linux-3.0.patch 434 SHA256 d8967b6e2a1d0e5d4058c993c326196beb0358a46fc23834eeb0187faa891ce5 SHA512 5f520d4a8e2b5f710124e7d96a79e798b89adbb9497c322ac379343ce71e439b5c742f31aa391af2f48177e819a7268b07f32d120c2aa148c92a0313916d590e WHIRLPOOL 47cc060cdad4cf2dd39cd8214d4904cf6eb26086c74185cf419bd61ae17c8f2cacc9f1768858114438ef48a34e7b366fb33264b8d279686fbcccb9d4fe8165b4
+AUX wanpipe-3.5.22-Makefile.patch 2613 SHA256 eb639994a6f80b3228096d7481a68649a15ba2f704e9d28132fde584025f92ea SHA512 919901b49ca6be39c91b541946bc633c66e0442d2595132a880a3f8897a06f0580efc2de5d2aaf571a80c8521a426d7381247f5f239f38f94e8445316faf90bc WHIRLPOOL aa8f94aa10e737212efa39aae7ecf5fb37e1f6d45517c0ae9429e028e47233a1311722a7ff43cb227b3bc3af55431421fd1fb59a37775808496caf6228c68026
+AUX wanpipe-3.5.22-QA-fix-parallel-make.patch 11925 SHA256 b3e6ea243b20a5d71428e831764f4d471c21cf363af6f302c46b6ec7d20236f8 SHA512 1ea7f8af48eab402329ade78f6b38171ef6b7e3f710bed71b2a98b4fed25154979370561b633ecde8dac17bf9c0e5a0d12637aa3c2dd67f9cd522bfb96fc7ea0 WHIRLPOOL e504212753e900cb61ff16c3a4f88763ce4aae3f47bdf89b00e01b27b12331b3815bd8d4bde0275782bc53ecee331ad4a9c204cc0da7a6c949acce7c4bdec870
+AUX wanpipe-3.5.22-dahdi-location.patch 4017 SHA256 4a93d82eb56489a652d325c973f422fe70064cf8271a9d283c87f17483bd9613 SHA512 41d2f76f53dee80bf5dfd66de1b0e232b0212c4732de77c667911442e8e8de06aa2f7d11fee4d9042f987ad6b4937ec6b7f0bf14abece6a709edd9f0ec36873d WHIRLPOOL 46a28f8bd4322c675d4d7912bffefe88c5ce2ab56f25d7f7a77687317f568f66f220bef736d0004e765841896e0d82f95b88f377daa6e1946df056805400b238
+AUX wanpipe-3.5.22-wancfg_legacy-Makefile.patch 510 SHA256 b7fa76bbccd9ce3c2c05ac05ea73cfbcd9ea612fb2a1423772472f0ea881cfe7 SHA512 d11771cde5d7b3c315a0f52af8de595861f5cb3a30c4bcdbcc876b97f338349ad5f2e0c8513e803e62211dbdb2eee8f4889584d2c8f2079cb2ba0973b4352f67 WHIRLPOOL 8d98da0984bfa0aaf45d83146ad8d53b62c02d0da092692f016b19848a9396ec841a6d2042ec6fcdfe12061363494d87d17b3c3a128d753db28f6826702c464f
+AUX wanpipe-3.5.23-QA-fix-parallel-make.patch 12041 SHA256 d5ecb71d4ea0bfe30700f49e622fdce09a76bf15853d5920432d1b9ba7effbe1 SHA512 9605c2eeaa8a473e483fd53c255f5997c8d57dab9bdbb9744ec917b3b07e9fbac59a5de7718499cc526d9c9865b6001f27383a85223816fcc130e7f59180630d WHIRLPOOL 1cce3ea8ede0e3cf0322d024ae47e846a4c280f71f60ce168ba5b621b977f1e1c83cccfca0c587a232fdcf513b953d1e6cf033bf0b4222bd52b907d3835dc02f
+AUX wanpipe-3.5.24-Makefile.patch 2110 SHA256 eecc573cda4755be9c0db32bbf9d2c8feb1b13db19e80db0e9facd6b4bfc00c5 SHA512 3bb9cef1c8abce0bee10f76737eeca0f2d8d13682c49000ab6408a1856a6c09ae4432f0bf53fadb78c8107ea12c7573bca056c43bd1b532b432f134f4c26c6c5 WHIRLPOOL ae54b1fe160f50fd70257e2eb0bdeb9d7c49e28134d3bcb3b8d91943b21b4dc6c565ac871da0419dba921edb6fca5a90ff808bdf343a5d6f56a9461d5fb43696
+AUX wanpipe-3.5.24-QA-fix-const-char-warnings.patch 10202 SHA256 5d1419c70263a3c401fbb5d12b9a2ca441327d7121774f8a639a5ff2354bddd3 SHA512 da6e5f57f0213bb6f347d3780262233f759b05f322c0a31d4ac7d7c6cc7973a82e517f1a03eff772c2670dec9bc1c407678081a42fc5a6f47dee724a1552ca71 WHIRLPOOL 4ea969ee238304bc152297ca6af25e7f1907d2968966d6c42158233ff1a95d035b8b09caf34cb2bf5421a86615dcb2d96e5d90c8140cf353dd92819d6fff87a5
+AUX wanpipe-3.5.24-QA-fix-format-literal-warnings.patch 28394 SHA256 889aaea49f33094452b3edb1567bdabb44bdf168a09b9fbe6b4d7b21a54667c1 SHA512 975f5be50c8186d75545d349a115d17b71ed13bd9d8fad5c4522611bcffc77f49cd7ac34c7559f68f288ba92f42096e1a08e3e73f73c8507b05dc8979e21ff5e WHIRLPOOL 20e017cbb6a229921025a6ba1d12edd0202cfe32d9ec38a5a145f987616e913f9ceec9f1ddd6b4a3b8a5f6623ffe5811d2af9085827f75a5b2dc6e881353cc8c
+AUX wanpipe-3.5.24-QA-fix-parallel-make.patch 11829 SHA256 0ad5bbb1bfdad4f95bdaa424d07d7b7e2d582e935cd18b421022b54722eb18b7 SHA512 d0f148e4a50aeb2976fcd3f5bccd023b0eed5e61dad9aac9277a4d2e356535ff7af7e3b0cc9237b17500840723248b030597120e4fcd27b552366d902835b883 WHIRLPOOL d6720086fdbd3b38f47b2ef6ae3cc86cca1f16089a8dcac665b0f8fc94759e54a2adf14316a1de55f5fafbdb9fe5fd9586203e6c42eabbc9283a6f87614f1382
+AUX wanpipe-3.5.24-QA-fix-warn_unused_result-legacy.patch 5097 SHA256 065545cd4cc0abe1aee7bc4e6e7cb4f8b6e638e405a80230951d16ec27e3be33 SHA512 fe126267059000f2c8cd3e5668b62ab7f9d95689d2859ffa19bb570d03a594f9d6d4cc9c3ba194ee5b01094604e7775f4d8938a3ba54595e72e360f2482214fa WHIRLPOOL e36b5d22f8a7d2b0a0e33fe8b5084393a16c1cae7d561eeb0cb04a245c0330b1ec30f23fb0e0c34595e1346c47568a0284b8d7e989ea098d4a1f23e2494e3ed9
+AUX wanpipe-3.5.24-QA-fix-warn_unused_result.patch 9793 SHA256 5c4f9013f51143fc03654e0114a291db6af1fc22da9c1e5182da764cddbb1481 SHA512 09f9de0078dcfcaed62975c01bce1cb24a1361cbc4e60c97d49751466535da140f1c744a66d1ddd7dc9d23595f43ac5d9552f1b3c3cbc41f370ecce552081658 WHIRLPOOL 4bd4060b25f54a0c399471a16db79749003a1cfe51730418e0d9ab48cbe5fb0794e8109f9978118f213074f532e24b375beb52bd4c815fbf6f0dae0de234de58
+AUX wanpipe-3.5.24-linux-3.1.patch 1485 SHA256 0e77ffa0a11b0b60a1e87c4b813adcdd2b6ce77609fe2f1d7cd94613c80fcd85 SHA512 6db91e5b94e8dd3a82a061c5212328f2e5a143dfff214e691165bfceddca1fb01a2151410bf099b7f668d8c997efdb9aae164877784821bdbe14764abf48c738 WHIRLPOOL 5ccfaa7c06c5024579e23a94d97f52dde61ca60b47a24078c74c5002dbe040217bd43e99a629e4cfc217b0707812d395f8fd41d67fd765133dd8c1ce14567bbe
+AUX wanpipe-3.5.27-QA-fix-const-char-warnings.patch 7704 SHA256 75731efc08eb350875a913b1cbca6fd09bad42555ef6009e2bd55d7508486ca4 SHA512 0e2c232231e5a29a8285493d2f4994cf0b6efe2bb0bf6fd08562a5bf888d2498f1aa2f96310ca4b29de325dc218b00d491f8dad515ae9a237119fb7ba86c139e WHIRLPOOL 02ae97530b47c3c206353e2254ec56917f44d0586ad1b75c77bc2837f371db22928c3adcaf7e4bc8c3959ceaad4924ccad93f2eb4826321131e7c51435777f95
+AUX wanpipe-3.5.27-linux-3.4.patch 1021 SHA256 2b6401d402e408e92a8461a825b0e61678532d88e7073c70931f8ab13a46b89d SHA512 9e009a83a4427e9eb50487013450769b588e8e0d49a7e1d466dd2c23a33200fb39eb0deb3e46c6b0e1f7f01463806e2985e642b4e58ad54e7f8fcd3a7eb02487 WHIRLPOOL c95e8106b46efe66dde9532518bfbe4e09cf26e3c278a3f0dcc767608b7ca7cb9ffa1a1d36acb2187eeab1d1c900337a317dc88dd3b1b2f7b4422f0963328541
+AUX wanpipe-3.5.28-linux-3.7.patch 577 SHA256 1c634c39626bd3668f822f356099b002455af776d574991dd0cd370c5d1a1510 SHA512 a7d70675c7eeaafc704871c51fe8a58a3fb87fee2618cb0339aa111549c8fdf48656a825483d6e0eb24b78d6328af38e36c0c92cca2cb7941b762fd880117f4e WHIRLPOOL 92c32928a3990f7f2acaafcc44dcdd1d61819e4cb75bca6150fe928b8820b00fa4da3ded42122c0c91345ff6a0315388000c0b83196381a2c2e5db9c803060ac
+AUX wanpipe-7.0.0-linux-3.9.patch 1299 SHA256 8dd9491809296b016431d199a28e6d682102abee44eb34ecf9af5f8021597cdc SHA512 0ee1237b52212485943156b6c3a282eb163bb11817caffd491a681e1f0c30fcc7cc47cfbce4193ca5fff06c7635e91154eebd13daa03dc1cb50979ad8901e696 WHIRLPOOL 45e4099d3b5d6577e268f2671d0347020f26db2b3931b28ff25c220b81c4bad9bf92011a1983e84a89d4fd413170e42194bc0f02e4e7ea5b633f540c25d54f55
+AUX wanpipe.rules 126 SHA256 db1c55d351052e01cebc470c32ff8f6819b8496ae5545277a5a2e640994ee04a SHA512 d8dbfe31929005545d0d937af1c780520dafda8b4451700415b28773c090dbb4db6c18bd8c15a39fa92db39f05c2563f9091c45eb1ba187831cd20be6b84cfd6 WHIRLPOOL 2c206cbd588ecebb174b7cae5a2eeeed42ae5bc06732b53a3fe2f63748ccd3174d3882f6e4fb0c781b7b49c3e7d0dabe627bfba8598eafe3f199dc696ab52702
+AUX wanrouter.rc6 1083 SHA256 b334d2332d816c0e1c86c75116d3c0704364070ad382feb2e0e937c090265b17 SHA512 e31ea57cbcbee4ffa5ebdfe6f38f8a0c23d105dbc34d876bec347d3693c419bfaf91e5048bbfe1d3b0b6d6f31ca75355499bea3b6f50e56db19eab83e0c7db5a WHIRLPOOL c782935d599dc1c94a5231a82e493959d8fa67a1c4eca7668302cd4d4374b4130858b3f7216bd55caee64fcaa0b44ac2651b05c4f9d98afe4f5505110342857d
+DIST wanpipe-3.5.12.tgz 13929358 SHA256 70b2a8b343e56972424413657437fc50f54aa12ea23c6f8ec1d258662b2d767d
+DIST wanpipe-3.5.14.tgz 13923624 SHA256 ad8d91572f4121faa727dc6d75180a2bdb9cbdf0fe78ef74200da45984fc96c1
+DIST wanpipe-3.5.15.tgz 13925818 SHA256 fc7b3ef55506a85ff2e7a17724338e3f646682896ff04ac9702ac78b061b0e9c
+DIST wanpipe-3.5.16.tgz 13946738 SHA256 edad6c4969fa439b8012c84283093919435eff76966d21c689d42996ece75f2f
+DIST wanpipe-3.5.17.9.tgz 13970113 SHA256 f39c669d8c67539c33bb200a7384b01cab50f786a0e513706e49666add9fbec3
+DIST wanpipe-3.5.17.tgz 13971782 SHA256 667e14b83c3f4b9b3c1c755be3b45d59d687af4ac3bf96d7dc74a92ea9967840
+DIST wanpipe-3.5.18.tgz 15957879 SHA256 e82fd9670c33588f22a0c41d8712d53fc92531ab75e06ced97c737dc12d4ecc1
+DIST wanpipe-3.5.19.tgz 15608478 SHA256 473820c0d8466285f9ec2a28b07d60b6bfd7980eeeb48f87174e19321c49f72b
+DIST wanpipe-3.5.20.tgz 15766236 SHA256 4f064aad4e0264a46268b4ec83ba1212248f05fd84f48bdd953aade33d5bc574
+DIST wanpipe-3.5.22.tgz 14843768 SHA256 d8e7d95885d5d568cab37abea3d6b63f2648d94fecf4076c253c7f7956334f19
+DIST wanpipe-3.5.23.tgz 14846143 SHA256 ee5203c52a8f37ca9b8a3dd2b674ce5b04d3a140723613e9540ba8a1e8de174d SHA512 2baa0a865dd357467dff3011216c6c36d03935acd53718a5d7b35df2912bd3a055919c3ca99db1c3f5f6c4bb3f6e966204b92fea68c099c010386005577cbf72 WHIRLPOOL 34d3e1af1e1e2ec00cd31b5b9e878b829b468fa7f06f5b90023d9ed96f372d4229b8b5528232daf89ef5a12f4af48eced31c8523d5b13653044eb9441f741cbb
+DIST wanpipe-3.5.24.tgz 12202173 SHA256 367004acefc4b981ddafeaecdb91310599ba8c3b19f935bfda7d707fb6fd40ff SHA512 f2702259ef8886b53be7aaea2db2c8a88cfe50c75d630266b54a73baaabce578fb42bbc732b6b02b71a511208c8cad8c476da5ea9a492e7bcf3e0842d8f22665 WHIRLPOOL feea85b48bfe5c169d18408c03b1ffc9f89b4594d69a55aa9f7c4725723af492a8c9059bdb180c834c4d90a4b595f78a9ef09427007303694c2b456d465aaf07
+DIST wanpipe-3.5.25.tgz 12311853 SHA256 4018aee3797216447eaeae37850131bfd38ef2ce1dfa668787890124159edb43 SHA512 505abeb5b47f6bc822ff4f22031a0d0bdbb7ce8c0133f72ae4d8320dfad7ada702f5ae0c9885d000e55a45b8283aaee66e918e8f2e0515d13f79afc9d2841656 WHIRLPOOL 033be3a66356cf0c394ff1419c929a4effe840faf7ab6b14519c4682100bde2bb83c662a7f16315523515377a46167a19ceef5eeac9d19021671733268c18bd0
+DIST wanpipe-3.5.26.tgz 12945541 SHA256 803ef96b8aa433a7d354c0ded3291472dab4f824d0d9f4869b8345dac22f10ca SHA512 ec6fc903173e207a6ff4d5e169dca75e0c73394b0cbd58077141c4c327f612d2b8e5c215bae491455e9f9c3b6ea0fe00f9e4f51b0f9a214aa2a1cf01a714a0e5 WHIRLPOOL f47e998db8bb46a2a10c87ad5985cf2eaa1c3eff165aa6af8a0f33acc5cb86d0a435636ca075410079e55aeeeb1c90ed496768987f9587338b4fbdc48c06a50e
+DIST wanpipe-3.5.27.tgz 12945913 SHA256 4640fc00cd6db8f2069b720cd8dc4b21a4b011db2727dfa434ec089b5f2451cf SHA512 905af03a53212c6c678dd01be780cdebc6a811d7111cd4f9ebcbfeee6d67bcab2f58ad4af0d4ba7a8ce36bfca9968e46150c2079eaf7e8de05d4da1ff7b7736f WHIRLPOOL 489f1d0d78797d6491ba943774aa44afb6a5dc5af9ca946055dd07fa027ad279e95d846ad1e216681230907eb100d85efa5aa8574269821ba9bdc2ae6f3e26df
+DIST wanpipe-3.5.28.tgz 13157991 SHA256 67cae7f2545a054e6b51bc22b7d5a10e1dfbc230d7790ce275b14088b8124112 SHA512 d34c81ad3a8d5c7c9e143de88a09876508fece9b868027e84564c780878a018dd158f834a7b825bfc607e34c40e5ac1406f179463d9111d2d8f75c2fe5377cf2 WHIRLPOOL 1ab1309ddcf709a2086b86117ede4e821e0d933710c3034a29fdd946a192950a6606316c2fb54147be1067d789de002457b80d933738a17a578a9c88081fe838
+DIST wanpipe-7.0.0.tgz 13726568 SHA256 39e6b820168af511b3714d80aeede9bb62002ad6e03653ecf47904e4cc247118 SHA512 70996740de89f7369d16f5a55e825e36e29b227bef8f1a21962f7b8fdd7f5922ff125e3d0e9f4b6472acdf68567a8b469c85693b3a68f3b788ce15a68fb2a875 WHIRLPOOL 090c24a1a17b374573ffb93be6e71f5531234b8e18fd002c3f56533a12e92c7d8d4c946ea3d22534532024afb2d9a4ec503ab255434cc72fe5c192f7f5ad8f87
+DIST wanpipe-7.0.1.tgz 13728112 SHA256 ada6dd2e0a458ce657c1d16f732e44cf92e3a054a2f0a4de41a1d7f7daa598c5 SHA512 e7599cf2aaa843150db9a5e5064bd081df11d706c47a13f340c3b8c93946bfaba735019f732f048e856f24b8b134ba5ebcf6695a97b3cc4bc69badaca23a5851 WHIRLPOOL 2456fa2aa2471a9300efbbb725bd91e31b143c0fe8bd6b2a2554574c1f95db41ada048fbcf6d018cd18d42738a54235f643be421f3caaa0b10a4a47852da0678
+DIST wanpipe-7.0.10.tgz 13802987 SHA256 fa8eb475a429054f3e07ded6a4099dcb384893cc28d05a3328596dbe70455b18 SHA512 d3cc19cf079377b7c0c2bf42410a527deb2631a3aec91976c3a7935ef4b4392ab8fa8804567a23390b7ed29af98df8e9498e10795ea55ee7710de66998ff10e3 WHIRLPOOL 619cd8badd56b4de6bedb1dad9d35aa33b92b67909257fe3d7d99b616387b681cd35b37a2dd6a8a1f87c8a3e7e647514c71bf493985be3b9d7020a0c09fabb9e
+DIST wanpipe-7.0.3.tgz 13798371 SHA256 1868f8a5a4b6d861a3b245f91674f29201e9d243727d129a867216284f521183 SHA512 e83389ff32aa39e31a631e8287638b8864a6281f8674f237c17871a4aa64edd3e606ad4602b7a2919c6ac9665f0d124150893daae9f9e47b7a4936e9ace6c269 WHIRLPOOL 86ec1c7d60387c83830e2a3128f89b37c2e06e78a9516fe435438bf7fb7624cd04e0273958e2601c01fbabc40ff3ccb0781fbeee98474b975e00952405fe6919
+DIST wanpipe-7.0.5.tgz 13798930 SHA256 93a74ef498fe67d988262064c56b60411a40dc8ca48baf17169daff022764710 SHA512 1585dc770f9d5d89befb6d6fc5e8979bed28288e449a7f3f5f5004a29fb1b42b5437140dfc03d44b74652aceb001a78ce63397849e5bb95dcbf75631be8fa270 WHIRLPOOL 50f4815c9853b133a785ad8e897f082367dfd47b6a2699226e92f67c7754227639ea106382bc15cdc866488139f9ada8de03580993394a906c3c41d794e39c68
+DIST wanpipe-7.0.6.tgz 13800509 SHA256 5a9f01e697168166f6d18e9bfb71458e9355edf8c03793201b61e4e596a2d24c SHA512 a12e650344b22ac3ecaa8eb4707eb4bd780af2bc66f5c44c43a998363ea9e1579995a7461a055682b63b354e5945cf625f7a4a53a3287bfe05fb000a40c9abeb WHIRLPOOL ba66f1c5d24ba1c0517e3e10b9cf2edc8075660e4a5dc58b4411852e6e2119a50a4df0dd797c9fefc23eb49b39ae6788082e3c02eb5db17a29a31e86dc6265b4
+DIST wanpipe-7.0.8.tgz 13800800 SHA256 91de4d396c3b747aa78b2233fd633fce248db53c722057a01392e9adab3b2141 SHA512 76373929dac6bc3bfac1e7a9e77a35c2f099b9cbcabf3423b850695571a19fbfdb3d4a76ca57c6b7b300bd61a26069a533791f3f1d2175f0c4c52461abf8e03e WHIRLPOOL 021811957db747e464d26e77f2df6b117b5d3a17b0945e169406b1376b3e28ad6de4d8bea0e20137c0529dcec875a90aea361b6af0270ba3b1899505184488d1
+DIST wanpipe-7.0.9.tgz 13801878 SHA256 2e1d83bd12f0256d46218871fac606e9d362c61fa46a6615bb0a569fa2b58b28 SHA512 2fdb658f5ee2b39c241f648c76d0414fe1c762ca6d084d848f7a17c1f814079eca8cd252297e546414807ce9f68b484e5f0aba5ce386c1f3cf0e085a5b9f1dc2 WHIRLPOOL 04f7fa529a29c6692cd7cf41048668fe27112e2bae7493d53c4f97b96a13817dd28d820afce5d712f41e3ca312f9677e42836730ddf872cc1bb500944badfd71
+EBUILD wanpipe-3.5.12.ebuild 5803 SHA256 5217eaf7420e72b98d596e57539fe96029abb950fe07b8ccecfdca8b88918550 SHA512 1b559b31812c61ec654f6899b92d30cadeacb3bcb6bf3103187af5d7036233ffcab9e216726d350105a52ae1053e8d10cf4a9829276f58596d7869014083a03c WHIRLPOOL 22261c2f7ac1971fb8cd418db3c1e4395517ed656059d0bcb2fc49e8ff4ebf5df4010393b722764361ee3832df53dce1a2a346bd5c0dc6824fb5a6ef5fab18c4
+EBUILD wanpipe-3.5.14.ebuild 5837 SHA256 0c74da5034086eba64f82c116a57e64c391b85048eb08588fdb17fa0a44e1ef9 SHA512 2458440de43e3bf22128f6f2d661ccfaff8125e7dbef9bc2940346273adfe54c62de68836982d7b96526378a7a5c90713d80f63d657f6bfa0fd46ff3da392029 WHIRLPOOL ff7082fee091e907b10b2ae3d30c2f2fb25ae8995b27d45db6bf2b9d66003c1ecba6bbe2731c4e06f2d7728cc2853b7782aaca5101950f3e86355c089a73dca4
+EBUILD wanpipe-3.5.15-r1.ebuild 6186 SHA256 42802b6d8567d5c94da83b995b3d88b5bd3df6d1dbcbac582a87a03d649c91e7 SHA512 8dcd6c3424c092df0cbce55c15d3d1a6dec4201d234f7535322fc70c3dfb766a4a3ef4a2acb792dd006d09bf303017e827d4caaf844a258de04c52f2d1af6f7b WHIRLPOOL 83689455645576f9edb5fcc965f2d11f55ecf79b96de3a290a608bdbaa4b5731487aed1ee18d4eeb64b9aba36fa3214ef4d09b3b9dcb9752c3f443b0aea8a6e8
+EBUILD wanpipe-3.5.15.ebuild 6073 SHA256 9d59fb4ad2e5276afe2d2e23ed9390098a65400a41c178b9e934101c6fe7b266 SHA512 08d16910d8eed70889fc11f05fd340bf518765b92e5668e0042c3902a84278a6d8c750fa2cb5249d0113ed7296df67327192d7b6bc25393a4e3a715362092d4e WHIRLPOOL f7c0addf7783d53f122f94330bd07c0eb84f60014dec042c7dd8aa9bac02558214ec4d483a7e3ab3d4ca8994546118a0625d28d92e7c05280b59cebaf867a890
+EBUILD wanpipe-3.5.16.ebuild 6393 SHA256 fb20216d0ca54ba19baa5e4231ef5937c10815841fd2fb002013d4def243ec30 SHA512 127e9ef57d96b9f63c96c7db796dcb4da76dbb0a7ad6caf621fca865bde62b2f47bd6ef3f1bb7a140693ed128b902c3d3d54ff44005eddaf494be93e2277a805 WHIRLPOOL 6383eaee5141c35aa6bf8ebc1a844faa80a2c18271e022b53a095d0fecfc70b8687701f2b4c39490ea5dc7def66245bf2f0fbb2f9b92d2dc5e3f19997aec9381
+EBUILD wanpipe-3.5.17.ebuild 6578 SHA256 17daf82a34e8faace6747835ddaf7d4fb64de4e8f433508e45ed5cd4a7ee2089 SHA512 8b16e6fcd7f68df6b81047e53f6fd6081a60bfba1a241c7bcab9c40d22045e1238e894da81d1a4a0eb22f9d0dca0b0b558576cfc0193952c332caa4f65532eed WHIRLPOOL 73a9b589b93c8cb62127ad40d133c491b3a30cee585684133756b69293a198a658eda2ecabd612b4079c44d8f8972c764a14e33c1cc2eb92b7c26f2bf5e905e1
+EBUILD wanpipe-3.5.17_p9.ebuild 6738 SHA256 88be412d8942e7801b932b0de224cfd587e2ad0cb5eb779b0f5943f09d84f4f7 SHA512 37d7e35f15533f06f0bd4a2da11ae5026fc5b0ec9fac79b3525de14263965360775f6bbaebbee5d942847663ca58d415067d21600ab13743fa6c6d8209dae38a WHIRLPOOL 9e86e957cb26a78c54893bcc1a310246d36637473c8980d341c94b6d98afcde639b31c3540b8d22fb227a3ccdd59bc4ccbf0e41b91382d00488237c1d82718db
+EBUILD wanpipe-3.5.18.ebuild 6825 SHA256 fc63e4c7bf9b5288aa0ded7219e79805731499b5ee56ee39998b6e4f9d27182d SHA512 97cba86abb61c9cb048aa95d5781112e315a43d261dc14dba5a41c190caf1e4ed50bd232a96f6787e73832af7b191a01feb1cdb3979d7acb11aa1f772df95b46 WHIRLPOOL 7e6a39106497b5455cf4837e6599a63c6cb7b55c119ef95286a0ac2e7e836b6df94d000cc77786af33f052aa6d781397c7d5fc1f7c4172c0567e914c493656cf
+EBUILD wanpipe-3.5.19.ebuild 6802 SHA256 736b179b41606ac77654553a1e67b1dc4891cfa837858714f7ce862ff0e3b7b8 SHA512 e965ec4c66cd571a98d8fbc654327d289e8a0628b5a9031e5f1f4e48887f1d9f2c0730c3f797954dace7dcb7b7c241fe6f5a627787c0bae51195128d7c8e90b7 WHIRLPOOL 3cb933415277577a18313a5f2b0d85916a03eb322573a129e308bb3cff49c2ffdc9e7b50120ce03f86205a010c6745f9e068917ebd24899680798fc444abec54
+EBUILD wanpipe-3.5.20.ebuild 7398 SHA256 43a7eb1fbf3426fb536b6ad2d63ed97232fd1461323fead7f9586bd76d067605 SHA512 f2944232fa11b74e6c88ad09494d0ce28a431dfa99dbd097f9c93c18c4d7d37bb196ff1b45531ef0eb44d1014b2e5ebf03fdfcd9bf2ee6d1259d1830aa07bb5a WHIRLPOOL 56cbe9d7abd5fe50bc1edb1563ea376fc088f2e27331821245ffb51dac77646833a7852ae953b4df8e8c9c6b72746cbb62f8e6ef9d451a1a8d7e771066782b71
+EBUILD wanpipe-3.5.22.ebuild 7499 SHA256 a3a324c738c060d64d34aadff52d8b0f123c2bb745f1564cc72a25b753d78281 SHA512 f462be000caab703b3746824f34746b9dbe922b3be0facb8d404912f383b091f8eb2ad8d0a97f5158f16761004a0b2c5643a08349ce5a370829611735969c038 WHIRLPOOL fe98eb946119a92c59bd4392bdd02a4049eaa1dc657f4e773918e0faa94833e322b7925a805433a89fd07c164a7a9c901d4004d5e8d8141a0707ca5cf1385059
+EBUILD wanpipe-3.5.23.ebuild 7758 SHA256 af8aca691f0ca6c6d1a71be36f6eae0f98da5d46cf1c68d40dcbc39d7b9b68c1 SHA512 fc56cfd933f786cec30114c3e2c2771cf291b71105e80063e6397ff448567afcaff554fa6bdca35e19c0992fad90ec990444dc983009e7709601ed9e2ddf6fb2 WHIRLPOOL 2f8a5e61f428fa4878a5ad19dcb2cf6ce4b6a0a99ec3a229428a06999879a061e2be0bcd1450aa5ca744741a0f08ea6f1876e4901db3ac5b1c62908ce3d50467
+EBUILD wanpipe-3.5.24.ebuild 7884 SHA256 b3ed365c915819a1427d6612abc8d62ee6ecf1134b2664fe1c0f34071afadffb SHA512 2d0259ae76efb333cf4b8d10de072a79fd4a9c5eb97147ad8969c4a0b7e998ac725ae4a13a2852c7429181921eb04d7497d350bcb9edb99fe93aa51bc6bfb775 WHIRLPOOL 5a308a3b8fa72944cac4ac72773c57fdd85597ece65395da54085da72c757a892ff660781e730463fb05e4046000a6b34f62db3cb3f8d9a6789a5b0c377a8eb8
+EBUILD wanpipe-3.5.25.ebuild 8528 SHA256 6f0d7ca70326848546e6efa59284df3988ec0ffc7d8ad8d7db51659f23ef584e SHA512 7020e2c570e94c3e6aa6ba83d8b79425d64aa8590a1031b44955253d697e2883198da1a01a3d6cfc05f178ef54b7a12d8688b048dbc4b26cddfa17e3b8428ac4 WHIRLPOOL 58fa0730172f7f040ef41aaf112bcb45561a33e88431767f9cfe3c4b7d876287d24be61f6aae6c7f7d1fe69fcf1413841ef67e3d59f593ac6fb1a8c5d614b7a2
+EBUILD wanpipe-3.5.26.ebuild 8529 SHA256 031f5f7fcfb8c34bd5296b87497141ef66ee88331619d8f96e531e82b661abf3 SHA512 268388833ccadcb8ed275639bb41192bb3330147878417079b7b653b0a6f2eb312e072827a85c70a9dda4f6cb24e55ba81e5b9507376ad47614ace4aea767c5d WHIRLPOOL d485a6272ef26ff3bfca9dba96e826d1e71e5d92850c514c5f53c2cc422e22fac3f80b066427c3a2ccc8780cc7ed48bddac716cc59e36b71905eef9b67f64f8b
+EBUILD wanpipe-3.5.27.ebuild 8626 SHA256 292342965dcccec771f055bf193c4870ab85a0b734627b2c517d9e6c844887af SHA512 cc2ed4d6fcd07b09c8ba40c6db7a2b17eef1ee2e76760f6289c57524d231640986021cf8ee900b5cf083336c6dd1d99e2641352867bb3cbf15b03310cb5f9570 WHIRLPOOL cd66639fbee0f69ad98755868694a4ee39d9e591d8653440a415225c5c57c2c4b047baaefa77b10baa8726e7d90eedf83158ea982b675396936cde55d82cb735
+EBUILD wanpipe-3.5.28.ebuild 8714 SHA256 5557ac4c87a153252d37fc04fd3388a4a5ec5aff19de042593c6a3617bc66d19 SHA512 a9983208360a6ad976c1245b2af2353b452cbb97f9dfd1480698f21de86427aa1ccd057bef7d4cd880b2b06bd0b9bd4f5b9bb859aa82a4f57652d4e3adab9296 WHIRLPOOL 2413566c0c0cbf617bfeb10dc6b037e524fd580aebdaffd01eb2af3282fd35bf2ca350139ee34474ef4bbd7854d66030abd8c12415cf3545aab33881ba6022ac
+EBUILD wanpipe-7.0.0.ebuild 8065 SHA256 f58ec47d9a3428d17698ebb339e7cce88d13c754f0ff1bb62d0f09d97b5a240d SHA512 5feebe4019edb183a57aaae6a8957be93bb9f66f8e1f8090e31426e7b2354f5df92e2470c5bb114edf1b874bfae66220d8c59ed544cd14bd0519ca441d6f8313 WHIRLPOOL 13daabc44922d688bec285e823b6f1c5b21baa6a477dbfe81d0b3ef441b8f63e25e4d106f418295ad0656e58e2bce2c1af9aeafe1a33bd1fbf20e82e1a6cfb6c
+EBUILD wanpipe-7.0.1.ebuild 8065 SHA256 f58ec47d9a3428d17698ebb339e7cce88d13c754f0ff1bb62d0f09d97b5a240d SHA512 5feebe4019edb183a57aaae6a8957be93bb9f66f8e1f8090e31426e7b2354f5df92e2470c5bb114edf1b874bfae66220d8c59ed544cd14bd0519ca441d6f8313 WHIRLPOOL 13daabc44922d688bec285e823b6f1c5b21baa6a477dbfe81d0b3ef441b8f63e25e4d106f418295ad0656e58e2bce2c1af9aeafe1a33bd1fbf20e82e1a6cfb6c
+EBUILD wanpipe-7.0.10.ebuild 8212 SHA256 a1175e743f7f52d1dfeb10a1d36f4230dcd76bd4305d072fc1b1e9eeac631965 SHA512 be1819d2b20eaf7a9b1d45990f5edaf0e165cfda73edd20e8e1d2ed66793e31844bd4ac29de6ba60c89501a92798bfca57c77b370870f127fcb04f008b200cb6 WHIRLPOOL 8ec221e30677c0d701fee504c53bbb8ab35ae14b2f9c3ee411a7a4051f6dfcaab0e44ab77dce5f6f04a1cfd084aebd7fc2491ae0dabeb4eb580d4d2220918fbc
+EBUILD wanpipe-7.0.3.ebuild 8210 SHA256 8344580e2de5c5436bf0a29a0a1b595dce06afcfd4af45c2bf62b5e70700db7f SHA512 d41127afbf17f53bb9e9e7652bca95456c6d8dbb8b141edf4871471f8f89143ce69a9c22f23b375afde5114d310ef26b2451ff711355d4ae9532fa05c9e77927 WHIRLPOOL 3d7f1fc6f94415aefa405fef8481a0f446ff41a0f093d8e4d0a07e2b87d34bc5d76b7de9f33b8bb9b8a7831cc706ed6295329c4b4aa01cb353e8a71a650eca21
+EBUILD wanpipe-7.0.5.ebuild 8210 SHA256 8344580e2de5c5436bf0a29a0a1b595dce06afcfd4af45c2bf62b5e70700db7f SHA512 d41127afbf17f53bb9e9e7652bca95456c6d8dbb8b141edf4871471f8f89143ce69a9c22f23b375afde5114d310ef26b2451ff711355d4ae9532fa05c9e77927 WHIRLPOOL 3d7f1fc6f94415aefa405fef8481a0f446ff41a0f093d8e4d0a07e2b87d34bc5d76b7de9f33b8bb9b8a7831cc706ed6295329c4b4aa01cb353e8a71a650eca21
+EBUILD wanpipe-7.0.6.ebuild 8210 SHA256 8344580e2de5c5436bf0a29a0a1b595dce06afcfd4af45c2bf62b5e70700db7f SHA512 d41127afbf17f53bb9e9e7652bca95456c6d8dbb8b141edf4871471f8f89143ce69a9c22f23b375afde5114d310ef26b2451ff711355d4ae9532fa05c9e77927 WHIRLPOOL 3d7f1fc6f94415aefa405fef8481a0f446ff41a0f093d8e4d0a07e2b87d34bc5d76b7de9f33b8bb9b8a7831cc706ed6295329c4b4aa01cb353e8a71a650eca21
+EBUILD wanpipe-7.0.8.ebuild 8210 SHA256 8344580e2de5c5436bf0a29a0a1b595dce06afcfd4af45c2bf62b5e70700db7f SHA512 d41127afbf17f53bb9e9e7652bca95456c6d8dbb8b141edf4871471f8f89143ce69a9c22f23b375afde5114d310ef26b2451ff711355d4ae9532fa05c9e77927 WHIRLPOOL 3d7f1fc6f94415aefa405fef8481a0f446ff41a0f093d8e4d0a07e2b87d34bc5d76b7de9f33b8bb9b8a7831cc706ed6295329c4b4aa01cb353e8a71a650eca21
+EBUILD wanpipe-7.0.9.ebuild 8212 SHA256 a1175e743f7f52d1dfeb10a1d36f4230dcd76bd4305d072fc1b1e9eeac631965 SHA512 be1819d2b20eaf7a9b1d45990f5edaf0e165cfda73edd20e8e1d2ed66793e31844bd4ac29de6ba60c89501a92798bfca57c77b370870f127fcb04f008b200cb6 WHIRLPOOL 8ec221e30677c0d701fee504c53bbb8ab35ae14b2f9c3ee411a7a4051f6dfcaab0e44ab77dce5f6f04a1cfd084aebd7fc2491ae0dabeb4eb580d4d2220918fbc
diff --git a/net-misc/wanpipe/files/extract_symver.sh b/net-misc/wanpipe/files/extract_symver.sh
new file mode 100644
index 0000000..443959f
--- /dev/null
+++ b/net-misc/wanpipe/files/extract_symver.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+#
+# Extract Module.symvers style information from kernel modules (*.ko)
+# Copyright (C) 2010 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+
+# readelf is required to extract data
+[ -z "$(which readelf)" ] && {
+	echo "Error: readelf not found" >&2
+	exit 1
+}
+
+# check argument
+[ -z "$1" -o ! -d "$1" ] && {
+	echo "Usage: $0 <directory>" >&2
+	exit 1
+}
+
+# special handling for installed modules
+#[ "$1" != "${1#/lib/modules/*/}" ] && {
+#	prefix="${1#/lib/modules/*/}/"
+#}
+
+# 
+case "$2" in
+GPL|gpl)
+	license="_GPL"
+	;;
+*)
+	;;
+esac
+
+find "$1" -type f -iname "*.ko" |\
+while read fn; do
+	elfclass="$(readelf -h "${fn}" | awk '/Class:/{ print $2 }')"
+
+	# calculate prefix for modules
+	prefix="$(dirname "${fn}")/"
+
+	[ "${prefix}" != "${prefix#/lib/modules/*/}" ] && \
+		prefix="${prefix#/lib/modules/*/}"
+
+	# extract version information from non-GPL symbols (__kcrctab + .rela__kcrctab)	
+	readelf -W -r "$fn" |\
+	awk -v sym_module="${prefix}`basename ${fn/.ko}`" -v sym_license="${license}" '
+		#
+		# sample readelf output:
+		#
+		/__crc_/{
+			sym_crc  = strtonum("0x"$4);
+			sym_name = substr($5, length("__crc_") + 1);
+
+			printf "0x%08x\t%s\t%s\tEXPORT_SYMBOL%s\n", sym_crc, sym_name, sym_module, sym_license
+		}
+	'
+
+	# extract regular version information
+	readelf -x __versions "$fn" |\
+	awk -v sym_module="${prefix}`basename ${fn/.ko}`" -v sym_license="${license}" -v elf_class="${elfclass}" '
+		#
+		# sample readelf output:
+		#
+		# Hex dump of section '__versions':
+		#  0x00000000 f6664954 6d6f6475 6c655f6c 61796f75 .fITmodule_layou
+		#  0x00000010 74000000 00000000 00000000 00000000 t...............
+		#  0x00000020 00000000 00000000 00000000 00000000 ................
+		#  0x00000030 00000000 00000000 00000000 00000000 ................
+		#  0x00000040 c0fbc36b 5f5f756e 72656769 73746572 ...k__unregister
+		#  ...
+		#
+		function read_hex32(inp) {
+			tmp = substr(inp, 7, 2) "" substr(inp, 5, 2) "" substr(inp, 3, 2) "" substr(inp, 1, 2);
+			return strtonum("0x"tmp);
+		}
+
+		BEGIN{
+			# offset of symbol name in entries first line,
+			# different for 32 and 64bit
+			if (elf_class == "ELF64") {
+				name_offset = 58;
+			} else {
+				name_offset = 54;
+			}
+		}
+
+		# skip padding lines
+		#
+		$6 ~ /^\.{16}$/{ next }
+
+		# extract data 
+		#
+		/0x[0-9a-f]+/{
+			sym_crc  = read_hex32($2);
+			sym_name = "";
+			line = "";
+			off  = 1;
+
+			# extract from $0 to avoid problems with space ('0x20')
+			# chars in ascii output of crc checksum
+			line = substr($0, name_offset);
+
+			# sym_name can span multiple lines
+			do {
+				if ((off = index(line, ".")) == 0) {
+					sym_name = sym_name line;
+					getline;
+					line = $6;
+					continue;
+				} else if (off == 1) {
+					break;
+				} else {
+					sym_name = sym_name substr(line, 1, off - 1);
+					break;
+				}
+			} while (1);
+
+			# filter (imported) symbols with emtpy crc
+			if (sym_crc == 0)
+				next
+
+			# output symvers format line
+			printf "0x%08x\t%s\t%s\tEXPORT_SYMBOL%s\n", sym_crc, sym_name, sym_module, sym_license
+
+			next
+		}
+	'
+done
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-Makefile.patch
new file mode 100644
index 0000000..94572fc
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-Makefile.patch
@@ -0,0 +1,38 @@
+--- wanpipe-3.5.10/Makefile.orig	2010-02-05 23:26:55.000000000 +0100
++++ wanpipe-3.5.10/Makefile	2010-02-05 23:29:40.000000000 +0100
+@@ -168,10 +168,10 @@
+ 
+ 
+ #Build only kernel modules
+-all_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod:  _checkzap _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules  
+ 
+-all_bin_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_bin_kmod:  _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ast_build_dir ]; then \
+ 		rm -rf $(PWD)/ast_build_dir; \
+ 	fi
+@@ -181,7 +181,7 @@
+ 
+ 
+ #Clean utilites and kernel modules
+-clean: cleanup_local  clean_util _cleanoldwanpipe
++clean: cleanup_local  clean_util
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
+ 	$(MAKE) -C api SUBDIRS=$(WAN_DIR) clean
+ 	@find patches/kdrivers -name '.*.cmd' | xargs rm -f
+@@ -294,12 +294,10 @@
+ 		echo "install -m 644 -D $(WAN_DIR)/wanpipe_lip.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanpipe_lip.${MODTYPE}"; \
+ 		install -m 644 -D $(WAN_DIR)/wanpipe_lip.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanpipe_lip.${MODTYPE}; \
+ 	fi
+-	@eval "./patches/rundepmod.sh"	
+-	
+ endif
+ 
+ #Compile utilities only
+-all_util:  install_inc
++all_util:
+ 	$(MAKE) -C util all EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I $(PWD)/api/libsangoma/include" CC=$(CC) \
+ 	PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(ARCH) 
+ 	$(MAKE) -C util all_wancfg EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I$(PWD)/api/libsangoma/include" CC=$(CC) \
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-const-char-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-const-char-warnings.patch
new file mode 100644
index 0000000..5282a2f
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-const-char-warnings.patch
@@ -0,0 +1,93 @@
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_cpld.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_cpld.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_cpld.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_cpld.c	2010-03-14 02:07:48.802079460 +0000
+@@ -163,7 +163,7 @@ struct flash_spec_t {
+ extern int	verbose;
+ extern int	card_type;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c	2009-12-16 21:31:07.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c	2010-03-14 02:05:34.252063454 +0000
+@@ -74,7 +74,7 @@ extern int	card_type;
+ extern int	exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int	exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+ extern void	hit_any_key(void);
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ static int aft_reset_flash(wan_aft_cpld_t *cpld);
+ static int aft_is_protected(wan_aft_cpld_t *cpld, int stype);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c	2009-12-16 21:31:02.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c	2010-03-14 02:07:55.154064039 +0000
+@@ -48,7 +48,7 @@ aftup_flash_t	aft_a600_flash = {  0x014F
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c	2009-12-16 21:31:13.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c	2010-03-14 02:07:43.642063949 +0000
+@@ -114,7 +114,7 @@ aftup_flash_t	aft_shark_flash = {  0x014
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2010-03-14 02:06:53.803063891 +0000
+@@ -98,7 +98,7 @@ aftup_flash_t	aft_shark_ds_flash = {  0x
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c	2009-10-23 15:35:21.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c	2010-03-14 02:07:39.029064002 +0000
+@@ -180,7 +180,7 @@ struct flash_spec_t {
+ extern int	verbose;
+ extern int	card_type;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ extern int exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c	2009-12-16 21:31:17.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c	2010-03-14 02:06:22.372438749 +0000
+@@ -203,7 +203,7 @@ aft_core_info_t aft_core_table[] = {
+ /******************************************************************************
+ 			  FUNCTION PROTOTYPES
+ ******************************************************************************/
+-int progress_bar(char*,int,int);
++int progress_bar(const char*,int,int);
+ void main_menu(void);
+ void read_chip_control_menu(void);
+ void registers_and_internal_ram_test_menu(void);
+@@ -232,7 +232,7 @@ extern int wan_usbfxo_fwupdate(void*, ch
+ *			  FUNCTION DEFINITION	
+ ******************************************************************************/
+ 
+-int progress_bar(char *msg, int ci, int mi)
++int progress_bar(const char *msg, int ci, int mi)
+ {
+ 	static int index = 0;
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-format-literal-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-format-literal-warnings.patch
new file mode 100644
index 0000000..a518d8e
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-format-literal-warnings.patch
@@ -0,0 +1,617 @@
+diff -Naurp wanpipe-3.5.10.orig/api/libsangoma/libsangoma.c wanpipe-3.5.10/api/libsangoma/libsangoma.c
+--- wanpipe-3.5.10.orig/api/libsangoma/libsangoma.c	2010-01-11 23:24:25.000000000 +0000
++++ wanpipe-3.5.10/api/libsangoma/libsangoma.c	2010-03-14 01:19:45.696189673 +0000
+@@ -59,7 +59,7 @@ static void libsng_dbg(const char * fmt,
+ #if defined(__WINDOWS__)
+ 	OutputDebugString(buf);
+ #else
+-	printf(buf);
++	printf("%s", buf);
+ #endif
+ 	va_end(args);
+ }
+diff -Naurp wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c wanpipe-3.5.10/util/lxdialog/lxdialog.c
+--- wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/lxdialog/lxdialog.c	2010-03-14 01:11:50.958063750 +0000
+@@ -240,7 +240,7 @@ j_inputbox (const char *t, int ac, const
+     int ret = dialog_inputbox (t, av[2], atoi (av[3]), atoi (av[4]),
+                             ac == 6 ? av[5] : (char *) NULL);
+     if (ret == 0)
+-        fprintf(stderr, (char*)dialog_input_result);
++        fprintf(stderr, "%s", (char*)dialog_input_result);
+     return ret;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp	2010-03-14 01:45:40.372313586 +0000
+@@ -1624,7 +1624,7 @@ int conf_file_reader::read_interfaces_se
+ 
+     //use copy of the name because 'strstr()' inserts nulls and it
+     //will break things.
+-    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, token[0]); 
++    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, "%s", token[0]); 
+     
+     if(parent_dev_name != NULL){
+ 	    
+@@ -1661,8 +1661,8 @@ int conf_file_reader::read_interfaces_se
+     chandef = &list_el_chan_def->data;
+     chanconf = chandef->chanconf;
+ 
+-    snprintf(chandef->name, WAN_IFNAME_SZ, token[0]);
+-    snprintf(chandef->addr, MAX_ADDR_STR_LEN, token[2]);
++    snprintf(chandef->name, WAN_IFNAME_SZ, "%s", token[0]);
++    snprintf(chandef->addr, MAX_ADDR_STR_LEN, "%s", token[2]);
+    
+     //NOTE: 'atoi()' returns zero if it failes AND if number
+     //is actually zero.
+@@ -1873,7 +1873,7 @@ int conf_file_reader::set_conf_param (ch
+ 
+     if(strcmp(key, "FIRMWARE") == 0){
+       Debug(DBG_CONF_FILE_READER, ("file name: %s\n", val));
+-      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, val);
++      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, "%s", val);
+     }
+     return 0;
+   }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp wanpipe-3.5.10/util/wancfg/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/cpp_string.cpp	2010-03-14 01:42:53.133063682 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strlcpy(cstr, tmp, MAX_STR);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/main.cpp wanpipe-3.5.10/util/wancfg/main.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/main.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/main.cpp	2010-03-14 01:30:55.980090540 +0000
+@@ -1410,8 +1410,7 @@ void err_printf(char* format, ...)
+   vsnprintf(dbg_tmp_buff, LEN_OF_DBG_BUFF, format, ap);
+   va_end(ap);
+ 
+-  printf(dbg_tmp_buff);
+-  printf("\n");
++  puts(dbg_tmp_buff);
+ }
+ 
+ /*
+@@ -1664,7 +1663,7 @@ void tokenize_string(char* input_buff, c
+ 
+   while(p != NULL){
+     //printf(p);
+-    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), p);
++    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), "%s", p);
+     p = strtok(NULL, delimeter_str);
+   }
+   Debug(DBG_WANCFG_MAIN, ("\ntokenized str: %s\n", output_buff));
+@@ -2085,7 +2084,7 @@ char* replace_numeric_with_char(char* st
+ 	unsigned int original_len = strlen(str);
+ 	static char new_str[1024];
+ 		
+-	snprintf(new_str, 1024, str);
++	snprintf(new_str, 1024, "%s", str);
+ 		
+ 	for(i=0; i < original_len; i++){
+ 
+@@ -2152,7 +2151,7 @@ void cleanup()
+ 
+   //remove 'date_and_time_file_name' file
+   snprintf(command_line, MAX_PATH_LENGTH, "rm -rf ");
+-  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line),
++  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line), "%s",
+ 		 date_and_time_file_name);
+   system(command_line);
+ }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp	2010-03-14 01:49:29.238063542 +0000
+@@ -475,7 +475,7 @@ int menu_adsl_advanced_cfg::
+   unsigned int int_tmp;
+   
+ again:
+-  snprintf(explanation_text, MAX_PATH_LENGTH, prompt_text);
++  snprintf(explanation_text, MAX_PATH_LENGTH, "%s", prompt_text);
+   if(is_hexadecimal == NO){
+     snprintf(initial_text, MAX_PATH_LENGTH, "%u", *initial_value);
+   }else{
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp	2010-03-14 01:23:07.548063423 +0000
+@@ -230,7 +230,7 @@ show_analog_chan_input_box:
+       switch(*selection_index)
+       {
+       case INPUT_BOX_BUTTON_OK:
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, input_bx.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", input_bx.get_lxdialog_output_string());
+ 
+         str_tolower(tmp_buff);
+       
+@@ -243,7 +243,7 @@ show_analog_chan_input_box:
+ 		if(chan >= 1 && chan <= MAX_FXOFXS_CHANNELS){
+           		logical_ch_cfg->data.chanconf->active_ch = chan;
+ 			snprintf(logical_ch_cfg->data.active_channels_string,
+-					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, tmp_buff);
++					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", tmp_buff);
+ 		}else{
+ 			tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, "Invalid input: %s!",
+ 				input_bx.get_lxdialog_output_string());
+@@ -270,7 +270,7 @@ show_analog_chan_input_box:
+         switch(*selection_index)
+         {
+         case INPUT_BOX_BUTTON_OK:
+-          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+                 act_channels_ip.get_lxdialog_output_string());
+ 
+           logical_ch_cfg->data.chanconf->active_ch = act_channels_ip.active_ch;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp	2010-03-14 01:28:51.172188232 +0000
+@@ -459,7 +459,7 @@ show_firmware_path_input_box:
+         Debug(DBG_MENU_DEVICE_MISCELLANEOUS_OPTIONS,
+           ("firmware path on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH,
++        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2010-03-14 01:20:32.838063458 +0000
+@@ -689,7 +689,7 @@ If this option is used, TE1 Clock MUST b
+ 		switch(*selection_index)
+ 		{
+ 		case INPUT_BOX_BUTTON_OK:
+-		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+ 				act_channels_ip.get_lxdialog_output_string());
+ 
+ 		  break;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp	2010-03-14 01:48:51.406063789 +0000
+@@ -266,14 +266,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -307,14 +307,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -349,14 +349,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -451,14 +451,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp	2010-03-14 01:25:29.673063441 +0000
+@@ -447,7 +447,7 @@ WAN_IFNAME_SZ
+ );
+           goto show_if_name_input_box;
+         }else{
+-          snprintf(chandef->name, WAN_IFNAME_SZ, inb.get_lxdialog_output_string());
++          snprintf(chandef->name, WAN_IFNAME_SZ, "%s", inb.get_lxdialog_output_string());
+           //list_el_chan_def->data.name
+           Debug(DBG_MENU_NET_INTERFACE_SETUP,("menu_net_interface_setup: chan_def: %p\n", chandef));
+         }
+@@ -830,7 +830,7 @@ show_hwec_map_input_box:
+       {
+       case INPUT_BOX_BUTTON_OK:
+ 	snprintf(chandef->active_hwec_channels_string,
+-		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, inb.get_lxdialog_output_string());
++		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", inb.get_lxdialog_output_string());
+ 	break;
+ 
+       case INPUT_BOX_BUTTON_HELP:
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp	2010-03-14 01:24:59.186063452 +0000
+@@ -336,7 +336,7 @@ show_user_id_input_box:
+           goto show_user_id_input_box;
+         }
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.userid,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -382,7 +382,7 @@ show_password_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.passwd,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,7 +427,7 @@ show_sysname_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.sysname,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp	2010-03-14 01:46:49.184063542 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.gateway: %s\n",
+           if_config.gateway));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/text_box_help.h wanpipe-3.5.10/util/wancfg/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wancfg/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/text_box_help.h	2010-03-14 01:45:59.729063764 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c wanpipe-3.5.10/util/wanconfig/wanconfig.c
+--- wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c	2009-11-16 22:50:30.000000000 +0000
++++ wanpipe-3.5.10/util/wanconfig/wanconfig.c	2010-03-14 01:14:48.999189553 +0000
+@@ -1935,7 +1935,7 @@ void show_help(void) {
+  * Show usage text
+  */
+ void show_usage(void) {
+-	fprintf(stderr, usagetext);
++	fputs(usagetext, stderr);
+ 	exit(1);
+ }
+ 
+@@ -1987,7 +1987,7 @@ int gencat (char *filename) 
+ 	}
+ 	
+ 	while(fgets(buf, sizeof(buf) -1, file)) {
+-		printf(buf);
++		printf("%s", buf);
+ 	}	
+ 
+ 	fclose(file);
+@@ -5079,7 +5079,7 @@ void update_adsl_vci_vpi_list(wan_adsl_v
+ 		if (buf[0] != '#'){
+ 			break;
+ 		}else{
+-			fprintf(tmp_file, buf);
++			fprintf(tmp_file, "%s", buf);
+ 		}
+ 	}	
+ 	for(x = 0; x < vcivpi_num; x++){
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp wanpipe-3.5.10/util/wanctl/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/cpp_string.cpp	2010-03-14 01:18:14.224313496 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strcpy(cstr, tmp);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp	2010-03-14 01:28:29.733080770 +0000
+@@ -252,14 +252,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -293,14 +293,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -335,14 +335,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,14 +427,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp	2010-03-14 01:23:55.514313075 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/text_box_help.h wanpipe-3.5.10/util/wanctl/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wanctl/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/text_box_help.h	2010-03-14 01:24:16.425313082 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c wanpipe-3.5.10/util/wanpipemon/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c	2009-11-16 22:50:37.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon/prot_trace.c	2010-03-14 01:16:31.331063406 +0000
+@@ -1805,8 +1805,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c	2010-03-14 01:16:42.435063486 +0000
+@@ -1731,8 +1731,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-libstelephony.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-libstelephony.patch
new file mode 100644
index 0000000..9aa3a77
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-libstelephony.patch
@@ -0,0 +1,13 @@
+--- wanpipe-3.5.10/api/libstelephony/stel_tone/fsk.c.orig	2010-02-08 19:36:21.000000000 +0100
++++ wanpipe-3.5.10/api/libstelephony/stel_tone/fsk.c	2010-02-08 19:37:22.000000000 +0100
+@@ -237,8 +237,8 @@
+ 	}
+ 
+ 	if ((*handle)->attr.bytehandler) {
+-		dsp_uart_handle_t** dhandle = (dsp_uart_handle_t**)(&(*handle)->attr.bithandler_arg);
+-		dsp_uart_destroy(dhandle);
++		dsp_uart_handle_t* dhandle = (dsp_uart_handle_t*)((*handle)->attr.bithandler_arg);
++		dsp_uart_destroy(&dhandle);
+ 	}
+ 
+ 	free(*handle);
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..6446f77
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-QA-fix-parallel-make.patch
@@ -0,0 +1,254 @@
+--- wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-06 16:21:47.000000000 +0100
++++ wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile	2010-02-06 16:22:39.000000000 +0100
+@@ -109,7 +109,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.10/util/Makefile.orig	2010-02-06 16:21:18.000000000 +0100
++++ wanpipe-3.5.10/util/Makefile	2010-02-06 16:23:16.000000000 +0100
+@@ -9,60 +9,60 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.10/api/Makefile.orig	2010-02-06 16:21:07.000000000 +0100
++++ wanpipe-3.5.10/api/Makefile	2010-02-06 16:23:35.000000000 +0100
+@@ -10,14 +10,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api
+-	make -C legacy
+-	make -C sample_c
+-	make -C sample_cpp
++	$(MAKE) -C tdm_api
++	$(MAKE) -C legacy
++	$(MAKE) -C sample_c
++	$(MAKE) -C sample_cpp
+ 
+ clean:
+-	make -C tdm_api clean 
+-	make -C legacy clean 
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean 
++	$(MAKE) -C legacy clean 
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.10/api/legacy/Makefile.orig	2010-02-06 16:21:02.000000000 +0100
++++ wanpipe-3.5.10/api/legacy/Makefile	2010-02-06 16:23:42.000000000 +0100
+@@ -9,15 +9,15 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  APIINC=$(APIINC)
+-	make -C chdlc all  APIINC=$(APIINC)
+-	make -C fr all  APIINC=$(APIINC)
+-	make -C bitstrm all APIINC=$(APIINC)
+-	make -C bisync all APIINC=$(APIINC)
++	$(MAKE) -C x25 all  APIINC=$(APIINC)
++	$(MAKE) -C chdlc all  APIINC=$(APIINC)
++	$(MAKE) -C fr all  APIINC=$(APIINC)
++	$(MAKE) -C bitstrm all APIINC=$(APIINC)
++	$(MAKE) -C bisync all APIINC=$(APIINC)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C bisync clean
+--- wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile.orig	2010-02-06 16:19:43.000000000 +0100
++++ wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile	2010-02-06 16:20:35.000000000 +0100
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-linux-2.6.31.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-linux-2.6.31.patch
new file mode 100644
index 0000000..64a2550
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-linux-2.6.31.patch
@@ -0,0 +1,777 @@
+--- wanpipe-3.5.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c.orig	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c	2010-03-14 00:36:02.263312803 +0000
+@@ -231,8 +231,8 @@ int wanpipe_bind_sk_to_parent(struct soc
+ 		
+ 		ifr.ifr_data = (void*)parent_sk;
+ 		err=-EINVAL;
+-		if (dev->do_ioctl)
+-			err=dev->do_ioctl(dev,&ifr,SIOC_WANPIPE_BIND_SK);
++		if (dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl)
++			err=dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_WANPIPE_BIND_SK);
+ 
+ 		if (err != 0){
+ 			DEBUG_EVENT("%s: Error: Dev busy with another protocol!\n",
+@@ -256,7 +256,7 @@ int wanpipe_bind_sk_to_parent(struct soc
+ 					PPRIV(parent_sk)->seven_bit_hdlc?7:8);
+ 
+ 		PPRIV(parent_sk)->time_slots = 
+-		                      dev->do_ioctl(dev,NULL,SIOC_WANPIPE_GET_TIME_SLOTS);
++		                      dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_WANPIPE_GET_TIME_SLOTS);
+ 		if (PPRIV(parent_sk)->time_slots < 0){
+ 			DEBUG_EVENT("%s: Error, failed to obtain time slots from driver!\n",
+ 					dev->name);
+@@ -265,7 +265,7 @@ int wanpipe_bind_sk_to_parent(struct soc
+ 		}
+ 		
+ 		PPRIV(parent_sk)->media      =
+-		                      dev->do_ioctl(dev,NULL,SIOC_WANPIPE_GET_MEDIA_TYPE);
++		                      dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_WANPIPE_GET_MEDIA_TYPE);
+ 		if (PPRIV(parent_sk)->media < 0){
+ 			DEBUG_EVENT("%s: Error, failed to obtain media type from driver!\n",
+ 					dev->name);
+@@ -302,7 +302,7 @@ int wanpipe_bind_sk_to_parent(struct soc
+ #endif
+ 		write_unlock_irqrestore(&wanpipe_parent_sklist_lock,flags);
+ 
+-		err=dev->do_ioctl(dev,&ifr,SIOC_WANPIPE_DEV_STATE);
++		err=dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_WANPIPE_DEV_STATE);
+ 		if (err == WANSOCK_CONNECTED){
+ 			parent_sk->sk_state = WANSOCK_CONNECTED;
+ 		}else{
+@@ -1726,12 +1726,12 @@ static void wanpipe_free_parent_sock(str
+ 	write_lock_irqsave(&PPRIV(sk)->lock,flags);
+ 
+ 	dev=SK_PRIV(sk)->dev;
+-	if (dev && dev->do_ioctl){
++	if (dev && dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
+ 		struct ifreq ifr;
+ 		memset(&ifr,0,sizeof(struct ifreq));
+ 		ifr.ifr_data = (void*)sk;
+ 		DEBUG_TEST("%s: UNBINDING SK dev=%s\n",__FUNCTION__,dev->name);
+-		dev->do_ioctl(dev,&ifr,SIOC_WANPIPE_UNBIND_SK);
++		dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_WANPIPE_UNBIND_SK);
+ 	}
+ 
+ 	sk->sk_socket = NULL;
+--- wanpipe-3.5.10/patches/kdrivers/src/wanrouter/af_wanpipe_src.c.orig	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/wanrouter/af_wanpipe_src.c	2010-03-14 00:36:02.265438668 +0000
+@@ -289,12 +289,12 @@ dev_private_ioctl:
+ 				if (!dev)
+ 					return -ENODEV;
+ 
+-				if (!dev->do_ioctl)
++				if (!dev->netdev_ops && !dev->netdev_ops->ndo_do_ioctl)
+ 					return -ENODEV;
+-				
++
+ 				ifr.ifr_data = (void*)arg;
+ 			
+-				return dev->do_ioctl(dev,&ifr,cmd);
++				return dev->netdev_ops->ndo_do_ioctl(dev,&ifr,cmd);
+ 			}
+ 
+ 			DEBUG_EVENT("%s: Ioctl call not supported DevPriv %i Cmd %i \n",
+@@ -426,7 +426,7 @@ static int wanpipe_listen_rcv (struct sk
+ 	/* Bind the new socket into the lower layer. The lower
+ 	 * layer will increment the sock reference count. */
+ 	ifr.ifr_data = (void*)newsk;
+-	if (!dev->do_ioctl || dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_BIND_SK) != 0){
++	if (!dev->netdev_ops || !dev->netdev_ops->ndo_do_ioctl || dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_BIND_SK) != 0){
+ 		wanpipe_kill_sock(newsk);
+ 		return -ENODEV;
+ 	}
+@@ -603,9 +603,9 @@ static int wanpipe_accept(struct socket 
+ 		if (wansk_is_zapped(newsk) && SK_PRIV(newsk) && 
+ 		   (dev = (struct net_device *)SK_PRIV(newsk)->dev)){
+ 
+-			if (dev && dev->do_ioctl){
++			if (dev && dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
+ 				struct sock* dev_sk;
+-				dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_GET_SK);
++				dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_GET_SK);
+ 				
+ 				if ((dev_sk=(struct sock*)ifr.ifr_data)!=NULL){
+ 					__sock_put(dev_sk);
+@@ -623,8 +623,8 @@ static int wanpipe_accept(struct socket 
+ 				}
+ 
+ 				ifr.ifr_data=(void*)newsk;
+-				if (dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
+-					dev->do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);	
++				if (dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
++					dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);	
+ 				}
+ 			}else{
+ 				printk(KERN_INFO "af_wanpipe: Accept killing newsk, lower layer down!\n");
+@@ -916,7 +916,7 @@ static int wanpipe_sendmsg(struct socket
+ 	}
+ 
+ 	dev = (struct net_device *)SK_PRIV(sk)->dev;
+-	if (dev == NULL){
++	if (dev == NULL || dev->netdev_ops == NULL){
+ 		printk(KERN_INFO "af_wanpipe: Send failed, dev index: %i\n",ifindex);
+ 		return -ENXIO;
+ 	}
+@@ -973,7 +973,7 @@ static int wanpipe_sendmsg(struct socket
+ #endif
+ 
+ 	AF_SKB_DEC(skb->truesize);
+-	if (!dev->hard_start_xmit(skb,dev)){
++	if (!dev->netdev_ops->ndo_start_xmit(skb,dev)){
+ 		return(len);
+ 	}else{
+ 		err = -EBUSY;
+@@ -1082,11 +1082,11 @@ static void release_queued_pending_socke
+ 
+ 		if (SK_PRIV(deadsk)){
+ 			dev = (struct net_device *)SK_PRIV(deadsk)->dev;
+-			if (dev && dev->do_ioctl){
++			if (dev && dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
+ 				struct ifreq ifr;
+ 				ifr.ifr_data=(void*)sk;
+-				if (dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
+-					dev->do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);
++				if (dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
++					dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);
+ 				}
+ 			}	
+ 		}
+@@ -1162,11 +1162,11 @@ static int wanpipe_release(struct socket
+ 
+ 		netdevice_t *dev = (struct net_device *)SK_PRIV(sk)->dev;
+ 		if (dev){
+-			if(dev->do_ioctl){
++			if(dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
+ 				struct ifreq ifr;
+ 				ifr.ifr_data=(void*)sk;
+-				if (dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
+-					dev->do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);
++				if (dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK)==0){
++					dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_ANNEXG_CLEAR_CALL);
+ 				}
+ 			}
+ 		}else{
+@@ -1175,10 +1175,10 @@ static int wanpipe_release(struct socket
+ 	}else if (wansk_is_zapped(sk)){
+ 		netdevice_t *dev = (struct net_device *)SK_PRIV(sk)->dev;
+ 		if (dev){
+-			if(dev->do_ioctl){
++			if(dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
+ 				struct ifreq ifr;
+ 				ifr.ifr_data=(void*)sk;
+-				dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK);
++				dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_UNBIND_SK);
+ 			}
+ 		}else{
+ 			DEBUG_EVENT("%s: No dev on pvc release !\n",__FUNCTION__);
+@@ -1465,8 +1465,8 @@ wanpipe_svc_listen_skip:
+ 		}
+ #endif
+ 		
+-		if (dev->do_ioctl)
+-			err=dev->do_ioctl(dev,&ifr,SIOC_ANNEXG_BIND_SK);
++		if (dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl)
++			err=dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_ANNEXG_BIND_SK);
+ 		
+ 		if (err == 0){
+ 			sk->sk_bound_dev_if = dev->ifindex; 
+@@ -1478,7 +1478,7 @@ wanpipe_svc_listen_skip:
+ 			    SK_PRIV(sk)->num == htons(DSP_PROT)){
+ 				sk->sk_state = WANSOCK_DISCONNECTED;
+ 			}else{
+-				err=dev->do_ioctl(dev,&ifr,SIOC_WANPIPE_DEV_STATE);
++				err=dev->netdev_ops->ndo_do_ioctl(dev,&ifr,SIOC_WANPIPE_DEV_STATE);
+ 				if (err == WANSOCK_CONNECTED){
+ 					sk->sk_state = WANSOCK_CONNECTED;
+ 				}else{
+@@ -1508,8 +1508,9 @@ wanpipe_svc_listen_skip:
+  *      and adds the socket to the wanpipe_sk_list. 
+  *      Crates AF_WANPIPE socket.
+  *===========================================================*/
+-
+-#ifdef LINUX_FEAT_2624 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++int wanpipe_create(struct net *net, struct socket *sock, int protocol, int kern)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+ int wanpipe_create(struct net *net, struct socket *sock, int protocol)
+ #else
+ int wanpipe_create(struct socket *sock, int protocol)
+@@ -1622,8 +1623,8 @@ static int wanpipe_recvmsg(struct socket
+ 
+ 	dev = (struct net_device *)SK_PRIV(sk)->dev;
+ 	if (dev){
+-		if (dev->do_ioctl){
+-			dev->do_ioctl(dev,NULL,SIOC_ANNEXG_KICK);
++		if (dev->netdev_ops && dev->netdev_ops->ndo_do_ioctl){
++			dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_ANNEXG_KICK);
+ 		}
+ 	}
+ 	
+@@ -1966,13 +1967,13 @@ static int wanpipe_connect(struct socket
+ 		return -ENETUNREACH;
+ 	}
+ 
+-	if (!dev->do_ioctl)
++	if (!dev->netdev_ops || !dev->netdev_ops->ndo_do_ioctl)
+ 		return -ENETUNREACH;
+ 
+ 	sock->state   = SS_CONNECTING;
+ 	sk->sk_state     = WANSOCK_CONNECTING;
+ 
+-	err=dev->do_ioctl(dev,NULL,SIOC_ANNEXG_PLACE_CALL);
++	err=dev->netdev_ops->ndo_do_ioctl(dev,NULL,SIOC_ANNEXG_PLACE_CALL);
+ 	if (err){
+ 		sk->sk_state   = WANSOCK_DISCONNECTED;	
+ 		sock->state = SS_UNCONNECTED;
+--- wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_linux_iface.c.orig	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_linux_iface.c	2010-03-14 00:36:02.266146771 +0000
+@@ -130,6 +130,32 @@ static void wan_iface_free(netdevice_t* 
+ }
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++const static struct net_device_ops wan_netdev_ops = {
++	.ndo_init               = &wan_iface_eth_init,
++	.ndo_get_stats		= &wan_iface_get_stats,
++	.ndo_do_ioctl		= &wan_iface_ioctl,
++	.ndo_open		= &wan_iface_open,
++	.ndo_stop		= &wan_iface_close,
++	.ndo_start_xmit		= &wan_iface_send,
++	.ndo_get_stats		= &wan_iface_get_stats,
++	.ndo_tx_timeout		= &wan_iface_tx_timeout,
++	.ndo_change_mtu		= &wan_iface_change_mtu
++};
++const static struct net_device_ops wan_netdev_ops_eth = {
++	.ndo_init               = &wan_iface_init,
++	.ndo_get_stats		= &wan_iface_get_stats,
++	.ndo_do_ioctl		= &wan_iface_ioctl,
++	.ndo_open		= &wan_iface_open,
++	.ndo_stop		= &wan_iface_close,
++	.ndo_start_xmit		= &wan_iface_send,
++	.ndo_get_stats		= &wan_iface_get_stats,
++	.ndo_tx_timeout		= &wan_iface_tx_timeout,
++	.ndo_change_mtu		= &wan_iface_change_mtu
++};
++#endif
++
++
+ static int wan_iface_attach_eth (netdevice_t* dev, char *ifname, int is_netdev)
+ {
+ 	int err = 0;
+@@ -137,7 +163,11 @@ static int wan_iface_attach_eth (netdevi
+ 		if (ifname){
+ 			wan_netif_init(dev, ifname);
+ 		}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		dev->netdev_ops = &wan_netdev_ops_eth;
++#else
+ 		dev->init = &wan_iface_eth_init;
++#endif
+ 		err=register_netdev(dev);
+ 	}else{
+ #ifdef CONFIG_PRODUCT_WANPIPE_GENERIC
+@@ -154,7 +184,11 @@ static int wan_iface_attach_eth (netdevi
+ 	if (err){
+ 		DEBUG_EVENT("%s: Failed to register interface (%d)\n",
+ 					wan_netif_name(dev), err);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		dev->netdev_ops = NULL;
++#else
+ 		dev->init = NULL;
++#endif
+ 		*(dev->name) = 0;
+ 		wan_netif_free(dev);
+ 		return -EINVAL;
+@@ -170,7 +204,11 @@ static int wan_iface_attach (netdevice_t
+ 		if (ifname){
+ 			wan_netif_init(dev, ifname);
+ 		}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		dev->netdev_ops = &wan_netdev_ops;
++#else
+ 		dev->init = &wan_iface_init;
++#endif
+ 		err=register_netdev(dev);
+ 	}else{
+ #ifdef CONFIG_PRODUCT_WANPIPE_GENERIC
+@@ -187,7 +225,11 @@ static int wan_iface_attach (netdevice_t
+ 	if (err){
+ 		DEBUG_EVENT("%s: Failed to register interface (%d)\n",
+ 					wan_netif_name(dev), err);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		dev->netdev_ops = NULL;
++#else
+ 		dev->init = NULL;
++#endif
+ 		*(dev->name) = 0;
+ 		wan_netif_free(dev);
+ 		return -EINVAL;
+@@ -217,19 +259,20 @@ static void wan_iface_detach (netdevice_
+ static int wan_iface_init(netdevice_t* dev)
+ {
+ //	dev->priv = NULL;	/* We need 'priv', hdlc doesn't */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->get_stats		= &wan_iface_get_stats;
+ 	dev->do_ioctl		= &wan_iface_ioctl;
+ 	dev->open		= &wan_iface_open;
+ 	dev->stop		= &wan_iface_close;
+-
+ 	dev->hard_start_xmit	= &wan_iface_send;
+ 	dev->get_stats		= &wan_iface_get_stats;
+ 	dev->tx_timeout		= &wan_iface_tx_timeout;
+ 	dev->change_mtu		= &wan_iface_change_mtu;
++	dev->set_config		= NULL;
++#endif
+ 
+ 	dev->watchdog_timeo	= HZ*2;
+ 	dev->hard_header_len	= 32;
+-	dev->set_config		= NULL;
+ 	
+ 	/* Initialize media-specific parameters */
+ 	dev->flags		|= IFF_POINTOPOINT;
+@@ -261,6 +304,7 @@ static int wan_iface_eth_init(netdevice_
+ 	int hw_addr=0;
+ 
+ //	dev->priv = NULL;	/* We need 'priv', hdlc doesn't */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->get_stats		= &wan_iface_get_stats;
+ 	dev->do_ioctl		= &wan_iface_ioctl;
+ 	dev->open		= &wan_iface_open;
+@@ -268,9 +312,10 @@ static int wan_iface_eth_init(netdevice_
+ 	dev->hard_start_xmit	= &wan_iface_send;
+ 	dev->get_stats		= &wan_iface_get_stats;
+ 	dev->tx_timeout		= &wan_iface_tx_timeout;
++	dev->set_config		= NULL;
++#endif
+ 	dev->watchdog_timeo	= HZ*2;
+ 	dev->hard_header_len	= 32;
+-	dev->set_config		= NULL;
+ 	
+ 	if (!dev->mtu) {
+ 		dev->mtu		= 1500;
+--- wanpipe-3.5.10/patches/kdrivers/src/net/aft_core.c.orig	2009-12-24 17:18:00.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/aft_core.c	2010-03-14 00:37:02.018438081 +0000
+@@ -264,6 +264,7 @@ static int aft_rx_copyback=500;
+ static int gcnt=0;
+ #endif
+ 
++
+ /*=================================================================
+  * Function Prototypes
+  *================================================================*/
+@@ -439,6 +440,27 @@ extern void 	wan_ng_link_state(wanpipe_c
+  int set_netdev_state(sdla_t* card, netdevice_t* dev, int state);
+ #endif
+ 
++
++#if defined(__LINUX__)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops if_ops = {
++	.ndo_init		= &if_init,
++	.ndo_open		= &if_open,
++	.ndo_stop		= &if_close,
++/*	.ndo_tx_timeout		= &if_tx_timeout, */
++/*	.ndo_start_xmit		= &if_send, */
++	.ndo_get_stats		= &if_stats,
++	.ndo_do_ioctl		= &if_do_ioctl,
++	.ndo_change_mtu		= &if_change_mtu
++
++};
++
++static struct net_device_ops if_init_ops = {
++	.ndo_init		= &if_init
++};
++# endif
++#endif
++
+ /*=================================================================
+  * Public Functions
+  *================================================================*/
+@@ -2769,7 +2791,11 @@ static int new_if_private (wan_device_t*
+ 	 * finished successfully.  DO NOT place any code below that
+ 	 * can return an error */
+ #if defined(__LINUX__) || defined(__WINDOWS__)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->init = &if_init;
++#else
++	dev->netdev_ops = &if_init_ops;
++#endif
+ # if defined(CONFIG_PRODUCT_WANPIPE_GENERIC)
+ 	if_init(dev);
+ # endif
+@@ -3612,8 +3638,6 @@ static void disable_comm (sdla_t *card)
+  *
+  ********************************************************************/
+ 
+-
+-
+ /*============================================================================
+  * if_init - Initialize Linux network interface.
+  *
+@@ -3640,27 +3664,45 @@ static int if_init (netdevice_t* dev)
+ #endif
+ 
+ 	/* Initialize device driver entry points */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops		= &if_ops;
++#else
+ 	dev->open		= &if_open;
+ 	dev->stop		= &if_close;
++	dev->get_stats		= &if_stats;
++	dev->do_ioctl		= &if_do_ioctl;
++	dev->change_mtu		= &if_change_mtu;
++#endif
+ #if defined(CONFIG_PRODUCT_WANPIPE_GENERIC)
+ 	hdlc		= dev_to_hdlc(dev);
+ 	hdlc->xmit 	= if_send;
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	if_ops.ndo_start_xmit   = &if_send;
++#else
+ 	dev->hard_start_xmit	= &if_send;
+ #endif
+-	dev->get_stats		= &if_stats;
++#endif
+ 
+ #if 0
+ 	dev->tx_timeout		= &if_tx_timeout;
+ 	dev->watchdog_timeo	= 2*HZ;
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	if (chan->common.usedby == TDM_VOICE ||
++	    chan->common.usedby == TDM_VOICE_API){
++		if_ops.ndo_tx_timeout	= NULL;
++	}else{
++		if_ops.ndo_tx_timeout	= &if_tx_timeout;
++	}
++#else
+ 	if (chan->common.usedby == TDM_VOICE ||
+ 	    chan->common.usedby == TDM_VOICE_API){
+ 		dev->tx_timeout		= NULL;
+ 	}else{
+ 		dev->tx_timeout		= &if_tx_timeout;
+ 	}
+-
++#endif
+ 	dev->watchdog_timeo	= 2*HZ;
+ 	{
+ 		u32 secs = ((chan->max_tx_bufs/2)*chan->dma_mru*8) / (64000 * chan->num_of_time_slots);
+@@ -3674,8 +3716,6 @@ static int if_init (netdevice_t* dev)
+ 	}
+ 
+ #endif
+-	dev->do_ioctl		= if_do_ioctl;
+-	dev->change_mtu		= if_change_mtu;
+ 
+ 	if (chan->common.usedby == BRIDGE ||
+             chan->common.usedby == BRIDGE_NODE){
+--- wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_usb.c.orig	2009-11-16 22:49:30.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_usb.c	2010-03-14 00:36:02.275439125 +0000
+@@ -164,6 +164,22 @@ static void wp_usb__task (void * card_pt
+ #endif  
+ static void wp_usb_isr(void *arg);
+ 
++#if defined(__LINUX__)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops if_ops = {
++	.ndo_init		= &wp_usb_if_init,
++	.ndo_open		= &wp_usb_if_open,
++	.ndo_stop		= &wp_usb_if_close,
++	.ndo_start_xmit		= &wp_usb_if_send,
++	.ndo_get_stats		= &wp_usb_if_stats,
++	.ndo_do_ioctl		= &wp_usb_if_do_ioctl
++};
++
++static struct net_device_ops if_init_ops = {
++	.ndo_init		= &wp_usb_if_init
++};
++# endif
++#endif
+ 
+ /*****************************************************************************
+ *                       FUNCTION DEFINITIONS
+@@ -356,7 +372,11 @@ wp_usb_new_if_private (wan_device_t* wan
+ 	chan->time_slot_map=conf->active_ch;
+ 
+ #if defined(__LINUX__)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops = &if_init_ops;
++# else
+ 	dev->init = &wp_usb_if_init;
++# endif
+ # if defined(CONFIG_PRODUCT_WANPIPE_GENERIC)
+ 	wp_usb_if_init(dev);
+ # endif
+@@ -762,28 +782,35 @@ static void wp_usb_disable_comm (sdla_t 
+ 	return;
+ }
+ 
+-
+ #if defined(__LINUX__)
+ static int wp_usb_if_init (netdevice_t* dev)
+ {
+ 	wp_usb_softc_t	*chan = wan_netif_priv(dev);
+ 	
+ 	/* Initialize device driver entry points */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops		= &if_ops;
++#else
+ 	dev->open		= &wp_usb_if_open;
+ 	dev->stop		= &wp_usb_if_close;
+ 	dev->hard_start_xmit	= &wp_usb_if_send;
+ 	dev->get_stats		= &wp_usb_if_stats;
+-
++#endif
+ 	if (chan->common.usedby == TDM_VOICE || 
+ 	    chan->common.usedby == TDM_VOICE_API){
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		if_ops.ndo_tx_timeout	= NULL;
++	} else {
++		if_ops.ndo_tx_timeout	= &wp_usb_if_tx_timeout;
++	}
++#else
+ 		dev->tx_timeout		= NULL;
+-	}else{
++	} else {
+ 		dev->tx_timeout		= &wp_usb_if_tx_timeout;
+ 	}
+-	dev->watchdog_timeo	= 2*HZ;
+-		
+-	dev->do_ioctl		= wp_usb_if_do_ioctl;
+-
++	dev->do_ioctl	= wp_usb_if_do_ioctl;
++#endif
++	dev->watchdog_timeo = 2*HZ;
+ 	dev->flags     |= IFF_POINTOPOINT;
+ 	dev->flags     |= IFF_NOARP;
+ 	dev->type	= ARPHRD_PPP;
+--- wanpipe-3.5.10/patches/kdrivers/src/net/sdla_tdmv.c.orig	2009-12-07 22:16:05.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/sdla_tdmv.c	2010-03-14 00:36:02.277145454 +0000
+@@ -2455,7 +2455,11 @@ static void wp_tdmv_tx_hdlc_hard(struct 
+ 		DEBUG_ERROR("%s: ERROR: TX HW DCHAN %d bytes (res %d)\n",
+ 					wp->devname, size, res);
+ 	}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	err = wp->dchan_dev->netdev_ops->ndo_start_xmit(skb, wp->dchan_dev);
++#else
+ 	err = wp->dchan_dev->hard_start_xmit(skb, wp->dchan_dev);
++#endif
+ 	if (err){
+ 		wan_skb_free(skb);
+ 	}
+--- wanpipe-3.5.10/patches/kdrivers/src/net/sdla_aft_te3.c.orig	2009-11-16 22:44:38.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/sdla_aft_te3.c	2010-03-14 00:36:02.282147049 +0000
+@@ -417,6 +417,21 @@ static void xilinx_delay(int sec)
+ #endif
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops if_ops = {
++	.ndo_init		= &if_init,
++	.ndo_open		= &if_open,
++	.ndo_stop		= &if_close,
++	.ndo_get_stats		= &if_stats,
++	.ndo_do_ioctl		= &if_do_ioctl,
++	.ndo_change_mtu		= &if_change_mtu
++};
++
++static struct net_device_ops if_init_ops = {
++	.ndo_init		= &if_init
++};
++#endif
++
+ /**SECTION*********************************************************
+  *
+  * Public Functions
+@@ -997,7 +1012,11 @@ static int new_if (wan_device_t* wandev,
+ 	 * can return an error */
+ 	wan_netif_set_priv(dev,chan);
+ #if defined(__LINUX__)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->init = &if_init;
++# else
++	dev->netdev_ops = &if_init_ops;
++# endif
+ # ifdef WANPIPE_GENERIC
+ 	if_init(dev);
+ # endif
+@@ -1150,8 +1169,6 @@ static int del_if (wan_device_t* wandev,
+  *
+  ********************************************************************/
+ 
+-
+-
+ /*============================================================================
+  * if_init - Initialize Linux network interface.
+  *
+@@ -1176,23 +1193,35 @@ static int if_init (netdevice_t* dev)
+ #ifdef WANPIPE_GENERIC
+ 	hdlc_device*	hdlc;
+ #endif
+-
+ 	/* Initialize device driver entry points */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops		= &if_ops;
++#else
+ 	dev->open		= &if_open;
+ 	dev->stop		= &if_close;
++	dev->get_stats		= &if_stats;
++	dev->do_ioctl		= if_do_ioctl;
++	dev->change_mtu		= if_change_mtu;
++#endif
+ #ifdef WANPIPE_GENERIC
+ 	hdlc		= dev_to_hdlc(dev);
+ 	hdlc->xmit 	= if_send;
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	if_ops.ndo_start_xmit	= &if_send;
++#else
+ 	dev->hard_start_xmit	= &if_send;
+ #endif
+-	dev->get_stats		= &if_stats;
++#endif /* !WANPIPE_GENERIC */
++
+ #if defined(LINUX_2_4)||defined(LINUX_2_6)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	if_ops.ndo_tx_timeout	= &if_tx_timeout;
++#else
+ 	dev->tx_timeout		= &if_tx_timeout;
++#endif
+ 	dev->watchdog_timeo	= 2*HZ;
+ #endif
+-	dev->do_ioctl		= if_do_ioctl;
+-	dev->change_mtu		= if_change_mtu;
+ 
+ 	if (chan->common.usedby == BRIDGE ||
+             chan->common.usedby == BRIDGE_NODE){
+--- wanpipe-3.5.10/patches/kdrivers/src/net/sdla_xilinx.c.orig	2009-12-16 21:29:46.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/sdla_xilinx.c	2010-03-14 00:36:02.286145729 +0000
+@@ -476,6 +476,23 @@ int wp_xilinx_default_ifcfg(sdla_t* card
+ }
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops if_ops = {
++	.ndo_init		= &if_init,
++	.ndo_open		= &wanpipe_xilinx_open,
++	.ndo_stop		= &wanpipe_xilinx_close,
++	.ndo_start_xmit		= &wanpipe_xilinx_send,
++	.ndo_get_stats		= &wanpipe_xilinx_ifstats,
++	.ndo_do_ioctl		= &wanpipe_xilinx_ioctl,
++/*	.ndo_tx_timeout		= &wanpipe_xilinx_tx_timeout */
++};
++
++static struct net_device_ops if_init_ops = {
++	.ndo_init		= &if_init,
++};
++#endif
++
++
+ /*============================================================================
+ * wp_xilinx_init - Cisco HDLC protocol initialization routine.
+ *
+@@ -1739,7 +1756,11 @@ static int new_if_private (wan_device_t*
+ 
+ 
+ #if defined(__LINUX__) || defined(__WINDOWS__)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->init = &if_init;
++# else
++	dev->netdev_ops = &if_init_ops;
++# endif
+ # ifdef CONFIG_PRODUCT_WANPIPE_GENERIC
+ 	if_init(dev);
+ # endif
+@@ -2096,8 +2117,6 @@ static int del_if (wan_device_t* wandev,
+ *
+ ********************************************************************/
+ 
+-
+-
+ /*============================================================================
+ * if_init - Initialize Linux network interface.
+ *
+@@ -2124,22 +2143,34 @@ static int if_init (netdevice_t* dev)
+ 	/* Initialize device driver entry points */
+ #if defined(__LINUX__) || defined(__WINDOWS__)
+ # ifndef CONFIG_PRODUCT_WANPIPE_GENERIC
++#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops		= &if_ops;
++#  else
+ 	dev->open		= &wanpipe_xilinx_open;
+ 	dev->stop		= &wanpipe_xilinx_close;
+ 	dev->hard_start_xmit	= &wanpipe_xilinx_send;
+ 	dev->get_stats		= &wanpipe_xilinx_ifstats;
+-
++#  endif
+ #  if defined(LINUX_2_4)||defined(LINUX_2_6)
+ 	if (chan->common.usedby == TDM_VOICE ||
+ 		chan->common.usedby == TDM_VOICE_DCHAN ||
+ 		chan->common.usedby == TDM_VOICE_API) {
+-			dev->tx_timeout		= NULL;
++#   if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++		if_ops.ndo_tx_timeout	= NULL;
++	} else {
++		if_ops.ndo_tx_timeout	= &wanpipe_xilinx_tx_timeout;
++	}
++#   else
++		dev->tx_timeout		= NULL;
+ 	} else {
+ 		dev->tx_timeout		= &wanpipe_xilinx_tx_timeout;
+ 	}
++#   endif
+ 	dev->watchdog_timeo	= 2*HZ;
+ #  endif
++#  if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 	dev->do_ioctl		= wanpipe_xilinx_ioctl;
++#  endif
+ # endif
+ 
+ 	if (chan->common.usedby == BRIDGE ||
+--- wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_syncppp.c.orig	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/patches/kdrivers/src/net/wanpipe_syncppp.c	2010-03-14 00:36:02.289438670 +0000
+@@ -2230,6 +2230,16 @@ int wp_sppp_do_ioctl(struct net_device *
+ 
+ EXPORT_SYMBOL(wp_sppp_do_ioctl);
+ 
++static struct net_device_ops if_ops = {
++	.ndo_do_ioctl		= &wp_sppp_do_ioctl,
++#if 0
++	.ndo_get_stats		= NULL,		/* Let the driver override these */
++	.ndo_open		= &wp_sppp_open,
++	.ndo_stop		= &wp_sppp_close,
++#endif	
++	.ndo_change_mtu		= &wp_sppp_change_mtu
++};
++
+ /**
+  *	wp_sppp_attach - attach synchronous PPP/HDLC to a device
+  *	@pd:	PPP device to initialise
+@@ -2313,20 +2323,20 @@ void wp_sppp_attach(struct ppp_device *p
+ 	dev->addr_len = 0;
+ 	dev->hard_header_len = sizeof(struct ppp_header);
+ 	dev->mtu = PPP_MTU;
++	dev->flags = IFF_MULTICAST|IFF_POINTOPOINT|IFF_NOARP;
+ 	/*
+ 	 *	These 4 are callers but MUST also call sppp_ functions
+ 	 */
+-	dev->do_ioctl = wp_sppp_do_ioctl;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++	dev->netdev_ops = &if_ops;
++#else
++	dev->do_ioctl   = wp_sppp_do_ioctl;
++	dev->change_mtu = wp_sppp_change_mtu;
++#endif
+ #if 0
+ 	dev->get_stats = NULL;		/* Let the driver override these */
+ 	dev->open = wp_sppp_open;
+ 	dev->stop = wp_sppp_close;
+-#endif	
+-	dev->change_mtu = wp_sppp_change_mtu;
+-	
+-	dev->flags = IFF_MULTICAST|IFF_POINTOPOINT|IFF_NOARP;
+-	
+-#if 0				
+ 	dev_init_buffers(dev);	/* Let the driver do this */
+ #endif
+ }
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10-silence-QA-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.10-silence-QA-warnings.patch
new file mode 100644
index 0000000..7a1076d
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10-silence-QA-warnings.patch
@@ -0,0 +1,10 @@
+--- wanpipe-3.5.10/api/lib/hdlc/wanpipe_hdlc.h.orig	2010-02-05 23:51:20.000000000 +0100
++++ wanpipe-3.5.10/api/lib/hdlc/wanpipe_hdlc.h	2010-02-05 23:51:28.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #if defined(__WINDOWS__)
+ # define wan_inline __inline
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.10_p10-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.10_p10-Makefile.patch
new file mode 100644
index 0000000..9f16a53
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.10_p10-Makefile.patch
@@ -0,0 +1,47 @@
+--- wanpipe-3.5.10.10/Makefile.orig	2010-03-10 03:32:57.000000000 +0000
++++ wanpipe-3.5.10.10/Makefile	2010-03-24 11:36:17.482461841 +0000
+@@ -179,10 +179,10 @@
+ 
+ 
+ #Build only kernel modules
+-all_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod:  _checkzap _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules  
+ 
+-all_kmod_ss7: _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_ss7: _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ss7_build_dir ]; then \
+ 		rm -rf $(PWD)/ss7_build_dir; \
+ 	fi
+@@ -190,7 +190,7 @@
+ 	./Setup drivers --builddir=$(PWD)/ss7_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=AFT_TE1-XMTP2 --no-zaptel-compile --noautostart --arch=$(ARCH) --silent
+ 	@eval "./patches/copy_modules.sh $(PWD)/ss7_build_dir $(WAN_DIR)"  
+ 
+-all_bin_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_bin_kmod:  _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ast_build_dir ]; then \
+ 		rm -rf $(PWD)/ast_build_dir; \
+ 	fi
+@@ -200,7 +200,7 @@
+ 
+ 
+ #Clean utilites and kernel modules
+-clean: cleanup_local  clean_util _cleanoldwanpipe
++clean: cleanup_local  clean_util
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
+ 	$(MAKE) -C api SUBDIRS=$(WAN_DIR) clean
+ 	@find patches/kdrivers -name '.*.cmd' | xargs rm -f
+@@ -318,12 +318,10 @@
+         echo "install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}"; \
+         install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}; \
+     fi
+-	@eval "./patches/rundepmod.sh"	
+-	
+ endif
+ 
+ #Compile utilities only
+-all_util:  install_inc
++all_util:
+ 	$(MAKE) -C util all EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I $(PWD)/api/libsangoma/include" CC=$(CC) \
+ 	PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(ARCH) 
+ 	$(MAKE) -C util all_wancfg EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I$(PWD)/api/libsangoma/include" CC=$(CC) \
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.11-linux-2.6.35.patch b/net-misc/wanpipe/files/wanpipe-3.5.11-linux-2.6.35.patch
new file mode 100644
index 0000000..e2a0577
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.11-linux-2.6.35.patch
@@ -0,0 +1,58 @@
+--- wanpipe-3.5.11/patches/kdrivers/include/wanpipe_common.h.orig	2009-12-16 22:24:29.000000000 +0100
++++ wanpipe-3.5.11/patches/kdrivers/include/wanpipe_common.h	2010-05-31 02:04:21.539309251 +0200
+@@ -2614,7 +2614,7 @@
+ static __inline int wan_netif_mcount(netdevice_t* dev)
+ {
+ #if defined(__LINUX__)
+-	return dev->mc_count;
++	return netdev_mc_count(dev);
+ #elif defined(__FreeBSD__)
+ 	return dev->if_amcount;
+ #elif defined(__OpenBSD__) || defined(__NetBSD__)
+--- wanpipe-3.5.11/patches/kdrivers/src/net/../wanrouter/af_wanpipe_src.c.orig	2010-05-31 02:22:23.601060726 +0200
++++ wanpipe-3.5.11/patches/kdrivers/src/net/../wanrouter/af_wanpipe_src.c	2010-05-31 02:22:44.416060428 +0200
+@@ -338,7 +338,7 @@
+ 	sk->sk_sndbuf      = osk->sk_sndbuf;
+ 	sk->sk_debug       = osk->sk_debug;
+ 	sk->sk_state       = WANSOCK_CONNECTING;
+-	sk->sk_sleep       = osk->sk_sleep;
++	sk->sk_wq          = osk->sk_wq;
+ 
+ 	return sk;
+ }
+@@ -564,7 +564,7 @@
+ 	if (SK_PRIV(sk)->num != htons(ETH_P_X25) && SK_PRIV(sk)->num != htons(WP_X25_PROT) && SK_PRIV(sk)->num != htons(DSP_PROT))
+ 		return -EPROTOTYPE;
+ 
+-	add_wait_queue(sk->sk_sleep,&wait);
++	add_wait_queue(sk_sleep(sk),&wait);
+ 	current->state = TASK_INTERRUPTIBLE;
+ 	for (;;){
+ 		skb = skb_dequeue(&sk->sk_receive_queue);
+@@ -585,7 +585,7 @@
+ 		schedule();
+ 	}
+ 	current->state = TASK_RUNNING;
+-	remove_wait_queue(sk->sk_sleep,&wait);
++	remove_wait_queue(sk_sleep(sk),&wait);
+ 
+ 	if (err != 0)
+ 		return err;
+@@ -657,7 +657,7 @@
+ 	newsk->sk_pair = NULL;
+ #endif
+ 	newsk->sk_socket = newsock;
+-	newsk->sk_sleep = &newsock->wait;
++	newsk->sk_wq = newsock->wq;
+ 
+ 	/* Now attach up the new socket */
+ 	sk->sk_ack_backlog--;
+@@ -1791,7 +1791,7 @@
+ 	DEBUG_TX("%s: Sock State %p = %d\n",
+ 			__FUNCTION__,sk,sk->sk_state);
+ 
+-	poll_wait(file, sk->sk_sleep, wait);
++	poll_wait(file, sk_sleep(sk), wait);
+ 
+ 	/* exceptional events? */
+ 	if (!SK_PRIV(sk) || 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.12-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.12-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..9837a85
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.12-QA-fix-parallel-make.patch
@@ -0,0 +1,262 @@
+--- wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-06 16:21:47.000000000 +0100
++++ wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile	2010-02-06 16:22:39.000000000 +0100
+@@ -109,7 +109,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.12/util/Makefile.orig	2010-06-29 00:16:39.000000000 +0200
++++ wanpipe-3.5.12/util/Makefile	2010-06-29 17:58:47.251844165 +0200
+@@ -9,63 +9,63 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctrl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctrl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.10/api/Makefile.orig	2010-02-06 16:21:07.000000000 +0100
++++ wanpipe-3.5.10/api/Makefile	2010-02-06 16:23:35.000000000 +0100
+@@ -10,14 +10,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api
+-	make -C legacy
+-	make -C sample_c
+-	make -C sample_cpp
++	$(MAKE) -C tdm_api
++	$(MAKE) -C legacy
++	$(MAKE) -C sample_c
++	$(MAKE) -C sample_cpp
+ 
+ clean:
+-	make -C tdm_api clean 
+-	make -C legacy clean 
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean 
++	$(MAKE) -C legacy clean 
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.12/api/legacy/Makefile.orig	2010-06-29 00:18:06.000000000 +0200
++++ wanpipe-3.5.12/api/legacy/Makefile	2010-06-29 17:59:17.797518469 +0200
+@@ -9,16 +9,16 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  APIINC=$(APIINC)
+-	make -C chdlc all  APIINC=$(APIINC)
+-	make -C fr all  APIINC=$(APIINC)
+-	make -C bitstrm all APIINC=$(APIINC)
+-	make -C bisync all APIINC=$(APIINC)
+-	make -C aft all APIINC=$(APIINC)
++	$(MAKE) -C x25 all  APIINC=$(APIINC)
++	$(MAKE) -C chdlc all  APIINC=$(APIINC)
++	$(MAKE) -C fr all  APIINC=$(APIINC)
++	$(MAKE) -C bitstrm all APIINC=$(APIINC)
++	$(MAKE) -C bisync all APIINC=$(APIINC)
++	$(MAKE) -C aft all APIINC=$(APIINC)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
+--- wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile.orig	2010-02-06 16:19:43.000000000 +0100
++++ wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile	2010-02-06 16:20:35.000000000 +0100
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.14-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.14-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..2748f32
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.14-QA-fix-parallel-make.patch
@@ -0,0 +1,265 @@
+--- wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-06 16:21:47.000000000 +0100
++++ wanpipe-3.5.10/ssmg/sangoma_mgd.trunk/Makefile	2010-02-06 16:22:39.000000000 +0100
+@@ -109,7 +109,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.12/util/Makefile.orig	2010-06-29 00:16:39.000000000 +0200
++++ wanpipe-3.5.12/util/Makefile	2010-06-29 17:58:47.251844165 +0200
+@@ -9,63 +9,63 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctrl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctrl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.10/api/Makefile.orig	2010-02-06 16:21:07.000000000 +0100
++++ wanpipe-3.5.10/api/Makefile	2010-02-06 16:23:35.000000000 +0100
+@@ -10,14 +10,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api
+-	make -C legacy
+-	make -C sample_c
+-	make -C sample_cpp
++	$(MAKE) -C tdm_api
++	$(MAKE) -C legacy
++	$(MAKE) -C sample_c
++	$(MAKE) -C sample_cpp
+ 
+ clean:
+-	make -C tdm_api clean 
+-	make -C legacy clean 
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean 
++	$(MAKE) -C legacy clean 
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.14/api/legacy/Makefile.orig	2010-06-29 17:57:29.000000000 +0200
++++ wanpipe-3.5.14/api/legacy/Makefile	2010-07-05 10:28:50.759241117 +0200
+@@ -9,18 +9,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  APIINC=$(APIINC)
+-	make -C chdlc all  APIINC=$(APIINC)
+-	make -C fr all  APIINC=$(APIINC)
+-	make -C bitstrm all APIINC=$(APIINC)
+-	make -C bisync all APIINC=$(APIINC)
+-	make -C aft all APIINC=$(APIINC)
++	$(MAKE) -C x25 all  APIINC=$(APIINC)
++	$(MAKE) -C chdlc all  APIINC=$(APIINC)
++	$(MAKE) -C fr all  APIINC=$(APIINC)
++	$(MAKE) -C bitstrm all APIINC=$(APIINC)
++	$(MAKE) -C bisync all APIINC=$(APIINC)
++	$(MAKE) -C aft all APIINC=$(APIINC)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile.orig	2010-02-06 16:19:43.000000000 +0100
++++ wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile	2010-02-06 16:20:35.000000000 +0100
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.14-dahdi-location.patch b/net-misc/wanpipe/files/wanpipe-3.5.14-dahdi-location.patch
new file mode 100644
index 0000000..3f17c32
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.14-dahdi-location.patch
@@ -0,0 +1,117 @@
+diff -Naurp wanpipe-3.5.14.orig/patches/kdrivers/include/sdladrv.h wanpipe-3.5.14/patches/kdrivers/include/sdladrv.h
+--- wanpipe-3.5.14.orig/patches/kdrivers/include/sdladrv.h	2010-06-23 23:19:47.000000000 +0200
++++ wanpipe-3.5.14/patches/kdrivers/include/sdladrv.h	2010-08-13 23:03:22.693506494 +0200
+@@ -793,8 +793,6 @@ WP_EXTERN int sdla_get_hw_usb_adptr_cnt(
+ WP_EXTERN int sdla_get_hwinfo(hardware_info_t *hwinfo, int card_no);
+ 
+ 
+-#ifdef __SDLADRV__
+-
+ static __inline unsigned int sdla_get_pci_bus(sdlahw_t* hw)
+ {
+ 	sdlahw_card_t	*hwcard;
+@@ -851,6 +849,48 @@ static __inline unsigned int sdla_get_pc
+ 	return 0;
+ }
+ 
++static __inline unsigned int sdla_get_location(sdlahw_t *hw, char *output, const int size)
++{
++	sdlahw_card_t	*hwcard;
++	sdlahw_cpu_t	*hwcpu;
++
++	WAN_ASSERT(hw == NULL);
++	WAN_ASSERT(hw->hwcpu == NULL);
++	hwcpu = hw->hwcpu;
++
++	WAN_ASSERT(hwcpu->hwcard == NULL);
++	hwcard = hwcpu->hwcard;
++
++	switch (hwcard->hw_type) {
++	case SDLA_PCI_CARD: /* PCI */
++		snprintf(output, size, "PCI Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_PCI_EXP_CARD: /* PCI Express */
++		snprintf(output, size, "PCI Express Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_ISA_CARD: /* ISA */
++		snprintf(output, size, "ISA IOPort 0x%03x", hwcard->u_isa.ioport);
++		output[size - 1] = '\0';
++		break;
++	case SDLA_USB_CARD: /* USB */
++#if defined(__LINUX__)
++		snprintf(output, size, "USB Bus %02d Device ID %02d",
++			 hwcard->u_usb.usb_dev->bus->busnum, hwcard->u_usb.usb_dev->devnum);
++		output[size - 1] = '\0';
++#endif
++		break;
++	default:
++		break;
++	}
++	return 0;
++}
++
++#ifdef __SDLADRV__
++
+ static __inline int 
+ sdla_bus_space_map(sdlahw_t* hw, int reg, int size, sdla_mem_handle_t* handle)
+ {
+diff -Naurp wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_bri_tdmv.c wanpipe-3.5.14/patches/kdrivers/src/net/sdla_bri_tdmv.c
+--- wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_bri_tdmv.c	2010-06-18 01:43:48.000000000 +0200
++++ wanpipe-3.5.14/patches/kdrivers/src/net/sdla_bri_tdmv.c	2010-08-13 23:04:05.077104544 +0200
+@@ -529,6 +529,10 @@ static int wp_tdmv_bri_software_init(wan
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WPBRI/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+diff -Naurp wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_remora_tdmv.c wanpipe-3.5.14/patches/kdrivers/src/net/sdla_remora_tdmv.c
+--- wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_remora_tdmv.c	2010-05-03 19:09:30.000000000 +0200
++++ wanpipe-3.5.14/patches/kdrivers/src/net/sdla_remora_tdmv.c	2010-08-13 23:04:18.020981728 +0200
+@@ -691,6 +691,10 @@ static int wp_tdmv_remora_software_init(
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+diff -Naurp wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_tdmv.c wanpipe-3.5.14/patches/kdrivers/src/net/sdla_tdmv.c
+--- wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_tdmv.c	2010-06-18 01:44:02.000000000 +0200
++++ wanpipe-3.5.14/patches/kdrivers/src/net/sdla_tdmv.c	2010-08-13 23:04:45.174723995 +0200
+@@ -1131,6 +1131,10 @@ static int wp_tdmv_software_init(wan_tdm
+ 		sprintf(wp->span.name, "WPT1/%d", wp->num);
+ 	}
+ 	sprintf(wp->span.desc, "%s card %d", wp->devname, wp->num);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wp->span.location, sizeof(wp->span.location));
++#endif
++
+ 	wp->span.spanconfig = wp_tdmv_spanconfig;
+ 	wp->span.chanconfig = wp_tdmv_chanconfig;
+ 	wp->span.startup = wp_tdmv_startup;
+diff -Naurp wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c wanpipe-3.5.14/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c
+--- wanpipe-3.5.14.orig/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c	2010-05-28 21:03:50.000000000 +0200
++++ wanpipe-3.5.14/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c	2010-08-13 23:05:00.877574895 +0200
+@@ -1168,6 +1168,10 @@ static int wp_usb_tdmv_remora_software_i
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.15-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.15-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..941b6ed
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.15-QA-fix-parallel-make.patch
@@ -0,0 +1,265 @@
+--- wanpipe-3.5.15/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.15/ssmg/sangoma_mgd.trunk/Makefile	2010-08-28 16:52:18.909775205 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.15/util/Makefile.orig	2010-08-19 21:48:10.000000000 +0200
++++ wanpipe-3.5.15/util/Makefile	2010-08-28 16:52:52.135393573 +0200
+@@ -9,63 +9,63 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)  
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.10/api/Makefile.orig	2010-02-06 16:21:07.000000000 +0100
++++ wanpipe-3.5.10/api/Makefile	2010-02-06 16:23:35.000000000 +0100
+@@ -10,14 +10,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api
+-	make -C legacy
+-	make -C sample_c
+-	make -C sample_cpp
++	$(MAKE) -C tdm_api
++	$(MAKE) -C legacy
++	$(MAKE) -C sample_c
++	$(MAKE) -C sample_cpp
+ 
+ clean:
+-	make -C tdm_api clean 
+-	make -C legacy clean 
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean 
++	$(MAKE) -C legacy clean 
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.14/api/legacy/Makefile.orig	2010-06-29 17:57:29.000000000 +0200
++++ wanpipe-3.5.14/api/legacy/Makefile	2010-07-05 10:28:50.759241117 +0200
+@@ -9,18 +9,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  APIINC=$(APIINC)
+-	make -C chdlc all  APIINC=$(APIINC)
+-	make -C fr all  APIINC=$(APIINC)
+-	make -C bitstrm all APIINC=$(APIINC)
+-	make -C bisync all APIINC=$(APIINC)
+-	make -C aft all APIINC=$(APIINC)
++	$(MAKE) -C x25 all  APIINC=$(APIINC)
++	$(MAKE) -C chdlc all  APIINC=$(APIINC)
++	$(MAKE) -C fr all  APIINC=$(APIINC)
++	$(MAKE) -C bitstrm all APIINC=$(APIINC)
++	$(MAKE) -C bisync all APIINC=$(APIINC)
++	$(MAKE) -C aft all APIINC=$(APIINC)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile.orig	2010-02-06 16:19:43.000000000 +0100
++++ wanpipe-3.5.10/patches/kdrivers/src/lip/Makefile	2010-02-06 16:20:35.000000000 +0100
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.15-dahdi-2.4.0.patch b/net-misc/wanpipe/files/wanpipe-3.5.15-dahdi-2.4.0.patch
new file mode 100644
index 0000000..fc44323
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.15-dahdi-2.4.0.patch
@@ -0,0 +1,413 @@
+--- wanpipe-3.5.15/patches/kdrivers/src/net/sdla_tdmv_dummy.c.orig	2010-09-14 01:00:35.910220288 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/sdla_tdmv_dummy.c	2010-09-14 01:00:38.349931878 +0200
+@@ -87,7 +87,6 @@
+ #endif
+    wpd->span.channels = 0;	/* no channels */
+    wpd->span.deflaw = ZT_LAW_MULAW;
+-   wpd->span.pvt = wpd;
+    wpd->chan.pvt = wpd;
+    
+    if (zt_register(&wpd->span, 0)) {
+--- wanpipe-3.5.15/patches/kdrivers/src/net/sdla_bri_tdmv.c.orig	2010-09-14 01:00:35.913219934 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/sdla_bri_tdmv.c	2010-09-14 01:02:47.946620019 +0200
+@@ -310,11 +310,14 @@
+ 
+ static int wp_bri_zap_watchdog(struct zt_span *span, int event)
+ {
++#if 0
++	wp_tdmv_bri_t *wr = container_of(span, wp_tdmv_bri_t, span);
++#endif
+ 	BRI_FUNC();
+ 
+ #if 0
+ 	printk("TDM: Restarting DMA\n");
+-	wctdm_restart_dma(span->pvt);
++	wctdm_restart_dma(wr);
+ #endif
+ 	return 0;
+ }
+@@ -344,6 +347,10 @@
+ 	WAN_ASSERT2(wr->card == NULL, -ENODEV);
+ 	card	= wr->card;
+ 
++	/* card has no echo canceller module */
++	if (!card->wandev.ec_dev)
++		return -ENODEV;
++
+ 	if (ecp->param_count > 0) {
+  		DEBUG_TDMV("[TDMV] Wanpipe echo canceller does not support parameters; failing request\n");
+  		return -EINVAL;
+@@ -431,6 +438,10 @@
+ 	card	= wr->card;
+ 	fe	= &card->fe;
+ 
++	/* card has no echo canceller module */
++	if (!card->wandev.ec_dev)
++		return -ENODEV;
++
+ 	if (card->wandev.ec_enable){
+ 		DEBUG_EVENT("[TDMV_BRI]: %s: %s(): channel %d\n",
+ 			wr->devname, __FUNCTION__, chan->chanpos);
+@@ -502,6 +513,14 @@
+ 	return 0;
+ }
+ 
++static const struct dahdi_span_ops wp_tdmv_bri_span_ops = {
++	.owner		= THIS_MODULE,
++	.open		= wp_bri_zap_open,
++	.close		= wp_bri_zap_close,
++	.ioctl		= wp_bri_zap_ioctl,
++	.watchdog	= wp_bri_zap_watchdog,
++	.echocan_create = wp_tdmv_bri_hwec_create
++};
+ 
+ static int wp_tdmv_bri_software_init(wan_tdmv_t *wan_tdmv)
+ {
+@@ -585,7 +604,6 @@
+ 		//wr->rxsig_state[x] = ZT_RXSIG_INITIAL;
+ 	}/* for() */
+ 
+-	wr->span.pvt		= wr;
+ #ifdef DAHDI_ISSUES
+ 	wr->span.chans		= wr->chans_ptrs;
+ #else
+@@ -594,21 +612,10 @@
+ 	wr->span.channels	= MAX_BRI_TIMESLOTS;/* this is the number of b-chans (2) and the d-chan on one BRI line. */;
+ 	wr->span.linecompat	= ZT_CONFIG_AMI | ZT_CONFIG_CCS; /* <--- this is really BS */
+ 
+-	wr->span.open		= wp_bri_zap_open;
+-	wr->span.close		= wp_bri_zap_close;
++	wr->span.ops		= &wp_tdmv_bri_span_ops;
+ 
+ 	//wr->span.flags	= ZT_FLAG_RBS;
+ 
+-	wr->span.ioctl		= wp_bri_zap_ioctl;
+-	wr->span.watchdog	= wp_bri_zap_watchdog;
+-	/* Set this pointer only if card has hw echo canceller module */
+-	if (card->wandev.ec_dev){
+-#ifdef DAHDI_22
+-		wr->span.echocan_create = wp_tdmv_bri_hwec_create;
+-#else
+-		wr->span.echocan = wp_bri_zap_hwec;
+-#endif
+-	}
+ #if defined(__LINUX__)
+ 	init_waitqueue_head(&wr->span.maintq);
+ #endif
+--- wanpipe-3.5.15/patches/kdrivers/src/net/sdla_remora_tdmv.c.orig	2010-09-14 01:00:35.915219698 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/sdla_remora_tdmv.c	2010-09-14 01:03:45.464829408 +0200
+@@ -448,8 +448,10 @@
+ static int wp_remora_zap_watchdog(struct zt_span *span, int event)
+ {
+ #if 0
++	wp_tdmv_remora_t *wr = container_of(span, wp_tdmv_remora_t, span);
++
+ 	printk("TDM: Restarting DMA\n");
+-	wctdm_restart_dma(span->pvt);
++	wctdm_restart_dma(wr);
+ #endif
+ 	return 0;
+ }
+@@ -478,6 +480,9 @@
+ 	WAN_ASSERT2(wr->card == NULL, -ENODEV);
+ 	card = wr->card;
+ 
++	/* card has no echo canceller module */
++	if (!(wr->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
+ 	
+ 	if (ecp->param_count > 0) {
+ 		DEBUG_TDMV("[TDMV] Wanpipe echo canceller does not support parameters; failing request\n");
+@@ -569,6 +574,9 @@
+ 	WAN_ASSERT2(wr->card == NULL, -ENODEV);
+ 	card = wr->card;
+ 
++	/* card has no echo canceller module */
++	if (!(wr->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
+ 
+ 	if (enable) {
+ 		wan_set_bit(chan->chanpos-1,&card->wandev.rtp_tap_call_map);
+@@ -670,6 +678,17 @@
+ 	return 0;		
+ }
+ 
++static const struct dahdi_span_ops wp_tdmv_remora_span_ops = {
++	.owner		= THIS_MODULE,
++	.hooksig	= wp_remora_zap_hooksig,
++	.open		= wp_remora_zap_open,
++	.close		= wp_remora_zap_close,
++	.ioctl		= wp_remora_zap_ioctl,
++	.watchdog	= wp_remora_zap_watchdog,
++	.chanconfig 	= wp_remora_chanconfig,
++	.echocan_create = wp_tdmv_remora_hwec_create
++};
++
+ static int wp_tdmv_remora_software_init(wan_tdmv_t *wan_tdmv)
+ {
+ 	sdla_t			*card = NULL;
+@@ -746,7 +765,6 @@
+ 			num++;
+ 		}
+ 	}
+-	wr->span.pvt = wr;
+ #ifdef DAHDI_ISSUES
+ #ifdef DAHDI_23
+         wr->span.owner          = THIS_MODULE;
+@@ -755,24 +773,11 @@
+ #else
+ 	wr->span.chans		= wr->chans;
+ #endif
++	wr->span.ops		= &wp_tdmv_remora_span_ops;
++
+ 	wr->span.channels	= num/*wr->max_timeslots*/;
+-	wr->span.hooksig	= wp_remora_zap_hooksig;
+-	wr->span.open		= wp_remora_zap_open;
+-	wr->span.close		= wp_remora_zap_close;
+ 	wr->span.flags		= ZT_FLAG_RBS;
+-	wr->span.ioctl		= wp_remora_zap_ioctl;
+-	wr->span.watchdog	= wp_remora_zap_watchdog;
+-
+-	wr->span.chanconfig 	= wp_remora_chanconfig;
+ 
+-	/* Set this pointer only if card has hw echo canceller module */
+-	if (wr->hwec == WANOPT_YES && card->wandev.ec_dev){
+-#ifdef DAHDI_22
+-		wr->span.echocan_create = wp_tdmv_remora_hwec_create;
+-#else
+-		wr->span.echocan = wp_remora_zap_hwec;
+-#endif
+-	}
+ 
+ #if defined(__LINUX__)
+ 	init_waitqueue_head(&wr->span.maintq);
+--- wanpipe-3.5.15/patches/kdrivers/src/net/sdla_tdmv.c.orig	2010-09-14 01:00:35.918219344 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/sdla_tdmv.c	2010-09-14 01:04:59.209127598 +0200
+@@ -1096,6 +1096,23 @@
+ **
+ */
+ 
++static const struct dahdi_span_ops wp_tdmv_span_ops = {
++	.owner = THIS_MODULE,
++	.spanconfig = wp_tdmv_spanconfig,
++	.chanconfig = wp_tdmv_chanconfig,
++	.startup = wp_tdmv_startup,
++	.shutdown = wp_tdmv_shutdown,
++	.rbsbits = wp_tdmv_rbsbits,
++	.maint = wp_tdmv_maint,
++	.open = wp_tdmv_open,
++	.close = wp_tdmv_close,
++	.ioctl = wp_tdmv_ioctl,
++	.echocan_create = wp_tdmv_hwec_create,
++#if defined(CONFIG_PRODUCT_WANPIPE_TDM_VOICE_DCHAN) && defined(CONFIG_PRODUCT_WANPIPE_TDM_VOICE_DCHAN_ZAPTEL)
++	.hdlc_hard_xmit = wp_tdmv_tx_hdlc_hard
++#endif
++};
++
+ /******************************************************************************
+ ** wp_tdmv_software_init() - 
+ **
+@@ -1134,15 +1151,8 @@
+ #ifdef DAHDI_ISSUES
+ 	sdla_get_location(card->hw, wp->span.location, sizeof(wp->span.location));
+ #endif
++	wp->span.ops = &wp_tdmv_span_ops;
+ 
+-	wp->span.spanconfig = wp_tdmv_spanconfig;
+-	wp->span.chanconfig = wp_tdmv_chanconfig;
+-	wp->span.startup = wp_tdmv_startup;
+-	wp->span.shutdown = wp_tdmv_shutdown;
+-	wp->span.rbsbits = wp_tdmv_rbsbits;
+-	wp->span.maint = wp_tdmv_maint;
+-	wp->span.open = wp_tdmv_open;
+-	wp->span.close = wp_tdmv_close;
+ 	wp->span.channels = wp->max_timeslots;
+ #ifdef DAHDI_ISSUES
+ #ifdef DAHDI_23
+@@ -1154,24 +1164,6 @@
+ #endif
+ 	wp->span.flags = ZT_FLAG_RBS;
+ 
+-	wp->span.ioctl = wp_tdmv_ioctl;
+-	/* Set this pointer only if card has hw echo canceller module */
+-	if (wp->hwec == WANOPT_YES && card->wandev.ec_dev){
+-		/* Initialize it only if HWEC option is enabled */
+-#ifdef DAHDI_22
+-		wp->span.echocan_create = wp_tdmv_hwec_create;
+-#else
+-		wp->span.echocan = wp_tdmv_hwec;
+-#endif
+-	}
+-#if defined(CONFIG_PRODUCT_WANPIPE_TDM_VOICE_DCHAN) && defined(CONFIG_PRODUCT_WANPIPE_TDM_VOICE_DCHAN_ZAPTEL)
+-	if (wp->dchan_map){
+-		DEBUG_EVENT("%s: Enable Zaptel HW DCHAN interface\n",
+-				wp->devname);
+-		wp->span.hdlc_hard_xmit = wp_tdmv_tx_hdlc_hard;
+-	}
+-#endif
+-	wp->span.pvt = wp;
+ 	if (wp->ise1){
+ 		wp->span.deflaw = ZT_LAW_ALAW;
+ 		card->fe.fe_cfg.tdmv_law = WAN_TDMV_ALAW;
+@@ -1284,8 +1276,7 @@
+ 	int			i;
+ 
+ 	WAN_ASSERT2(span == NULL, -ENODEV);
+-	WAN_ASSERT2(span->pvt == NULL, -ENODEV);
+-	wp		= span->pvt;
++	wp		= container_of(span, wp_tdmv_softc_t, span);
+ 
+ 	/* initialize the start value for the entire chunk of last ec buffer */
+ 	for(i = 0; i < span->channels; i++){
+@@ -1322,8 +1313,7 @@
+ 	wan_smp_flag_t		flags;
+ 
+ 	WAN_ASSERT2(span == NULL, -ENODEV);
+-	WAN_ASSERT2(span->pvt == NULL, -ENODEV);
+-	wp		= span->pvt;
++	wp		= container_of(span, wp_tdmv_softc_t, span);
+ 	wan_clear_bit(WP_TDMV_RUNNING, &wp->flags);
+ 	wan_spin_lock_irq(&wp->lockirq, &flags);
+ 	span->flags &= ~ZT_FLAG_RUNNING;
+@@ -1338,14 +1328,13 @@
+ */
+ static int wp_tdmv_maint(struct zt_span *span, int cmd)
+ {
+-	wp_tdmv_softc_t	*wp = span->pvt;
++	wp_tdmv_softc_t	*wp = NULL;
+ 	sdla_t		*card = wp->card;
+ 	int		res = 0;
+ 	wan_smp_flag_t	flags;
+ 	
+ 	WAN_ASSERT2(span == NULL, -ENODEV);
+-	WAN_ASSERT2(span->pvt == NULL, -ENODEV);
+-	wp		= span->pvt;
++	wp		= container_of(span, wp_tdmv_softc_t, span);;
+ 	wan_spin_lock_irq(&wp->lockirq, &flags);
+ 	if (wp->ise1) {
+ #if 0
+@@ -1561,8 +1550,7 @@
+ 	wan_smp_flag_t smp_flags;
+ 
+ 	WAN_ASSERT2(span == NULL, -ENODEV);
+-	WAN_ASSERT2(span->pvt == NULL, -ENODEV);
+-	wp		= span->pvt;
++	wp		= container_of(span, wp_tdmv_softc_t, span);
+ 	card = (sdla_t*)wp->card;
+ 	DEBUG_TDMV("%s: Configuring span device..\n", wp->devname);
+ 	switch(wp->lcode){
+@@ -2134,6 +2122,10 @@
+ 	wp_tdmv_softc_t	*wp = NULL;
+ 	sdla_t *card = NULL;
+ 	int	err = -EINVAL;
++
++	/* card has no echo canceller module */
++	if (!(wp->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
+ 	
+ 	if (ecp->param_count > 0) {
+ 		DEBUG_TDMV("[TDMV] Wanpipe echo canceller does not support parameters; failing request\n");
+@@ -2230,6 +2222,10 @@
+ 	WAN_ASSERT2(wp->card == NULL, -ENODEV);
+ 	card = wp->card;
+ 
++	/* card has no echo canceller module */
++	if (!(wp->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
++
+ 	if (enable) {
+ 		wan_set_bit(chan->chanpos-1,&card->wandev.rtp_tap_call_map);
+ 		wp_fax_tone_timeout_set(wp, chan->chanpos-1);
+@@ -2476,6 +2472,9 @@
+ 	wp	= chan->pvt;
+ 	WAN_ASSERT_VOID(wp->dchan_dev == NULL);
+ 
++	if (!wp->dchan_map)
++		return;
++
+ 	size = chan->writen[chan->outwritebuf] - chan->writeidx[chan->outwritebuf]-2;
+ 	if (!size) {
+      /* Do not transmit zero length frame */
+--- wanpipe-3.5.15/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c.orig	2010-09-14 01:00:35.921218989 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c	2010-09-14 01:06:29.864436909 +0200
+@@ -539,8 +539,10 @@
+ static int wp_remora_zap_watchdog(struct zt_span *span, int event)
+ {
+ #if 0
++	wp_usb_tdmv_remora_t *wr = container_of(span, wp_usb_tdmv_remora_t, span);
++
+ 	printk("TDM: Restarting DMA\n");
+-	wctdm_restart_dma(span->pvt);
++	wctdm_restart_dma(wr);
+ #endif
+ 	return 0;
+ }
+@@ -571,6 +573,9 @@
+ 	WAN_ASSERT2(wr->card == NULL, -ENODEV);
+ 	card = wr->card;
+ 
++	/* card has no echo canceller module */
++	if (!(wr->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
+ 	
+ 	if (ecp->param_count > 0) {
+ 		DEBUG_TDMV("[TDMV] Wanpipe echo canceller does not support parameters; failing request\n");
+@@ -656,6 +661,10 @@
+ 	WAN_ASSERT2(wr->card == NULL, -ENODEV);
+ 	card = wr->card;
+ 
++	/* card has no echo canceller module */
++	if (!(wr->hwec == WANOPT_YES && card->wandev.ec_dev))
++		return -ENODEV;
++
+ 	if (enable) {
+ 		wan_set_bit(chan->chanpos-1, &card->wandev.rtp_tap_call_map);
+ 	} else {
+@@ -1147,6 +1156,16 @@
+ 	return 0;
+ }
+ 
++static const struct dahdi_span_ops wp_usb_tdmv_span_ops = {
++	.owner		= THIS_MODULE,
++	.hooksig	= wp_remora_zap_hooksig,
++	.open		= wp_remora_zap_open,
++	.close		= wp_remora_zap_close,
++	.ioctl		= wp_remora_zap_ioctl,
++	.watchdog	= wp_remora_zap_watchdog,
++	.echocan_create = wp_usb_tdmv_remora_hwec_create
++};
++
+ static int wp_usb_tdmv_remora_software_init(wan_tdmv_t *wan_tdmv)
+ {
+ 	sdla_t			*card = NULL;
+@@ -1237,27 +1256,16 @@
+ 			num++;
+ 		}
+ 	}
+-	wr->span.pvt = wr;
+ #ifdef DAHDI_ISSUES
+ 	wr->span.chans		= wr->chans_ptrs;
+ #else
+ 	wr->span.chans		= wr->chans;
+ #endif
+ 	wr->span.channels	= num/*wr->max_timeslots*/;
+-	wr->span.hooksig	= wp_remora_zap_hooksig;
+-	wr->span.open		= wp_remora_zap_open;
+-	wr->span.close		= wp_remora_zap_close;
+ 	wr->span.flags		= ZT_FLAG_RBS;
+-	wr->span.ioctl		= wp_remora_zap_ioctl;
+-	wr->span.watchdog	= wp_remora_zap_watchdog;
+-	/* Set this pointer only if card has hw echo canceller module */
+-	if (wr->hwec == WANOPT_YES && card->wandev.ec_dev){
+-#ifdef DAHDI_22
+-		wr->span.echocan_create = wp_usb_tdmv_remora_hwec_create;
+-#else
+-		wr->span.echocan = wp_remora_zap_hwec;
+-#endif
+-	}
++
++	wr->span.ops		= &wp_usb_tdmv_span_ops;
++
+ #if defined(__LINUX__)
+ 	init_waitqueue_head(&wr->span.maintq);
+ #endif
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.15-linux-2.6.36.patch b/net-misc/wanpipe/files/wanpipe-3.5.15-linux-2.6.36.patch
new file mode 100644
index 0000000..a5c3876
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.15-linux-2.6.36.patch
@@ -0,0 +1,142 @@
+Experimental 2.6.36 support patch for wanpipe-3.5.15
+
+NOTE: naive unlocked_ioctl conversion, still need to check
+      if we need (additional) locking in the wan*_ioctl functions
+      to protect from race conditions
+
+--- wanpipe-3.5.15/patches/kdrivers/src/wanrouter/wanproc.c.orig	2010-08-28 18:14:44.211974672 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/wanrouter/wanproc.c	2010-08-28 18:14:47.250940409 +0200
+@@ -292,7 +292,11 @@ static struct file_operations wandev_fop
+ 	.read	 = seq_read,
+ 	.llseek	 = seq_lseek,
+ 	.release = single_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++	.unlocked_ioctl	 = wanrouter_ioctl,
++#else
+ 	.ioctl	 = wanrouter_ioctl,
++#endif
+ };
+ 
+ static int wp_hwprobe_open(struct inode *inode, struct file *file)
+--- wanpipe-3.5.15/patches/kdrivers/src/wanrouter/wanmain.c.orig	2010-08-28 18:14:44.216974615 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/wanrouter/wanmain.c	2010-08-28 18:14:47.253940376 +0200
+@@ -527,8 +527,13 @@ unsigned short wanrouter_type_trans (str
+  *	o execute requested action or pass command to the device driver
+  */
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++int wanrouter_ioctl(struct file *file,
++		unsigned int cmd, unsigned long arg)
++#else
+ int wanrouter_ioctl(struct inode *inode, struct file *file,
+ 		unsigned int cmd, unsigned long arg)
++#endif
+ {
+ 	int err = 0;
+ 	struct proc_dir_entry *dent;
+@@ -540,7 +545,11 @@ int wanrouter_ioctl(struct inode *inode,
+ 		return -EINVAL;
+ 	}
+ 		
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++	dent = WP_PDE(file->f_dentry->d_inode);
++#else
+ 	dent = WP_PDE(inode);
++#endif
+ 	if ((dent == NULL) || (dent->data == NULL)){
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ 		DEBUG_EVENT("%s: Invalid dent\n",
+--- wanpipe-3.5.15/patches/kdrivers/src/net/wanpipe_cdev_linux.c.orig	2010-08-28 18:14:44.219974582 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/net/wanpipe_cdev_linux.c	2010-08-28 18:14:47.255940354 +0200
+@@ -121,7 +121,11 @@ static struct file_operations wp_cdev_fo
+ 	llseek: NULL,
+ 	open: wp_cdev_open,
+ 	release: wp_cdev_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++	unlocked_ioctl: wp_cdev_ioctl,
++#else
+ 	ioctl: wp_cdev_ioctl,
++#endif
+ 	read: wp_cdev_read,
+ 	write: wp_cdev_write,
+ 	poll: wp_cdev_poll,
+@@ -779,7 +783,11 @@ static ssize_t wp_cdev_write(struct file
+ }
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ static int wp_cdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
++#else
++static int wp_cdev_ioctl(struct file *file, unsigned int cmd, unsigned long data)
++#endif
+ {
+ 	wanpipe_cdev_t *cdev;
+ 	int err=-EINVAL;
+--- wanpipe-3.5.15/patches/kdrivers/include/wanpipe_wanrouter.h.orig	2010-08-28 18:15:06.810719887 +0200
++++ wanpipe-3.5.15/patches/kdrivers/include/wanpipe_wanrouter.h	2010-08-28 18:16:44.020623909 +0200
+@@ -440,7 +440,11 @@ extern int wanpipe_lip_get_if_status(voi
+ unsigned short wanrouter_type_trans(struct sk_buff *skb, netdevice_t *dev);
+ int wanrouter_encapsulate(struct sk_buff *skb, netdevice_t *dev,unsigned short type);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++extern int wanrouter_ioctl( struct file *file, unsigned int cmd, unsigned long arg);
++#else
+ extern int wanrouter_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
++#endif
+ /* Proc interface functions. These must not be called by the drivers! */
+ extern int wanrouter_proc_init(void);
+ extern void wanrouter_proc_cleanup(void);
+--- wanpipe-3.5.15/patches/kdrivers/wanec/wanec_dev.c.orig	2010-08-28 18:14:44.226974503 +0200
++++ wanpipe-3.5.15/patches/kdrivers/wanec/wanec_dev.c	2010-08-28 18:14:47.258940318 +0200
+@@ -92,8 +92,12 @@ static int wanec_dev_release(struct inod
+ #if defined(__WINDOWS__)
+ int wanec_dev_ioctl(void *data, char *card_devname);
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++static int wanec_dev_ioctl(struct file*, unsigned int, unsigned long);
++#else
+ static int wanec_dev_ioctl(struct inode*, struct file*, unsigned int, unsigned long);
+ #endif
++#endif
+ 
+ #if !defined(__WINDOWS__)
+ /*==============================================================
+@@ -104,7 +108,11 @@ static struct file_operations wanec_dev_
+ 	llseek: NULL,
+ 	open: wanec_dev_open,
+ 	release: wanec_dev_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++	unlocked_ioctl: wanec_dev_ioctl,
++#else
+ 	ioctl: wanec_dev_ioctl,
++#endif
+ 	read: NULL,
+ 	write: NULL,
+ 	poll: NULL,
+@@ -244,8 +252,13 @@ int wanec_dev_ioctl(void *data, char *ca
+ }
+ #else
+ extern int wanec_ioctl(unsigned int, void*);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++static int wanec_dev_ioctl(struct file *file,
++		      unsigned int cmd, unsigned long data)
++#else
+ static int wanec_dev_ioctl(struct inode *inode, struct file *file,
+ 		      unsigned int cmd, unsigned long data)
++#endif
+ {
+ 	if (data == 0){
+ 		return -EINVAL;
+--- wanpipe-3.5.15/patches/kdrivers/src/wanrouter/af_wanpipe_src.c.orig	2010-08-28 18:29:26.722913927 +0200
++++ wanpipe-3.5.15/patches/kdrivers/src/wanrouter/af_wanpipe_src.c	2010-08-28 18:30:10.128416963 +0200
+@@ -1516,7 +1516,9 @@
+  *      Crates AF_WANPIPE socket.
+  *===========================================================*/
+ 
+-#ifdef LINUX_FEAT_2624 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
++int wanpipe_create(struct net *net, struct socket *sock, int protocol, int kern)
++#elif defined(LINUX_FEAT_2624)
+ int wanpipe_create(struct net *net, struct socket *sock, int protocol)
+ #else
+ int wanpipe_create(struct socket *sock, int protocol)
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.16-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.16-Makefile.patch
new file mode 100644
index 0000000..38307c7
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.16-Makefile.patch
@@ -0,0 +1,51 @@
+--- wanpipe-3.5.16/Makefile.orig	2010-09-24 18:59:57.000000000 +0200
++++ wanpipe-3.5.16/Makefile	2010-10-07 00:50:41.248451275 +0200
+@@ -199,13 +199,13 @@
+ 
+ 
+ #Build only kernel modules
+-all_kmod_dahdi:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_dahdi:  _checkzap _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(DAHDI_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules  
+ 
+-all_kmod:  _checksrc _cleanoldwanpipe _check_kver
++all_kmod:  _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR= ZAPHDLC= HOMEDIR=$(PWD) modules  
+ 
+-all_kmod_ss7: _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_ss7: _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ss7_build_dir ]; then \
+ 		rm -rf $(PWD)/ss7_build_dir; \
+ 	fi
+@@ -213,7 +213,7 @@
+ 	./Setup drivers --builddir=$(PWD)/ss7_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=AFT_TE1-XMTP2 --no-zaptel-compile --noautostart --arch=$(WARCH) --silent
+ 	@eval "./patches/copy_modules.sh $(PWD)/ss7_build_dir $(WAN_DIR)"  
+ 
+-all_bin_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_bin_kmod:  _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ast_build_dir ]; then \
+ 		rm -rf $(PWD)/ast_build_dir; \
+ 	fi
+@@ -223,7 +223,7 @@
+ 
+ 
+ #Clean utilites and kernel modules
+-clean: cleanup_local  clean_util _cleanoldwanpipe
++clean: cleanup_local  clean_util
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
+ 	$(MAKE) -C api SUBDIRS=$(WAN_DIR) clean
+ 	@find patches/kdrivers -name '.*.cmd' | xargs rm -f
+@@ -343,12 +343,10 @@
+         echo "install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}"; \
+         install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}; \
+     fi
+-	@eval "./patches/rundepmod.sh"	
+-	
+ endif
+ 
+ #Compile utilities only
+-all_util:  install_inc
++all_util:
+ 	$(MAKE) -C util all EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I $(PWD)/api/libsangoma/include" CC=$(CC) \
+ 	PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(WARCH) 
+ 	$(MAKE) -C util all_wancfg EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I$(PWD)/api/libsangoma/include" CC=$(CC) \
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-format-literal-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-format-literal-warnings.patch
new file mode 100644
index 0000000..7f3eb8c
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-format-literal-warnings.patch
@@ -0,0 +1,605 @@
+diff -Naurp wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c wanpipe-3.5.10/util/lxdialog/lxdialog.c
+--- wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/lxdialog/lxdialog.c	2010-03-14 01:11:50.958063750 +0000
+@@ -240,7 +240,7 @@ j_inputbox (const char *t, int ac, const
+     int ret = dialog_inputbox (t, av[2], atoi (av[3]), atoi (av[4]),
+                             ac == 6 ? av[5] : (char *) NULL);
+     if (ret == 0)
+-        fprintf(stderr, (char*)dialog_input_result);
++        fprintf(stderr, "%s", (char*)dialog_input_result);
+     return ret;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp	2010-03-14 01:45:40.372313586 +0000
+@@ -1624,7 +1624,7 @@ int conf_file_reader::read_interfaces_se
+ 
+     //use copy of the name because 'strstr()' inserts nulls and it
+     //will break things.
+-    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, token[0]); 
++    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, "%s", token[0]); 
+     
+     if(parent_dev_name != NULL){
+ 	    
+@@ -1661,8 +1661,8 @@ int conf_file_reader::read_interfaces_se
+     chandef = &list_el_chan_def->data;
+     chanconf = chandef->chanconf;
+ 
+-    snprintf(chandef->name, WAN_IFNAME_SZ, token[0]);
+-    snprintf(chandef->addr, MAX_ADDR_STR_LEN, token[2]);
++    snprintf(chandef->name, WAN_IFNAME_SZ, "%s", token[0]);
++    snprintf(chandef->addr, MAX_ADDR_STR_LEN, "%s", token[2]);
+    
+     //NOTE: 'atoi()' returns zero if it failes AND if number
+     //is actually zero.
+@@ -1873,7 +1873,7 @@ int conf_file_reader::set_conf_param (ch
+ 
+     if(strcmp(key, "FIRMWARE") == 0){
+       Debug(DBG_CONF_FILE_READER, ("file name: %s\n", val));
+-      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, val);
++      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, "%s", val);
+     }
+     return 0;
+   }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp wanpipe-3.5.10/util/wancfg/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/cpp_string.cpp	2010-03-14 01:42:53.133063682 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strlcpy(cstr, tmp, MAX_STR);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/main.cpp wanpipe-3.5.10/util/wancfg/main.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/main.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/main.cpp	2010-03-14 01:30:55.980090540 +0000
+@@ -1410,8 +1410,7 @@ void err_printf(char* format, ...)
+   vsnprintf(dbg_tmp_buff, LEN_OF_DBG_BUFF, format, ap);
+   va_end(ap);
+ 
+-  printf(dbg_tmp_buff);
+-  printf("\n");
++  puts(dbg_tmp_buff);
+ }
+ 
+ /*
+@@ -1664,7 +1663,7 @@ void tokenize_string(char* input_buff, c
+ 
+   while(p != NULL){
+     //printf(p);
+-    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), p);
++    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), "%s", p);
+     p = strtok(NULL, delimeter_str);
+   }
+   Debug(DBG_WANCFG_MAIN, ("\ntokenized str: %s\n", output_buff));
+@@ -2085,7 +2084,7 @@ char* replace_numeric_with_char(char* st
+ 	unsigned int original_len = strlen(str);
+ 	static char new_str[1024];
+ 		
+-	snprintf(new_str, 1024, str);
++	snprintf(new_str, 1024, "%s", str);
+ 		
+ 	for(i=0; i < original_len; i++){
+ 
+@@ -2152,7 +2151,7 @@ void cleanup()
+ 
+   //remove 'date_and_time_file_name' file
+   snprintf(command_line, MAX_PATH_LENGTH, "rm -rf ");
+-  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line),
++  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line), "%s",
+ 		 date_and_time_file_name);
+   system(command_line);
+ }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp	2010-03-14 01:49:29.238063542 +0000
+@@ -475,7 +475,7 @@ int menu_adsl_advanced_cfg::
+   unsigned int int_tmp;
+   
+ again:
+-  snprintf(explanation_text, MAX_PATH_LENGTH, prompt_text);
++  snprintf(explanation_text, MAX_PATH_LENGTH, "%s", prompt_text);
+   if(is_hexadecimal == NO){
+     snprintf(initial_text, MAX_PATH_LENGTH, "%u", *initial_value);
+   }else{
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp	2010-03-14 01:23:07.548063423 +0000
+@@ -230,7 +230,7 @@ show_analog_chan_input_box:
+       switch(*selection_index)
+       {
+       case INPUT_BOX_BUTTON_OK:
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, input_bx.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", input_bx.get_lxdialog_output_string());
+ 
+         str_tolower(tmp_buff);
+       
+@@ -243,7 +243,7 @@ show_analog_chan_input_box:
+ 		if(chan >= 1 && chan <= MAX_FXOFXS_CHANNELS){
+           		logical_ch_cfg->data.chanconf->active_ch = chan;
+ 			snprintf(logical_ch_cfg->data.active_channels_string,
+-					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, tmp_buff);
++					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", tmp_buff);
+ 		}else{
+ 			tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, "Invalid input: %s!",
+ 				input_bx.get_lxdialog_output_string());
+@@ -270,7 +270,7 @@ show_analog_chan_input_box:
+         switch(*selection_index)
+         {
+         case INPUT_BOX_BUTTON_OK:
+-          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+                 act_channels_ip.get_lxdialog_output_string());
+ 
+           logical_ch_cfg->data.chanconf->active_ch = act_channels_ip.active_ch;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp	2010-03-14 01:28:51.172188232 +0000
+@@ -459,7 +459,7 @@ show_firmware_path_input_box:
+         Debug(DBG_MENU_DEVICE_MISCELLANEOUS_OPTIONS,
+           ("firmware path on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH,
++        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2010-03-14 01:20:32.838063458 +0000
+@@ -689,7 +689,7 @@ If this option is used, TE1 Clock MUST b
+ 		switch(*selection_index)
+ 		{
+ 		case INPUT_BOX_BUTTON_OK:
+-		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+ 				act_channels_ip.get_lxdialog_output_string());
+ 
+ 		  break;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp	2010-03-14 01:48:51.406063789 +0000
+@@ -266,14 +266,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -307,14 +307,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -349,14 +349,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -451,14 +451,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp	2010-03-14 01:25:29.673063441 +0000
+@@ -447,7 +447,7 @@ WAN_IFNAME_SZ
+ );
+           goto show_if_name_input_box;
+         }else{
+-          snprintf(chandef->name, WAN_IFNAME_SZ, inb.get_lxdialog_output_string());
++          snprintf(chandef->name, WAN_IFNAME_SZ, "%s", inb.get_lxdialog_output_string());
+           //list_el_chan_def->data.name
+           Debug(DBG_MENU_NET_INTERFACE_SETUP,("menu_net_interface_setup: chan_def: %p\n", chandef));
+         }
+@@ -830,7 +830,7 @@ show_hwec_map_input_box:
+       {
+       case INPUT_BOX_BUTTON_OK:
+ 	snprintf(chandef->active_hwec_channels_string,
+-		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, inb.get_lxdialog_output_string());
++		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", inb.get_lxdialog_output_string());
+ 	break;
+ 
+       case INPUT_BOX_BUTTON_HELP:
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp	2010-03-14 01:24:59.186063452 +0000
+@@ -336,7 +336,7 @@ show_user_id_input_box:
+           goto show_user_id_input_box;
+         }
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.userid,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -382,7 +382,7 @@ show_password_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.passwd,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,7 +427,7 @@ show_sysname_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.sysname,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp	2010-03-14 01:46:49.184063542 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.gateway: %s\n",
+           if_config.gateway));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/text_box_help.h wanpipe-3.5.10/util/wancfg/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wancfg/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/text_box_help.h	2010-03-14 01:45:59.729063764 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c wanpipe-3.5.10/util/wanconfig/wanconfig.c
+--- wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c	2009-11-16 22:50:30.000000000 +0000
++++ wanpipe-3.5.10/util/wanconfig/wanconfig.c	2010-03-14 01:14:48.999189553 +0000
+@@ -1935,7 +1935,7 @@ void show_help(void) {
+  * Show usage text
+  */
+ void show_usage(void) {
+-	fprintf(stderr, usagetext);
++	fputs(usagetext, stderr);
+ 	exit(1);
+ }
+ 
+@@ -1987,7 +1987,7 @@ int gencat (char *filename) 
+ 	}
+ 	
+ 	while(fgets(buf, sizeof(buf) -1, file)) {
+-		printf(buf);
++		printf("%s", buf);
+ 	}	
+ 
+ 	fclose(file);
+@@ -5079,7 +5079,7 @@ void update_adsl_vci_vpi_list(wan_adsl_v
+ 		if (buf[0] != '#'){
+ 			break;
+ 		}else{
+-			fprintf(tmp_file, buf);
++			fprintf(tmp_file, "%s", buf);
+ 		}
+ 	}	
+ 	for(x = 0; x < vcivpi_num; x++){
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp wanpipe-3.5.10/util/wanctl/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/cpp_string.cpp	2010-03-14 01:18:14.224313496 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strcpy(cstr, tmp);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp	2010-03-14 01:28:29.733080770 +0000
+@@ -252,14 +252,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -293,14 +293,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -335,14 +335,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,14 +427,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp	2010-03-14 01:23:55.514313075 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/text_box_help.h wanpipe-3.5.10/util/wanctl/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wanctl/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/text_box_help.h	2010-03-14 01:24:16.425313082 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c wanpipe-3.5.10/util/wanpipemon/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c	2009-11-16 22:50:37.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon/prot_trace.c	2010-03-14 01:16:31.331063406 +0000
+@@ -1805,8 +1805,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c	2010-03-14 01:16:42.435063486 +0000
+@@ -1731,8 +1731,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..5842320
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.16-QA-fix-parallel-make.patch
@@ -0,0 +1,265 @@
+--- wanpipe-3.5.16/util/Makefile.orig	2010-09-14 01:17:11.000000000 +0200
++++ wanpipe-3.5.16/util/Makefile	2010-10-07 00:55:04.331623918 +0200
+@@ -14,63 +14,63 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.16-dahdi-location.patch b/net-misc/wanpipe/files/wanpipe-3.5.16-dahdi-location.patch
new file mode 100644
index 0000000..3255c39
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.16-dahdi-location.patch
@@ -0,0 +1,120 @@
+--- wanpipe-3.5.16/patches/kdrivers/src/net/sdla_bri_tdmv.c.orig	2010-09-14 00:41:55.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/net/sdla_bri_tdmv.c	2010-10-07 01:01:51.188381112 +0200
+@@ -555,6 +555,10 @@
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WPBRI/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- wanpipe-3.5.16/patches/kdrivers/src/net/sdla_remora_tdmv.c.orig	2010-09-14 00:41:57.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/net/sdla_remora_tdmv.c	2010-10-07 01:01:51.191380749 +0200
+@@ -729,6 +729,10 @@
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- wanpipe-3.5.16/patches/kdrivers/src/net/sdla_tdmv.c.orig	2010-10-04 23:50:19.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/net/sdla_tdmv.c	2010-10-07 01:04:00.484726844 +0200
+@@ -1135,7 +1135,7 @@
+ 	WAN_ASSERT(wp == NULL);
+ 	WAN_ASSERT(wp->card == NULL);
+ 	card = wp->card;
+-	
++
+ 	if (wan_test_bit(WP_TDMV_REGISTER, &wp->flags)){
+ 		DEBUG_EVENT("%s: Wanpipe device is already registered to Zaptel span # %d!\n", 
+ 					wp->devname, wp->span.spanno);
+@@ -1156,6 +1156,9 @@
+ 		sprintf(wp->span.name, "WPT1/%d", wp->num);
+ 	}
+ 	sprintf(wp->span.desc, "%s card %d", wp->devname, wp->num);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wp->span.location, sizeof(wp->span.location));
++#endif
+ 
+ #if defined(DAHDI_24) 
+     wp->span.ops = &wp_tdm_span_ops;
+--- wanpipe-3.5.16/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c.orig	2010-09-14 00:42:00.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c	2010-10-07 01:01:51.198379902 +0200
+@@ -1197,6 +1197,10 @@
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- wanpipe-3.5.16/patches/kdrivers/include/sdladrv.h.orig	2010-06-23 23:19:47.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/include/sdladrv.h	2010-10-07 01:01:51.185381475 +0200
+@@ -793,8 +793,6 @@
+ WP_EXTERN int sdla_get_hwinfo(hardware_info_t *hwinfo, int card_no);
+ 
+ 
+-#ifdef __SDLADRV__
+-
+ static __inline unsigned int sdla_get_pci_bus(sdlahw_t* hw)
+ {
+ 	sdlahw_card_t	*hwcard;
+@@ -851,6 +849,48 @@
+ 	return 0;
+ }
+ 
++static __inline unsigned int sdla_get_location(sdlahw_t *hw, char *output, const int size)
++{
++	sdlahw_card_t	*hwcard;
++	sdlahw_cpu_t	*hwcpu;
++
++	WAN_ASSERT(hw == NULL);
++	WAN_ASSERT(hw->hwcpu == NULL);
++	hwcpu = hw->hwcpu;
++
++	WAN_ASSERT(hwcpu->hwcard == NULL);
++	hwcard = hwcpu->hwcard;
++
++	switch (hwcard->hw_type) {
++	case SDLA_PCI_CARD: /* PCI */
++		snprintf(output, size, "PCI Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_PCI_EXP_CARD: /* PCI Express */
++		snprintf(output, size, "PCI Express Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_ISA_CARD: /* ISA */
++		snprintf(output, size, "ISA IOPort 0x%03x", hwcard->u_isa.ioport);
++		output[size - 1] = '\0';
++		break;
++	case SDLA_USB_CARD: /* USB */
++#if defined(__LINUX__)
++		snprintf(output, size, "USB Bus %02d Device ID %02d",
++			 hwcard->u_usb.usb_dev->bus->busnum, hwcard->u_usb.usb_dev->devnum);
++		output[size - 1] = '\0';
++#endif
++		break;
++	default:
++		break;
++	}
++	return 0;
++}
++
++#ifdef __SDLADRV__
++
+ static __inline int 
+ sdla_bus_space_map(sdlahw_t* hw, int reg, int size, sdla_mem_handle_t* handle)
+ {
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.17-linux-2.6.37.patch b/net-misc/wanpipe/files/wanpipe-3.5.17-linux-2.6.37.patch
new file mode 100644
index 0000000..9ac7805
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.17-linux-2.6.37.patch
@@ -0,0 +1,14 @@
+--- wanpipe-3.5.17/work/wanpipe-3.5.17/patches/kdrivers/src/wanrouter/wanmain.c.orig	2010-11-01 22:22:16.278907705 +0100
++++ wanpipe-3.5.17/work/wanpipe-3.5.17/patches/kdrivers/src/wanrouter/wanmain.c	2010-11-01 22:21:42.685960077 +0100
+@@ -2144,9 +2144,9 @@
+ {
+ 	if (skb->dev){
+ 		struct net_device *dev=skb->dev;
+-		atomic_dec(&(dev)->refcnt);
++		dev_put(dev);
+ 		//printk(KERN_INFO "%s: Skb destructor: put dev: refcnt=%i\n",
+-		//		dev->name,atomic_read(&dev->refcnt));
++		//		dev->name, netdev_refcnt_read(dev));
+ 	}	
+ }
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.18-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.18-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..4ddf386
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.18-QA-fix-parallel-make.patch
@@ -0,0 +1,267 @@
+--- wanpipe-3.5.18/util/Makefile.orig	2010-09-14 01:17:11.000000000 +0200
++++ wanpipe-3.5.18/util/Makefile	2010-10-07 00:55:04.331623918 +0200
+@@ -14,64 +14,64 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.19-disable-ldconfig.patch b/net-misc/wanpipe/files/wanpipe-3.5.19-disable-ldconfig.patch
new file mode 100644
index 0000000..162a0c9
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.19-disable-ldconfig.patch
@@ -0,0 +1,13 @@
+--- wanpipe-3.5.19/Makefile.orig	2011-03-05 03:07:17.407897875 +0100
++++ wanpipe-3.5.19/Makefile	2011-03-05 03:20:42.944522969 +0100
+@@ -315,8 +315,8 @@ install: install_etc install_util instal
+ 	@if [ -e .all_lib ] ; then \
+ 		$(MAKE) -C api/libsangoma install DESTDIR=$(INSTALLPREFIX); \
+ 		$(MAKE) -C api/libstelephony install DESTDIR=$(INSTALLPREFIX); \
+-		ldconfig; \
+-    fi
++		#ldconfig; \
++	fi
+ 
+ 
+ #Install kernel modules only
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.20-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.20-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..234b8d4
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.20-QA-fix-parallel-make.patch
@@ -0,0 +1,265 @@
+--- wanpipe-3.5.20/util/Makefile.orig	2011-03-18 17:37:43.000000000 +0100
++++ wanpipe-3.5.20/util/Makefile	2011-04-19 22:45:30.285796459 +0200
+@@ -14,63 +14,63 @@ WAN_VIRTUAL=$(PREFIX)
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C ft1 all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C sdladump all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
+ 
+ install:
+-	make -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C ft1 install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.20-libstelephony-cleanup.patch b/net-misc/wanpipe/files/wanpipe-3.5.20-libstelephony-cleanup.patch
new file mode 100644
index 0000000..80b3884
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.20-libstelephony-cleanup.patch
@@ -0,0 +1,75 @@
+--- wanpipe-3.5.20/api/libstelephony/Makefile.am	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.20.17/api/libstelephony/Makefile.am	2011-05-24 23:10:51.000000000 +0200
+@@ -1,6 +1,6 @@
+  
+ WLINC=../../patches/kdrivers/include
+-WINC=$(DESTDIR)/usr/include/wanpipe
++WINC=/usr/include/wanpipe
+ 
+ AM_CFLAGS		= -fPIC -Wall -Wstrict-prototypes -Wmissing-prototypes -g -I$(WLINC) -I$(WINC)  -I. \
+ 	-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -O2 -D_DEBUG_=2 -D_GNUC_ -I../lib -Istel_tone 
+@@ -8,16 +8,13 @@ AM_CFLAGS		= -fPIC -Wall -Wstrict-protot
+ AM_CXXFLAGS		= -fPIC -Wall -g -I$(WLINC) -I$(WINC)  -I. \
+ 	-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -O2 -D_DEBUG_=2 -D_GNUC_ -I../lib  -Istel_tone
+ 
+-LIB_SOUCES		= libstelephony.cpp PToneDecoder.cpp PToneEncoder.cpp Q931EventsDecoder.cpp stelephony.cpp stel_tone/stel_tone.c stel_tone/wp_uart.c stel_tone/wp_libteletone_generate.c stel_tone/wp_libteletone_detect.c stel_tone/wp_fsk.c
+ 
++lib_LTLIBRARIES = libstelephony.la
++include_HEADERS = libstelephony.h 
+ 
+-library_includedir      = $(includedir)
+-library_include_HEADERS = libstelephony.h 
++libstelephony_la_SOURCES = libstelephony.cpp PToneDecoder.cpp PToneEncoder.cpp Q931EventsDecoder.cpp stelephony.cpp stel_tone/stel_tone.c stel_tone/wp_uart.c stel_tone/wp_libteletone_generate.c stel_tone/wp_libteletone_detect.c stel_tone/wp_fsk.c
+ 
+-lib_LTLIBRARIES         = libstelephony.la
+-libstelephony_la_CXXFLAGS    = $(AM_CXXFLAGS)
+-libstelephony_la_LDFLAGS   = -version-info @LIBSTELEPHONY_LT_CURRENT@:@LIBSTELEPHONY_LT_REVISION@:@LIBSTELEPHONY_LT_AGE@
+-libstelephony_la_SOURCES   = $(LIB_SOUCES)
++libstelephony_la_CFLAGS    = $(AM_CFLAGS)
++libstelephony_la_CXXFLAGS  = $(AM_CXXFLAGS)
++libstelephony_la_LDFLAGS   = -version-info 1:0:0
+ 
+-lib_LIBRARIES           = libstelephony.a
+-libstelephony_a_CXXFLAGS     = $(AM_CXXFLAGS)
+--- wanpipe-3.5.20/api/libstelephony/configure.in	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.20.17/api/libstelephony/configure.in	2011-05-24 23:06:13.000000000 +0200
+@@ -2,36 +2,18 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.59)
+-AC_INIT(libstelephony, 2.0.0, anthmct@yahoo.com)
+-AM_INIT_AUTOMAKE(libstelephony,2.0.0)
+-
+-LIBSTELEPHONY_LT_CURRENT=2  # interface 2
+-LIBSTELEPHONY_LT_REVISION=0 # first revision of this interface
+-LIBSTELEPHONY_LT_AGE=0      #not backwards compatible (0 previous interfaces are compatible)
+-
+-#AC_CONFIG_MACRO_DIR([m4])
+-
+-AC_SUBST(LIBSTELEPHONY_LT_CURRENT)
+-AC_SUBST(LIBSTELEPHONY_LT_REVISION)
+-AC_SUBST(LIBSTELEPHONY_LT_AGE)
++AC_INIT(libstelephony, 2.0.0)
++AC_CONFIG_HEADERS(config.h)
++AM_INIT_AUTOMAKE
+ 
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+-AC_CONFIG_HEADERS(config.h)
+ 
+-AC_CHECK_PROG(AR, ar, ar, no)
+ # Checks for libraries.
+-
+ AC_CHECK_HEADERS(fcntl.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h math.h)
+ 
+-AC_ARG_WITH(libpri,
+-	[  --with-libpri=<path> enable pri support],[libpripath="$withval"])
+-
+-AM_CONDITIONAL([LIBPRI],[test -d "$libpripath" ])
+-AC_SUBST([libpripath])
+-
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_TIME
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.20-linux-2.6.39.patch b/net-misc/wanpipe/files/wanpipe-3.5.20-linux-2.6.39.patch
new file mode 100644
index 0000000..ae989bb
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.20-linux-2.6.39.patch
@@ -0,0 +1,31 @@
+--- wanpipe-3.5.20/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c.orig	2011-06-30 18:24:41.115938712 +0200
++++ wanpipe-3.5.20/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c	2011-06-30 18:26:28.426083687 +0200
+@@ -71,7 +71,7 @@ HLIST_HEAD(wanpipe_parent_sklist);
+ #else
+ struct sock * wanpipe_parent_sklist = NULL;
+ #endif
+-static rwlock_t wanpipe_parent_sklist_lock = RW_LOCK_UNLOCKED;
++static DEFINE_RWLOCK(wanpipe_parent_sklist_lock);
+ 
+ static int wanpipe_check_prot_options(struct sock *sk);
+ void wanpipe_unbind_sk_from_parent(struct sock *sk);
+@@ -212,7 +212,7 @@ int wanpipe_bind_sk_to_parent(struct soc
+ 		PPRIV_INIT(parent_sk,buf);
+ 		memset(PPRIV(parent_sk),0,sizeof(wanpipe_parent_t));
+ 
+-		PPRIV(parent_sk)->lock = RW_LOCK_UNLOCKED; 
++		rwlock_init(&(PPRIV(parent_sk)->lock));
+ 
+ 		SK_PRIV(parent_sk)->dev=dev;
+ 
+--- wanpipe-3.5.20/patches/kdrivers/src/wanrouter/af_wanpipe_src.c.orig	2011-06-30 18:28:54.086569874 +0200
++++ wanpipe-3.5.20/patches/kdrivers/src/wanrouter/af_wanpipe_src.c	2011-06-30 18:29:25.701024888 +0200
+@@ -133,7 +133,7 @@ static struct proto packet_proto = {
+ static struct sock * wanpipe_sklist = NULL;
+ #endif
+ 
+-static rwlock_t wanpipe_sklist_lock = RW_LOCK_UNLOCKED;
++static DEFINE_RWLOCK(wanpipe_sklist_lock);
+ 
+ static atomic_t af_mem_alloc;
+ static atomic_t af_skb_alloc;
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.20-linux-3.0.patch b/net-misc/wanpipe/files/wanpipe-3.5.20-linux-3.0.patch
new file mode 100644
index 0000000..b944663
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.20-linux-3.0.patch
@@ -0,0 +1,11 @@
+--- wanpipe-3.5.20/samples/wanrouter.orig	2011-07-23 22:10:55.163731552 +0200
++++ wanpipe-3.5.20/samples/wanrouter	2011-07-23 22:11:16.105168258 +0200
+@@ -2263,7 +2263,7 @@
+ 				fi
+ 			else
+ 	
+-				uname -r | grep "^2.6.*" > /dev/null
++				uname -r | grep "^\(2.6\|3\).*" > /dev/null
+ 				if [ $? -eq 0 ]; then
+ 					if [ -d /lib/modules/$(uname -r)/kernel ]; then	
+ 						MOD1=/lib/modules/$(uname -r)/kernel/drivers/net/wan/sdladrv
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.22-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.22-Makefile.patch
new file mode 100644
index 0000000..76ed81d
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.22-Makefile.patch
@@ -0,0 +1,51 @@
+--- wanpipe-3.5.22/Makefile.orig	2011-08-22 21:33:18.000000000 +0200
++++ wanpipe-3.5.22/Makefile	2011-08-25 12:24:41.033237392 +0200
+@@ -199,13 +199,13 @@ cleanup_local:
+ 
+ 
+ #Build only kernel modules
+-all_kmod_dahdi:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_dahdi:  _checkzap _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(DAHDI_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules  
+ 
+-all_kmod:  _checksrc _cleanoldwanpipe _check_kver
++all_kmod:  _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR= ZAPHDLC= HOMEDIR=$(PWD) modules  
+ 
+-all_kmod_ss7: _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_ss7: _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ss7_build_dir ]; then \
+ 		rm -rf $(PWD)/ss7_build_dir; \
+ 	fi
+@@ -213,7 +213,7 @@ all_kmod_ss7: _checkzap _checksrc _clean
+ 	./Setup drivers --builddir=$(PWD)/ss7_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=AFT_TE1-XMTP2 --no-zaptel-compile --noautostart --arch=$(WARCH) --silent
+ 	@eval "./patches/copy_modules.sh $(PWD)/ss7_build_dir $(WAN_DIR)"  
+ 
+-all_bin_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_bin_kmod:  _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ast_build_dir ]; then \
+ 		rm -rf $(PWD)/ast_build_dir; \
+ 	fi
+@@ -224,7 +224,7 @@ all_bin_kmod:  _checkzap _checksrc _clea
+ 
+ #Clean utilites and kernel modules
+ .PHONY: clean
+-clean: cleanup_local  clean_util _cleanoldwanpipe
++clean: cleanup_local  clean_util
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
+ 	$(MAKE) -C api SUBDIRS=$(WAN_DIR) clean
+ 	@find patches/kdrivers -name '.*.cmd' | xargs rm -f
+@@ -351,12 +351,10 @@ install_kmod:
+         echo "install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}"; \
+         install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}; \
+     fi
+-	@eval "./patches/rundepmod.sh"	
+-	
+ endif
+ 
+ #Compile utilities only
+-all_util:  install_inc all_lib 
++all_util: all_lib 
+ 	$(MAKE) -C util all EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I $(PWD)/api/libsangoma/include" CC=$(CC) \
+ 	PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(WARCH) 
+ 	$(MAKE) -C util all_wancfg EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I$(PWD)/api/libsangoma/include" CC=$(CC)  \
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.22-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.22-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..95c8cf6
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.22-QA-fix-parallel-make.patch
@@ -0,0 +1,264 @@
+--- wanpipe-3.5.22/util/Makefile.orig	2011-08-19 00:25:25.000000000 +0200
++++ wanpipe-3.5.22/util/Makefile	2011-08-25 12:27:03.653156465 +0200
+@@ -15,63 +15,63 @@ endif
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma install DESTDIR=$(PWD)/.lib
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma install DESTDIR=$(PWD)/.lib
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
+ 
+ install:
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+ 	@rm -rf .lib
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.22-dahdi-location.patch b/net-misc/wanpipe/files/wanpipe-3.5.22-dahdi-location.patch
new file mode 100644
index 0000000..4ecd7a3
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.22-dahdi-location.patch
@@ -0,0 +1,111 @@
+--- ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c.orig	2011-08-16 05:01:34.000000000 +0200
++++ ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_usb_remora_tdmv.c	2011-08-25 12:36:21.795181830 +0200
+@@ -1199,6 +1199,10 @@ static int wp_usb_tdmv_remora_software_i
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_tdmv.c.orig	2011-08-16 05:01:33.000000000 +0200
++++ ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_tdmv.c	2011-08-25 12:36:21.792181917 +0200
+@@ -1202,6 +1202,9 @@ static int wp_tdmv_software_init(wan_tdm
+ 		sprintf(wp->span.name, "WPT1/%d", wp->num);
+ 	}
+ 	sprintf(wp->span.desc, "%s card %d", wp->devname, wp->num);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wp->span.location, sizeof(wp->span.location));
++#endif
+ 
+ #if defined(DAHDI_24) || defined(DAHDI_25) 
+     wp->span.ops = &wp_tdm_span_ops;
+--- ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_remora_tdmv.c.orig	2011-08-25 00:02:54.000000000 +0200
++++ ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_remora_tdmv.c	2011-08-25 12:36:21.788182030 +0200
+@@ -761,6 +761,10 @@ static int wp_tdmv_remora_software_init(
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WRTDM/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_bri_tdmv.c.orig	2011-08-16 05:01:32.000000000 +0200
++++ ./wanpipe-3.5.22/patches/kdrivers/src/net/sdla_bri_tdmv.c	2011-08-25 12:36:21.785182117 +0200
+@@ -617,6 +617,10 @@ static int wp_tdmv_bri_software_init(wan
+ 	/* Zapata stuff */
+ 	sprintf(wr->span.name, "WPBRI/%d", wr->num);
+ 	sprintf(wr->span.desc, "wrtdm Board %d", wr->num + 1);
++#ifdef DAHDI_ISSUES
++	sdla_get_location(card->hw, wr->span.location, sizeof(wr->span.location));
++#endif
++
+ 	switch(fe->fe_cfg.tdmv_law){
+ 	case WAN_TDMV_ALAW:
+ 		DEBUG_EVENT(
+--- ./wanpipe-3.5.22/patches/kdrivers/include/sdladrv.h.orig	2011-08-05 23:29:04.000000000 +0200
++++ ./wanpipe-3.5.22/patches/kdrivers/include/sdladrv.h	2011-08-25 12:36:21.798181744 +0200
+@@ -795,8 +795,6 @@ WP_EXTERN int sdla_get_hw_usb_adptr_cnt(
+ WP_EXTERN int sdla_get_hwinfo(hardware_info_t *hwinfo, int card_no);
+ 
+ 
+-#ifdef __SDLADRV__
+-
+ static __inline unsigned int sdla_get_pci_bus(sdlahw_t* hw)
+ {
+ 	sdlahw_card_t	*hwcard;
+@@ -853,6 +851,48 @@ static __inline unsigned int sdla_get_pc
+ 	return 0;
+ }
+ 
++static __inline unsigned int sdla_get_location(sdlahw_t *hw, char *output, const int size)
++{
++	sdlahw_card_t	*hwcard;
++	sdlahw_cpu_t	*hwcpu;
++
++	WAN_ASSERT(hw == NULL);
++	WAN_ASSERT(hw->hwcpu == NULL);
++	hwcpu = hw->hwcpu;
++
++	WAN_ASSERT(hwcpu->hwcard == NULL);
++	hwcard = hwcpu->hwcard;
++
++	switch (hwcard->hw_type) {
++	case SDLA_PCI_CARD: /* PCI */
++		snprintf(output, size, "PCI Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_PCI_EXP_CARD: /* PCI Express */
++		snprintf(output, size, "PCI Express Bus %02d Slot %02d",
++			sdla_get_pci_bus(hw), sdla_get_pci_slot(hw));
++		output[size - 1] = '\0';
++		break;
++	case SDLA_ISA_CARD: /* ISA */
++		snprintf(output, size, "ISA IOPort 0x%03x", hwcard->u_isa.ioport);
++		output[size - 1] = '\0';
++		break;
++	case SDLA_USB_CARD: /* USB */
++#if defined(__LINUX__)
++		snprintf(output, size, "USB Bus %02d Device ID %02d",
++			 hwcard->u_usb.usb_dev->bus->busnum, hwcard->u_usb.usb_dev->devnum);
++		output[size - 1] = '\0';
++#endif
++		break;
++	default:
++		break;
++	}
++	return 0;
++}
++
++#ifdef __SDLADRV__
++
+ static __inline int 
+ sdla_bus_space_map(sdlahw_t* hw, int reg, int size, sdla_mem_handle_t* handle)
+ {
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.22-wancfg_legacy-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.22-wancfg_legacy-Makefile.patch
new file mode 100644
index 0000000..5f60a25
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.22-wancfg_legacy-Makefile.patch
@@ -0,0 +1,11 @@
+--- wanpipe-3.5.22/util/wancfg_legacy/Makefile.Linux.orig	2011-08-25 13:17:16.240483638 +0200
++++ wanpipe-3.5.22/util/wancfg_legacy/Makefile.Linux	2011-08-25 13:19:05.477331367 +0200
+@@ -1,7 +1,7 @@
+ install:
+ 	install -D -m 755 wancfg_legacy $(WAN_VIRTUAL)/usr/sbin/wancfg_legacy
+ 	install -D -m 755 pppconfig $(WAN_VIRTUAL)/usr/sbin/wp_pppconfig
+-	cp -rf lib $(WAN_VIRTUAL)/etc/wanpipe/
++	install -D -m 644 -t $(WAN_VIRTUAL)/etc/wanpipe/lib/ lib/*
+ 
+ uninstall:
+ 	rm -f $(WAN_VIRTUAL)/usr/sbin/wancfg_legacy
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.23-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.23-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..3d27a76
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.23-QA-fix-parallel-make.patch
@@ -0,0 +1,269 @@
+--- wanpipe-3.5.22/util/Makefile.orig	2011-08-19 00:25:25.000000000 +0200
++++ wanpipe-3.5.22/util/Makefile	2011-08-25 12:27:03.653156465 +0200
+@@ -17,68 +17,68 @@ endif
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma install DESTDIR=$(PWD)/.lib
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma install DESTDIR=$(PWD)/.lib
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
+ 
+ install:
+ 	@if [ ! -e $(WAN_VIRTUAL)/etc/wanpipe ]; then \
+ 		mkdir -p $(WAN_VIRTUAL)/etc/wanpipe; \
+ 	fi
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
+ 
+ install_wancfg:
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm-ng clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C misc clean  WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+ 	@rm -rf .lib
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-Makefile.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-Makefile.patch
new file mode 100644
index 0000000..7236ee6
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-Makefile.patch
@@ -0,0 +1,46 @@
+--- wanpipe-3.5.24/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/Makefile	2011-11-17 10:11:00.253662383 +0100
+@@ -199,13 +199,13 @@
+ 
+ 
+ #Build only kernel modules
+-all_kmod_dahdi:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_dahdi:  _checkzap _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(DAHDI_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules  
+ 
+-all_kmod:  _checksrc _cleanoldwanpipe _check_kver
++all_kmod:  _checksrc _check_kver
+ 	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR= ZAPHDLC= HOMEDIR=$(PWD) modules  
+ 
+-all_kmod_ss7: _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_kmod_ss7: _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ss7_build_dir ]; then \
+ 		rm -rf $(PWD)/ss7_build_dir; \
+ 	fi
+@@ -213,7 +213,7 @@
+ 	./Setup drivers --builddir=$(PWD)/ss7_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=AFT_TE1-XMTP2 --no-zaptel-compile --noautostart --arch=$(WARCH) --silent
+ 	@eval "./patches/copy_modules.sh $(PWD)/ss7_build_dir $(WAN_DIR)"  
+ 
+-all_bin_kmod:  _checkzap _checksrc _cleanoldwanpipe _check_kver
++all_bin_kmod:  _checkzap _checksrc _check_kver
+ 	@if [ -e  $(PWD)/ast_build_dir ]; then \
+ 		rm -rf $(PWD)/ast_build_dir; \
+ 	fi
+@@ -224,7 +224,7 @@
+ 
+ #Clean utilites and kernel modules
+ .PHONY: clean
+-clean: cleanup_local  clean_util _cleanoldwanpipe
++clean: cleanup_local  clean_util
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
+ 	$(MAKE) -C api SUBDIRS=$(WAN_DIR) clean
+ 	@find patches/kdrivers -name '.*.cmd' | xargs rm -f
+@@ -352,8 +352,6 @@
+         echo "install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}"; \
+         install -m 644 -D $(WAN_DIR)/xmtp2km.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/xmtp2km.${MODTYPE}; \
+     fi
+-	@eval "./patches/rundepmod.sh"	
+-	
+ endif
+ 
+ #Compile utilities only
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-const-char-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-const-char-warnings.patch
new file mode 100644
index 0000000..9997059
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-const-char-warnings.patch
@@ -0,0 +1,215 @@
+diff -Naurp wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv.c wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv.c
+--- wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv.c	2011-11-17 15:15:07.507595529 +0100
+@@ -343,12 +343,12 @@ static unsigned	sdla_test_memregion (sdl
+ static unsigned short sdla_checksum (unsigned char* buf, unsigned len);
+ static int sdla_init_pci_slot(sdlahw_t *);
+ 
+-static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
++static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
+ static int sdla_card_unregister (sdlahw_card_t*);
+-static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
++static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
+ static int sdla_card_info(sdlahw_card_t*);
+ 
+-sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, char*);
++sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char*);
+ static sdlahw_cpu_t* sdla_hwcpu_register(sdlahw_card_t*, int, int, void*);
+ static int sdla_hwcpu_unregister(sdlahw_cpu_t*);
+ static int sdla_hwcpu_info(sdlahw_cpu_t*);
+@@ -4275,7 +4275,7 @@ static int sdla_card_info(sdlahw_card_t
+ }
+ 
+ static sdlahw_card_t*
+-sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
++sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
+ {
+ 	sdlahw_card_t	*new_hwcard, *last_hwcard;
+ 
+@@ -4344,7 +4344,7 @@ sdla_card_unregister(sdlahw_card_t* hwca
+ }
+ 
+ static sdlahw_card_t*
+-sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
++sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
+ {
+ 	sdlahw_card_t*	tmp;
+ 	
+@@ -4483,7 +4483,7 @@ static int sdla_hwcpu_unregister(sdlahw_
+ }
+ 
+ sdlahw_cpu_t*
+-sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, char *bus_id)
++sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, const char *bus_id)
+ {
+ 	sdlahw_cpu_t*	tmp;
+ 	
+@@ -5716,7 +5716,7 @@ static int sdla_bootcfg (sdlahw_t* hw, s
+ #ifdef __WINDOWS__
+ 		offset = sfminfo->dataoffs - (unsigned short)hwcpu->vector;
+ #else
+-		offset = sfminfo->dataoffs - (unsigned int)hwcpu->vector;
++		offset = (unsigned int)(sfminfo->dataoffs - (unsigned long)hwcpu->vector);
+ #endif
+ 	}
+ 
+diff -Naurp wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv_usb.c wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv_usb.c
+--- wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv_usb.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv_usb.c	2011-11-17 15:10:05.200560777 +0100
+@@ -188,7 +188,7 @@ struct sdla_usb_desc {
+ ****               F U N C T I O N   P R O T O T Y P E S                ****
+ ***************************************************************************/
+ extern sdlahw_t* sdla_find_adapter(wandev_conf_t* conf, char* devname);
+-extern sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int);
++extern sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char *);
+ extern sdlahw_t* sdla_hw_search(sdlahw_cpu_t*, int);
+ extern int sdla_hw_fe_test_and_set_bit(void *phw,int value);
+ extern int sdla_hw_fe_test_bit(void *phw,int value);
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c
+--- wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c	2011-11-17 14:54:30.976639794 +0100
+@@ -70,7 +70,7 @@ static sangoma_status_t sangoma_hwec_byp
+ static int sangoma_hwec_is_numeric_parameter(char *parameter)
+ {
+ 	int i;
+-	static char *WANEC_numeric_params[] = {
++	static const char *WANEC_numeric_params[] = {
+ 		"WANEC_TailDisplacement",
+ 		"WANEC_MaxPlayoutBuffers",
+ 		"WANEC_MaxConfBridges",
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/wanec/wanec_api_lib.c wanpipe-3.5.24/api/libsangoma/wanec/wanec_api_lib.c
+--- wanpipe-3.5.24.orig/api/libsangoma/wanec/wanec_api_lib.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/wanec/wanec_api_lib.c	2011-11-17 14:56:45.543661831 +0100
+@@ -132,8 +132,8 @@ typedef struct {
+ 	UINT32	max_channels;
+ 	UINT32	memory_chip_size;
+ 	UINT32	debug_data_mode;
+-	char	*image_name;	
+-	char	*image_path;
++	const char	*image_name;	
++	const char	*image_path;
+ } wanec_image_info_t;
+ 
+ wanec_image_info_t	wanec_image_32 = 
+@@ -184,8 +184,8 @@ struct wan_ec_image
+ 	UINT32	max_channels;
+ 	UINT32	memory_chip_size;
+ 	UINT32	debug_data_mode;
+-	char	*image;	
+-	char	*image_path;
++	const char	*image;	
++	const char	*image_path;
+ 	int	hwec_opt_no;
+ 	int	hwec_opt[5];
+ } wan_ec_image_list[] =
+@@ -222,7 +222,7 @@ struct wan_ec_image
+ #endif
+ 
+ #if !defined(__WINDOWS__)	
+-CHAR *ToneBufferPaths[WAN_NUM_PLAYOUT_TONES] = 
++const CHAR *ToneBufferPaths[WAN_NUM_PLAYOUT_TONES] = 
+ {
+ 	WAN_EC_BUFFERS "/DTMF_0_ulaw.pcm",
+ 	WAN_EC_BUFFERS "/DTMF_1_ulaw.pcm",
+@@ -436,7 +436,7 @@ int wanec_api_lib_ioctl(HANDLE dev, wan_
+ **/
+ static int
+ wanec_api_lib_loadImageFile(	wan_ec_api_t 	*ec_api,
+-				char		*path,
++				const char	*path,
+ 				UINT8		**WP_POINTER_64 pData,
+ 				UINT32		*file_size)
+ {
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c
+--- wanpipe-3.5.24.orig/firmware/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 10:27:41.214136518 +0100
++++ wanpipe-3.5.24/firmware/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 10:26:30.853064433 +0100
+@@ -32,7 +32,7 @@ int CloseConnection(char *ifname);
+ int wan_usbfxo_fwupdate(void*, char *ifname, int);
+ int exec_usb_data_write(void*, int off, char *data, int len);
+ int exec_usb_data_read(void*, char *data, int len);
+-int progress_bar(char *msg, int ci, int mi);
++int progress_bar(const char *msg, int ci, int mi);
+ void hit_any_key(void);
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c	2009-12-16 21:31:07.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c	2010-03-14 02:05:34.252063454 +0000
+@@ -74,7 +74,7 @@ extern int	card_type;
+ extern int	exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int	exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+ extern void	hit_any_key(void);
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ static int aft_reset_flash(wan_aft_cpld_t *cpld);
+ static int aft_is_protected(wan_aft_cpld_t *cpld, int stype);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c	2009-12-16 21:31:02.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c	2010-03-14 02:07:55.154064039 +0000
+@@ -48,7 +48,7 @@ aftup_flash_t	aft_a600_flash = {  0x014F
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c	2009-12-16 21:31:13.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c	2010-03-14 02:07:43.642063949 +0000
+@@ -114,7 +114,7 @@ aftup_flash_t	aft_shark_flash = {  0x014
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2010-03-14 02:06:53.803063891 +0000
+@@ -98,7 +98,7 @@ aftup_flash_t	aft_shark_ds_flash = {  0x
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c	2009-10-23 15:35:21.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c	2010-03-14 02:07:39.029064002 +0000
+@@ -180,7 +180,7 @@ struct flash_spec_t {
+ extern int	verbose;
+ extern int	card_type;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ extern int exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c	2009-12-16 21:31:17.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c	2010-03-14 02:06:22.372438749 +0000
+@@ -203,7 +203,7 @@ aft_core_info_t aft_core_table[] = {
+ /******************************************************************************
+ 			  FUNCTION PROTOTYPES
+ ******************************************************************************/
+-int progress_bar(char*,int,int);
++int progress_bar(const char*,int,int);
+ void main_menu(void);
+ void read_chip_control_menu(void);
+ void registers_and_internal_ram_test_menu(void);
+@@ -232,7 +232,7 @@ extern int wan_usbfxo_fwupdate(void*, ch
+ *			  FUNCTION DEFINITION	
+ ******************************************************************************/
+ 
+-int progress_bar(char *msg, int ci, int mi)
++int progress_bar(const char *msg, int ci, int mi)
+ {
+ 	static int index = 0;
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-format-literal-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-format-literal-warnings.patch
new file mode 100644
index 0000000..8ae4b60
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-format-literal-warnings.patch
@@ -0,0 +1,617 @@
+diff -Naurp wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c wanpipe-3.5.10/util/lxdialog/lxdialog.c
+--- wanpipe-3.5.10.orig/util/lxdialog/lxdialog.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/lxdialog/lxdialog.c	2010-03-14 01:11:50.958063750 +0000
+@@ -240,7 +240,7 @@ j_inputbox (const char *t, int ac, const
+     int ret = dialog_inputbox (t, av[2], atoi (av[3]), atoi (av[4]),
+                             ac == 6 ? av[5] : (char *) NULL);
+     if (ret == 0)
+-        fprintf(stderr, (char*)dialog_input_result);
++        fprintf(stderr, "%s", (char*)dialog_input_result);
+     return ret;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/conf_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/conf_file_reader.cpp	2010-03-14 01:45:40.372313586 +0000
+@@ -1624,7 +1624,7 @@ int conf_file_reader::read_interfaces_se
+ 
+     //use copy of the name because 'strstr()' inserts nulls and it
+     //will break things.
+-    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, token[0]); 
++    snprintf(dev_name_backup, LEN_OF_DBG_BUFF, "%s", token[0]); 
+     
+     if(parent_dev_name != NULL){
+ 	    
+@@ -1661,8 +1661,8 @@ int conf_file_reader::read_interfaces_se
+     chandef = &list_el_chan_def->data;
+     chanconf = chandef->chanconf;
+ 
+-    snprintf(chandef->name, WAN_IFNAME_SZ, token[0]);
+-    snprintf(chandef->addr, MAX_ADDR_STR_LEN, token[2]);
++    snprintf(chandef->name, WAN_IFNAME_SZ, "%s", token[0]);
++    snprintf(chandef->addr, MAX_ADDR_STR_LEN, "%s", token[2]);
+    
+     //NOTE: 'atoi()' returns zero if it failes AND if number
+     //is actually zero.
+@@ -1873,7 +1873,7 @@ int conf_file_reader::set_conf_param (ch
+ 
+     if(strcmp(key, "FIRMWARE") == 0){
+       Debug(DBG_CONF_FILE_READER, ("file name: %s\n", val));
+-      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, val);
++      snprintf(lnks_def->firmware_file_path, MAX_PATH_LENGTH, "%s", val);
+     }
+     return 0;
+   }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp wanpipe-3.5.10/util/wancfg/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/cpp_string.cpp	2010-03-14 01:42:53.133063682 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strlcpy(cstr, tmp, MAX_STR);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/main.cpp wanpipe-3.5.10/util/wancfg/main.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/main.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/main.cpp	2010-03-14 01:30:55.980090540 +0000
+@@ -1410,8 +1410,7 @@ void err_printf(char* format, ...)
+   vsnprintf(dbg_tmp_buff, LEN_OF_DBG_BUFF, format, ap);
+   va_end(ap);
+ 
+-  printf(dbg_tmp_buff);
+-  printf("\n");
++  puts(dbg_tmp_buff);
+ }
+ 
+ /*
+@@ -1664,7 +1663,7 @@ void tokenize_string(char* input_buff, c
+ 
+   while(p != NULL){
+     //printf(p);
+-    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), p);
++    snprintf(&output_buff[strlen(output_buff)], buff_length - strlen(output_buff), "%s", p);
+     p = strtok(NULL, delimeter_str);
+   }
+   Debug(DBG_WANCFG_MAIN, ("\ntokenized str: %s\n", output_buff));
+@@ -2085,7 +2084,7 @@ char* replace_numeric_with_char(char* st
+ 	unsigned int original_len = strlen(str);
+ 	static char new_str[1024];
+ 		
+-	snprintf(new_str, 1024, str);
++	snprintf(new_str, 1024, "%s", str);
+ 		
+ 	for(i=0; i < original_len; i++){
+ 
+@@ -2152,7 +2151,7 @@ void cleanup()
+ 
+   //remove 'date_and_time_file_name' file
+   snprintf(command_line, MAX_PATH_LENGTH, "rm -rf ");
+-  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line),
++  snprintf(&command_line[strlen(command_line)], MAX_PATH_LENGTH - strlen(command_line), "%s",
+ 		 date_and_time_file_name);
+   system(command_line);
+ }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_adsl_advanced_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_adsl_advanced_cfg.cpp	2010-03-14 01:49:29.238063542 +0000
+@@ -475,7 +475,7 @@ int menu_adsl_advanced_cfg::
+   unsigned int int_tmp;
+   
+ again:
+-  snprintf(explanation_text, MAX_PATH_LENGTH, prompt_text);
++  snprintf(explanation_text, MAX_PATH_LENGTH, "%s", prompt_text);
+   if(is_hexadecimal == NO){
+     snprintf(initial_text, MAX_PATH_LENGTH, "%u", *initial_value);
+   }else{
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_aft_logical_channel_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_aft_logical_channel_cfg.cpp	2010-03-14 01:23:07.548063423 +0000
+@@ -230,7 +230,7 @@ show_analog_chan_input_box:
+       switch(*selection_index)
+       {
+       case INPUT_BOX_BUTTON_OK:
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, input_bx.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", input_bx.get_lxdialog_output_string());
+ 
+         str_tolower(tmp_buff);
+       
+@@ -243,7 +243,7 @@ show_analog_chan_input_box:
+ 		if(chan >= 1 && chan <= MAX_FXOFXS_CHANNELS){
+           		logical_ch_cfg->data.chanconf->active_ch = chan;
+ 			snprintf(logical_ch_cfg->data.active_channels_string,
+-					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, tmp_buff);
++					MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", tmp_buff);
+ 		}else{
+ 			tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, "Invalid input: %s!",
+ 				input_bx.get_lxdialog_output_string());
+@@ -270,7 +270,7 @@ show_analog_chan_input_box:
+         switch(*selection_index)
+         {
+         case INPUT_BOX_BUTTON_OK:
+-          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++          snprintf(logical_ch_cfg->data.active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+                 act_channels_ip.get_lxdialog_output_string());
+ 
+           logical_ch_cfg->data.chanconf->active_ch = act_channels_ip.active_ch;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_device_miscellaneous_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_device_miscellaneous_options.cpp	2010-03-14 01:28:51.172188232 +0000
+@@ -459,7 +459,7 @@ show_firmware_path_input_box:
+         Debug(DBG_MENU_DEVICE_MISCELLANEOUS_OPTIONS,
+           ("firmware path on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH,
++        snprintf( link_def->firmware_file_path, MAX_PATH_LENGTH, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_hardware_te1_card_advanced_options.cpp	2010-03-14 01:20:32.838063458 +0000
+@@ -689,7 +689,7 @@ If this option is used, TE1 Clock MUST b
+ 		switch(*selection_index)
+ 		{
+ 		case INPUT_BOX_BUTTON_OK:
+-		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING,
++		  snprintf(link_def->active_channels_string, MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s",
+ 				act_channels_ip.get_lxdialog_output_string());
+ 
+ 		  break;
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_ip_configuration.cpp	2010-03-14 01:48:51.406063789 +0000
+@@ -266,14 +266,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -307,14 +307,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -349,14 +349,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -451,14 +451,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_net_interface_setup.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_net_interface_setup.cpp	2010-03-14 01:25:29.673063441 +0000
+@@ -447,7 +447,7 @@ WAN_IFNAME_SZ
+ );
+           goto show_if_name_input_box;
+         }else{
+-          snprintf(chandef->name, WAN_IFNAME_SZ, inb.get_lxdialog_output_string());
++          snprintf(chandef->name, WAN_IFNAME_SZ, "%s", inb.get_lxdialog_output_string());
+           //list_el_chan_def->data.name
+           Debug(DBG_MENU_NET_INTERFACE_SETUP,("menu_net_interface_setup: chan_def: %p\n", chandef));
+         }
+@@ -830,7 +830,7 @@ show_hwec_map_input_box:
+       {
+       case INPUT_BOX_BUTTON_OK:
+ 	snprintf(chandef->active_hwec_channels_string,
+-		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, inb.get_lxdialog_output_string());
++		MAX_LEN_OF_ACTIVE_CHANNELS_STRING, "%s", inb.get_lxdialog_output_string());
+ 	break;
+ 
+       case INPUT_BOX_BUTTON_HELP:
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/menu_ppp_basic_cfg.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/menu_ppp_basic_cfg.cpp	2010-03-14 01:24:59.186063452 +0000
+@@ -336,7 +336,7 @@ show_user_id_input_box:
+           goto show_user_id_input_box;
+         }
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.userid,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -382,7 +382,7 @@ show_password_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.passwd,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,7 +427,7 @@ show_sysname_input_box:
+         }
+ 
+         snprintf( (char*)list_el_chan_def->data.chanconf->u.ppp.sysname,
+-                  MAX_PPP_AUTHENTICATION_STR_LEN,
++                  MAX_PPP_AUTHENTICATION_STR_LEN, "%s",
+                   inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wancfg/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/net_interface_file_reader.cpp	2010-03-14 01:46:49.184063542 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.gateway: %s\n",
+           if_config.gateway));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wancfg/text_box_help.h wanpipe-3.5.10/util/wancfg/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wancfg/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wancfg/text_box_help.h	2010-03-14 01:45:59.729063764 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c wanpipe-3.5.10/util/wanconfig/wanconfig.c
+--- wanpipe-3.5.10.orig/util/wanconfig/wanconfig.c	2009-11-16 22:50:30.000000000 +0000
++++ wanpipe-3.5.10/util/wanconfig/wanconfig.c	2010-03-14 01:14:48.999189553 +0000
+@@ -1935,7 +1935,7 @@ void show_help(void) {
+  * Show usage text
+  */
+ void show_usage(void) {
+-	fprintf(stderr, usagetext);
++	fputs(usagetext, stderr);
+ 	exit(1);
+ }
+ 
+@@ -1987,7 +1987,7 @@ int gencat (char *filename) 
+ 	}
+ 	
+ 	while(fgets(buf, sizeof(buf) -1, file)) {
+-		printf(buf);
++		printf("%s", buf);
+ 	}	
+ 
+ 	fclose(file);
+@@ -5079,7 +5079,7 @@ void update_adsl_vci_vpi_list(wan_adsl_v
+ 		if (buf[0] != '#'){
+ 			break;
+ 		}else{
+-			fprintf(tmp_file, buf);
++			fprintf(tmp_file, "%s", buf);
+ 		}
+ 	}	
+ 	for(x = 0; x < vcivpi_num; x++){
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp wanpipe-3.5.10/util/wanctl/cpp_string.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/cpp_string.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/cpp_string.cpp	2010-03-14 01:18:14.224313496 +0000
+@@ -37,7 +37,7 @@ cpp_string::cpp_string(char* param)
+ {
+   Debug(DBG_CPP_STR, ("cpp_string::cpp_string(char* param)\n"));
+ 
+-  snprintf(cstr, MAX_STR, param);
++  snprintf(cstr, MAX_STR, "%s", param);
+ }
+ 
+ 
+@@ -54,7 +54,7 @@ void cpp_string::operator= (char* param)
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param);
++  snprintf(tmp, MAX_STR, "%s", param);
+   strcpy(cstr, tmp);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+@@ -67,7 +67,7 @@ void cpp_string::operator= (const char* 
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+ //  *this = (char*)param;
+-  snprintf(cstr, MAX_STR, (char*)param);
++  snprintf(cstr, MAX_STR, "%s", (char*)param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator=' cstr: %s\n", cstr));
+ }
+@@ -79,7 +79,7 @@ char* cpp_string::operator+ (char* param
+   Debug(DBG_CPP_STR, ("strlen(param): %d\n", strlen(param)));
+   Debug(DBG_CPP_STR, ("strlen(cstr): %d\n", strlen(cstr)));
+ 
+-  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), param);
++  snprintf(&cstr[strlen(cstr)], MAX_STR - strlen(cstr), "%s", param);
+ 
+   Debug(DBG_CPP_STR, ("end of 'operator+' cstr: %s\n", cstr));
+ 
+@@ -120,7 +120,7 @@ char* cpp_string::operator+= (cpp_string
+ 
+   char tmp[MAX_STR];
+ 
+-  snprintf(tmp, MAX_STR, param.c_str());
++  snprintf(tmp, MAX_STR, "%s", param.c_str());
+ 
+   *this = *this + tmp;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/menu_net_interface_ip_configuration.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/menu_net_interface_ip_configuration.cpp	2010-03-14 01:28:29.733080770 +0000
+@@ -252,14 +252,14 @@ show_local_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Local IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_local_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -293,14 +293,14 @@ show_point_to_point_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Point-to-point IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_point_to_point_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -335,14 +335,14 @@ show_netmask_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Netmask on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_netmask_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.netmask, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+@@ -427,14 +427,14 @@ show_gateway_ip_input_box:
+         Debug(DBG_MENU_NET_INTERFACE_IP_CONFIGURATION,
+           ("Gateway IP on return: %s\n", inb.get_lxdialog_output_string()));
+ 
+-        snprintf(tmp_buff, MAX_PATH_LENGTH, inb.get_lxdialog_output_string());
++        snprintf(tmp_buff, MAX_PATH_LENGTH, "%s", inb.get_lxdialog_output_string());
+         ip_validation_result = validate_ipv4_address_string(tmp_buff);
+         if(ip_validation_result != NULL){
+           tb.show_error_message(lxdialog_path, NO_PROTOCOL_NEEDED, ip_validation_result);
+           goto show_gateway_ip_input_box;
+         }
+ 
+-        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN,
++        snprintf(interface_file_reader.if_config.gateway, IF_CONFIG_BUF_LEN, "%s",
+           inb.get_lxdialog_output_string());
+         break;
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp
+--- wanpipe-3.5.10.orig/util/wanctl/net_interface_file_reader.cpp	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/net_interface_file_reader.cpp	2010-03-14 01:23:55.514313075 +0000
+@@ -81,25 +81,25 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "DEVICE=");
+       if(tmp != NULL){
+-        snprintf(if_config.device, WAN_IFNAME_SZ, tmp += strlen("DEVICE="));
++        snprintf(if_config.device, WAN_IFNAME_SZ, "%s", tmp += strlen("DEVICE="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.device: %s\n", if_config.device));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "IPADDR=");
+       if(tmp != NULL){
+-        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("IPADDR="));
++        snprintf(if_config.ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("IPADDR="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.ipaddr: %s\n", if_config.ipaddr));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "NETMASK=");
+       if(tmp != NULL){
+-        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, tmp += strlen("NETMASK="));
++        snprintf(if_config.netmask, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("NETMASK="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.netmask: %s\n", if_config.netmask));
+       }
+ 
+       tmp = strstr(tmp_read_buffer, "POINTOPOINT=");
+       if(tmp != NULL){
+-        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, tmp += strlen("POINTOPOINT="));
++        snprintf(if_config.point_to_point_ipaddr, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("POINTOPOINT="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+@@ -121,7 +121,7 @@ int net_interface_file_reader::parse_net
+ 
+       tmp = strstr(tmp_read_buffer, "GATEWAY=");
+       if(tmp != NULL){
+-        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, tmp += strlen("GATEWAY="));
++        snprintf(if_config.gateway, IF_CONFIG_BUF_LEN, "%s", tmp += strlen("GATEWAY="));
+         Debug(DBG_NET_INTERFACE_FILE_READER, ("if_config.point_to_point_ipaddr: %s\n",
+           if_config.point_to_point_ipaddr));
+       }
+diff -Naurp wanpipe-3.5.10.orig/util/wanctl/text_box_help.h wanpipe-3.5.10/util/wanctl/text_box_help.h
+--- wanpipe-3.5.10.orig/util/wanctl/text_box_help.h	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanctl/text_box_help.h	2010-03-14 01:24:16.425313082 +0000
+@@ -43,7 +43,7 @@ public: 
+   {
+     Debug(DBG_TEXT_BOX_HELP, ("text_box_help::text_box_help()\n"));
+ 
+-    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, lxdialog_path);
++    snprintf(this->lxdialog_path, MAX_PATH_LENGTH, "%s", lxdialog_path);
+     this->help_text_type = help_text_type;
+   }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c wanpipe-3.5.10/util/wanpipemon/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon/prot_trace.c	2009-11-16 22:50:37.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon/prot_trace.c	2010-03-14 01:16:31.331063406 +0000
+@@ -1805,8 +1805,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c
+--- wanpipe-3.5.10.orig/util/wanpipemon_legacy/prot_trace.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/util/wanpipemon_legacy/prot_trace.c	2010-03-14 01:16:42.435063486 +0000
+@@ -1731,8 +1731,8 @@ static int decode_ppp(wp_trace_output_if
+ 		break;
+ 	}
+ 
+-	printf(outstr);
+-	printf("\n\n");
++	puts(outstr);
++	printf("\n");
+ 	return inf_frame;
+ }
+ 
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma-pvt.h wanpipe-3.5.24/api/libsangoma/libsangoma-pvt.h
+--- wanpipe-3.5.24.orig/api/libsangoma/libsangoma-pvt.h	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/libsangoma-pvt.h	2011-11-17 14:49:46.828255406 +0100
+@@ -134,7 +134,7 @@ static void libsng_dbg(const char * fmt,
+ #if defined(__WINDOWS__)
+ 	OutputDebugString(buf);
+ #else
+-	printf(buf);
++	printf("%s", buf);
+ #endif
+ 	va_end(args);
+ }
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-parallel-make.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-parallel-make.patch
new file mode 100644
index 0000000..4583565
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-parallel-make.patch
@@ -0,0 +1,265 @@
+--- wanpipe-3.5.24/util/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/Makefile	2011-11-17 10:14:18.598507617 +0100
+@@ -17,66 +17,66 @@
+ ARCH=$(shell uname -m)
+ 
+ all:
+-	make -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C libsangoma install DESTDIR=$(PWD)/.lib
+-	make -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+-	make -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C lxdialog all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C libsangoma install DESTDIR=$(PWD)/.lib
++	$(MAKE) -C wanconfig all CC=$(CC) SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanec_client all CC=$(CC)  SYSINC=$(SYSINC) WANINCDIR=$(WANINCDIR) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_plxctrl all CC=$(CC)  SYSINC=$(SYSINC) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon all  CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP) EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wanpipemon_legacy all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C bwm all SYSINC=$(SYSINC) CC=$(CC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
++	$(MAKE) -C wan_aftup all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH)
+ 
+ all_wancfg:
+-	make -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
++	$(MAKE) -C wancfg all CC=$(CC) SYSINC=$(SYSINC) PROTOCOL_DEFS="$(PROTOCOL_DEFS)" EXTRA_FLAGS="$(EXTRA_FLAGS)" ARCH=$(ARCH) 2> /dev/null
+ 
+ install:
+ 	@if [ ! -e $(WAN_VIRTUAL)/etc/wanpipe ]; then \
+ 		mkdir -p $(WAN_VIRTUAL)/etc/wanpipe; \
+ 	fi
+-	make -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup install WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C libsangoma install DESTDIR=$(WAN_VIRTUAL)
+ 
+ install_wancfg:
+-	make -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg install WAN_VIRTUAL=$(WAN_VIRTUAL)
+ 
+ uninstall:
+-	make -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
++	$(MAKE) -C ft1 uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup uninstall WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm uninstall   WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg_zaptel uninstall WAN_VIRTUAL=$(WAN_VIRTUAL)  
+ 
+ clean:
+-	make -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
+-	make -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+-	make -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C ft1 clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C lxdialog clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C sdladump clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanconfig clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanec_client clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_plxctrl clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanpipemon clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wanpipemon_legacy clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wancfg clean WAN_VIRTUAL=$(WAN_VIRTUAL)
++	$(MAKE) -C wan_aftup clean WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C bwm clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wanctl clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
++	$(MAKE) -C wan_fxotune clean  WAN_VIRTUAL=$(WAN_VIRTUAL) 
+ 	@rm -rf .lib
+--- wanpipe-3.5.16/api/legacy/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/legacy/Makefile	2010-10-07 00:55:43.426893259 +0200
+@@ -13,18 +13,18 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C x25 all  WANINCDIR=$(WANINCDIR)
+-	make -C chdlc all  WANINCDIR=$(WANINCDIR)
+-	make -C fr all  WANINCDIR=$(WANINCDIR)
+-	make -C bitstrm all WANINCDIR=$(WANINCDIR)
+-	make -C bisync all WANINCDIR=$(WANINCDIR)
+-	make -C aft all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C x25 all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C chdlc all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C fr all  WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bitstrm all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C bisync all WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C aft all WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C x25 clean 
+-	make -C chdlc clean 
+-	make -C fr clean 
+-	make -C bitstrm clean
+-	make -C aft clean
+-	make -C bisync clean
++	$(MAKE) -C x25 clean 
++	$(MAKE) -C chdlc clean 
++	$(MAKE) -C fr clean 
++	$(MAKE) -C bitstrm clean
++	$(MAKE) -C aft clean
++	$(MAKE) -C bisync clean
+ 
+--- wanpipe-3.5.16/api/Makefile.orig	2010-09-07 21:10:25.000000000 +0200
++++ wanpipe-3.5.16/api/Makefile	2010-10-07 00:56:02.250615436 +0200
+@@ -14,14 +14,14 @@
+ ####### RULES ################################################################
+ 
+ all:	
+-	make -C tdm_api WANINCDIR=$(WANINCDIR)
+-	make -C legacy WANINCDIR=$(WANINCDIR)
+-	make -C sample_c WANINCDIR=$(WANINCDIR)
+-	make -C sample_cpp WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C tdm_api WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C legacy WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_c WANINCDIR=$(WANINCDIR)
++	$(MAKE) -C sample_cpp WANINCDIR=$(WANINCDIR)
+ 
+ clean:
+-	make -C tdm_api clean
+-	make -C legacy clean
+-	make -C lib/hdlc clean
+-	make -C sample_c clean
+-	make -C sample_cpp clean
++	$(MAKE) -C tdm_api clean
++	$(MAKE) -C legacy clean
++	$(MAKE) -C lib/hdlc clean
++	$(MAKE) -C sample_c clean
++	$(MAKE) -C sample_cpp clean
+--- wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile.orig	2010-02-26 01:13:02.000000000 +0100
++++ wanpipe-3.5.16/ssmg/sangoma_mgd.trunk/Makefile	2010-10-07 00:54:28.766927151 +0200
+@@ -128,7 +128,7 @@
+ clean:  old_cleanup
+ 	find . -name '*.o' | xargs rm -f
+ 	rm -fr sangoma_mgd pritest *.o *.so *~ *core* *.so* *.a
+-	make -C lib/libteletone clean
++	$(MAKE) -C lib/libteletone clean
+ 
+ distclean: clean
+ 	@echo OK
+--- wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile.orig	2009-08-25 22:44:41.000000000 +0200
++++ wanpipe-3.5.16/patches/kdrivers/src/lip/Makefile	2010-10-07 00:54:28.775926062 +0200
+@@ -190,37 +190,37 @@
+ 
+ 
+ $(FRDIR)/wanpipe_fr.o:
+-	make -C $(FRDIR) clean
+-	make -C $(FRDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(FRDIR) clean
++	$(MAKE) -C $(FRDIR) all REGPARM=$(REGPARM)
+ 
+ $(LIP_ATM_DIR)/wanpipe_lip_atm.o:
+-	make -C $(LIP_ATM_DIR) clean
+-	make -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LIP_ATM_DIR) clean
++	$(MAKE) -C $(LIP_ATM_DIR) all REGPARM=$(REGPARM)
+ 
+ 
+ $(LAPBDIR)/wanpipe_lapb.o: 
+-	make -C $(LAPBDIR) clean
+-	make -C $(LAPBDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPBDIR) clean
++	$(MAKE) -C $(LAPBDIR) all REGPARM=$(REGPARM)
+ 	
+ $(LAPDDIR)/wanpipe_lapd.o: 
+-	make -C $(LAPDDIR) clean
+-	make -C $(LAPDDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(LAPDDIR) clean
++	$(MAKE) -C $(LAPDDIR) all REGPARM=$(REGPARM)
+ 
+ $(XDLCDIR)/wanpipe_xdlc.o:
+-	make -C $(XDLCDIR) clean
+-	make -C $(XDLCDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XDLCDIR) clean
++	$(MAKE) -C $(XDLCDIR) all REGPARM=$(REGPARM)
+ 
+ $(SPPPDIR)/wanpipe_sppp.o:
+-	make -C $(SPPPDIR) clean
+-	make -C $(SPPPDIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(SPPPDIR) all REGPARM=$(REGPARM)
+ 
+ $(XMTP2DIR)/wanpipe_xmtp2.o:
+-	make -C $(XMTP2DIR) clean
+-	make -C $(XMTP2DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C $(XMTP2DIR) all REGPARM=$(REGPARM)
+ 
+ $(X25DIR)/wanpipe_x25.o:
+-	make -C $(X25DIR) clean
+-	make -C $(X25DIR) all REGPARM=$(REGPARM)
++	$(MAKE) -C $(X25DIR) clean
++	$(MAKE) -C $(X25DIR) all REGPARM=$(REGPARM)
+ 
+ clean:
+ 	rm -f wanpipe_lip.$(MODTYPE)
+@@ -228,13 +228,13 @@
+ 	rm -f mod/*.*o
+ 	rm -f tmp/*.*o
+ 	rm -f modinfo/*.*o
+-	make -C ../fr clean
+-	make -C ../lapb clean
+-	make -C ../lapd clean
+-	make -C ../xdlc clean
+-	make -C $(SPPPDIR) clean
+-	make -C $(XMTP2DIR) clean
+-	make -C ../x25 clean
++	$(MAKE) -C ../fr clean
++	$(MAKE) -C ../lapb clean
++	$(MAKE) -C ../lapd clean
++	$(MAKE) -C ../xdlc clean
++	$(MAKE) -C $(SPPPDIR) clean
++	$(MAKE) -C $(XMTP2DIR) clean
++	$(MAKE) -C ../x25 clean
+ 
+ install:
+ 	install -D $(OUTDIR)/wanpipe_lip.${MODTYPE} /lib/modules/$(shell uname -r)/kernel/net/wanrouter/wanpipe_lip.${MODTYPE}
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result-legacy.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result-legacy.patch
new file mode 100644
index 0000000..00ec9b3
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result-legacy.patch
@@ -0,0 +1,177 @@
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon_legacy/prot_trace.c wanpipe-3.5.24/util/wanpipemon_legacy/prot_trace.c
+--- wanpipe-3.5.24.orig/util/wanpipemon_legacy/prot_trace.c	2011-11-17 16:11:52.875800977 +0100
++++ wanpipe-3.5.24/util/wanpipemon_legacy/prot_trace.c	2011-11-17 16:14:34.835672162 +0100
+@@ -1495,6 +1495,7 @@ static void decode_annexg_x25_pkt (wp_tr
+ static void print_pcap_file_header (wp_trace_output_iface_t *trace_iface)
+ {
+     struct pcap_hdr fh;
++    int err;
+ 
+     fh.magic = PCAP_MAGIC;
+     fh.version_major = 2;
+@@ -1504,12 +1505,13 @@ static void print_pcap_file_header (wp_t
+     fh.snaplen = 102400;
+     fh.network = trace_iface->link_type;
+ 
+-    fwrite(&fh, sizeof(fh), 1, trace_iface->output_file);
++    err = fwrite(&fh, sizeof(fh), 1, trace_iface->output_file);
+ }
+ 
+ static void print_pcap_record_header(wp_trace_output_iface_t *trace_iface)
+ {
+ 	struct pcaprec_hdr ph;
++	int err;
+ 	
+  	/* Write PCap header */
+         ph.ts_sec = trace_iface->pkts_written;
+@@ -1517,7 +1519,7 @@ static void print_pcap_record_header(wp_
+         ph.incl_len =  trace_iface->len;
+         ph.orig_len = trace_iface->len;
+ 
+-	fwrite(&ph, sizeof(ph), 1, trace_iface->output_file);
++	err = fwrite(&ph, sizeof(ph), 1, trace_iface->output_file);
+ }
+ 
+ static void get_ppp_magic_number(unsigned char* data, int len, char* outstr, int max_len, char offset_flag)
+@@ -1741,6 +1743,7 @@ void wp_trace_output(wp_trace_output_ifa
+ {
+ 	//int num_chars;
+ 	//int j;
++	int err;
+ 	int trace_started=0;
+ 
+ try_trace_again:
+@@ -1838,7 +1841,7 @@ try_trace_again:
+ 		
+ 		print_pcap_record_header(trace_iface);
+ 
+-		fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_iface->output_file);
++		err = fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_iface->output_file);
+ 
+ 		printf("\rTotal Captured=%-5u (Len=%i)",trace_iface->pkts_written+1,trace_iface->len);
+ 		
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon_legacy/wangui.c wanpipe-3.5.24/util/wanpipemon_legacy/wangui.c
+--- wanpipe-3.5.24.orig/util/wanpipemon_legacy/wangui.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/wanpipemon_legacy/wangui.c	2011-11-17 16:12:55.978697494 +0100
+@@ -182,7 +182,7 @@ static int wan_if_ip_menu(void)
+ 	
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,50);
++	err=read(pipefds[0],data,50);
+ 	data[strlen(data)-1]='\0';
+ 
+ 	close(pipefds[0]);
+@@ -237,7 +237,7 @@ static int wan_ip_menu(void)
+ 
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,99);
++	err=read(pipefds[0],data,99);
+ 	
+ 	if (stat==SELECT_OK){
+ 		struct in_addr *ip_str = NULL;
+@@ -274,12 +274,12 @@ static int wan_ip_menu(void)
+ 
+ 	memset(data,0,100);
+ 	
+-	read(pipefds[0],data,99);
++	err=read(pipefds[0],data,99);
+ 
+ 	close(pipefds[0]);
+ 	close(pipefds[1]);
+ 
+-	if (err==SELECT_OK){
++	if (stat==SELECT_OK){
+ 		udp_port=atoi(data);
+ 		return 0;
+ 	}
+@@ -411,7 +411,7 @@ static int wan_iface_menu(void)
+ 
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,50);
++	err=read(pipefds[0],data,50);
+ 	data[strlen(data)-1]='\0';
+ 
+ 	close(pipefds[0]);
+@@ -474,7 +474,7 @@ static void wan_main_menu(void)
+ 	
+ 		pid=waitpid(pid,&stat,WUNTRACED);
+ 		
+-		read(pipefds[0],data,50);
++		err=read(pipefds[0],data,50);
+ 		data[strlen(data)-1]='\0';
+ 
+ 		if (stat == SELECT_OK){
+@@ -508,13 +508,13 @@ static void wan_main_menu(void)
+ 
+ 				memset(cmd_data,0,100);
+ 				pid=waitpid(pid,&stat,WUNTRACED);
+-				read(pipefds[0],cmd_data,50);
++				err=read(pipefds[0],cmd_data,50);
+ 				cmd_data[strlen(cmd_data)-1]='\0';
+ 				
+ 				if (stat == SELECT_OK){
+ 
+ exec_cmd_again:
+-					system("clear");	
++					err=system("clear");	
+ 					EXEC_PROT_FUNC(main,wan_protocol,err,(cmd_data, 0, NULL));
+ 					
+ 					hit_enter_or_space_key();
+@@ -540,11 +540,12 @@ static int if_system = UNKNOWN_SYS;
+ int wan_main_gui(void)
+ {
+ 	int local=0;
++	int err;
+ #ifdef LOCALE
+     	(void) setlocale (LC_ALL, "");
+ #endif	
+ 	
+-	system("clear");
++	err = system("clear");
+ 
+ if_ip_menu:
+ 	if (if_system == UNKNOWN_SYS){
+@@ -558,7 +559,7 @@ if_local_remote_sys:
+ 	switch(if_system){
+ 	case LOCAL_SYS:
+ 		if (wan_iface_menu() != 0){
+-			system("clear");
++			err = system("clear");
+ 			if_system = UNKNOWN_SYS;
+ 			goto if_ip_menu;
+ 		}
+@@ -569,7 +570,7 @@ if_local_remote_sys:
+ 
+ 	case REMOTE_SYS:
+ 		if (wan_ip_menu() != 0){
+-			system("clear");
++			err = system("clear");
+ 			if_system = UNKNOWN_SYS;
+ 			goto if_ip_menu;
+ 		}
+@@ -589,6 +590,6 @@ main_menu:
+ 	local = 0;
+ 	goto if_local_remote_sys;
+ 
+-	system("clear");
++	err = system("clear");
+ 	return WAN_TRUE;
+ }
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon_legacy/xml_lib.c wanpipe-3.5.24/util/wanpipemon_legacy/xml_lib.c
+--- wanpipe-3.5.24.orig/util/wanpipemon_legacy/xml_lib.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/wanpipemon_legacy/xml_lib.c	2011-11-17 16:12:55.979697556 +0100
+@@ -47,7 +47,10 @@ int output_start_xml_router (void)
+ 	if (!pipe_fd)
+ 		return 1;
+ 	
+-	fgets(host,sizeof(host)-1,pipe_fd);
++	if (fgets(host,sizeof(host)-1,pipe_fd) < 0) {
++		pclose(pipe_fd);
++		return 1;
++	}
+ 	pclose(pipe_fd);
+ 	host[strlen(host)-1]='\0';
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result.patch
new file mode 100644
index 0000000..f786632
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-QA-fix-warn_unused_result.patch
@@ -0,0 +1,309 @@
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma.c wanpipe-3.5.24/api/libsangoma/libsangoma.c
+--- wanpipe-3.5.24.orig/api/libsangoma/libsangoma.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/libsangoma.c	2011-11-17 15:40:01.978280499 +0100
+@@ -1525,7 +1525,8 @@ sangoma_status_t _LIBSNG_CALL sangoma_wa
+ 		for(i = 0; i < j; i++){
+ 			if (pfds[number_of_sangoma_wait_objects+i].revents & POLLIN) {
+ 				/* read and discard the signal byte  */
+-				read(pfds[number_of_sangoma_wait_objects+i].fd, &dummy_buf, 1);
++				if (read(pfds[number_of_sangoma_wait_objects+i].fd, &dummy_buf, 1) <= 0)
++					return SANG_STATUS_GENERAL_ERROR;
+ 				/* set the proper flag so users may know this object was signaled */
+ 				out_flags[i] |= SANG_WAIT_OBJ_IS_SIGNALED;
+ 			}
+diff -Naurp wanpipe-3.5.24.orig/util/wanconfig/wanconfig.c wanpipe-3.5.24/util/wanconfig/wanconfig.c
+--- wanpipe-3.5.24.orig/util/wanconfig/wanconfig.c	2011-11-17 15:34:58.939213280 +0100
++++ wanpipe-3.5.24/util/wanconfig/wanconfig.c	2011-11-17 15:45:48.085637041 +0100
+@@ -3432,7 +3432,7 @@ int start_daemon(void)
+ 	if (fp){
+ 		char pid_str[10];
+ 		snprintf(pid_str,10,"%i",getpid());
+-		write(fp,&pid_str,strlen(pid_str));
++		err=write(fp,&pid_str,strlen(pid_str));
+ 		close(fp);
+ 	}
+ 
+@@ -3550,9 +3550,12 @@ void wakeup_java_ui(void)
+ 			return;
+ 		}
+ 		
+-		fgets(buf, sizeof(buf)-1, file);
+-
+-		ui_pid=atoi(buf);
++		if (fgets(buf, sizeof(buf)-1, file) <= 0) {
++			fprintf(stderr, "%s: cannot read PID from %s\n",
++				prognamed, UI_JAVA_PID_FILE);
++		} else {
++			ui_pid = atoi(buf);
++		}
+ 
+ 		fclose(file);
+ 	}
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon/prot_trace.c wanpipe-3.5.24/util/wanpipemon/prot_trace.c
+--- wanpipe-3.5.24.orig/util/wanpipemon/prot_trace.c	2011-11-17 15:34:58.944213430 +0100
++++ wanpipe-3.5.24/util/wanpipemon/prot_trace.c	2011-11-17 15:48:35.308691171 +0100
+@@ -1568,6 +1568,7 @@ static void decode_annexg_x25_pkt (wp_tr
+ static void print_pcap_file_header (wp_trace_output_iface_t *trace_iface)
+ {
+     struct pcap_hdr fh;
++    int err;
+ 
+     fh.magic = PCAP_MAGIC;
+     fh.version_major = 2;
+@@ -1577,12 +1578,13 @@ static void print_pcap_file_header (wp_t
+     fh.snaplen = 102400;
+     fh.network = trace_iface->link_type;
+ 
+-    fwrite(&fh, sizeof(fh), 1, trace_iface->output_file);
++    err = fwrite(&fh, sizeof(fh), 1, trace_iface->output_file);
+ }
+ 
+ static void print_pcap_record_header(wp_trace_output_iface_t *trace_iface)
+ {
+ 	struct pcaprec_hdr ph;
++	int err;
+ 	
+  	/* Write PCap header */
+  	ph.ts_sec = trace_iface->sec;
+@@ -1590,7 +1592,7 @@ static void print_pcap_record_header(wp_
+         ph.incl_len =  trace_iface->len;
+         ph.orig_len = trace_iface->len;
+ 
+-	fwrite(&ph, sizeof(ph), 1, trace_iface->output_file);
++	err = fwrite(&ph, sizeof(ph), 1, trace_iface->output_file);
+ }
+ 
+ static void
+@@ -1815,6 +1817,7 @@ void wp_trace_output(wp_trace_output_ifa
+ {
+ 	//int num_chars;
+ 	//int j;
++	int err;
+ 	int trace_started=0;
+ 	uint8_t lapd_hdr[LAPD_SLL_LEN];
+ 	uint8_t mtp2_hdr[MTP2_HDR_LEN];
+@@ -1967,16 +1970,16 @@ try_trace_again:
+ 		print_pcap_record_header(trace_iface);
+ 
+ 		if (pcap_prot == 177) {
+-			fwrite(&lapd_hdr[0], sizeof(lapd_hdr), 1, trace_iface->output_file);
++			err = fwrite(&lapd_hdr[0], sizeof(lapd_hdr), 1, trace_iface->output_file);
+ 			trace_iface->len -= sizeof(lapd_hdr);
+ 		}	
+ 
+ 		if (pcap_prot == 139) {
+-			fwrite(&mtp2_hdr[0], sizeof(mtp2_hdr), 1, trace_iface->output_file);
++			err = fwrite(&mtp2_hdr[0], sizeof(mtp2_hdr), 1, trace_iface->output_file);
+ 			trace_iface->len -= sizeof(mtp2_hdr);
+ 		}
+ 
+-		fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_iface->output_file);
++		err = fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_iface->output_file);
+ 
+ 		printf("\rTotal Captured=%-5u (Len=%i)",trace_iface->pkts_written+1,trace_iface->len);
+ 		
+@@ -2007,9 +2010,9 @@ try_trace_again:
+    } 
+ #endif
+ 	if (trace_iface->status) {
+-		  fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_bin_out);
++		err = fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_bin_out);
+     } else {
+-		  fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_bin_in);
++		err = fwrite(&trace_iface->data[0], trace_iface->len, 1, trace_bin_in);
+     }
+ 
+     break;
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon/wangui.c wanpipe-3.5.24/util/wanpipemon/wangui.c
+--- wanpipe-3.5.24.orig/util/wanpipemon/wangui.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/wanpipemon/wangui.c	2011-11-17 16:00:03.890466160 +0100
+@@ -178,7 +178,7 @@ static int wan_if_ip_menu(void)
+ 	
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,50);
++	err=read(pipefds[0],data,50);
+ 	data[strlen(data)-1]='\0';
+ 
+ 	close(pipefds[0]);
+@@ -233,7 +233,7 @@ static int wan_ip_menu(void)
+ 
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,99);
++	err=read(pipefds[0],data,99);
+ 	
+ 	if (stat==SELECT_OK){
+ 		struct in_addr *ip_str = NULL;
+@@ -270,12 +270,12 @@ static int wan_ip_menu(void)
+ 
+ 	memset(data,0,100);
+ 	
+-	read(pipefds[0],data,99);
++	err=read(pipefds[0],data,99);
+ 
+ 	close(pipefds[0]);
+ 	close(pipefds[1]);
+ 
+-	if (err==SELECT_OK){
++	if (stat==SELECT_OK){
+ 		udp_port=atoi(data);
+ 		return 0;
+ 	}
+@@ -407,7 +407,7 @@ static int wan_iface_menu(void)
+ 
+ 	pid=waitpid(pid,&stat,WUNTRACED);
+ 	
+-	read(pipefds[0],data,50);
++	err=read(pipefds[0],data,50);
+ 	data[strlen(data)-1]='\0';
+ 
+ 	close(pipefds[0]);
+@@ -470,7 +470,7 @@ static void wan_main_menu(void)
+ 	
+ 		pid=waitpid(pid,&stat,WUNTRACED);
+ 		
+-		read(pipefds[0],data,50);
++		err=read(pipefds[0],data,50);
+ 		data[strlen(data)-1]='\0';
+ 
+ 		if (stat == SELECT_OK){
+@@ -504,13 +504,13 @@ static void wan_main_menu(void)
+ 
+ 				memset(cmd_data,0,100);
+ 				pid=waitpid(pid,&stat,WUNTRACED);
+-				read(pipefds[0],cmd_data,50);
++				err=read(pipefds[0],cmd_data,50);
+ 				cmd_data[strlen(cmd_data)-1]='\0';
+ 				
+ 				if (stat == SELECT_OK){
+ 
+ exec_cmd_again:
+-					system("clear");	
++					err=system("clear");	
+ 					EXEC_PROT_FUNC(main,wan_protocol,err,(cmd_data, 0, NULL));
+ 					
+ 					hit_enter_or_space_key();
+@@ -536,11 +536,12 @@ static int if_system = UNKNOWN_SYS;
+ int wan_main_gui(void)
+ {
+ 	int local=0;
++	int err;
+ #ifdef LOCALE
+     	(void) setlocale (LC_ALL, "");
+ #endif	
+ 	
+-	system("clear");
++	err = system("clear");
+ 
+ if_ip_menu:
+ 	if (if_system == UNKNOWN_SYS){
+@@ -554,7 +555,7 @@ if_local_remote_sys:
+ 	switch(if_system){
+ 	case LOCAL_SYS:
+ 		if (wan_iface_menu() != 0){
+-			system("clear");
++			err = system("clear");
+ 			if_system = UNKNOWN_SYS;
+ 			goto if_ip_menu;
+ 		}
+@@ -565,7 +566,7 @@ if_local_remote_sys:
+ 
+ 	case REMOTE_SYS:
+ 		if (wan_ip_menu() != 0){
+-			system("clear");
++			err = system("clear");
+ 			if_system = UNKNOWN_SYS;
+ 			goto if_ip_menu;
+ 		}
+@@ -585,6 +586,6 @@ main_menu:
+ 	local = 0;
+ 	goto if_local_remote_sys;
+ 
+-	system("clear");
++	err = system("clear");
+ 	return WAN_TRUE;
+ }
+diff -Naurp wanpipe-3.5.24.orig/util/wanpipemon/xml_lib.c wanpipe-3.5.24/util/wanpipemon/xml_lib.c
+--- wanpipe-3.5.24.orig/util/wanpipemon/xml_lib.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/wanpipemon/xml_lib.c	2011-11-17 15:51:36.990175956 +0100
+@@ -41,7 +41,10 @@ int output_start_xml_router (void)
+ 	if (!pipe_fd)
+ 		return 1;
+ 	
+-	fgets(host,sizeof(host)-1,pipe_fd);
++	if (fgets(host,sizeof(host)-1,pipe_fd) < 0) {
++		pclose(pipe_fd);
++		return 1;
++	}
+ 	pclose(pipe_fd);
+ 	host[strlen(host)-1]='\0';
+ 
+diff -Naurp wanpipe-3.5.24.orig/util/bwm/bwm.c wanpipe-3.5.24/util/bwm/bwm.c
+--- wanpipe-3.5.24.orig/util/bwm/bwm.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/util/bwm/bwm.c	2011-11-17 16:23:44.896196060 +0100
+@@ -102,7 +102,12 @@ int main(int argc, char *argv[])
+       exit(EXIT_FAILURE);
+     }
+ 
+-    fgets(buffer, 255, devfile);
++    if (fgets(buffer, 255, devfile) < 0)
++    {
++      perror("fgets");
++      fclose(devfile);
++      exit(EXIT_FAILURE);
++    }
+ 
+     while(fgets(buffer, 255, devfile) != NULL && inum++ < MAX_INTERFACES - 1)
+     {
+diff -Naurp wanpipe-3.5.24.orig/util/wan_aftup/wan_aftup.c wanpipe-3.5.24/util/wan_aftup/wan_aftup.c
+--- wanpipe-3.5.24.orig/util/wan_aftup/wan_aftup.c	2011-11-17 16:32:00.839090721 +0100
++++ wanpipe-3.5.24/util/wan_aftup/wan_aftup.c	2011-11-17 16:28:48.492313735 +0100
+@@ -1193,7 +1193,7 @@ static int wan_aftup_parse_hwprobe(wan_c
+ {
+ 	wan_aftup_t	*aft = NULL, *aft_prev = NULL;
+ 	char		sel_name[20], *tmp = NULL;
+-	int		j, cnt = 0;
++	int		j, cnt = 0, err;
+ 	
+ 	
+ 	tmp = strtok((char*)api_cmd->data, "\n");
+@@ -1300,7 +1300,7 @@ static int wan_aftup_parse_hwprobe(wan_c
+ 		printf("\n");
+ 		printf("Please select card interface [def=%s; q=exit] > ",
+ 					aft->if_name);
+-		scanf("%s", sel_name);
++		err = scanf("%s", sel_name);
+ 		printf("\n");
+ 
+ 		while(aft){
+diff -Naurp wanpipe-3.5.24.orig/util/wan_aftup/wan_usb_fwupdate.cpp wanpipe-3.5.24/util/wan_aftup/wan_usb_fwupdate.cpp
+--- wanpipe-3.5.24.orig/util/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 16:31:33.940278810 +0100
++++ wanpipe-3.5.24/util/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 16:30:34.510495609 +0100
+@@ -56,7 +56,7 @@ int wan_usbfxo_fwupdate(void *arg, char
+ 
+ filename_again:
+ 	printf("Enter new USB-FXO firmware file [q=exit] > ");
+-	scanf("%s", filename);
++	err = scanf("%s", filename);
+ 	if (strlen(filename) == 1 && toupper(filename[0]) == 'Q'){
+ 		return -EINVAL;
+ 	}
+@@ -70,7 +70,7 @@ filename_again:
+ 
+ update_again:
+ 
+-	system("modprobe -r wan_aften");
++	err = system("modprobe -r wan_aften");
+ 
+ 	printf("\n");
+ 	printf(
+@@ -91,7 +91,7 @@ update_again:
+ 	printf("Connect USB-FXO device and press Enter to update firmware ...");
+ 	getchar();	
+ 
+-	system("modprobe wan_aften");
++	err = system("modprobe wan_aften");
+ 	sleep(3);
+ 	if (MakeConnection(ifname)){
+ 		printf("%s: Failed to create socket to the driver!\n", ifname);
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.24-linux-3.1.patch b/net-misc/wanpipe/files/wanpipe-3.5.24-linux-3.1.patch
new file mode 100644
index 0000000..a8f90ee
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.24-linux-3.1.patch
@@ -0,0 +1,39 @@
+--- wanpipe-3.5.24/patches/kdrivers/include/wanpipe_kernel.h.orig	2011-11-17 13:18:59.658684573 +0100
++++ wanpipe-3.5.24/patches/kdrivers/include/wanpipe_kernel.h	2011-11-17 13:24:47.629233904 +0100
+@@ -108,6 +108,10 @@
+ 
+ 
+ //////////////////////
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
++#define HAVE_NET_DEVICE_OPS
++#endif
++
+ #ifdef HAVE_NET_DEVICE_OPS
+ #define WAN_DECLARE_NETDEV_OPS(_ops_name) static struct net_device_ops _ops_name = {0};
+ 
+--- wanpipe-3.5.24/patches/kdrivers/include/wanpipe_defines.h.orig	2011-11-17 13:19:08.251946155 +0100
++++ wanpipe-3.5.24/patches/kdrivers/include/wanpipe_defines.h	2011-11-17 13:24:44.044125392 +0100
+@@ -893,6 +893,12 @@ typedef struct wan_rtp_pkt {
+ #pragma pack()
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
++#ifndef HAVE_NET_DEVICE_OPS
++#define HAVE_NET_DEVICE_OPS
++#endif
++#endif
++
+ #if defined(HAVE_NET_DEVICE_OPS) 
+ 
+ #define WAN_DECLARE_NETDEV_OPS(_ops_name) static struct net_device_ops _ops_name = {0};
+--- wanpipe-3.5.24/samples/wanrouter.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/samples/wanrouter	2012-02-01 10:00:13.491721703 +0100
+@@ -2282,7 +2282,7 @@
+ 						WANEC_MOD_DIR=/lib/modules/$(uname -r)/kernel/net/wanrouter
+ 					fi
+ 				else
+-					uname -r | grep "^3.0.*" > /dev/null
++					uname -r | grep "^3.*" > /dev/null
+ 					if [ $? -eq 0 ]; then	
+ 						MOD1=/lib/modules/$(uname -r)/kernel/drivers/net/wan/sdladrv
+ 						MOD2=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanrouter
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.27-QA-fix-const-char-warnings.patch b/net-misc/wanpipe/files/wanpipe-3.5.27-QA-fix-const-char-warnings.patch
new file mode 100644
index 0000000..b5ef61e
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.27-QA-fix-const-char-warnings.patch
@@ -0,0 +1,160 @@
+diff -Naurp wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv_usb.c wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv_usb.c
+--- wanpipe-3.5.24.orig/patches/kdrivers/src/net/sdladrv_usb.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/patches/kdrivers/src/net/sdladrv_usb.c	2011-11-17 15:10:05.200560777 +0100
+@@ -188,7 +188,7 @@ struct sdla_usb_desc {
+ ****               F U N C T I O N   P R O T O T Y P E S                ****
+ ***************************************************************************/
+ extern sdlahw_t* sdla_find_adapter(wandev_conf_t* conf, char* devname);
+-extern sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int);
++extern sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char *);
+ extern sdlahw_t* sdla_hw_search(sdlahw_cpu_t*, int);
+ extern int sdla_hw_fe_test_and_set_bit(void *phw,int value);
+ extern int sdla_hw_fe_test_bit(void *phw,int value);
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c
+--- wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c	2011-11-17 14:54:30.976639794 +0100
+@@ -70,7 +70,7 @@ static sangoma_status_t sangoma_hwec_byp
+ static int sangoma_hwec_is_numeric_parameter(char *parameter)
+ {
+ 	int i;
+-	static char *WANEC_numeric_params[] = {
++	static const char *WANEC_numeric_params[] = {
+ 		"WANEC_TailDisplacement",
+ 		"WANEC_MaxPlayoutBuffers",
+ 		"WANEC_MaxConfBridges",
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/wanec/wanec_api_lib.c wanpipe-3.5.24/api/libsangoma/wanec/wanec_api_lib.c
+--- wanpipe-3.5.24.orig/api/libsangoma/wanec/wanec_api_lib.c	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-3.5.24/api/libsangoma/wanec/wanec_api_lib.c	2011-11-17 14:56:45.543661831 +0100
+@@ -132,8 +132,8 @@ typedef struct {
+ 	UINT32	max_channels;
+ 	UINT32	memory_chip_size;
+ 	UINT32	debug_data_mode;
+-	char	*image_name;	
+-	char	*image_path;
++	const char	*image_name;	
++	const char	*image_path;
+ } wanec_image_info_t;
+ 
+ wanec_image_info_t	wanec_image_32 = 
+@@ -184,8 +184,8 @@ struct wan_ec_image
+ 	UINT32	max_channels;
+ 	UINT32	memory_chip_size;
+ 	UINT32	debug_data_mode;
+-	char	*image;	
+-	char	*image_path;
++	const char	*image;	
++	const char	*image_path;
+ 	int	hwec_opt_no;
+ 	int	hwec_opt[5];
+ } wan_ec_image_list[] =
+@@ -222,7 +222,7 @@ struct wan_ec_image
+ #endif
+ 
+ #if !defined(__WINDOWS__)	
+-CHAR *ToneBufferPaths[WAN_NUM_PLAYOUT_TONES] = 
++const CHAR *ToneBufferPaths[WAN_NUM_PLAYOUT_TONES] = 
+ {
+ 	WAN_EC_BUFFERS "/DTMF_0_ulaw.pcm",
+ 	WAN_EC_BUFFERS "/DTMF_1_ulaw.pcm",
+@@ -436,7 +436,7 @@ int wanec_api_lib_ioctl(HANDLE dev, wan_
+ **/
+ static int
+ wanec_api_lib_loadImageFile(	wan_ec_api_t 	*ec_api,
+-				char		*path,
++				const char	*path,
+ 				UINT8		**WP_POINTER_64 pData,
+ 				UINT32		*file_size)
+ {
+diff -Naurp wanpipe-3.5.24.orig/api/libsangoma/libsangoma_hwec.c wanpipe-3.5.24/api/libsangoma/libsangoma_hwec.c
+--- wanpipe-3.5.24.orig/firmware/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 10:27:41.214136518 +0100
++++ wanpipe-3.5.24/firmware/wan_aftup/wan_usb_fwupdate.cpp	2011-11-17 10:26:30.853064433 +0100
+@@ -32,7 +32,7 @@ int CloseConnection(char *ifname);
+ int wan_usbfxo_fwupdate(void*, char *ifname, int);
+ int exec_usb_data_write(void*, int off, char *data, int len);
+ int exec_usb_data_read(void*, char *data, int len);
+-int progress_bar(char *msg, int ci, int mi);
++int progress_bar(const char *msg, int ci, int mi);
+ void hit_any_key(void);
+ }
+ 
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash.c	2009-12-16 21:31:07.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash.c	2010-03-14 02:05:34.252063454 +0000
+@@ -74,7 +74,7 @@ extern int	card_type;
+ extern int	exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int	exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+ extern void	hit_any_key(void);
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ static int aft_reset_flash(wan_aft_cpld_t *cpld);
+ static int aft_is_protected(wan_aft_cpld_t *cpld, int stype);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_a600.c	2009-12-16 21:31:02.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_a600.c	2010-03-14 02:07:55.154064039 +0000
+@@ -48,7 +48,7 @@ aftup_flash_t	aft_a600_flash = {  0x014F
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark.c	2009-12-16 21:31:13.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark.c	2010-03-14 02:07:43.642063949 +0000
+@@ -114,7 +114,7 @@ aftup_flash_t	aft_shark_flash = {  0x014
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2009-08-25 20:44:41.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_flash_shark_ds.c	2010-03-14 02:06:53.803063891 +0000
+@@ -98,7 +98,7 @@ aftup_flash_t	aft_shark_ds_flash = {  0x
+ 
+ extern int	verbose;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ /*
+  ******************************************************************************
+ 			  FUNCTION PROTOTYPES
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aft_prg.c	2009-10-23 15:35:21.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aft_prg.c	2010-03-14 02:07:39.029064002 +0000
+@@ -180,7 +180,7 @@ struct flash_spec_t {
+ extern int	verbose;
+ extern int	card_type;
+ 
+-extern int	progress_bar(char*,int,int);
++extern int	progress_bar(const char*,int,int);
+ 
+ extern int exec_read_cmd(void*,unsigned int, unsigned int, unsigned int*);
+ extern int exec_write_cmd(void*,unsigned int, unsigned int, unsigned int);
+diff -Naurp wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c
+--- wanpipe-3.5.10.orig/firmware/wan_aftup/wan_aftup.c	2009-12-16 21:31:17.000000000 +0000
++++ wanpipe-3.5.10/firmware/wan_aftup/wan_aftup.c	2010-03-14 02:06:22.372438749 +0000
+@@ -203,7 +203,7 @@ aft_core_info_t aft_core_table[] = {
+ /******************************************************************************
+ 			  FUNCTION PROTOTYPES
+ ******************************************************************************/
+-int progress_bar(char*,int,int);
++int progress_bar(const char*,int,int);
+ void main_menu(void);
+ void read_chip_control_menu(void);
+ void registers_and_internal_ram_test_menu(void);
+@@ -232,7 +232,7 @@ extern int wan_usbfxo_fwupdate(void*, ch
+ *			  FUNCTION DEFINITION	
+ ******************************************************************************/
+ 
+-int progress_bar(char *msg, int ci, int mi)
++int progress_bar(const char *msg, int ci, int mi)
+ {
+ 	static int index = 0;
+ 
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.27-linux-3.4.patch b/net-misc/wanpipe/files/wanpipe-3.5.27-linux-3.4.patch
new file mode 100644
index 0000000..8517aac
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.27-linux-3.4.patch
@@ -0,0 +1,26 @@
+--- wanpipe-3.5.27/patches/kdrivers/include/linux/wanpipe_includes.h.orig	2012-05-27 12:07:15.759583006 +0200
++++ wanpipe-3.5.27/patches/kdrivers/include/linux/wanpipe_includes.h	2012-05-27 12:12:18.407547079 +0200
+@@ -270,7 +270,9 @@
+ #  include <linux/netdevice.h>
+ #  include <linux/list.h>
+ #  include <asm/io.h>		/* phys_to_virt() */
+-#  include <asm/system.h>
++#  if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
++#   include <asm/system.h>
++#  endif
+ #  include <asm/byteorder.h>
+ #  include <asm/delay.h>
+ #  include <linux/pci.h>
+--- wanpipe-3.5.27/patches/kdrivers/include/linux/wanpipe.h.orig	2012-05-27 12:23:15.293853683 +0200
++++ wanpipe-3.5.27/patches/kdrivers/include/linux/wanpipe.h	2012-05-27 12:27:02.704183860 +0200
+@@ -219,7 +219,9 @@
+ 
+ # if defined(LINUX_2_4) || defined(LINUX_2_6)
+ #  include <linux/serial.h>
+-#  include <linux/serialP.h>
++#  if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
++#   include <linux/serialP.h>
++#  endif
+ #  include <linux/serial_reg.h>
+ #  include <asm/serial.h>
+ # endif
diff --git a/net-misc/wanpipe/files/wanpipe-3.5.28-linux-3.7.patch b/net-misc/wanpipe/files/wanpipe-3.5.28-linux-3.7.patch
new file mode 100644
index 0000000..3b4f70e
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-3.5.28-linux-3.7.patch
@@ -0,0 +1,14 @@
+--- wanpipe-3.5.28/patches/kdrivers/include/wanpipe_kernel.h	2013-01-06 15:30:21.936769374 +0100
++++ wanpipe-3.5.28/patches/kdrivers/include/wanpipe_kernel.h	2013-01-06 15:33:58.821779305 +0100
+@@ -53,6 +53,11 @@
+ # define wan_rwlock_init(lock)  *(lock)=RW_LOCK_UNLOCKED	
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++/* Used by sdladrv(_src).c, removed in 3.7 */
++#define pci_dev_b(n) list_entry(n, struct pci_dev, bus_list)
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) 
+ #define device_create_drvdata(a,b,c,d,e) device_create(a,b,c,d,e) 
+ #endif
diff --git a/net-misc/wanpipe/files/wanpipe-7.0.0-linux-3.9.patch b/net-misc/wanpipe/files/wanpipe-7.0.0-linux-3.9.patch
new file mode 100644
index 0000000..570aab4
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe-7.0.0-linux-3.9.patch
@@ -0,0 +1,33 @@
+--- wanpipe-7.0.2/patches/kdrivers/src/wanrouter/af_wanpipe.c.orig	2013-05-25 17:20:12.347660389 +0200
++++ wanpipe-7.0.2/patches/kdrivers/src/wanrouter/af_wanpipe.c	2013-05-25 17:20:37.993661563 +0200
+@@ -1725,9 +1725,6 @@ static int wanpipe_getname(struct socket
+ int wanpipe_notifier(struct notifier_block *this, unsigned long msg, void *data)
+ {
+ 	struct sock *sk;
+-#ifdef LINUX_2_6
+-	struct hlist_node *node;
+-#endif
+ 	netdevice_t *dev = (netdevice_t*)data;
+ 
+ 	if (dev==NULL){
+@@ -1737,7 +1734,7 @@ int wanpipe_notifier(struct notifier_blo
+ 
+ 	read_lock(&wanpipe_sklist_lock);
+ #ifdef LINUX_2_6
+-	sk_for_each(sk, node, &wanpipe_sklist) {
++	sk_for_each(sk, &wanpipe_sklist) {
+ #else
+ 	for (sk = wanpipe_sklist; sk; sk = sk->next) {
+ #endif
+--- wanpipe-7.0.2/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c.orig	2013-05-25 17:19:13.933657714 +0200
++++ wanpipe-7.0.2/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c	2013-05-25 17:19:57.081659690 +0200
+@@ -151,8 +151,7 @@ int wanpipe_bind_sk_to_parent(struct soc
+ 	write_lock_irqsave(&wanpipe_parent_sklist_lock,flags);
+ #ifdef LINUX_2_6
+ 	{
+-	struct hlist_node *node;
+-	sk_for_each(parent_sk, node, &wanpipe_parent_sklist) {
++	sk_for_each(parent_sk, &wanpipe_parent_sklist) {
+ 		if (SK_PRIV((parent_sk))->dev == dev) {
+ 			break;
+ 		}
diff --git a/net-misc/wanpipe/files/wanpipe.rules b/net-misc/wanpipe/files/wanpipe.rules
new file mode 100644
index 0000000..fedf309
--- /dev/null
+++ b/net-misc/wanpipe/files/wanpipe.rules
@@ -0,0 +1,2 @@
+KERNEL=="wanpipe*", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL=="wanec",    OWNER="root", GROUP="dialout", MODE="0660"
diff --git a/net-misc/wanpipe/files/wanrouter.rc6 b/net-misc/wanpipe/files/wanrouter.rc6
new file mode 100755
index 0000000..75a8325
--- /dev/null
+++ b/net-misc/wanpipe/files/wanrouter.rc6
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+#
+
+opts="${opts} showconfig showdevices showstatus"
+
+depend() {
+	before dahdi
+}
+
+checkconfig() {
+	local devices=""
+
+	if [ ! -f /etc/wanpipe/wanrouter.rc ] ; then
+		error "No wanrouter configuration found!"
+		error "Please use the wancfg tools to create the configuration"
+		return 1
+	fi
+
+	devices="$(sh -c 'source /etc/wanpipe/wanrouter.rc ; echo ${WAN_DEVICES}')"
+	if [ -z "${devices}" ] ; then
+		error "No devices in wanrouter configuration found!"
+		error "Please use the wancfg tools to create the configuration"
+		return 1
+	fi
+
+	for x in ${devices}; do
+		if [ ! -f "/etc/wanpipe/${x}.conf" ] ; then
+			error "No ${x} configuration found!"
+			error "Please use the wancfg tools to create the configuration"
+			return 1
+		fi
+	done
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting wanrouter"
+	/usr/sbin/wanrouter start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wanrouter"
+	/usr/sbin/wanrouter stop
+	eend $?
+}
+
+showconfig() {
+	/usr/sbin/wanrouter summary
+}
+
+showdevices() {
+	/usr/sbin/wanrouter list
+}
+
+showstatus() {
+	/usr/sbin/wanrouter status
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.12.ebuild b/net-misc/wanpipe/wanpipe-3.5.12.ebuild
new file mode 100644
index 0000000..0f797ad
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.12.ebuild
@@ -0,0 +1,152 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( <net-misc/dahdi-2.4.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.10_p10-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.12-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.35(-rcX) support
+	#epatch "${FILESDIR}/${PN}-3.5.11-linux-2.6.35.patch"
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	# Build everything
+	emake all_src all_lib ARCH="$(tc-arch-kernel)" DAHDI_DIR="${S_DAHDI}" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib ARCH="$(tc-arch-kernel)" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.14.ebuild b/net-misc/wanpipe/wanpipe-3.5.14.ebuild
new file mode 100644
index 0000000..c9fe295
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.14.ebuild
@@ -0,0 +1,154 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( <net-misc/dahdi-2.4.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.10_p10-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.14-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.35(-rcX) support
+	if kernel_is ge 2 6 35; then
+		epatch "${FILESDIR}/${PN}-3.5.11-linux-2.6.35.patch"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	# Build everything
+	emake all_src all_lib ARCH="$(tc-arch-kernel)" DAHDI_DIR="${S_DAHDI}" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib ARCH="$(tc-arch-kernel)" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.15-r1.ebuild b/net-misc/wanpipe/wanpipe-3.5.15-r1.ebuild
new file mode 100644
index 0000000..74a9226
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.15-r1.ebuild
@@ -0,0 +1,164 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.10_p10-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.15-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		ewarn "Experimental support for linux-2.6.36"
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.14-dahdi-location.patch
+
+	# experimental patch for dahdi-2.4.0 support
+	if use dahdi && has_version ">=net-misc/dahdi-2.4.0"; then
+		ewarn "Experimental support for dahdi-2.4.0"
+		epatch "${FILESDIR}/${PN}-3.5.15-dahdi-2.4.0.patch"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	# Build everything
+	emake all_src all_lib ARCH="$(tc-arch-kernel)" DAHDI_DIR="${S_DAHDI}" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib ARCH="$(tc-arch-kernel)" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.15.ebuild b/net-misc/wanpipe/wanpipe-3.5.15.ebuild
new file mode 100644
index 0000000..37b127b
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.15.ebuild
@@ -0,0 +1,162 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( <net-misc/dahdi-2.4.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.10_p10-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.15-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.35(-rcX) support
+#	if kernel_is ge 2 6 35; then
+#		epatch "${FILESDIR}/${PN}-3.5.11-linux-2.6.35.patch"
+#	fi
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.14-dahdi-location.patch
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	# Build everything
+	emake all_src all_lib ARCH="$(tc-arch-kernel)" DAHDI_DIR="${S_DAHDI}" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib ARCH="$(tc-arch-kernel)" KVER="${KV_FULL}" KDIR="${S_KERNEL}" DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.16.ebuild b/net-misc/wanpipe/wanpipe-3.5.16.ebuild
new file mode 100644
index 0000000..1e78e5d
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.16.ebuild
@@ -0,0 +1,179 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+	#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		ewarn "Experimental support for linux-2.6.36"
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.16-dahdi-location.patch
+
+	# experimental patch for dahdi-2.4.0 support
+#	if use dahdi && has_version ">=net-misc/dahdi-2.4.0"; then
+#		ewarn "Experimental support for dahdi-2.4.0"
+#		epatch "${FILESDIR}/${PN}-3.5.15-dahdi-2.4.0.patch"
+#	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.17.ebuild b/net-misc/wanpipe/wanpipe-3.5.17.ebuild
new file mode 100644
index 0000000..1b197c9
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.17.ebuild
@@ -0,0 +1,185 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+	#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		ewarn "Experimental support for linux-2.6.36"
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental patch for 2.6.37(-rcX) support
+	if kernel_is ge 2 6 37; then
+		ewarn "Experimental support for linux-2.6.37"
+		epatch "${FILESDIR}/${PN}-3.5.17-linux-2.6.37.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.16-dahdi-location.patch
+
+	# experimental patch for dahdi-2.4.0 support
+#	if use dahdi && has_version ">=net-misc/dahdi-2.4.0"; then
+#		ewarn "Experimental support for dahdi-2.4.0"
+#		epatch "${FILESDIR}/${PN}-3.5.15-dahdi-2.4.0.patch"
+#	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.17_p9.ebuild b/net-misc/wanpipe/wanpipe-3.5.17_p9.ebuild
new file mode 100644
index 0000000..578583d
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.17_p9.ebuild
@@ -0,0 +1,192 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+	#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		ewarn "Experimental support for linux-2.6.36"
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental patch for 2.6.37(-rcX) support
+	if kernel_is ge 2 6 37; then
+		ewarn "Experimental support for linux-2.6.37"
+		epatch "${FILESDIR}/${PN}-3.5.17-linux-2.6.37.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.16-dahdi-location.patch
+
+	# experimental patch for dahdi-2.4.0 support
+#	if use dahdi && has_version ">=net-misc/dahdi-2.4.0"; then
+#		ewarn "Experimental support for dahdi-2.4.0"
+#		epatch "${FILESDIR}/${PN}-3.5.15-dahdi-2.4.0.patch"
+#	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.18.ebuild b/net-misc/wanpipe/wanpipe-3.5.18.ebuild
new file mode 100644
index 0000000..768e4ff
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.18.ebuild
@@ -0,0 +1,196 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+	#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+	# Silence "jobserver unavailable" messages and QA warnings
+	epatch "${FILESDIR}/${PN}-3.5.18-QA-fix-parallel-make.patch"
+
+	# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+	#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+	# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+	epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+	# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+	epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+	# experimental patch for 2.6.36(-rcX) support
+	if kernel_is ge 2 6 36; then
+		ewarn "Experimental support for linux-2.6.36"
+		epatch "${FILESDIR}/${PN}-3.5.15-linux-2.6.36.patch"
+	fi
+
+	# experimental patch for 2.6.37(-rcX) support
+	if kernel_is ge 2 6 37; then
+		ewarn "Experimental support for linux-2.6.37"
+		epatch "${FILESDIR}/${PN}-3.5.17-linux-2.6.37.patch"
+	fi
+
+	# experimental dahdi location support
+	epatch "${FILESDIR}"/${PN}-3.5.16-dahdi-location.patch
+
+	# experimental patch for dahdi-2.4.0 support
+#	if use dahdi && has_version ">=net-misc/dahdi-2.4.0"; then
+#		ewarn "Experimental support for dahdi-2.4.0"
+#		epatch "${FILESDIR}/${PN}-3.5.15-dahdi-2.4.0.patch"
+#	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install install_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.19.ebuild b/net-misc/wanpipe/wanpipe-3.5.19.ebuild
new file mode 100644
index 0000000..2d189fe
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.19.ebuild
@@ -0,0 +1,196 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.18-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+		# experimental patch for 2.6.37(-rcX) support
+		if kernel_is ge 2 6 37; then
+			ewarn "Experimental support for linux-2.6.37"
+			epatch "${FILESDIR}/${PN}-3.5.17-linux-2.6.37.patch"
+		fi
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.16-dahdi-location.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+	# disable ldconfig, causes sandbox violation otherwise
+	epatch "${FILESDIR}/${PN}-3.5.19-disable-ldconfig.patch"
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.20.ebuild b/net-misc/wanpipe/wanpipe-3.5.20.ebuild
new file mode 100644
index 0000000..4232c18
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.20.ebuild
@@ -0,0 +1,213 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.16-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.20-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+		# experimental patch for 2.6.37(-rcX) support
+		if kernel_is ge 2 6 37; then
+			ewarn "Experimental support for linux-2.6.37+"
+			epatch "${FILESDIR}/${PN}-3.5.17-linux-2.6.37.patch"
+		fi
+
+		# experimental patch for 2.6.39(-rcX) support
+		if kernel_is ge 2 6 39; then
+			ewarn "Experimental support for linux-2.6.39+"
+			epatch "${FILESDIR}/${PN}-3.5.20-linux-2.6.39.patch"
+		fi
+
+		# experimental patch for 3.0 (-rcX) support
+		if kernel_is ge 3 0 0; then
+			ewarn "Experimental support for linux-3.0+"
+			epatch "${FILESDIR}/${PN}-3.5.20-linux-3.0.patch"
+		fi
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.16-dahdi-location.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+	# disable ldconfig, causes sandbox violation otherwise
+	epatch "${FILESDIR}/${PN}-3.5.19-disable-ldconfig.patch"
+	# libstelephony autotools cleanup, fixes error on build (from pre-3.5.21)
+	epatch "${FILESDIR}/${PN}-3.5.20-libstelephony-cleanup.patch"
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# install drivers, tools, headers and libs
+	emake install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.22.ebuild b/net-misc/wanpipe/wanpipe-3.5.22.ebuild
new file mode 100644
index 0000000..19d9b9c
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.22.ebuild
@@ -0,0 +1,215 @@
+#
+#
+#
+EAPI="2"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.22-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.22-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.22-dahdi-location.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+	# fix clash between wancfg_legacy and top-level Makefile install targets
+	# ("/var/.../image//etc/wanpipe/lib/: file already exists")
+	epatch "${FILESDIR}/${PN}-3.5.22-wancfg_legacy-Makefile.patch"
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.23.ebuild b/net-misc/wanpipe/wanpipe-3.5.23.ebuild
new file mode 100644
index 0000000..9fd1d28
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.23.ebuild
@@ -0,0 +1,222 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#          do not install headers during "make all_util"
+	#
+	epatch "${FILESDIR}/${PN}-3.5.22-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.23-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.16-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-const-char-warnings.patch"
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.22-dahdi-location.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+	# fix clash between wancfg_legacy and top-level Makefile install targets
+	# ("/var/.../image//etc/wanpipe/lib/: file already exists")
+	epatch "${FILESDIR}/${PN}-3.5.22-wancfg_legacy-Makefile.patch"
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.24.ebuild b/net-misc/wanpipe/wanpipe-3.5.24.ebuild
new file mode 100644
index 0000000..fa5b8f3
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.24.ebuild
@@ -0,0 +1,226 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.22-dahdi-location.patch"
+
+		# >=linux-3.1 removed HAVE_NET_DEVICE_OPS from netdevice.h
+		epatch "${FILESDIR}/${PN}-3.5.24-linux-3.1.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.25.ebuild b/net-misc/wanpipe/wanpipe-3.5.25.ebuild
new file mode 100644
index 0000000..7381213
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.25.ebuild
@@ -0,0 +1,247 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		epatch "${FILESDIR}/${PN}-3.5.22-dahdi-location.patch"
+
+		# >=linux-3.1 removed HAVE_NET_DEVICE_OPS from netdevice.h
+		#epatch "${FILESDIR}/${PN}-3.5.24-linux-3.1.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.26.ebuild b/net-misc/wanpipe/wanpipe-3.5.26.ebuild
new file mode 100644
index 0000000..7b75946
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.26.ebuild
@@ -0,0 +1,247 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.1 removed HAVE_NET_DEVICE_OPS from netdevice.h
+		#epatch "${FILESDIR}/${PN}-3.5.24-linux-3.1.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.27.ebuild b/net-misc/wanpipe/wanpipe-3.5.27.ebuild
new file mode 100644
index 0000000..7b205bd
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.27.ebuild
@@ -0,0 +1,250 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.1 removed HAVE_NET_DEVICE_OPS from netdevice.h
+		#epatch "${FILESDIR}/${PN}-3.5.24-linux-3.1.patch"
+
+		# >=linux-3.4 removed asm/system.h
+		epatch "${FILESDIR}/${PN}-3.5.27-linux-3.4.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-3.5.28.ebuild b/net-misc/wanpipe/wanpipe-3.5.28.ebuild
new file mode 100644
index 0000000..2f542bd
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-3.5.28.ebuild
@@ -0,0 +1,253 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence memset/memcpy implicit declaration QA warnings (fixed in 3.5.16)
+		#epatch "${FILESDIR}/${PN}-3.5.10-silence-QA-warnings.patch"
+
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# TODO: Silence "stel_tone/fsk.c:240: warning: dereferencing type-punned pointer will break strict-aliasing rules"
+		#epatch "${FILESDIR}/${PN}-3.5.10-QA-fix-libstelephony.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.1 removed HAVE_NET_DEVICE_OPS from netdevice.h
+		#epatch "${FILESDIR}/${PN}-3.5.24-linux-3.1.patch"
+
+		# >=linux-3.4 removed asm/system.h
+		epatch "${FILESDIR}/${PN}-3.5.27-linux-3.4.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+
+#	# Remove some include paths
+#	sed -i -e "s:-I\$(INSTALLPREFIX)/include::; s:-I\$(INSTALLPREFIX)/usr/include::" \
+#		Makefile
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.0.ebuild b/net-misc/wanpipe/wanpipe-7.0.0.ebuild
new file mode 100644
index 0000000..a767434
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.0.ebuild
@@ -0,0 +1,237 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.1.ebuild b/net-misc/wanpipe/wanpipe-7.0.1.ebuild
new file mode 100644
index 0000000..a767434
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.1.ebuild
@@ -0,0 +1,237 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/etc/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.10.ebuild b/net-misc/wanpipe/wanpipe-7.0.10.ebuild
new file mode 100644
index 0000000..9740bf0
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.10.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		#kernel_is ge 3 9 0 && \
+		#	epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.3.ebuild b/net-misc/wanpipe/wanpipe-7.0.3.ebuild
new file mode 100644
index 0000000..778a806
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.3.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		kernel_is ge 3 9 0 && \
+			epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.5.ebuild b/net-misc/wanpipe/wanpipe-7.0.5.ebuild
new file mode 100644
index 0000000..778a806
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.5.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		kernel_is ge 3 9 0 && \
+			epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.6.ebuild b/net-misc/wanpipe/wanpipe-7.0.6.ebuild
new file mode 100644
index 0000000..778a806
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.6.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		kernel_is ge 3 9 0 && \
+			epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.8.ebuild b/net-misc/wanpipe/wanpipe-7.0.8.ebuild
new file mode 100644
index 0000000..778a806
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.8.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		kernel_is ge 3 9 0 && \
+			epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-misc/wanpipe/wanpipe-7.0.9.ebuild b/net-misc/wanpipe/wanpipe-7.0.9.ebuild
new file mode 100644
index 0000000..9740bf0
--- /dev/null
+++ b/net-misc/wanpipe/wanpipe-7.0.9.ebuild
@@ -0,0 +1,241 @@
+#
+#
+#
+EAPI="4"
+
+inherit linux-mod versionator
+
+MY_P="${PN}-${PV/_p/.}"
+DESCRIPTION="Wanpipe driver for Sangoma PCI/PCIe Telephony Cards"
+HOMEPAGE="http://www.sangoma.com/"
+
+if [ "${PV/_p/}" = "${PV}" ]; then
+	# release version
+	SRC_URI="ftp://ftp.sangoma.com/linux/current_wanpipe/${MY_P}.tgz"
+else
+	# post-release (patched) version
+	SRC_URI="ftp://ftp.sangoma.com/linux/custom/3.5/${MY_P}.tgz"
+fi
+
+IUSE="+dahdi vanilla"
+KEYWORDS="~amd64 ~x86"
+LICENSE=""
+SLOT="0"
+
+RDEPEND="dahdi? ( net-misc/dahdi )
+	sys-devel/gcc[cxx]"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${P/_p/.}"
+S_DAHDI="${WORKDIR}/dahdi"
+S_KERNEL="${WORKDIR}/kernel"
+
+src_prepare() {
+	###
+	# DAHDI: copy includes
+	#
+	if use dahdi; then
+		mkdir -p "${S_DAHDI}"/{include,drivers/dahdi} || die "Failed to create directory for dahdi includes"
+		cp -R "${ROOT}/usr/include/dahdi" "${S_DAHDI}/include" || die "Failed to copy dahdi headers"
+
+		###
+		# !!! HACK Alert !!!
+		#
+		# wanpipe-3.5.25 needs include/dahdi/version.h, which (of course) is not part of the public API
+		# (not installed by DAHDI install-includes target), so create a fake version.h as a "workaround".
+		#
+		# !!! HACK Alert !!!
+		#
+		DAHDI_VER="$(best_version net-misc/dahdi)"
+		DAHDI_VER="$(get_version_component_range 1-4 "${DAHDI_VER#*dahdi-}")"
+
+		[ -z "${DAHDI_VER}" ] && die "Failed to create fake ${S_DAHDI}/include/dahdi/version.h"
+
+		cat ->"${S_DAHDI}/include/dahdi/version.h" <<-EOF
+		/*
+		 * Fake DAHDI version.h created by ${PF} ebuild
+		 */
+		#define DAHDI_VERSION "${DAHDI_VER}"
+		EOF
+
+
+		if linux_chkconfig_builtin MODVERSIONS; then
+			# extract symbol version
+			/bin/sh "${FILESDIR}/extract_symver.sh" \
+				"/lib/modules/${KV_FULL}/dahdi" > "${S_DAHDI}/drivers/dahdi/Module.symvers" || die "Failed to extract dahdi modules symbol version"
+		else
+			# shut up bogus wanpipe error message and modpost warnings,
+			# create a fake Module.symvers for dahdi.ko
+			#
+			cat - >"${S_DAHDI}/drivers/dahdi/Module.symvers" <<-EOF
+			0x00000000	dahdi_rbsbits	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_chunk	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_channel	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_unregister	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_ec_span	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_receive	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hooksig	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_qevent_lock	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_register	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_transmit	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_hdlc_getbuf	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			0x00000000	dahdi_alarm_notify	dahdi/dahdi	EXPORT_SYMBOL_GPL
+			EOF
+		fi
+	fi
+
+	###
+	# Kernel: create a local copy, so wanpipe doesn't
+	#         mess up things in /usr/src/...
+	#
+	# Credits: based on the wanpipe-3.1.4 ebuild in http://bugs.gentoo.org/show_bug.cgi?id=188939
+	#
+	mkdir -p "${S_KERNEL}" || die "Failed to create create ${S_KERNEL}"
+	cp -dPR "${KERNEL_DIR}/include" "${S_KERNEL}" || die "Failed to copy ${KV_FULL} includes to ${S_KERNEL}"
+	ln -s "${KERNEL_DIR}/Makefile"  "${S_KERNEL}/Makefile" || die "Failed to symlink ${KV_FULL} Makefile"
+	ln -s "${KERNEL_DIR}/scripts"   "${S_KERNEL}/scripts"  || die "Failed to symlink ${KV_FULL} scripts"
+	ln -s "${KERNEL_DIR}/arch"      "${S_KERNEL}/arch"     || die "Failed to symlink ${KV_FULL} arch"
+	ln -s "${KERNEL_DIR}/.config"   "${S_KERNEL}/.config"  || die "Failed to symlink ${KV_FULL} .config"
+
+	[ -f "${KERNEL_DIR}/Module.symvers" ] && \
+		ln -s "${KERNEL_DIR}/Module.symvers" "${S_KERNEL}/Module.symvers"
+
+	# Remove kernel's (old) wanrouter.h,
+	# so we're really only using wanpipe's version
+	#
+	rm -f "${S_KERNEL}/include/linux/wanrouter.h" || die "Failed to remove ${KV_FULL} old linux/wanrouter.h"
+
+	###
+	# Wanpipe: disable header cleaning script,
+	#          disable depmod call
+	#
+	epatch "${FILESDIR}/${PN}-3.5.24-Makefile.patch"
+
+	if ! use vanilla ; then
+		# Silence "jobserver unavailable" messages and QA warnings
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-parallel-make.patch"
+
+		# Silence gcc-4.4 "warning: format not a string literal and no format arguments"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-format-literal-warnings.patch"
+
+		# Silence gcc-4.4 "warning: deprecated conversion from string constant to 'char*'"
+		epatch "${FILESDIR}/${PN}-3.5.27-QA-fix-const-char-warnings.patch"
+
+		# Silence "ignoring return value of 'XXXX', declared with attribute warn_unused_result"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result.patch"
+		epatch "${FILESDIR}/${PN}-3.5.24-QA-fix-warn_unused_result-legacy.patch"
+
+		# experimental dahdi location support
+		#epatch "${FILESDIR}/${PN}-3.5.26-dahdi-location.patch"
+
+		# >=linux-3.7 removed pci.h:pci_dev_b()
+		epatch "${FILESDIR}/${PN}-3.5.28-linux-3.7.patch"
+
+		# >=linux-3.9 removed node field from sk_for_each() and friends
+		#kernel_is ge 3 9 0 && \
+		#	epatch "${FILESDIR}/${PN}-7.0.0-linux-3.9.patch"
+	else
+		ewarn "Vanilla wanpipe build, all non-mandatory patches are disabled!"
+	fi
+}
+
+src_compile() {
+	# DEBUG: deny write access to linux source
+	addread "${KERNEL_DIR}"
+
+	use dahdi && \
+		build_target="all_src_dahdi"
+
+	# Build everything
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake ${build_target:-all_src} all_lib \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to build wanpipe"
+}
+
+src_install() {
+	# Install drivers, tools, headers and libs
+	# Use LDCONFIG="/bin/true" to avoid sandbox violation
+	emake -j1 install \
+		ARCH="$(tc-arch-kernel)" \
+		WARCH="$(tc-arch-kernel)" \
+		DAHDI_DIR="${S_DAHDI}" \
+		KVER="${KV_FULL}" \
+		KDIR="${S_KERNEL}" \
+		LDCONFIG="/bin/true" \
+		DESTDIR="${D}" || die "Failed to install wanpipe"
+
+	# remove bogus symlink
+	rm "${D}/usr/include/wanpipe/linux"
+
+	# remove trixbox setup script
+	rm -r "${D}/usr/local"
+
+	# fixup permissions
+	find "${D}/usr/include/wanpipe" -type f -exec chmod 644 {} \;
+
+	# empty, but used by wanpipe/-router scripts
+	keepdir /etc/wanpipe/{interfaces,scripts}
+
+	# remove duplicate wan_aftup binary from /etc/wanpipe...
+	# TODO: fixup Makefile
+	sed -i -e 's:\(\./\)\?wan_aftup:/usr/sbin/wan_aftup:g' \
+		"${D}/etc/wanpipe/util/wan_aftup/update_aft_firm.sh" || die "Failed to update update_aft_firm.sh"
+	rm "${D}/etc/wanpipe/util/wan_aftup/wan_aftup"
+
+	# find leftover files in /etc/wanpipe
+	find "${D}/etc/wanpipe" -type f -iname "Makefile" -exec rm {} \;
+
+	# remove .svn directories...
+	find "${D}" -type d -name ".svn" -exec rm -rf {} \;
+
+	# clean up /etc/wanpipe/wancfg_zaptel
+	# (all these are already in /usr/sbin or useless)
+	for x in setup-sangoma wancfg_{zaptel,dahdi,tdmapi,openzap,fs,smg,hp_tdmapi} {clean,install,uninstall}.sh; do
+		rm "${D}/etc/wanpipe/wancfg_zaptel/${x}" || die "Failed to remove /etc/wanpipe/wancfg_zaptel/${x}"
+	done
+
+	# fix WAN_LOCK(_DIR)
+	sed -i -e '/^WAN_LOCK\(_DIR\)\?=/s:/var/lock/subsys:/var/lock:' \
+		"${D}/etc/wanpipe/wanrouter.rc" \
+		"${D}/etc/wanpipe/wancfg_zaptel/templates/wanrouter.rc.template" \
+		|| die "Failed to update WAN_LOCK(_DIR)"
+
+	# ugh, this shouldn't be there, really...
+	if ! use vanilla ; then
+		rm -rf "${D}/etc/wanpipe/api" || die "Failed to remove api folder"
+	fi
+
+	# move samples to /usr/share/doc/...
+	dodir "/usr/share/doc/${PF}"
+	rm "${D}/etc/wanpipe/samples/clean.sh"
+	mv "${D}/etc/wanpipe/samples" "${D}/usr/share/doc/${PF}" || die "Failed to move samples to /usr/share/doc/${PF}"
+
+	# install udev rules
+	insinto "/lib/udev/rules.d"
+	doins "${FILESDIR}/wanpipe.rules"
+
+	# install wanrouter init script
+	newinitd "${FILESDIR}/wanrouter.rc6" wanrouter
+}
+
+pkg_preinst() {
+	#
+	# Newer wanpipe versions use a symlink for oct6100_api, while older used
+	# a directory (duplicating a lot of files)
+	#
+	# Remove the directory to avoid a conflict during package installation
+	#
+	if [ -d "${ROOT}/usr/include/wanpipe/oct6100_api" ]
+	then
+		einfo "Removing old ${ROOT}/usr/include/wanpipe/oct6100_api, new wanpipe version will use a symlink here"
+		rm -rf "${ROOT}/usr/include/wanpipe/oct6100_api" || die "Failed to remove directory"
+	fi
+}
diff --git a/net-voip/yate/Manifest b/net-voip/yate/Manifest
new file mode 100644
index 0000000..00ce1dc
--- /dev/null
+++ b/net-voip/yate/Manifest
@@ -0,0 +1,5 @@
+DIST yate-3.0.0-1.tar.gz 2560508 RMD160 24a056f1dd11f19558be951253822bf254997208 SHA1 66c9291544c0059f3830ee45c8e7cf443bbda80a SHA256 bd6369342553e3f0c9500d90c44624e2dddf38f25fab981bac2928bea9788714
+DIST yate-3.3.2-1.tar.gz 3342883 RMD160 afd1008d9ef65039e8d7044b159243bdf8282e29 SHA1 cf725a254c260165bd11a8757dccb0d88688c48b SHA256 58c58aba636fbbe49edbfb98c01812e4946218094a59ba998de667b36314b966
+EBUILD yate-3.0.0.ebuild 1512 RMD160 18d4357476afb2c1df9d92a342b9df1f614e47db SHA1 af22baa04c215a2327694d467691e470216b7109 SHA256 5b935185e9e79a530af00c050801cbbe53a569964e5a1cc167d6ed7c20599860
+EBUILD yate-3.3.2.ebuild 1512 RMD160 18d4357476afb2c1df9d92a342b9df1f614e47db SHA1 af22baa04c215a2327694d467691e470216b7109 SHA256 5b935185e9e79a530af00c050801cbbe53a569964e5a1cc167d6ed7c20599860
+EBUILD yate-9999.ebuild 1510 RMD160 7043ba56ea78b733ca022d51ad1341d660954266 SHA1 163da8e8034be083eff6d00997d273ddfc1be47b SHA256 f435e5a69350eba0059c632f6c208ebb93f6bbb1383f58c29f1dcabde6eff464
diff --git a/net-voip/yate/yate-3.0.0.ebuild b/net-voip/yate/yate-3.0.0.ebuild
new file mode 100644
index 0000000..38c6fdb
--- /dev/null
+++ b/net-voip/yate/yate-3.0.0.ebuild
@@ -0,0 +1,77 @@
+
+EAPI="3"
+
+IUSE="alsa dahdi debug doc gsm mysql postgres sctp speex ssl"
+
+inherit flag-o-matic
+
+MY_P="${P/_/-}-1"
+
+DESCRIPTION="Yet Another Telephony Engine"
+HOMEPAGE="http://yate.null.ro/"
+
+if [[ "${PV}" = "9999" ]]
+then
+	inherit subversion
+	ESVN_REPO_URI="http://yate.null.ro/svn/yate/trunk"
+	ESVN_BOOTSTRAP="./autogen.sh"
+	SVN_DEPENDS="media-sound/sox"
+else
+	SRC_URI="http://yate.null.ro/tarballs/yate3/${MY_P}.tar.gz"
+fi
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPENDS="
+	alsa? ( media-libs/alsa-lib )
+	ssl? ( dev-libs/openssl )
+	gsm? ( media-sound/gsm )
+	speex? ( media-sound/speex )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sctp? ( net-misc/lksctp-tools )
+	dahdi? ( net-misc/dahdi )"
+
+DEPENDS="
+	${RDEPENDS}
+	${SVN_DEPENDS}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	use debug && append-cflags -DDEBUG=1
+
+	econf \
+		--without-libqt4 	\
+		--without-coredumper	\
+		--disable-wpcard --disable-tdmcard --disable-wanpipe \
+		$(use_enable sctp)	\
+		$(use_enable dahdi)	\
+		$(use_with gsm libgsm)	\
+		$(use_with speex libspeex)	\
+		$(use_with postgres libpq)	\
+		$(use_with mysql)		\
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	# remove yate installed docs
+	rm -r "${D}/usr/share/doc"
+
+	dodoc COPYING ChangeLog README
+	dodoc docs/*.html docs/*.dia
+
+	if use doc; then
+		einfo "Installing API documentation"
+		insinto "/usr/share/doc/${PF}"
+		doins -r docs/api
+	fi
+}
diff --git a/net-voip/yate/yate-3.3.2.ebuild b/net-voip/yate/yate-3.3.2.ebuild
new file mode 100644
index 0000000..38c6fdb
--- /dev/null
+++ b/net-voip/yate/yate-3.3.2.ebuild
@@ -0,0 +1,77 @@
+
+EAPI="3"
+
+IUSE="alsa dahdi debug doc gsm mysql postgres sctp speex ssl"
+
+inherit flag-o-matic
+
+MY_P="${P/_/-}-1"
+
+DESCRIPTION="Yet Another Telephony Engine"
+HOMEPAGE="http://yate.null.ro/"
+
+if [[ "${PV}" = "9999" ]]
+then
+	inherit subversion
+	ESVN_REPO_URI="http://yate.null.ro/svn/yate/trunk"
+	ESVN_BOOTSTRAP="./autogen.sh"
+	SVN_DEPENDS="media-sound/sox"
+else
+	SRC_URI="http://yate.null.ro/tarballs/yate3/${MY_P}.tar.gz"
+fi
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPENDS="
+	alsa? ( media-libs/alsa-lib )
+	ssl? ( dev-libs/openssl )
+	gsm? ( media-sound/gsm )
+	speex? ( media-sound/speex )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sctp? ( net-misc/lksctp-tools )
+	dahdi? ( net-misc/dahdi )"
+
+DEPENDS="
+	${RDEPENDS}
+	${SVN_DEPENDS}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	use debug && append-cflags -DDEBUG=1
+
+	econf \
+		--without-libqt4 	\
+		--without-coredumper	\
+		--disable-wpcard --disable-tdmcard --disable-wanpipe \
+		$(use_enable sctp)	\
+		$(use_enable dahdi)	\
+		$(use_with gsm libgsm)	\
+		$(use_with speex libspeex)	\
+		$(use_with postgres libpq)	\
+		$(use_with mysql)		\
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	# remove yate installed docs
+	rm -r "${D}/usr/share/doc"
+
+	dodoc COPYING ChangeLog README
+	dodoc docs/*.html docs/*.dia
+
+	if use doc; then
+		einfo "Installing API documentation"
+		insinto "/usr/share/doc/${PF}"
+		doins -r docs/api
+	fi
+}
diff --git a/net-voip/yate/yate-9999.ebuild b/net-voip/yate/yate-9999.ebuild
new file mode 100644
index 0000000..62fe0ef
--- /dev/null
+++ b/net-voip/yate/yate-9999.ebuild
@@ -0,0 +1,77 @@
+
+EAPI="3"
+
+IUSE="alsa dahdi debug doc gsm mysql postgres sctp speex ssl"
+
+inherit flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Yet Another Telephony Engine"
+HOMEPAGE="http://yate.null.ro/"
+
+if [[ "${PV}" = "9999" ]]
+then
+	inherit subversion
+	ESVN_REPO_URI="http://yate.null.ro/svn/yate/trunk"
+	ESVN_BOOTSTRAP="./autogen.sh"
+	SVN_DEPENDS="media-sound/sox"
+else
+	SRC_URI="http://yate.null.ro/tarballs/yate3/${MY_P}.tar.gz"
+fi
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPENDS="
+	alsa? ( media-libs/alsa-lib )
+	ssl? ( dev-libs/openssl )
+	gsm? ( media-sound/gsm )
+	speex? ( media-sound/speex )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sctp? ( net-misc/lksctp-tools )
+	dahdi? ( net-misc/dahdi )"
+
+DEPENDS="
+	${RDEPENDS}
+	${SVN_DEPENDS}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	use debug && append-cflags -DDEBUG=1
+
+	econf \
+		--without-libqt4 	\
+		--without-coredumper	\
+		--disable-wpcard --disable-tdmcard --disable-wanpipe \
+		$(use_enable sctp)	\
+		$(use_enable dahdi)	\
+		$(use_with gsm libgsm)	\
+		$(use_with speex libspeex)	\
+		$(use_with postgres libpq)	\
+		$(use_with mysql)		\
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	# remove yate installed docs
+	rm -r "${D}/usr/share/doc"
+
+	dodoc COPYING ChangeLog README
+	dodoc docs/*.html docs/*.dia
+
+	if use doc; then
+		einfo "Installing API documentation"
+		insinto "/usr/share/doc/${PF}"
+		doins -r docs/api
+	fi
+}
diff --git a/profiles/desc/freeswitch_modules.desc b/profiles/desc/freeswitch_modules.desc
new file mode 100644
index 0000000..3c1d662
--- /dev/null
+++ b/profiles/desc/freeswitch_modules.desc
@@ -0,0 +1,112 @@
+# Description of FreeSWITCH USE_EXPAND flags
+#
+# Copyright (C) 2008 Stefan Knoblich <s.knoblich@axsentis.de>
+#
+# NOTE: mod_lcr and mod_event_erlang not yet ready
+#       mod_event_{socket,multicast} not yet supported in ebuild
+#
+
+alsa - Alsa endpoint module (mod_alsa)
+amr - AMR-NB (Narrowband) pass-through codec module (mod_amr)
+amr_wb - AMR-WB (Wideband) pass-through codec module (mod_amrwb)
+avmd - Advanced voicemail detection application module (mod_avmd)
+bv - Broadvoice HD (Wideband) codec (mod_bv)
+cdr_csv - CSV (Comma-Separated-Value) CDR (Call-Detail-Record) module
+celt - CELT ultra-low delay wideband codec module (mod_celt)
+cepstral - Cepstral SWIFT TTS (Text-To-Speech) engine module (mod_cepstral)
+cidlookup - API commands to query CallerID lookup services (mod_cidlookup)
+conference - Conferencing application (mod_conference)
+console - Console logger module (mod_console)
+curl - Curl-based HTTP client api command, replacing mod_http  (mod_curl)
+db - Database-based resource limit module (mod_db)
+dialplan_asterisk - Asterisk-like dialplan module (mod_dialplan_asterisk)
+dialplan_directory - Directory interface dialplan module (mod_dialplan_directory)
+dialplan_xml - Default XML dialplan module (mod_dialplan_xml)
+dingaling - Jingle (XMPP / GoogleTalk) endpoint module (mod_dingaling)
+distributor - Distribute calls between multiple routes (mod_distributor)
+dptools - Dialplan tools (mod_dptools)
+easyroute - DB-based routing application module (mod_easyroute)
+enum - ENUM application module (mod_enum)
+erlang_event - Erlang event handler / remote control module (mod_event_erlang)
+event_multicast - Multicast event handler module (mod_event_multicast)
+event_socket - Socket event handler / remote control module (mod_event_socket)
+expr - Dialplan expressions (mod_expr)
+fax - Fax receive/transmit application module (mod_fax)(DEPRECATED: see mod_spandsp)
+fifo - First-in-First-out call queue module (mod_fifo)
+file_string - Stream audio from a file(?) (mod_file_string)
+flite - Flite TTS (Text-to-Speech) module (mod_flite)
+freetdm - FreeTDM (PRI, BRI, Analog) endpoint module (former OpenZAP) (mod_freetdm)
+fsv - Simple video recording application (mod_fsv)
+g723_1 - G.723.1 codec module (mod_g723_1)
+g729 - G.729 (pass-through only) codec module (mod_g729)
+gsmopen - GSM modem/handset endpoint module (mod_gsmopen)
+h26x - H.261, H.263, H.264 pass-through codec module (mod_h26x)
+hash - Hash-based resource limit module (mod_hash)
+http - HTTP client api command (mod_http)
+iax - Inter-Asterisk eXchange (IAX2) endpoint module (mod_iax)
+ilbc - iLBC codec module (mod_ilbc)
+java - Java language module (mod_java)
+lcr - LCR (Least-Cost-Routing) application module (mod_lcr)
+limit - Resource limit module (mod_limit) (DEPRECATED: see mod_db + mod_hash)
+local_stream - Local file streaming module (mod_local_stream)
+logfile - File logger module (mod_logfile)
+lua - LUA language module (mod_lua)
+managed - .NET managed mode language module (mod_managed)
+memcache - Memcache API interface module (mod_memcache)
+mp4v - MPEG4 / H.264 Video ES (Elementary Stream) pass-through codec module (mod_mp4v)
+nibblebill - Real-time debit module (mod_nibblebill)
+opal - H.323 endpoint module based on the Opal library (experimental) (mod_opal)
+openmrcp - OpenMRCP module (mod_openmrcp)
+openzap - OpenZAP (SS7BOOST, PRI, BRI, Analog) endpoint module (mod_openzap)
+osp - Open Settlement Protocol (OSP) module (mod_osp)
+perl - Perl language module (mod_perl)
+pocketsphinx - Pocketsphinx ASR (Speech-recognition) module (mod_pocketsphinx)
+portaudio - Portaudio endpoint module (mod_portaudio)
+portaudio_stream - Stream audio from a portaudio source (mod_portaudio_stream)
+python - Python language module (mod_python)
+radius_cdr - Radius CDR (Call-Detail-Record) module (mod_radius_cdr)
+redis - Redis (advanced key-value store)-based resource limit module (mod_redis)
+rss - RSS feed application (mod_rss)
+say_de - German TTS functions (mod_say_de)
+say_en - English TTS functions (mod_say_en)
+say_es - Spanish TTS functions (mod_say_es)
+say_fr - French TTS functions (mod_say_fr)
+say_it - Italian TTS functions (mod_say_it)
+say_nl - Dutch TTS functions (mod_say_nl)
+say_ru - Russian TTS functions (mod_say_ru)
+say_zh - Simplified Chinese TTS functions (mod_say_zh)
+shell_stream - Stream audio from an external application (mod_shell_stream)
+shout - Shoutcast streaming module (mod_shout)
+silk - SILK wideband codec module (mod_silk)
+siren - G.722.1 (aka "Siren") codec module (mod_siren)
+skinny - SCCP endpoint module (mod_skinny)
+skypiax - Skype endpoint module, using the Skype client remote control API (mod_skypiax)
+skypopen - Skype endpoint module, using the Skype client remote control API (mod_skypopen, formerly mod_skypiax)
+snapshot - Record sliding window (e.g. last 10 seconds) of audio (mod_snapshot)
+sndfile - Module to add support for various sound file formats (mod_sndfile)
+snom - SNOM VoIP phone helper applications (mod_snom)
+sofia - SIP (Session-Initiation-Protocol) endpoint module (mod_sofia)
+#soundtouch - 
+spandsp - SpanDSP fax applications and VoIP codecs (mod_spandsp)
+speex - Speex codec module (mod_speex)
+spidermonkey - Spidermonkey javascript language module (mod_spidermonkey)
+spidermonkey_curl - Spidermonkey curl extension (mod_spidermonkey_curl)
+spidermonkey_core_db - Spidermonkey db extension (mod_spidermonkey_core_db)
+spidermonkey_odbc - Spidermonkey ODBC extension (mod_spidermonkey_odbc)
+spidermonkey_socket - Spidermonkey socket extension (mod_spidermonkey_socket)
+spidermonkey_teletone - Spidermonkey tone detection/generation extension (mod_spidermonkey_teletone)
+spy - Spy on a user constantly (mod_spy)
+syslog - Syslog logger module (mod_syslog)
+tone_stream - (Scriptable) Tone generator module (mod_tone_stream)
+tts_commandline - System command TTS (Text-To-Speech) interface (mod_tts_commandline)
+unimrcp - MRCP (Media Resource Control Protocol) ASR/TTS client module (mod_unimrcp)
+valet_parking - Valet parking (mod_valet_parking)
+vmd - Voicemail detection application module (mod_vmd)
+voicemail - Voicemail application module (mod_voicemail)
+voipcodecs - Collection of most-used codecs (G.711, G.722, G.726, GSM, LPC10) (mod_voipcodecs)(DEPRECATED: see mod_spandsp)
+xml_cdr - XML CDR (Call-Detail-Record) module (mod_xml_cdr)
+xml_curl - CURL XML Gateway module (mod_xml_curl)
+xml_ldap - LDAP XML Gateway module (mod_xml_ldap)
+xml_rpc - XML RPC module (mod_xml_rpc)
+yaml - YaML (Yet-another-Markup-Language) dialplan module (mod_yaml)
+zeroconf - Zeroconf event handler module (mod_zeroconf)
diff --git a/profiles/desc/freetdm_modules.desc b/profiles/desc/freetdm_modules.desc
new file mode 100644
index 0000000..31d3a4a
--- /dev/null
+++ b/profiles/desc/freetdm_modules.desc
@@ -0,0 +1,9 @@
+#
+#
+#
+libpri -
+misdn -
+r2 -
+sng_isdn -
+sng_ss7 -
+wanpipe -
diff --git a/profiles/package.mask b/profiles/package.mask
index 9f43e7b..0c70e0d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,9 +1,5 @@
-# Brian Evans <grknight@tuffmail.com> (16 Dec 2013)
-# Add percona-server to the mask until the virtual is unmasked
->=dev-db/percona-server-5.6
-
-# Robin H. Johnson <robbat2@gentoo.org> (04 Mar 2013)
-# Only 5.6 remains masked.
->=dev-db/mariadb-5.6
->=dev-db/mysql-5.6
->=virtual/mysql-5.6
+#
+# Experimental version,
+# masked for now
+#
+>=net-misc/freeswitch-9999-r1
diff --git a/profiles/repo_name b/profiles/repo_name
index 975a719..344fe44 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-ScurvyNet
+freeswitch
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
new file mode 100644
index 0000000..16930c9
--- /dev/null
+++ b/profiles/use.local.desc
@@ -0,0 +1,19 @@
+net-misc/freeswitch:cepstral		Cepstral swift commercial text-to-speech engine
+net-misc/freeswitch:iax			Inter-Asterisk-Exchange VoIP protocol
+net-misc/freeswitch:h26x		Pass-through support for H.261 and H.263 video
+net-misc/freeswitch:libpri		Build OpenZAP/FreeTDM with libpri module
+net-misc/freeswitch:nosamples		Do not install sample configuration
+net-misc/freeswitch:openzap		OpenZAP (support for analog/isdn telephony cards)
+net-misc/freeswitch:resampler		Sound resampling (e.g. 16KHz -> 8KHz) support
+net-misc/freeswitch:sctp		SIP over SCTP (Stream-Control-Protocol) support
+net-misc/freeswitch-music:16k		16KHz sample rate (Wideband) On-Hold music
+net-misc/freeswitch-music:32k		32KHz sample rate (Ultra-Wideband) On-Hold music
+net-misc/freeswitch-music:48k		48KHz sample rate (Ultra-Wideband) On-Hold music
+net-misc/freeswitch-sounds:16k		16KHz sample rate (Wideband) sounds
+net-misc/freeswitch-sounds:32k		32KHz sample rate (Ultra-Wideband) sounds
+net-misc/freeswitch-sounds:48k		48KHz sample rate (Ultra-Wideband) sounds
+net-misc/freeswitch-svn:nosamples	Do not install sample configuration
+net-misc/freeswitch-svn:resampler	Sound resampling (e.g. 16KHz -> 8KHz) support
+net-misc/freeswitch-svn:sctp		SIP over SCTP (Stream-Control-Protocol) support
+net-libs/opal:celt			CELT ultra-low-delay 32KHz, 48KHz wideband audio codec support
+media-libs/celt:fixed-point-math	Enable fixed-point arithmetic

From 7cb3fdc51d369f6527f164f52e4fac63242c92a4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 13:41:42 -0700
Subject: [PATCH 033/261] updated cyneric overlay

---
 net-misc/freeswitch-cyneric/Manifest          |    7 +-
 .../freeswitch-cyneric/files/cyneric.cron     |   42 +-
 .../freeswitch-cyneric/files/cyneric.fstab    |   20 +
 .../freeswitch-cyneric-0.1.0.ebuild           |   64 +
 .../freeswitch-cyneric-1.2.12.ebuild          | 1166 -----------------
 profiles/package.mask                         |    5 -
 profiles/repo_name                            |    2 +-
 7 files changed, 112 insertions(+), 1194 deletions(-)
 create mode 100644 net-misc/freeswitch-cyneric/files/cyneric.fstab
 create mode 100644 net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
 delete mode 100644 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index b5a461d..caae4e2 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1 +1,6 @@
-DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
+AUX cyneric.cron 3344 SHA256 06c626ee726617df31f54db29b9ec72d69860950b8abf063bf62cd29e277a439 SHA512 df712655002e1189bb4501e6ef06d04c69a9f4c2ddccf36cd9818545e280dbff7afe211d4fe77cc35c478e35c4efa62dfaef21918adca3c7c566b8faa7822ecf WHIRLPOOL 7da6e4ddd9b3f0076f995cdcbc3ae31f0df4e2f810335b58507b4e6dbb08cd51d9d4b77c1dcb89187a143835a4b5ceec188f7cf016b608f5a6f62bf8ea8f7e04
+AUX cyneric.fstab 1183 SHA256 3c268d5a7381e32ca260b192e7e242bfa3b54a5bc9c31c459986bb8cf7977600 SHA512 c118fc8b36de20add478306fcbb1b9a551855c803c71a304f6b2b8721990f958fb004e14a3dd158c0a990a762a133c1e2683bb78024c254d0519423c79ea9c2b WHIRLPOOL 8822e27be06fdf2532762639936ea1753a8479d56b975cc38a4a599896518d4d1ac238aa3951f0bc78168236bdd22a006aa83cde0eac6b1943c4bee6fa8bce69
+AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
+AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
+DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1524 SHA256 066d324226219f2df73f79578dc9ae0cd5aa8863a498693246076cf18a5cfa2d SHA512 2015b65555f013a1dbddedf78678ccebc78282d9edf0dc53ca1d2605d5f2467401ccaf6b48a1d0600826f3da536e619a2e4a4af925a716d0c5be23e02e2a5aca WHIRLPOOL b344563832dbfaddc54ed92f967a5be1f685637a1ab8dd6589ee753b548fb86a779bfceacb01f33e832f59d4a8eca341548f8cc3f6b2c6496043c1d153253516
diff --git a/net-misc/freeswitch-cyneric/files/cyneric.cron b/net-misc/freeswitch-cyneric/files/cyneric.cron
index 43f6cc4..fa60101 100644
--- a/net-misc/freeswitch-cyneric/files/cyneric.cron
+++ b/net-misc/freeswitch-cyneric/files/cyneric.cron
@@ -1,33 +1,33 @@
 # cyneric log rotation stuff
 # m h  dom mon dow   command
-01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/FSLogRotate.pl > /dev/null 2>&1
+#01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/FSLogRotate.pl > /dev/null 2>&1
 
 # disk space
-01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/freeswitch.df.pl > /dev/null 2>&1
+#01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/freeswitch.df.pl > /dev/null 2>&1
 
 # crontab sync
-* *    * * *    root    /usr/bin/screen -d -m -S crontab_sync /usr/bin/ionice -c3 /usr/bin/nice -n 19 /usr/local/sbin/crontab_sync.php > /dev/null 2>&1
+#* *    * * *    root    /usr/bin/screen -d -m -S crontab_sync /usr/bin/ionice -c3 /usr/bin/nice -n 19 /usr/local/sbin/crontab_sync.php > /dev/null 2>&1
 
 # delete old log files
-10 1   * * *   root    find /opt/freeswitch/log/a/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
-10 1   * * *   root    find /opt/freeswitch/log/b/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
-10 1   * * *   root    find /opt/freeswitch/log/c/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
-10 1   * * *   root    find /opt/freeswitch/log/d/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
-10 1   * * *   root    find /opt/freeswitch/log/e/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
-10 1   * * *   root    find /opt/freeswitch/log/f/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/a/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/b/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/c/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/d/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/e/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
+#10 1   * * *   root    find /opt/freeswitch/log/f/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
 
 # backup cdr records
-10 1    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
-10 1    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
-10 1    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
-10 1    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
-10 1    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
-10 1    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
+#10 1    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +7 -type f -name "*.csv*" -exec gzip -9 {} \; -exec mv {}.gz /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
 
 # moved left over records
-10 *    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
-10 *    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
-10 *    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
-10 *    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
-10 *    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
-10 *    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/a/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_a \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/b/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_b \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/c/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_c \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/d/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_d \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/e/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_e \; 2>/dev/null
+#10 *    * * *   root    find /opt/freeswitch/log/f/archivos -mtime +2 -type f -name "*.gz*" -exec mv {} /freeswitch_logs/`hostname`/instance_f \; 2>/dev/null
diff --git a/net-misc/freeswitch-cyneric/files/cyneric.fstab b/net-misc/freeswitch-cyneric/files/cyneric.fstab
new file mode 100644
index 0000000..703d505
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/cyneric.fstab
@@ -0,0 +1,20 @@
+# freeswitch
+/dev/xvdb   /opt/freeswitch            ext4    noatime              0 1
+
+tmpfs            /opt/freeswitch/db/a               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/a/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/b               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/b/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/c               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/c/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/d               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/d/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/e               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/e/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/f               tmpfs   size=10m,mode=0755     0       0
+tmpfs            /opt/freeswitch/log/f/cdr-csv  tmpfs   size=10m,mode=0755     0       0
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
new file mode 100644
index 0000000..79bcf57
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright whoever
+# Free as in beer
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Cyneric overlay for freeswitch"
+HOMEPAGE="http://safesoft.us"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+LICENSE=""
+IUSE=""
+RESTRICT="mirror"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/${P}.tar.gz"
+
+RDEPEND="dev-java/oracle-jdk-bin
+        net-misc/freeswitch"
+
+DEPEND="${RDEPEND}"
+
+
+pkg_preinst() {
+        einfo "removing freeswitch configs"
+				rm -rf /opt/freeswitch/conf
+				rm -rf /etc/freeswitch
+
+				einfo "installing new cyneric files"
+
+        cd ${WORKDIR}
+        cp -R * /opt/freeswitch/
+
+        einfo "updating configs"
+        ln -s /opt/freeswitch/conf /etc/freeswitch
+        
+        einfo "all config files are now in /opt/freeswitch/conf"
+        einfo ""
+        einfo "adding a disabled cron in /etc/cron.d"
+        
+        cp "${FILESDIR}"/cyneric.cron /etc/cron.d/
+        
+        cp "${FILESDIR}"/cyneric.fstab /etc/cron.d/
+
+}
+
+pkg_postinst() {
+        einfo ""
+        elog "updating /etc/init.d/freeswitch"
+        elog "because this is multi instance overlay"
+        elog "you'll need to symlink your instance name"
+        elog "for example ln -s /etc/init.d/freeswitch /etc/init.d/freeswitch.a"
+        einfo ""
+
+        newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
+        newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+        einfo ""
+        einfo "cyneric install completed"
+        
+        einfo "check /opt/freeswitch/cyneric.fstab for mounts
+        " 
+        
+}
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
deleted file mode 100644
index ea024f5..0000000
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.2.12.ebuild
+++ /dev/null
@@ -1,1166 +0,0 @@
-#
-# Copyright (C) 2008-2014 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-# The automagic default "latest" only works for eautoreconf and friends,
-# so force these versions until we don't have to use (re)bootstrap.sh anymore.
-WANT_AUTOMAKE="1.11"
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils flag-o-matic python user
-
-DESCRIPTION="FreeSWITCH telephony platform"
-HOMEPAGE="http://www.freeswitch.org/"
-
-KEYWORDS="~arm ~amd64 ~x86"
-LICENSE="MPL-1.1"
-SLOT="0"
-
-case ${PV} in
-9999*)
-	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
-	EGIT_BOOTSTRAP=""
-	inherit git-2
-	;;
-${PV%.*}.9999*)
-	EGIT_REPO_URI="git://git.freeswitch.org/freeswitch.git"
-	EGIT_BRANCH="v${PV%.*}.stable"
-	EGIT_BOOTSTRAP=""
-	inherit git-2
-	;;
-*_rc*)
-	MY_P="${PN}-${PV/.?_/.}"	# 1.2.0_rcX -> 1.2.rcX
-	SRC_URI="http://files.freeswitch.org/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY}"
-	;;
-*)
-	SRC_URI="http://files.freeswitch.org/freeswitch-1.2.12.tar.bz2"
-	S="${WORKDIR}/freeswitch-1.2.12"
-	;;
-esac
-
-
-IUSE="esl nosamples odbc +resampler sctp zrtp"
-
-IUSE_ESL="esl-ruby esl-php esl-perl esl-python esl-lua"
-IUSE_FREETDM="libpri misdn"
-
-IUSE_MODULES="alsa amr amrwb avmd bv +cdr_csv cdr_pg_csv cdr_sqlite celt cepstral cidlookup +console curl
-	+db dialplan_directory dingaling distributor easyroute erlang_event
-	flite freetdm fsk +g723_1 g729 gsmopen h26x +hash +ilbc java lcr ldap +limit +local_stream +logfile +lua
-	managed memcache mp4v nibblebill opal osp perl pocketsphinx portaudio portaudio_stream python radius_cdr redis rtmp
-	shell_stream shout silk siren skinny skypopen snapshot +sndfile snom +sofia +spandsp +speex spidermonkey spy +syslog
-	+tone_stream tts_commandline unimrcp valet_parking vmd +voicemail
-	xml_cdr xml_curl xml_ldap xml_rpc
-"
-
-# mod_say_X
-IUSE_LINGUAS="de +en es fr he it nl ru zh"
-
-# inter-module dependencies
-INTER_MODULE_DEPENDS="
-	limit:db
-	limit:hash
-"
-
-# modules need these core functions
-CORE_MODULE_DEPENDS="
-	nibblebill:odbc
-	easyroute:odbc
-	lcr:odbc
-"
-
-# external dependencies of modules
-MODULES_RDEPEND="
-	freeswitch_modules_alsa? ( media-libs/alsa-lib )
-	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
-	freeswitch_modules_xml_curl? ( net-misc/curl )
-	freeswitch_modules_xml_ldap? ( net-nds/openldap )
-	freeswitch_modules_ldap? ( net-nds/openldap )
-	freeswitch_modules_java? ( >=virtual/jdk-1.5 )
-	freeswitch_modules_opal? ( >=net-libs/opal-9999[h323,iax]
-				   >=net-libs/ptlib-9999 )
-	freeswitch_modules_python? ( =dev-lang/python-2* )
-	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
-	freeswitch_modules_nibblebill? ( dev-db/unixODBC )
-	freeswitch_modules_easyroute? ( dev-db/unixODBC )
-	freeswitch_modules_lcr? ( dev-db/unixODBC )
-	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
-	freeswitch_modules_memcache? ( net-misc/memcached )
-	freeswitch_modules_erlang_event? ( dev-lang/erlang )
-	freeswitch_modules_shout? ( media-libs/libogg )
-	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.0 )
-	freeswitch_modules_freetdm? (
-		libpri? ( >=net-libs/libpri-1.4.0 )
-		misdn? ( >=net-dialup/misdnuser-2.0.0 )
-	)
-	freeswitch_modules_spandsp? ( virtual/jpeg )
-	freeswitch_modules_redis? ( dev-db/redis )
-	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql-base )
-"
-#	freeswitch_modules_gsmopen? ( net-libs/libctb ... ) 
-
-# external core dependencies
-CORE_RDEPEND="
-	odbc? ( dev-db/unixODBC )
-	esl-lua? ( dev-lang/lua dev-lang/swig )
-	esl-php? ( dev-lang/php dev-lang/swig )
-	esl-perl? ( dev-lang/perl dev-lang/swig )
-	esl-ruby? ( dev-lang/ruby dev-lang/swig )
-	esl-python? ( dev-lang/python dev-lang/swig )
-"
-
-#
-#
-#
-RDEPEND="virtual/libc
-	 ${CORE_RDEPEND}
-	 ${MODULES_RDEPEND}"
-
-DEPEND="${RDEPEND}
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
-
-PDEPEND="media-sound/freeswitch-sounds
-        media-sound/freeswitch-sounds-music
-"
-
-###
-# IUSE merging
-#
-for x in ${IUSE_MODULES}; do
-	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
-done
-for x in ${IUSE_LINGUAS}; do
-	IUSE="${IUSE} ${x//[^+]/}linguas_${x/+}"
-done
-
-IUSE="${IUSE} ${IUSE_ESL} ${IUSE_FREETDM}"
-
-
-###
-# pre-flight checks
-#
-pkg_setup() {
-	local x mod dep error_cnt=0 mod_cnt=0 lang_cnt=0
-
-	#
-	# 1. safety check
-	#
-	for mod in ${IUSE_MODULES}; do
-		use freeswitch_modules_${mod/+} && (( mod_cnt++ ))
-	done
-	if [ "${mod_cnt}" = "0" -a "${FREESWITCH_CORE_ONLY}" != "yes" ]; then
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		eerror "No modules selected for build! Are you sure you only want the FreeSWITCH core?"
-		eerror "This isn't a good idea, usually..."
-		eerror ""
-		eerror "If you really know what you are doing set FREESWITCH_CORE_ONLY="yes" in your make.conf"
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		die "FREESWITCH_MODULES empty / no modules selected for build"
-	fi
-
-	#
-	# 2. check prerequisites
-	#
-	if use freeswitch_modules_cepstral; then
-
-		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
-
-		if [ ! -d "${SWIFT_HOME}" ]; then
-			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
-			die "No cepstral installation found in \"${SWIFT_HOME}\""
-		fi
-
-		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
-			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
-			die "Cepstral library not found!"
-		fi
-
-		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
-
-		export SWIFT_HOME
-	fi
-
-	if use freeswitch_modules_python ; then
-
-		if built_with_use --missing false dev-lang/python nothreads ; then
-			echo
-			eerror "python: FreeSWITCH needs python with threads support"
-			eerror "python: please reemerge python with \"nothreads\" useflag disabled"
-			echo
-			(( error_cnt++ ))
-
-		elif ! built_with_use --missing true dev-lang/python threads ; then
-			echo
-			eerror "python: FreeSWITCH needs python with threads support"
-			eerror "python: please reemerge python with \"threads\" useflag enabled"
-			echo
-			(( error_cnt++ ))
-		fi
-	fi
-
-	if use freeswitch_modules_perl && ! built_with_use dev-lang/perl ithreads; then
-		echo
-		eerror "perl: FreeSWITCH needs perl with threads support"
-		eerror "perl: please reemerge libperl and perl with \"ithreads\" useflag enabled"
-		echo
-
-		(( error_cnt++ ))
-	fi
-
-	if use freeswitch_modules_xml_ldap && ! built_with_use net-nds/openldap sasl; then
-		echo
-		eerror "ldap: OpenLDAP with sasl support is required"
-		eerror "ldap: please reemerge openldap with \"sasl\" useflag enabled"
-		echo
-
-		(( error_cnt++ ))
-	fi
-
-	if [ "${error_cnt}" != "0" ]; then
-		echo
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		eerror "Build-time requirements not met!"
-		eerror "Please correct above error messages or disable the useflags and re-emerge ${PN}"
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		die "Build-time requirements not met: ${error_cnt} errors"
-	fi
-
-	#
-	# 3. check inter-module dependencies
-	#
-	einfo "Checking inter-module dependencies..."
-	for x in ${INTER_MODULE_DEPENDS}; do
-		mod="${x%:*}"
-		dep="${x#*:}"
-
-		if use "freeswitch_modules_${mod}" && ! use "freeswitch_modules_${dep}"; then
-			# check if this module has an external dependency
-			if $(echo "${MODULES_RDEPEND}" | grep -q "freeswitch_modules_${dep}\?"); then
-				eerror "Module \"${mod}\" requires module \"${dep}\","
-				eerror "can not auto-enable this feature because it has an unmet external dependency!"
-				(( error_cnt++ ))
-			else
-				ewarn "Module \"${mod}\" requires module \"${dep}\" to be enabled, auto-enabling!"
-				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} freeswitch_modules_${dep}"
-			fi
-		fi
-	done
-
-	#
-	# 4. check core dependencies
-	#
-	einfo "Checking core dependencies..."
-	for x in ${CORE_MODULE_DEPENDS}; do
-		mod="${x%:*}"
-		dep="${x#*:}"
-
-		if has "freeswitch_modules_${mod}" ${FREESWITCH_AUTO_USE} ${USE} && ! use "${dep}"; then
-			# check if this core option has an external dependency
-			if $(echo "${CORE_RDEPEND}" | grep -q "${dep}\?"); then
-				eerror "Module \"${mod}\" requires core useflag \"${dep}\","
-				eerror "can not auto-enable this feature because it has an unmet external dependency!"
-				(( error_cnt++ ))
-			else
-				ewarn "Module \"${mod}\" requires core useflag \"${dep}\", auto-enabling!"
-				FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} ${dep}"
-			fi
-		fi
-	done
-
-	if [ "${error_cnt}" != "0" ]; then
-		echo
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		eerror "Inter-module and/or module-core dependencies not met and auto-enabling failed because of unmet"
-		eerror "external dependencies! This is for your own security, sorry..."
-		eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		die "Please read the error messages above and fix the listed issues"
-	fi
-
-	#
-	# 5. language checks
-	#
-	einfo "Checking selected languages..."
-	for x in ${IUSE_LINGUAS}; do
-		mod="${x/+}"
-		use linguas_${mod} && (( lang_cnt++ ))
-	done
-	if [ "${mod_cnt}" = "0" ]; then
-		echo
-		ewarn "No languages selected, enabling \"en\" as a fallback"
-
-		FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE} linguas_en"
-	fi
-
-	#
-	# 6. create user + group
-	#
-	enewgroup freeswitch
-	enewuser freeswitch -1 -1 /opt/freeswitch freeswitch
-
-	#
-	# 7. set active python version
-	#
-	python_set_active_version 2
-	python_pkg_setup
-
-	#
-	# DONE
-	#
-	export FREESWITCH_AUTO_USE="${FREESWITCH_AUTO_USE}"
-}
-
-
-###
-# ABI compat safety check functions
-#
-
-fs_abi_generate_symbols_array() {
-	local libfile="$1" syms
-
-	if [ ! -f "${libfile}" ]; then
-		eerror "Library ${libfile} does not exist"
-		return 1
-	fi
-
-	syms="$(nm -DS -t d --defined-only "${libfile}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print "\tsymbols[\""$4"\"]="$2";" }')"
-	if [ -z "${syms}" ]; then
-		eerror "Failed to create list of exported libfreeswitch symbols"
-		return 1
-	fi
-
-	echo "${syms}"
-	return 0
-}
-
-fs_check_core_abi_compat() {
-	local libfreeswitch libfreeswitch_syms
-
-	if [ "${EBUILD_PHASE}" != "preinst" ]; then
-		eerror "fs_check_core_abi_compat() can only be called from pkg_preinst"
-		return 1
-	fi
-
-	# no need to check anything if there's no previous install...
-	[ -z "${REPLACING_VERSIONS}" ] && return 0
-
-	libfreeswitch="$(ls -1 "${EROOT}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
-	if [ ! -f "${libfreeswitch}" ]; then
-		eerror "Failed to locate old libfreeswitch"
-		return 1
-	fi
-
-	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
-	if [ -z "${libfreeswitch_syms}" ]; then
-		eerror "Failed to create list of exported libfreeswitch symbols"
-		return 1
-	fi
-
-	cat > "${T}/symbols_check_abi.awk" <<-EOF
-	BEGIN{
-	${libfreeswitch_syms}
-	}
-
-	/switch_.+/{
-	    sym=\$4
-            sym_len=\$2
-
-	    if (! sym in symbols)
-	        print sym
-
-	    if (symbols[sym] != sym_len)
-	        print sym
-	}
-	EOF
-
-	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
-	if [ ! -f "${libfreeswitch}" ]; then
-		eerror "Failed to locate new libfreeswitch"
-		return 1
-	fi
-
-	einfo "Checking for incompatible ABI changes in FreeSWITCH core library..."
-	changed_syms="$(nm -DS -t d --defined-only "${libfreeswitch}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 -f "${T}/symbols_check_abi.awk")"
-	if [ -n "${changed_syms}" ]; then
-		einfo "Some FreeSWITCH API functions have been modified, external modules may have to be rebuild"
-	fi
-
-	export FREESWITCH_ABI_CHANGED_SYMBOLS="${changed_syms}"
-}
-
-fs_check_modules_api_compat() {
-	local x mod name libfreeswitch libfreeswitch_syms
-	local sym need_upgrade module_syms
-	local mod_warn_list="" mod_error_list=""
-
-	if [ "${EBUILD_PHASE}" != "preinst" ]; then
-		eerror "fs_check_modules_api_compat() can only be used in pkg_preinst"
-		return 1
-	fi
-
-	# no need to check anything if there's no previous install...
-	[ ! -e "${EROOT}"/opt/freeswitch/mod ] && return 0
-
-	# create an awk script with the list of "switch_*" symbols exported by libfreeswitch
-	# run the script once for each module, the list of needed "switch_*" symbols is supplied via stdin
-	# (raw nm output)
-	#
-	libfreeswitch="$(ls -1 "${D}"/opt/freeswitch/lib/libfreeswitch.so.*.*.*)"
-	if [ ! -f "${libfreeswitch}" ]; then
-		eerror "Failed to locate libfreeswitch"
-		return 1
-	fi
-
-	libfreeswitch_syms="$(fs_abi_generate_symbols_array "${libfreeswitch}")"
-	if [ -z "${libfreeswitch_syms}" ]; then
-		eerror "Failed to create list of exported libfreeswitch symbols"
-		return 1
-	fi
-
-	cat > "${T}/symbols_check.awk" <<-EOF
-	BEGIN{
-	${libfreeswitch_syms}
-	}
-
-	/switch_.+/{
-	    sym=\$2
-
-	    if (! sym in symbols)
-	        exit 1
-	}
-	EOF
-
-	einfo "Checking for incompatible modules..."
-	for x in "${EROOT}"/opt/freeswitch/mod/mod_*.so; do
-		mod="$(basename "${x}")"
-		name="$(echo "${mod}" | sed -e 's:^mod_\(.\+\)\.so$:\1:')"
-		need_upgrade="no"
-
-		# no need to check modules that will be overwritten
-		[ -e "${D}/opt/freeswitch/mod/${mod}" ] && continue
-
-
-		# skip modules that are in our list but disabled (= will be uninstalled)
-		if has "${name}" $(echo "${IUSE_MODULES}" | tr -d '+') && ! use "freeswitch_modules_${name}"; then
-			continue
-		fi
-
-		# check module
-		module_syms="$(nm -D --undefined-only "${x}" | sed -e 's:0\+\([1-9][0-9]*\):\1:g' | awk -v IGNORECASE=1 '/switch_.+/{ print $2 }')"
-		if ! $(echo "${module_syms}" | awk -v IGNORECASE=1 -f "${T}/symbols_check.awk"); then
-			# needed symbol is not in the list of available ones, mark module broken
-			need_upgrade="yes"
-		else
-			# check if one of the used functions has been modified in the core,
-			# this may be an indication that the ABI has been changed too
-			# NOTE: This check isn't perfect...
-			for sym in ${FREESWITCH_ABI_CHANGED_SYMBOLS}; do
-
-				if $(echo "${module_syms}" | grep -q "^${sym}"); then
-					# symbol is in the list of functions that _may_ have been changed in a
-					# ABI incompatible way, mark module broken
-					need_upgrade="maybe"
-					break
-				fi
-			done
-		fi
-
-		case "${need_upgrade}" in
-		maybe)
-			mod_warn_list="${mod_warn_list} ${mod}"
-			;;
-		yes)
-			mod_error_list="${mod_error_list} ${mod}"
-			;;
-		*)
-			;;
-		esac
-	done
-
-	if [ -n "${mod_warn_list}" ]; then
-		ewarn "The following modules use functions that have been changed since the last version,"
-		ewarn "you may need to upgrade:"
-		ewarn "  ${mod_warn_list}"
-		echo
-	fi
-
-	if [ -n "${mod_error_list}" ]; then
-		eerror "These modules are incompatible with this FreeSWITCH version, please upgrade:"
-		eerror "  ${mod_error_list}"
-		echo
-	fi
-
-	return 0
-}
-
-
-###
-# modules setup functions
-#
-
-fs_set_module() {
-	local config="build/modules.conf.in"
-	local mod="$2"
-
-	[ -f "modules.conf" ] && config="modules.conf"
-
-	case ${mod} in
-	mod_freetdm)
-		category="../../libs/freetdm"
-		mod="mod_freetdm"
-		;;
-	*)
-		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
-		;;
-	esac
-
-	[ -z "${category}" ] && die "unable to determine category for module \"${mod}\" (from: `pwd`)"
-
-	case $1 in
-	enable)
-		if grep -q "/${mod}$" ${config}
-		then
-			einfo "  ++ Enabling ${mod}"
-			sed -i -e "/\/${mod}$/s:.*:${category}/${mod}:" \
-				${config} || die "Failed to enable module \"${mod}\""
-		else
-			# module not in list, add it
-			einfo "  **  Adding ${mod}"
-			echo "${category}/${mod}" >> ${config}
-		fi
-		;;
-
-	disable)
-		einfo "  -- Disabling ${mod}"
-		sed -i -e "/\/${mod}$/s:.*:#${category}/${mod}:" \
-			${config} || die "Failed to disable module \"${mod}\""
-		;;
-	*)
-		eerror "fs_set_module <enable|disable> <module_path>"
-		return 1
-		;;
-	esac
-
-	return 0
-}
-
-setup_modules() {
-	local x mod enablemod
-
-	einfo "Optional modules:"
-	for x in ${IUSE_MODULES}; do
-		mod="${x/+}"
-		enablemod=1
-
-		[ -z "${x}" ] && continue
-
-		fs_use freeswitch_modules_${mod} || enablemod=0
-
-		[ ${enablemod} -eq 1 ] \
-			&& fs_set_module "enable"  "mod_${mod}" \
-			|| fs_set_module "disable" "mod_${mod}"
-	done
-
-	einfo "Language modules:"
-	for x in ${IUSE_LINGUAS}; do
-		mod="${x/+}"
-		enablemod=1
-
-		[ -z "${x}" ] && continue
-
-		fs_use linguas_${mod} || enablemod=0
-
-		[ ${enablemod} -eq 1 ] \
-			&& fs_set_module "enable"  "mod_say_${mod}" \
-			|| fs_set_module "disable" "mod_say_${mod}"
-	done
-}
-
-###
-# src_configure() helpers
-#
-
-fs_use() {
-	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
-		return 0
-	fi
-	return 1
-}
-
-fs_use_any_of() {
-	for x in $@ ; do
-		fs_use ${x} && return 0
-	done
-	return 1
-}
-
-fs_enable() {
-	local option value
-
-	if [ -z "${1}" ]; then
-		eerror "fs_enable(): Usage fs_enable <useflag> [<optname> [<optvalue>]]"
-		return 1
-	fi
-
-	if [ -n "${3}" ]; then
-		value="=${3}"
-	fi
-
-	option="${2}"
-	if [ -z "${option}" ]; then
-		option="${1}"
-	fi
-
-	if fs_use $1; then
-		echo "--enable-${option}${value}"
-	else
-		echo "--disable-${option}"
-	fi
-}
-
-fs_with() {
-	local option value
-
-	if [ -z "${1}" ]; then
-		eerror "fs_with(): Usage fs_with <useflag> [<optname> [<optvalue>]]"
-		return 1
-	fi
-
-	if [ -n "${3}" ]; then
-		value="=${3}"
-	fi
-
-	option="${2}"
-	if [ -z "${option}" ]; then
-		option="${1}"
-	fi
-
-	if has $1 ${FREESWITCH_AUTO_USE} ${USE}; then
-		echo "--with-${option}${value}"
-	else
-		echo "--without-${option}"
-	fi
-}
-
-###
-# other helpers
-#
-
-fs_is_upgrade() {
-	# svn install is always an upgrade
-	[ -n "${EGIT_REPO_URI}" ] && return 0
-
-	# regular up/-downgrade
-	if has_version "${CATEGORY}/${PN}" && ! has_version "~${CATEGORY}/${P}"; then
-		return 0
-	fi
-
-	# not an up-/downgrade
-	return 1
-}
-
-esl_modname() {
-	[ -z "$1" ] && return 1
-
-	case "$1" in
-	"python")
-		echo "pymod"
-		;;
-
-	*)
-		echo "${1#*-}mod"
-		;;
-	esac
-	return 0
-}
-
-esl_dorubymod() {
-        ( # dont want to pollute calling env
-                insinto $(${RUBY:-/usr/bin/ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-		insopts -m755
-                doins "$@"
-        ) || die "failed to install $@"
-}
-
-esl_dopymod() {
-        ( # dont want to pollute calling env
-                insinto $(python_get_sitedir)
-
-		for x in ${@}; do
-			insopts -m644 
-
-			[ "${x}" != "${x%.so}" ] && insopts -m755
-
-	                doins "${x}" || die "failed to install ${x}"
-		done
-        ) || die "failed to install $@"
-}
-
-esl_doluamod() {
-        ( # dont want to pollute calling env
-                insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -v 2>&1 | sed -e '1s:^Lua \([0-9]\.[0-9]\)\.[0-9]\+.*:\1:')
-		insopts -m755
-                doins "$@"
-        ) || die "failed to install $@"
-}
-
-esl_doperlmod() {
-        ( # dont want to pollute calling env
-		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
-		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
-
-		for x in ${@}; do
-			target="lib"
-
-			[ "${x}" != "${x%.so}" ] && target="arch"
-
-			case "${target}" in
-			"lib")
-				insinto "${installvendorlib}"
-				insopts -m644
-				doins -r "${x}" || die "failed to install ${x}"
-				;;
-			"arch")
-				insinto "${installvendorarch}"
-				insopts -m755
-				doins "${x}" || die "failed to install ${x}"
-				;;
-			esac
-		done
-        ) || die "failed to install $@"
-}
-
-###
-# Set file and directory permissions
-#
-fs_set_permissions() {
-	local prefix="$1"
-
-	[ -z "${prefix}" ] && {
-		die "Usage: set_permissions <prefix>"
-	}
-
-	einfo "Setting file and directory permissions..."
-
-	# sysconfdir
-	chown -R root:freeswitch "${prefix}/etc/freeswitch" || die
-	chmod -R u=rwX,g=rX,o=   "${prefix}/etc/freeswitch" || die
-
-	# prefix
-	chown -R root:freeswitch "${prefix}/opt/freeswitch" || die
-	chmod -R u=rwX,g=rX,o=   "${prefix}/opt/freeswitch" || die
-	# allow read access for things like building external modules
-	chmod -R u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch/"{lib*,bin,include} || die
-	chmod    u=rwx,g=rx,o=rx "${prefix}/opt/freeswitch" || die
-
-	# directories owned by the fs user
-	for x in db run log cores storage recordings; do
-		chown -R freeswitch:freeswitch "${prefix}/opt/freeswitch/${x}" ||  die
-	done
-}
-
-
-###
-# main ebuild functions
-#
-
-src_unpack() {
-	if [ -n "${EGIT_REPO_URI}" ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-
-	cd "${S}"
-	#
-	# 1. custom user patches
-	#
-	epatch_user
-}
-
-src_prepare() {
-	local BOOTSTRAP_CMD="" BOOTSTRAP_OPTS=""
-
-	if [ -n "${EGIT_REPO_URI}" ]; then
-		BOOTSTRAP_CMD="${S}/bootstrap.sh"
-	elif [ -x "${S}/rebootstrap.sh" ]; then
-		BOOTSTRAP_CMD="${S}/rebootstrap.sh"
-	fi
-
-	if [ -n "${BOOTSTRAP_CMD}" ]; then
-		# Bootstrap FreeSWITCH (multi-threaded bootstrap)
-		[ "${MAKEOPTS}" != "${MAKEOPTS/-j}" ] && {
-			einfo "Using parallel bootstrap..."
-			BOOTSTRAP_OPTS="-j"
-		}
-		einfo "Bootstrapping FreeSWITCH"
-		${BOOTSTRAP_CMD} ${BOOTSTRAP_OPTS} || die "Failed to bootstrap FreeSWITCH"
-
-		# Bootstrap FreeTDM
-		#if use freeswitch_modules_freetdm
-		#then
-		#	einfo "Bootstrapping FreeTDM"
-		#	( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
-		#fi
-	fi
-
-	#
-	# 1. enable / disable optional modules
-	#
-	setup_modules
-
-	#
-	# 2. patches for esl modules (*sigh*)
-	#
-	sed -i -e '/^LOCAL_LDFLAGS/s:^\(.*\):\1 -lpthread:' \
-		libs/esl/{ruby,python,perl,lua}/Makefile || die "failed to patch esl modules"
-
-	if use esl-python; then
-		python_get_version || die "Failed to determine current python version"
-
-		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
-			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
-	fi
-
-	#
-	# 3. workarounds remove as soon as the fix has been comitted
-	#
-}
-
-src_configure() {
-	local java_opts ftdm_opts config_opts
-
-	#
-	# option handling
-	#
-	fs_use freeswitch_modules_java && \
-		java_opts="--with-java=$(/usr/bin/java-config -O)"
-
-	# FreeTDM specific options
-	ftdm_opts="$(fs_with libpri) $(fs_with misdn)"
-
-	#
-	# 1. filter some flags known to break things
-	#
-
-	# breaks linking freeswitch core lib (missing libdl symbols)
-	filter-ldflags -Wl,--as-needed
-
-	# breaks freetdm
-	filter-flags -fvisibility-inlines-hidden
-
-	#
-	# 2. configure (can't use econf thanks to b0rked buildsystem)
-	#
-	einfo "Configuring FreeSWITCH..."
-	./configure -C \
-		--host=${CHOST} \
-		${CBUILD:+--build=${CBUILD}} \
-		${CTARGET:+--target=${CTARGET}} \
-		--prefix=/opt/freeswitch \
-		--libdir=/opt/freeswitch/lib \
-		--sysconfdir=/opt/freeswitch/conf \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--enable-core-libedit-support \
-		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
-		$(fs_enable sctp) \
-		$(fs_enable zrtp) \
-		$(fs_with freeswitch_modules_python python "$(PYTHON -a)") \
-		$(fs_enable resampler resample) \
-		$(fs_enable odbc core-odbc-support) \
-		${java_opts} ${ftdm_opts} ${config_opts} \
-		${EXTRA_ECONF} || die "failed to configure FreeSWITCH"
-
-	#
-	# 3. configure FreeTDM
-	#
-	#if use freeswitch_modules_freetdm
-	#then
-	#	cd "${S}/libs/freetdm"
-	#	einfo "Configuring FreeTDM..."
-	#	econf \
-	#		--prefix=/opt/freeswitch \
-	#		--libdir=/opt/freeswitch/lib \
-	#		--sysconfdir=/opt/freeswitch/conf \
-	#		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
-	#		${config_opts} || die "failed to configure FreeTDM"
-	#fi
-}
-
-src_compile() {
-	local esl_lang
-
-	#
-	# 1. filter some flags known to break things
-	#
-
-	# breaks linking freeswitch core lib (missing libdl symbols)
-	filter-ldflags -Wl,--as-needed
-
-	# breaks freetdm
-	filter-flags -fvisibility-inlines-hidden
-
-	#
-	# build FreeTDM
-	#
-	if use freeswitch_modules_freetdm
-	then
-		einfo "Building FreeTDM..."
-		emake -j1 -C libs/freetdm || die "failed to build FreeTDM"
-	fi
-
-	#
-	# 2. build everything
-	#
-	einfo "Building FreeSWITCH... (this can take a long time)"
-	emake -j1 MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
-
-	#
-	# 3. reswig esl - workaround for warnings (= errors) generated by gcc-4.6+
-	#
-	if fs_use_any_of ${IUSE_ESL}; then
-		einfo "Running esl reswig..."
-		emake -j1 -C libs/esl reswig || die "esl make reswig failed"
-	fi
-
-	#
-	# 4. build esl modules
-	#
-	for esl_lang in ${IUSE_ESL}; do
-		use ${esl_lang} || continue
-
-		esl_lang="${esl_lang#*-}"
-
-		einfo "Building esl module for ${esl_lang}..."
-		emake -j1 -C libs/esl "$(esl_modname "${esl_lang}")" || die "Failed to build esl module for language \"${esl_lang}\""
-	done
-
-	if use esl; then
-		einfo "Building libesl..."
-		emake -j1 -C libs/esl || die "Failed to build libesl"
-	fi
-}
-
-
-src_install() {
-	local esl_lang
-
-	#
-	# 1. Install core
-	#
-	einfo "Installing freeswitch core and modules..."
-	make -j1 install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
-
-	#
-	# 2. Documentation, sample config files, ...
-	#
-	einfo "Installing documentation and misc files..."
-	dodoc AUTHORS NEWS README ChangeLog INSTALL
-
-	insinto /opt/freeswitch/scripts/rss
-	doins scripts/rss/rss2ivr.pl
-
-	keepdir /opt/freeswitch/{htdocs,log,log/{xml_cdr,cdr-csv},db,grammar,cores,storage,scripts,recordings}
-
-	newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
-	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
-
-	# save a copy of the default config
-	einfo "Saving a copy of the default configuration..."
-	find "${D}/opt/freeswitch/conf" -type f | sed -e "s:${D}/opt/freeswitch::" |\
-	while read fn; do
-		docinto "$(dirname "${fn}")"
-		dodoc   "${D}/opt/freeswitch/${fn}"
-	done
-
-	# remove sample configuration if the user wishes so,
-	# but only if this isn't a fresh installation
-	if use nosamples; then
-		if ! has_version "net-misc/freeswitch"; then
-			einfo "No previous installation of FreeSWITCH found, installing sample configuration..."
-		else
-			einfo "Removing sample configuration files..."
-			rm -r "${D}"/opt/freeswitch/conf/*
-		fi
-	fi
-
-	# move configuration to /etc/freeswitch and
-	# create symlink to /opt/freeswitch/conf
-	dodir /etc
-	mv "${D}/opt/freeswitch/conf" "${D}/etc/freeswitch"
-	dosym /etc/freeswitch /opt/freeswitch/conf
-
-	# keep managed subdir
-	fs_use freeswitch_modules_managed && keepdir /opt/freeswitch/mod/managed
-
-	# TODO: install contributed stuff
-
-	# mod_skypopen sample config & helper files
-	if fs_use freeswitch_modules_skypopen ; then
-		docinto skypopen
-		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
-		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
-	fi
-
-	#
-	# 3. Remove .a and .la files
-	#
-	prune_libtool_files --modules
-
-	#
-	# 4. install esl modules
-	#
-	if use esl-ruby; then
-		einfo "Installing esl module for ruby..."
-		esl_dorubymod libs/esl/ruby/ESL.so
-	fi
-
-	if use esl-python; then
-		einfo "Installing esl module for python..."
-		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
-	fi
-
-	if use esl-lua; then
-		einfo "Installing esl module for lua..."
-		esl_doluamod libs/esl/lua/ESL.so
-	fi
-
-	if use esl-php; then
-		einfo "Installing esl module for php..."
-		emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
-	fi
-
-	if use esl-perl; then
-		einfo "Installing esl module for perl..."
-		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
-	fi
-
-	if use esl; then
-		einfo "Installing libesl..."
-		insinto "/opt/freeswitch/lib"
-		doins libs/esl/libesl.a
-	fi
-
-	#
-	# 5. Fix permissions
-	#
-	fs_set_permissions "${D}"
-}
-
-pkg_preinst() {
-	#
-	# 1. upgrade api check
-	#
-	if fs_is_upgrade; then
-		einfo "Performing core ABI compatibility check..."
-
-		# compare exported symbols of new and old libfreeswitch to make sure
-		# external modules will still work
-		fs_check_core_abi_compat
-
-		# check if external modules will still work after upgrade
-		# to new libfreeswitch
-		fs_check_modules_api_compat
-	fi
-
-	#
-	# 2. preserve existing config files
-	#
-	if use nosamples; then
-		if has_version "net-misc/freeswitch"; then
-			einfo "Preserving existing configuration..."
-			rm -r "${D}/etc/freeswitch"
-			cp -dpR "${EROOT}/etc/freeswitch" "${D}/etc"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	#
-	# 1. Info
-	#
-	echo
-	einfo "FreeSWITCH has been successfully emerged!"
-	echo
-	einfo "More information about FreeSWITCH and how to configure it"
-	einfo "can be found on one of these sites:"
-	einfo
-	einfo "    http://www.freeswitch.org/"
-	einfo "    http://wiki.freeswitch.org/"
-	echo
-
-	# skypopen setup guide
-	if use freeswitch_modules_skypopen ; then
-		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
-		einfo "follow the instructions in the guide:"
-		einfo
-		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
-		einfo
-		echo
-	fi
-
-	einfo "A copy of the default configuration has been saved to"
-	einfo "    ${EROOT}/usr/share/doc/${PF}/conf"
-	echo
-
-	echo
-	einfo "FreeSWITCH Cyneric Specific files"
-	echo
-
-	mkdir /var/tmp/portage/cyneric
-	curl http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/freeswitch-cyneric.tar.gz -o /var/tmp/portage/cyneric/freeswitch-cyneric.tar.gz
-	cd /var/tmp/portage/cyneric; tar -zxvf freeswitch-cyneric.tar.gz
-
-	echo
-	einfo "copying cyneric specific files"
-	echo
-
-	rm -rf /var/tmp/portage/cyneric/freeswitch-cyneric.tar.gz
-	cp -R /var/tmp/portage/cyneric/* /opt/freeswitch/
-	rm -rf /var/tmp/portage/cyneric/*
-
-	echo
-	einfo "updating configurations"
-	echo
-
-	rm -rf /etc/freeswitch
-	cp -R /opt/freeswitch/conf/ /etc/freeswitch
-
-	echo
-	einfo "completed Cyneric code"
-	echo
-
-
-}
-
-pkg_config() {
-	local answer="N"
-
-	[ "$(id -u)" != "0" ] && {
-		eerror "This action needs root privileges"
-		die "Can not run as non-root user"
-	}
-
-	einfo "Reset permissions to installation defaults (y/N)?"
-	read answer
-
-	if [ "${answer/y/Y}" = "Y" ]; then
-		#
-		# Fix permissions
-		#
-		fs_set_permissions "${EROOT:-/}"
-
-		einfo "Done"
-	else
-		ewarn "Aborted"
-	fi
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 0c70e0d..e69de29 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +0,0 @@
-#
-# Experimental version,
-# masked for now
-#
->=net-misc/freeswitch-9999-r1
diff --git a/profiles/repo_name b/profiles/repo_name
index 344fe44..975a719 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-freeswitch
+ScurvyNet

From 6c1dc88d4f112e70bf4cfc933f8bdd08d0f0c6ec Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 14:01:07 -0700
Subject: [PATCH 034/261] added zabbix agents

---
 .../files/freeswitch.zabbix                   |   1 +
 .../files/zabbix-freeswitch.pl                | 137 ++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 net-misc/freeswitch-cyneric/files/freeswitch.zabbix
 create mode 100755 net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl

diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.zabbix b/net-misc/freeswitch-cyneric/files/freeswitch.zabbix
new file mode 100644
index 0000000..572b828
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.zabbix
@@ -0,0 +1 @@
+UserParameter=freeswitch[*],sudo -u zabbix sudo /opt/agents/zabbix-freeswitch.pl \$1 \$2
diff --git a/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl b/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl
new file mode 100755
index 0000000..58d3a6c
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl
@@ -0,0 +1,137 @@
+#!/usr/bin/perl
+
+# gets stats for freeswitch
+# this graphs multiple instances
+
+use strict;
+use warnings;
+no warnings 'uninitialized';
+use Data::Dumper;
+use Storable qw(nstore retrieve);
+
+my @instanceData;
+my $instances = ();
+
+my $cacheTime = 30;
+my $storeFile = '/opt/freeswitch/tmp/zabbix-freeswitch';
+my $fscli = "/opt/freeswitch/bin/fs_cli";
+
+my ($name, $dset) = @ARGV;
+
+# check for cache file newer CACHETIME seconds ago
+if ( -f $storeFile && time - (stat( $storeFile ))[9] < $cacheTime) {
+        # use cached data
+	$instances = retrieve($storeFile);
+} else {
+        # grab the status URL (fresh data)
+	$instances = get_instances();
+	getSpace();
+	nstore($instances, $storeFile);
+}
+
+foreach my $instance (keys %{ $instances }) {
+	if ($name eq $instance) {
+		foreach my $key (keys %{ $instances->{$instance} }) {
+			if ($dset eq $key) {
+				print "$instances->{$instance}->{$key}\n";
+			}
+		}
+	}
+}
+
+# functions
+
+# gets all instances into a array hash
+sub get_instances {
+	my $instances = ();
+	open(LINE, 'netstat -nlp|grep tcp|grep 5060|grep freeswitch|');
+	while (<LINE>) {
+		if ($_ =~ /^tcp\s+\d+\s+\d+\s(\d+\.\d+\.\d+\.\d+)\:.*\s+.*LISTEN\s+(\d+)\/.*/) {
+			my $ip = $1;
+			my $pid = $2;
+			my $instance_name = `cat /proc/$2/cmdline`;
+
+			# 			/opt/freeswitch/bin/freeswitch-conf/opt/freeswitch/conf/f-log/opt/freeswitch/log/f-db/opt/freeswitch/db/f-nc-ufreeswitch
+			if ($instance_name =~ /.*opt\/freeswitch\/log\/(.*)\-db.*/) {
+				$instance_name = $1;
+				$instance_name =~ s/[^a-zA-Z0-9 _-]//g;
+
+			}
+			$instances->{$instance_name}->{'IP'} = $ip;
+			$instances->{$instance_name}->{'PID'} = $pid;
+		}
+	}
+	close(LINE);
+
+	# lets gather stats now
+	foreach my $instance_id (keys %$instances) {
+		my $status = `$fscli -H $instances->{$instance_id}->{'IP'} -x 'status'`;
+
+		if ($status =~ /(\d+)\s+session\(s\)\s+\-\s+peak.*/) {
+			$instances->{$instance_id}->{'Sessions'} = $1;
+		}
+
+		# /usr/local/freeswitch/bin/fs_cli -H ${server[$n]} -x 'show bridged_calls' | grep total
+		my $b_calls = `$fscli -H $instances->{$instance_id}->{'IP'} -x 'show bridged_calls'|grep total`;
+		if ($b_calls =~ /(\d+)\s+total\./) {
+			$instances->{$instance_id}->{'BridgedCalls'} = $1;
+		}
+		
+		$instances->{$instance_id}->{'CallAttempts'} = $instances->{$instance_id}->{'Sessions'} - ($instances->{$instance_id}->{'BridgedCalls'} * 2);
+
+		# sql established connections
+		my $sql_est = `netstat -putan | grep 1433 | grep ESTABLISHED | grep $instances->{$instance_id}->{'PID'} | wc -l`;
+		chomp $sql_est;
+		$instances->{$instance_id}->{'SQLest'} = $sql_est;
+
+		# sql connections
+		my $sql_con = `netstat -putan | grep 1433 | grep $instances->{$instance_id}->{'PID'} | wc -l`;
+		chomp $sql_con;
+		$instances->{$instance_id}->{'SQLcons'} = $sql_con;
+
+		$instances->{ 'ALL' }->{ 'Sessions' } = $instances->{ 'ALL' }->{ 'Sessions' } + $instances->{ $instance_id }->{ 'Sessions' };
+		$instances->{ 'ALL' }->{ 'BridgedCalls' } = $instances->{ 'ALL' }->{ 'BridgedCalls' } + $instances->{$instance_id}->{'BridgedCalls'};
+		$instances->{ 'ALL' }->{ 'CallAttempts' } = $instances->{ 'ALL' }->{ 'CallAttempts' } + $instances->{$instance_id}->{'CallAttempts'};
+		$instances->{ 'ALL' }->{ 'SQLest' } = $instances->{ 'ALL' }->{ 'SQLest' } + $instances->{$instance_id}->{'SQLest'};
+		$instances->{ 'ALL' }->{ 'SQLcons' } = $instances->{ 'ALL' }->{ 'SQLcons' } + $instances->{$instance_id}->{'SQLcons'};
+	}
+
+	return($instances);
+}
+
+sub getSpace {
+
+        # gets spaced used from df, for tmpfs mounted items
+        open(LINE, 'df | grep freeswitch | grep tmpfs |');
+        while (<LINE>) {
+                # tmpfs 10M  376K  9.7M   4% /opt/freeswitch/db/a
+                if ($_ =~ /tmpfs\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)%\s+(.*)/) {
+                        my $size = $1;
+                        my $used = $2;
+                        my $avail = $3;
+                        my $usedPCT = $4;
+                        my $path = $5;
+
+                        # lets split on / for instance id
+                        my @paths = split(/\//, $path);
+			my $inID = $paths[4];
+
+			if ($paths[3] eq "db") {
+				$instances->{$inID}->{'TMPFS_DB_size'} = $size;
+				$instances->{$inID}->{'TMPFS_DB_used'} = $used;
+				$instances->{$inID}->{'TMPFS_DB_avail'} = $avail;
+				$instances->{$inID}->{'TMPFS_DB_usedPCT'} = $usedPCT;
+			}
+
+			# log cdr-csv
+			if ($paths[3] eq "log") {
+				$instances->{$inID}->{'TMPFS_CDR_size'} = $size;
+				$instances->{$inID}->{'TMPFS_CDR_used'} = $used;
+				$instances->{$inID}->{'TMPFS_CDR_avail'} = $avail;
+				$instances->{$inID}->{'TMPFS_CDR_usedPCT'} = $usedPCT;
+			}
+                }
+        }
+        close(LINE);
+
+}

From b3341482ede06d2599444191e9c74c3ec6609d93 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 14:15:11 -0700
Subject: [PATCH 035/261] updated ebuild, tested, and now working

---
 net-misc/freeswitch-cyneric/Manifest                      | 4 +++-
 .../freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild    | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index caae4e2..e07be6c 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -2,5 +2,7 @@ AUX cyneric.cron 3344 SHA256 06c626ee726617df31f54db29b9ec72d69860950b8abf063bf6
 AUX cyneric.fstab 1183 SHA256 3c268d5a7381e32ca260b192e7e242bfa3b54a5bc9c31c459986bb8cf7977600 SHA512 c118fc8b36de20add478306fcbb1b9a551855c803c71a304f6b2b8721990f958fb004e14a3dd158c0a990a762a133c1e2683bb78024c254d0519423c79ea9c2b WHIRLPOOL 8822e27be06fdf2532762639936ea1753a8479d56b975cc38a4a599896518d4d1ac238aa3951f0bc78168236bdd22a006aa83cde0eac6b1943c4bee6fa8bce69
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
+AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
+AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
 DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1524 SHA256 066d324226219f2df73f79578dc9ae0cd5aa8863a498693246076cf18a5cfa2d SHA512 2015b65555f013a1dbddedf78678ccebc78282d9edf0dc53ca1d2605d5f2467401ccaf6b48a1d0600826f3da536e619a2e4a4af925a716d0c5be23e02e2a5aca WHIRLPOOL b344563832dbfaddc54ed92f967a5be1f685637a1ab8dd6589ee753b548fb86a779bfceacb01f33e832f59d4a8eca341548f8cc3f6b2c6496043c1d153253516
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1776 SHA256 1ec19d2950015920edaa46b5190f03044b35895538b02ea67154215499678228 SHA512 c1765234ad21be63ea2a924c1b8cb32d134ad101c25b8972c91d27edd560992c6099620af2df925896d004a688d18f97105cad24da8d6b67595cafaad9dd4fad WHIRLPOOL 1b6de26a4acd9cf35fccc358695b58f7e5203ffda55147a04ee00e4bc22bd20d5b26125c91d05842201e9e9c176ddd7ff3e431324cdca6f4bd1a922ab49a7f83
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index 79bcf57..fe744d2 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -55,6 +55,14 @@ pkg_postinst() {
         newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
         newconfd "${FILESDIR}"/freeswitch.confd freeswitch
 
+	einfo ""
+
+	einfo "adding zabbix stuff"
+	cp "${FILESDIR}"/freeswitch.zabbix /etc/zabbix/zabbix_agentd.d/freeswitch.conf
+	cp "${FILESDIR}"/zabbix-freeswitch.pl /opt/agents/
+	chown -R zabbix:zabbix /etc/zabbix
+	chmod +x /opt/agents/zabbix-freeswitch.pl
+
         einfo ""
         einfo "cyneric install completed"
         

From f094105223b764533eb41d6e8e88c2fbb56a6dd5 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 14:17:18 -0700
Subject: [PATCH 036/261] forgot to copy over the fstab stuff

---
 net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index fe744d2..5cad0fa 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -60,6 +60,7 @@ pkg_postinst() {
 	einfo "adding zabbix stuff"
 	cp "${FILESDIR}"/freeswitch.zabbix /etc/zabbix/zabbix_agentd.d/freeswitch.conf
 	cp "${FILESDIR}"/zabbix-freeswitch.pl /opt/agents/
+	cp "${FILESDIR}"/cyneric.fstab /opt/freeswitch/
 	chown -R zabbix:zabbix /etc/zabbix
 	chmod +x /opt/agents/zabbix-freeswitch.pl
 

From 80dd8f555a8d2fd5170a6d0f550773ad98d14ddc Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 14:17:49 -0700
Subject: [PATCH 037/261] updated manifest for freeswitch-cyneric

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index e07be6c..10e73b9 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -5,4 +5,4 @@ AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdb
 AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
 AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
 DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1776 SHA256 1ec19d2950015920edaa46b5190f03044b35895538b02ea67154215499678228 SHA512 c1765234ad21be63ea2a924c1b8cb32d134ad101c25b8972c91d27edd560992c6099620af2df925896d004a688d18f97105cad24da8d6b67595cafaad9dd4fad WHIRLPOOL 1b6de26a4acd9cf35fccc358695b58f7e5203ffda55147a04ee00e4bc22bd20d5b26125c91d05842201e9e9c176ddd7ff3e431324cdca6f4bd1a922ab49a7f83
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1825 SHA256 21a592279b521a7451466426354f660ccc2dc4e728c7fdd7c0cb60a6d36950d4 SHA512 9123d3dda4ade2cc7cd4b3f589ff0027b4aeac4e7f893ee034ed81d393a881c79ead596e058fc67ff0d3bbd791b81c0ac173f65132d9b0bb52d7b044fb82df23 WHIRLPOOL 9856d941360ccd0d563b0f3b3b1ec5078b97cc1cf1a459ab05f8b0f74a801fee9b7ef148e4e138ab0cb6de73b611b8df48f4e241a03be9134abde24fce5c63b0

From 4fe0f3e214a6d673696c714a7c2f7b8371246e37 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 9 Sep 2014 14:20:38 -0700
Subject: [PATCH 038/261] fixed log, and fstab

---
 net-misc/freeswitch-cyneric/Manifest                     | 2 +-
 .../freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 10e73b9..1a9717b 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -5,4 +5,4 @@ AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdb
 AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
 AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
 DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1825 SHA256 21a592279b521a7451466426354f660ccc2dc4e728c7fdd7c0cb60a6d36950d4 SHA512 9123d3dda4ade2cc7cd4b3f589ff0027b4aeac4e7f893ee034ed81d393a881c79ead596e058fc67ff0d3bbd791b81c0ac173f65132d9b0bb52d7b044fb82df23 WHIRLPOOL 9856d941360ccd0d563b0f3b3b1ec5078b97cc1cf1a459ab05f8b0f74a801fee9b7ef148e4e138ab0cb6de73b611b8df48f4e241a03be9134abde24fce5c63b0
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1791 SHA256 0dffcff2cca4428d13ca997c5497288f0dd4598844e149d25f2346b5c8942c2c SHA512 4e84e0725ee7e3c0d0cc518b0a676c13d3eada75b20c4b1c261fb0c3d808b315b40cac98b937240edf57f351e784f400667aa645aa3afd2f3e960f3f3c820cc1 WHIRLPOOL 415c795392f6e58d96011ee3b95d70bff6d6a19ed376498879547f54cf4d8f069abd7b41e77ecd2bd1c4baac5c0d82c8ae1d340d60eb83eeba64430c2f739ae4
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index 5cad0fa..f0440df 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -23,10 +23,11 @@ DEPEND="${RDEPEND}"
 
 pkg_preinst() {
         einfo "removing freeswitch configs"
-				rm -rf /opt/freeswitch/conf
-				rm -rf /etc/freeswitch
+	rm -rf /opt/freeswitch/conf
+	rm -rf /etc/freeswitch
+	rm -rf /opt/freeswitch/log
 
-				einfo "installing new cyneric files"
+	einfo "installing new cyneric files"
 
         cd ${WORKDIR}
         cp -R * /opt/freeswitch/
@@ -40,8 +41,6 @@ pkg_preinst() {
         
         cp "${FILESDIR}"/cyneric.cron /etc/cron.d/
         
-        cp "${FILESDIR}"/cyneric.fstab /etc/cron.d/
-
 }
 
 pkg_postinst() {

From 0cdd73c3ee7656a04868318744d7cb711f05eaa3 Mon Sep 17 00:00:00 2001
From: Drew Matthews <drew@scurvynet.com>
Date: Tue, 9 Sep 2014 18:50:19 -0700
Subject: [PATCH 039/261] added net-analyzer/netcat as a dependancy due to
 cyneric

---
 net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index f0440df..575e537 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -16,7 +16,8 @@ RESTRICT="mirror"
 SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/${P}.tar.gz"
 
 RDEPEND="dev-java/oracle-jdk-bin
-        net-misc/freeswitch"
+        net-misc/freeswitch
+	net-analyzer/netcat"
 
 DEPEND="${RDEPEND}"
 

From 524e8321c542b24c0fbd4a559784342d82731287 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 12 Sep 2014 16:43:40 -0700
Subject: [PATCH 040/261] updated freeswitch manifest

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 1a9717b..b2ab867 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -5,4 +5,4 @@ AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdb
 AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
 AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
 DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1791 SHA256 0dffcff2cca4428d13ca997c5497288f0dd4598844e149d25f2346b5c8942c2c SHA512 4e84e0725ee7e3c0d0cc518b0a676c13d3eada75b20c4b1c261fb0c3d808b315b40cac98b937240edf57f351e784f400667aa645aa3afd2f3e960f3f3c820cc1 WHIRLPOOL 415c795392f6e58d96011ee3b95d70bff6d6a19ed376498879547f54cf4d8f069abd7b41e77ecd2bd1c4baac5c0d82c8ae1d340d60eb83eeba64430c2f739ae4
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1812 SHA256 44f6babef8c34da02c06cc8acfb9865b0d7e598c345b2dd9b6dc5fe36571e027 SHA512 649b28ba3c273f3e9fdb0ce59d41cfcc522c1a44a1f3c3bc6f744dd2367873c694b963168f49136041334baa74cbb2f372875e3b4084c82392350cc64d458a51 WHIRLPOOL c008cb65e50dffea3c9e72a4030fcad0333bb23388eb2c748d351dbff630c96110169b61d3b3e40d6b462bb5dcbf32d07e948f266ae6cb976360c91fb860da8d

From 4b2b6e9fc4d6dd844458a9c8302bcd2dd7591ad1 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 15 Sep 2014 18:43:27 -0700
Subject: [PATCH 041/261] added new ceph version

---
 .../PEAR-DB_DataObject_FormBuilder/Manifest   |   5 -
 ...EAR-DB_DataObject_FormBuilder-1.0.0.ebuild |  21 -
 ...DB_DataObject_FormBuilder-1.0.0_rc7.ebuild |  21 -
 .../metadata.xml                              |   5 -
 .../ioncube-loaders-4.4.0.ebuild              | 100 ----
 dev-php/pecl-redis/Manifest                   |   2 -
 dev-php/pecl-redis/pecl-redis-2.2.3.ebuild    |  32 --
 dev-php/predis/Manifest                       |   3 -
 dev-php/predis/files/channel.xml              |  17 -
 dev-php/predis/predis-0.8.0.ebuild            |  24 -
 media-tv/plex-media-server/files/pax_fix.sh   |  15 -
 .../files/plex-media-server-startup_fix.patch | 128 ------
 media-tv/plex-media-server/files/pms_initd_1  |  24 -
 .../plex-media-server/files/start_pms_1.patch |  19 -
 sys-cluster/ceph/ChangeLog                    | 328 +++++++++++++
 sys-cluster/ceph/Manifest                     |  35 +-
 sys-cluster/ceph/ceph-0.56.3.ebuild           | 103 -----
 sys-cluster/ceph/ceph-0.58.ebuild             | 103 -----
 sys-cluster/ceph/ceph-0.61.2.ebuild           | 115 -----
 sys-cluster/ceph/ceph-0.63.ebuild             | 114 -----
 sys-cluster/ceph/ceph-0.67.2.ebuild           | 111 -----
 sys-cluster/ceph/ceph-0.67.ebuild             | 111 -----
 sys-cluster/ceph/ceph-0.71.ebuild             | 111 -----
 .../{ceph-0.61.ebuild => ceph-0.85.ebuild}    |  74 ++-
 sys-cluster/ceph/ceph-9999.ebuild             |  74 ++-
 sys-cluster/ceph/files/README.gentoo          |  18 +
 .../ceph/files/ceph-0.26-autotools.patch      |  17 -
 .../ceph/files/ceph-0.60-mds_sessionmap.patch |  29 --
 .../ceph/files/ceph-0.61.7-install.patch      |  13 -
 sys-cluster/ceph/files/ceph-0.79-libzfs.patch |  13 +
 .../ceph/files/ceph-fix-gnustack.patch        |  22 +
 sys-cluster/ceph/files/ceph-issue1869.patch   |  18 -
 sys-cluster/ceph/files/ceph.confd             |   8 -
 sys-cluster/ceph/files/ceph.confd-r1          |   4 +
 sys-cluster/ceph/files/ceph.initd             |  27 --
 sys-cluster/ceph/files/ceph.initd-r1          |  48 ++
 sys-cluster/ceph/files/ceph.logrotate         |  22 +
 sys-cluster/ceph/files/ceph_init.sh           | 433 ------------------
 sys-cluster/ceph/metadata.xml                 |  23 +
 39 files changed, 590 insertions(+), 1800 deletions(-)
 delete mode 100644 dev-php/PEAR-DB_DataObject_FormBuilder/Manifest
 delete mode 100644 dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild
 delete mode 100644 dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild
 delete mode 100644 dev-php/PEAR-DB_DataObject_FormBuilder/metadata.xml
 delete mode 100644 dev-php/ioncube-loaders/ioncube-loaders-4.4.0.ebuild
 delete mode 100644 dev-php/pecl-redis/Manifest
 delete mode 100644 dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
 delete mode 100644 dev-php/predis/Manifest
 delete mode 100644 dev-php/predis/files/channel.xml
 delete mode 100644 dev-php/predis/predis-0.8.0.ebuild
 delete mode 100644 media-tv/plex-media-server/files/pax_fix.sh
 delete mode 100644 media-tv/plex-media-server/files/plex-media-server-startup_fix.patch
 delete mode 100644 media-tv/plex-media-server/files/pms_initd_1
 delete mode 100644 media-tv/plex-media-server/files/start_pms_1.patch
 create mode 100644 sys-cluster/ceph/ChangeLog
 delete mode 100644 sys-cluster/ceph/ceph-0.56.3.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.58.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.61.2.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.63.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.67.2.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.67.ebuild
 delete mode 100644 sys-cluster/ceph/ceph-0.71.ebuild
 rename sys-cluster/ceph/{ceph-0.61.ebuild => ceph-0.85.ebuild} (53%)
 create mode 100644 sys-cluster/ceph/files/README.gentoo
 delete mode 100644 sys-cluster/ceph/files/ceph-0.26-autotools.patch
 delete mode 100644 sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch
 delete mode 100644 sys-cluster/ceph/files/ceph-0.61.7-install.patch
 create mode 100644 sys-cluster/ceph/files/ceph-0.79-libzfs.patch
 create mode 100644 sys-cluster/ceph/files/ceph-fix-gnustack.patch
 delete mode 100644 sys-cluster/ceph/files/ceph-issue1869.patch
 delete mode 100644 sys-cluster/ceph/files/ceph.confd
 create mode 100644 sys-cluster/ceph/files/ceph.confd-r1
 delete mode 100644 sys-cluster/ceph/files/ceph.initd
 create mode 100644 sys-cluster/ceph/files/ceph.initd-r1
 create mode 100644 sys-cluster/ceph/files/ceph.logrotate
 delete mode 100755 sys-cluster/ceph/files/ceph_init.sh
 create mode 100644 sys-cluster/ceph/metadata.xml

diff --git a/dev-php/PEAR-DB_DataObject_FormBuilder/Manifest b/dev-php/PEAR-DB_DataObject_FormBuilder/Manifest
deleted file mode 100644
index 1f8a1ea..0000000
--- a/dev-php/PEAR-DB_DataObject_FormBuilder/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST DB_DataObject_FormBuilder-1.0.0.tgz 68183 SHA256 286e8f9cc6f02941a53206b54caed5a863c5eb96d20e08a4122370bc1b3db796 SHA512 d59ee8a56ccaeabbd29d66b45a5e0f049de1f8584a117abb7be5ddb18b155adb9edfd219a1d1b353d28c5febc5ea98af745a413a868f8d62c2e0e479b497b26d WHIRLPOOL c86ebeb8807607a535e79316679b8381b7cc6904dc6c065b8555cbb7f309728797e428de9fd46205efba9e7f7c7bfd6a3942b4c7a15ec46209f1a327bf4651cd
-DIST DB_DataObject_FormBuilder-1.0.0RC7.tgz 68052 SHA256 209ad9035ebaa3579a688efab3d48b9f333410dc164d46c2477db3b2b3c80fb2 SHA512 f5bcc90c4768c1b6144a6a3640a78ad1ce6aac1f111323e7d46f5338cbc484f69ecdee0f7d4c255ac95c5c98a6d40026701f56b8c0498dd582abf6617b15e2b0 WHIRLPOOL ddc45df95665460604088a72e2535ef7810d02a0e25faee3fd9d3f843aaafd51fb84ecde8f6d3682b800abaeebb77caaed643fa82e20de08a15672d9192fbc94
-EBUILD PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild 690 SHA256 2d6e41e405e4a440aa3c4d131cdcd6694fb7cbcdd6c55a4faea11724904ddc3e SHA512 387ebd7a3fe35fd061d2a75bddb9ab3863f9a9735decd43e91bc981e640e194b49399aeda4eea971970fff6af34b20b7560bacabc1c52a056d2f351c8e60a83d WHIRLPOOL 99612a00cdf1ddc263690f8fbe156208225a7c033958e536efbd740704ee2a78fa44525c7445c926ecb2befbd9875c2dead0151e54b5901a403da1d3293642bc
-EBUILD PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild 691 SHA256 6d5d92252feaaa40551b2b68be2565ffdfb3b82e9f846b4c4fb1b4f76a6f3ff3 SHA512 e6990b542b488c7ab382face1644b8b4fa91d7acd3f5e61da01e75b3862d1c138c206a8558dfb4c3bc8d3e1e1e4f7938d09b1b06af45ec146364790948f5d7cd WHIRLPOOL adbb1fef296dc1e217aafda17e7b5d8c5955c0ef3deccd32a127f5736e4390013189faa43f67e735a7861a01b50bf038fca5fe15d297e3318b8be6d23a772cbc
-MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
diff --git a/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild b/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild
deleted file mode 100644
index 8cde5ee..0000000
--- a/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0.ebuild,v 1.1 2010/02/16 04:31:50 beandog Exp $
-
-inherit php-pear-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Class to automatically build HTML_QuickForm objects from a DB_DataObject-derived class"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="minimal"
-
-DEPEND=""
-RDEPEND=">=dev-php/PEAR-DB_DataObject-1.8.5
-	>=dev-php/PEAR-HTML_QuickForm-3.2.4
-	!minimal? (
-		>=dev-php/PEAR-Date-1.4.7
-		>=dev-php/PEAR-HTML_Table-1.7.5
-		>=dev-php/PEAR-HTML_QuickForm_ElementGrid-0.1.0
-	)"
diff --git a/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild b/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild
deleted file mode 100644
index a0a5e84..0000000
--- a/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB_DataObject_FormBuilder/PEAR-DB_DataObject_FormBuilder-1.0.0_rc7.ebuild,v 1.2 2009/04/21 19:40:26 hollow Exp $
-
-inherit php-pear-r1
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Class to automatically build HTML_QuickForm objects from a DB_DataObject-derived class"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="minimal"
-
-DEPEND=""
-RDEPEND=">=dev-php/PEAR-DB_DataObject-1.8.5
-	>=dev-php/PEAR-HTML_QuickForm-3.2.4
-	!minimal? (
-		>=dev-php/PEAR-Date-1.4.7
-		>=dev-php/PEAR-HTML_Table-1.7.5
-		>=dev-php/PEAR-HTML_QuickForm_ElementGrid-0.1.0
-	)"
diff --git a/dev-php/PEAR-DB_DataObject_FormBuilder/metadata.xml b/dev-php/PEAR-DB_DataObject_FormBuilder/metadata.xml
deleted file mode 100644
index fd3dbe3..0000000
--- a/dev-php/PEAR-DB_DataObject_FormBuilder/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>php</herd>
-</pkgmetadata>
diff --git a/dev-php/ioncube-loaders/ioncube-loaders-4.4.0.ebuild b/dev-php/ioncube-loaders/ioncube-loaders-4.4.0.ebuild
deleted file mode 100644
index acdff3e..0000000
--- a/dev-php/ioncube-loaders/ioncube-loaders-4.4.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-PHP_EXT_NAME="ioncube_loader"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INI="yes"
-DOCS="README.txt LICENSE.txt"
-
-USE_PHP="php5-3 php5-4 php5-5"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~amd64 ~x86"
-
-MY_P="${PN}"
-MY_ARCH=${ARCH/amd64/x86-64}
-
-S="${WORKDIR}/ioncube"
-PHP_EXT_S=${S}
-
-DESCRIPTION="PHP extension that support for running PHP scripts encoded with ionCube's encoder"
-HOMEPAGE="http://www.ioncube.com/"
-SRC_URI="http://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_${MY_ARCH}.tar.bz2"
-LICENSE="${PN}"
-SLOT="0"
-IUSE=""
-
-RESTRICT="nomirror strip"
-
-RDEPEND=""
-DEPEND="!dev-php/eaccelerator !dev-php/PECL-apc"
-
-PHP_LIB_DIR="/usr/share/php/${PN}"
-
-pkg_setup() {
-    PHP_VER=$(best_version =dev-lang/php-5*)
-    PHP_VER=$(echo ${PHP_VER} | sed -e's#dev-lang/php-\([0-9]*\.[0-9]*\)\..*#\1#')
-    QA_TEXTRELS="${EXT_DIR/\//}/${PHP_EXT_NAME}.so"
-    QA_EXECSTACK="${EXT_DIR/\//}/${PHP_EXT_NAME}.so"
-}
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-    mkdir modules
-    local slot orig_s="${PHP_EXT_S}"
-    for slot in $(php_get_slots); do
-    	PHP_VER=$(echo ${slot} | sed 's/php\([0-9]\.[0-9]\)/\1/')
-	IONCUBE_SO_FILE="${PHP_EXT_NAME}_lin_${PHP_VER}.so"
-	mv ${IONCUBE_SO_FILE} "modules/${PHP_EXT_NAME}.so"
-	cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory"
-    done
-}
-
-src_install() {
-#Get from php-ext-source-r2_src_install
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-
-		# Let's put the default module away
-		insinto "${EXT_DIR}"
-		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-
-		local doc
-		for doc in ${DOCS} ; do
-			[[ -s ${doc} ]] && dodoc ${doc}
-		done
-	done
-	php-ext-source-r2_createinifiles
-}
-
-pkg_config () {
-    einfo "Please refer to the installation instructions"
-    einfo "in /usr/share/doc/${CATEGORY}/${P}/README."
-}
-
-pkg_postinst() {
-    # You only need to restart apache2 if you're using mod_php
-    if built_with_use =${PHP_PKG} apache2 ; then
-        elog
-        elog "You need to restart apache2 to activate the ${PN}."
-        elog
-    fi
-}
-
-src_prepare() {
-    FOO=bar
-}
-
-src_configure() {
-    FOO=bar
-}
-
-src_compile() {
-    FOO=bar
-}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
deleted file mode 100644
index 2f5ec47..0000000
--- a/dev-php/pecl-redis/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST redis-2.2.3.tgz 86664 SHA256 87861198403ef7bf09306494f2efc5b55bfdcc6095b7aac059a546a2e662967d SHA512 17ff00c0ee3fa36fa6a2040740c51a9ad36e16be19b9b6df9872138a9015e3f01add59b0b6437c66966fb2850a4c63800b47737e468f4103d7285bdebf377b3b WHIRLPOOL bf0a30d2b9ba399edaddaae7856c6e42e48ed4be88e86a4da88ba5556a7aa36d54a448830810d3ffd3a3e49329f5a8e36a1d0eac9436843fc00b157e0fc592aa
-EBUILD pecl-redis-2.2.3.ebuild 706 SHA256 991fad893003fec5401648aae0f1d83cf71b822312f4eeb501e1acbde74befb1 SHA512 9c0fc33a566e8dcd6be8a258d3304569ff2691a8293e160e0a1b7517037051e317b45c1bc69f2b6b806dd5fcf16ecc1354b474cc42b2faf3c83f3457141d1793 WHIRLPOOL 7d6798c2fc0993075ca43a20135d853cd38e23e957a995e722bb093d7a4fc89c6f530c38172cacf3612c95e71da8c393a24925a2624379834bd376b5c2b4acd1
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
deleted file mode 100644
index c329dc6..0000000
--- a/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild,v 1.1 2013/07/26 15:57:39 olemarkus Exp $
-
-EAPI="5"
-
-PHP_EXT_NAME="redis"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-5 php5-4 php5-3"
-
-DOCS="README ChangeLog"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="This extension provides an API for communicating with Redis servers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="igbinary"
-
-DEPEND="igbinary? ( dev-php/igbinary )"
-RDEPEND="$DEPEND"
-
-src_configure() {
-	my_conf="--enable-redis
-		$(use_enable igbinary redis-igbinary)"
-
-	php-ext-source-r2_src_configure
-}
diff --git a/dev-php/predis/Manifest b/dev-php/predis/Manifest
deleted file mode 100644
index 6655638..0000000
--- a/dev-php/predis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX channel.xml 710 SHA256 c24460ca96c9139de26a2c04ee7eadefd8459be479f11251455ae54e9eb8f5f8 SHA512 494235a94a79c28f7c688e6ba7df4e721a8898c156800571b0b1b7c08c6e39fa6baa6ef0a15425c9475562f3009fda9adb5e9599c93593b1a686897130868aa7 WHIRLPOOL 25f016364b238b63355b7e281a576309ab1360de35f9e55836e44d5a59c86082be082265673ac4fc85297cb0de1c5cff558c74102646da5826ce39d538aaefb3
-DIST Predis-0.8.0.tgz 168356 SHA256 6174513d7ab3e31d63db464f87d8d9b406fa50dac8cb322b930fccef5f970f33 SHA512 e8ef4fd466671361dbecea8e68d6441e127bec90acbeac6f1c211189cabec0faad6a19c1c0b6cbf0ea6f5acd3d2eebaf568f16fca84b28f98689daf55f45215d WHIRLPOOL e5e2f0bed8da8677b1c75a77462328cf5827eda9cc4d37ace6d42a5c35a88f1b4a0d52c72b740e162a68385b13687026eadd5b9f17ffba20dace397ce494c231
-EBUILD predis-0.8.0.ebuild 532 SHA256 7c530a4359f65a7a16d0aca7fd785c171afd1e6649b02c462e1a3acb45b5779c SHA512 31ddd1b6f2abea6e6d05f7d221396839936a80baf949b772bfc327c2cfa51ec9b92cdf88a90f152a617eb1692979434f3f072354970883d08e2be87a5d47a849 WHIRLPOOL faa3b66004f5fd45b41bc7c333f81e622f5601b44d270f2285f0e9a6f6ba696389f3b281e3ea56bc6fc33a6e93d913c81f16899c754e7501027b31ea7e5ebc2e
diff --git a/dev-php/predis/files/channel.xml b/dev-php/predis/files/channel.xml
deleted file mode 100644
index 041a359..0000000
--- a/dev-php/predis/files/channel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-  <name>pear.nrk.io</name>
-  <summary>nrk.io</summary>
-  <suggestedalias>nrk</suggestedalias>
-  <servers>
-    <primary>
-      <rest>
-        <baseurl type="REST1.0">http://pear.nrk.io//rest/</baseurl>
-        <baseurl type="REST1.1">http://pear.nrk.io//rest/</baseurl>
-        <baseurl type="REST1.2">http://pear.nrk.io//rest/</baseurl>
-        <baseurl type="REST1.3">http://pear.nrk.io//rest/</baseurl>
-      </rest>
-    </primary>
-  </servers>
-</channel>
-
diff --git a/dev-php/predis/predis-0.8.0.ebuild b/dev-php/predis/predis-0.8.0.ebuild
deleted file mode 100644
index 0d83e6f..0000000
--- a/dev-php/predis/predis-0.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.5.ebuild,v 1.1 2012/03/10 14:33:53 olemarkus Exp $
-
-EAPI=4
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.nrk.io"
-PHP_PEAR_PN="Predis"
-
-inherit php-pear-lib-r1
-
-DESCRIPTION="Flexible and feature-complete PHP client library for Redis."
-HOMEPAGE="http://pear.nrk.io/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-
diff --git a/media-tv/plex-media-server/files/pax_fix.sh b/media-tv/plex-media-server/files/pax_fix.sh
deleted file mode 100644
index 8358479..0000000
--- a/media-tv/plex-media-server/files/pax_fix.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-echo "Creating Headers"
-paxctl -c /usr/lib64/plexmediaserver/Plex\ Media\ Server
-paxctl -c /usr/lib64/plexmediaserver/Plex\ Media\ Scanner
-paxctl -c /usr/lib64/plexmediaserver/Resources/Python/bin/python
-paxctl -c /usr/lib64/plexmediaserver/Plex\ DLNA\ Server 
-paxctl -c /usr/lib64/plexmediaserver/Resources/Plex\ Transcoder
-paxctl -c /usr/lib64/plexmediaserver/Resources/Plex\ New\ Transcoder
-
-echo "Disabling memory pax check"
-paxctl -m /usr/lib64/plexmediaserver/Resources/Python/bin/python
-paxctl -m /usr/lib64/plexmediaserver/Plex\ Media\ Server 
-paxctl -m /usr/lib64/plexmediaserver/Plex\ Media\ Scanner 
-paxctl -m /usr/lib64/plexmediaserver/Plex\ DLNA\ Server 
-paxctl -m /usr/lib64/plexmediaserver/Resources/Plex\ Transcoder
-paxctl -m /usr/lib64/plexmediaserver/Resources/Plex\ New\ Transcoder
diff --git a/media-tv/plex-media-server/files/plex-media-server-startup_fix.patch b/media-tv/plex-media-server/files/plex-media-server-startup_fix.patch
deleted file mode 100644
index 0c5eaf7..0000000
--- a/media-tv/plex-media-server/files/plex-media-server-startup_fix.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -crBN data/etc/default/plexmediaserver data2/etc/default/plexmediaserver
-*** data/etc/default/plexmediaserver	2011-07-27 11:25:36.000000000 +0200
---- data2/etc/default/plexmediaserver	1970-01-01 01:00:00.000000000 +0100
-***************
-*** 1,13 ****
-- # default script for Plex Media Server
-- 
-- # the number of plugins that can run at the same time
-- PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
-- 
-- # ulimit -s $PLEX_MEDIA_SERVER_MAX_STACK_SIZE
-- PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000
-- 
-- # where the mediaserver should store the transcodes
-- PLEX_MEDIA_SERVER_TMPDIR=/tmp
-- 
-- # uncomment to set it to something else
-- # PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application\ Support"
---- 0 ----
-diff -crBN data/etc/init/plexmediaserver.conf data2/etc/init/plexmediaserver.conf
-*** data/etc/init/plexmediaserver.conf	2011-07-27 11:25:36.000000000 +0200
---- data2/etc/init/plexmediaserver.conf	1970-01-01 01:00:00.000000000 +0100
-***************
-*** 1,22 ****
-- # plexpms - service job file
-- 
-- description "Plex Media Server"
-- author "http://www.plexapp.com/"
-- 
-- # When to start the service
-- start on runlevel [2345]
-- 
-- # When to stop the service
-- stop on runlevel [016]
-- 
-- # Automatically restart process if crashed
-- respawn
-- 
-- # Sets nice and ionice level for job
-- nice -5
-- 
-- # What to execute
-- script
--         su -c /usr/sbin/start_pms plex
-- end script
-- 
---- 0 ----
-diff -crBN data/etc/init.d/plex-media-server data2/etc/init.d/plex-media-server
-*** data/etc/init.d/plex-media-server  1970-01-01 01:00:00.000000000 +0100
---- data2/etc/init.d/plex-media-server   2011-09-12 11:01:15.000000000 +0200
-***************
-*** 0 ****
---- 1,24 ----
-+ #!/sbin/runscript
-+ 
-+ depend() {
-+         need avahi-daemon
-+ }
-+ 
-+ start() {
-+         ebegin "Starting Plex Media Server"
-+         start-stop-daemon -S -m -p /var/run/plex-media-server.pid -1 /var/log/pms/out.log -2 /var/log/pms/err.log --quiet -u plex -N -5 -b --exec /usr/sbin/start_pms
-+         eend $?
-+ }
-+ 
-+ stop() {
-+         ebegin "Stopping Plex Media Server"
-+         # start-stop-daemon --stop --pidfile /var/run/plex-media-server.pid --quiet --exec /usr/sbin/start_pms
-+         kill -- -`cat /var/run/plex-media-server.pid`
-+         eend $?
-+ }
-+ 
-+ restart() {
-+         stop
-+         sleep 3
-+         start
-+ }
-diff -crBN data/etc/plex/plexmediaserver.conf data2/etc/plex/plexmediaserver.conf
-*** data/etc/plex/plexmediaserver.conf	1970-01-01 01:00:00.000000000 +0100
---- data2/etc/plex/plexmediaserver.conf	2011-09-12 10:15:11.000000000 +0200
-***************
-*** 0 ****
---- 1,13 ----
-+ # default script for Plex Media Server
-+ 
-+ # the number of plugins that can run at the same time
-+ PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
-+ 
-+ # ulimit -s $PLEX_MEDIA_SERVER_MAX_STACK_SIZE
-+ PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000
-+ 
-+ # where the mediaserver should store the transcodes
-+ PLEX_MEDIA_SERVER_TMPDIR=/tmp
-+ 
-+ # uncomment to set it to something else
-+ # PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application\ Support"
-diff -crBN data/usr/sbin/start_pms data2/usr/sbin/start_pms
-*** data/usr/sbin/start_pms	2011-09-12 10:16:10.000000000 +0200
---- data2/usr/sbin/start_pms	2011-09-12 10:15:15.000000000 +0200
-***************
-*** 7,13 ****
-  export PLEX_MEDIA_SERVER_TMPDIR=/tmp
-  export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
-  
-! test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver
-  
-  export LD_LIBRARY_PATH="${PLEX_MEDIA_SERVER_HOME}"
-  export TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}"
---- 7,13 ----
-  export PLEX_MEDIA_SERVER_TMPDIR=/tmp
-  export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
-  
-! test -f /etc/plex/plexmediaserver.conf && . /etc/plex/plexmediaserver.conf
-  
-  export LD_LIBRARY_PATH="${PLEX_MEDIA_SERVER_HOME}"
-  export TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}"
-diff -crBN data/usr/share/doc/plexmediaserver/README.Debian data2/usr/share/doc/plexmediaserver/README.Debian
-*** data/usr/share/doc/plexmediaserver/README.Debian	2011-07-27 11:25:36.000000000 +0200
---- data2/usr/share/doc/plexmediaserver/README.Debian	1970-01-01 01:00:00.000000000 +0100
-***************
-*** 1,6 ****
-- thecube-config for Debian
-- -------------------------
-- 
-- <possible notes regarding this package - if none, delete this file>
-- 
--  -- Tobias Hieta <tru@unknown>  Tue, 07 Dec 2010 16:36:42 +0100
---- 0 ----
diff --git a/media-tv/plex-media-server/files/pms_initd_1 b/media-tv/plex-media-server/files/pms_initd_1
deleted file mode 100644
index e2da23a..0000000
--- a/media-tv/plex-media-server/files/pms_initd_1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-        need avahi-daemon
-}
-
-start() {
-        ebegin "Starting Plex Media Server"
-        start-stop-daemon -S -m -p /var/run/plex-media-server.pid -1 /var/log/pms/out.log -2 /var/log/pms/err.log --quiet -u plex -N -5 -b --exec /usr/sbin/start_pms
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Plex Media Server"
-        # start-stop-daemon --stop --pidfile /var/run/plex-media-server.pid --quiet --exec /usr/sbin/start_pms
-        kill -- -`cat /var/run/plex-media-server.pid`
-        eend $?
-}
-
-restart() {
-        stop
-        sleep 3
-        start
-}
diff --git a/media-tv/plex-media-server/files/start_pms_1.patch b/media-tv/plex-media-server/files/start_pms_1.patch
deleted file mode 100644
index 32cf035..0000000
--- a/media-tv/plex-media-server/files/start_pms_1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** start_pms_old	2012-06-30 12:06:14.000000000 +0200
---- start_pms	2012-06-30 12:08:33.000000000 +0200
-***************
-*** 7,13 ****
-  export PLEX_MEDIA_SERVER_TMPDIR=/tmp
-  export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
-  
-! test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver
-  
-  export LD_LIBRARY_PATH="${PLEX_MEDIA_SERVER_HOME}"
-  export TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}"
---- 7,13 ----
-  export PLEX_MEDIA_SERVER_TMPDIR=/tmp
-  export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
-  
-! test -f /etc/plex/plexmediaserver.conf && . /etc/plex/plexmediaserver.conf
-  
-  export LD_LIBRARY_PATH="${PLEX_MEDIA_SERVER_HOME}"
-  export TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}"
diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
new file mode 100644
index 0000000..101df10
--- /dev/null
+++ b/sys-cluster/ceph/ChangeLog
@@ -0,0 +1,328 @@
+# ChangeLog for sys-cluster/ceph
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.60 2014/08/25 13:57:20 dlan Exp $
+
+  25 Aug 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.56.3.ebuild,
+  -files/ceph.confd, -files/ceph.initd:
+  prune old version
+
+  21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ceph-0.67.9.ebuild:
+  Stable for x86, wrt bug #518360
+
+  21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ceph-0.67.9.ebuild:
+  Stable for amd64, wrt bug #518360
+
+  21 Aug 2014; Yixun Lan <dlan@gentoo.org> ceph-0.56.3.ebuild,
+  +files/ceph.confd, +files/ceph.initd:
+  roll back old stable versions, bug 520250
+
+*ceph-0.67.10 (19 Aug 2014)
+
+  19 Aug 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.56.3.ebuild,
+  ceph-0.67.9.ebuild, +ceph-0.67.10.ebuild, ceph-0.80.5.ebuild,
+  ceph-9999.ebuild, +files/README.gentoo, -files/ceph.confd, -files/ceph.initd,
+  files/ceph.initd-r1:
+  drop 0.56.3 which never updated and have security problem. bump 0.67.10, fix
+  bug 519540
+
+*ceph-0.80.5 (01 Aug 2014)
+
+  01 Aug 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.80.4.ebuild,
+  +ceph-0.80.5.ebuild:
+  bump & drop old
+
+*ceph-0.80.4 (18 Jul 2014)
+*ceph-0.67.9 (18 Jul 2014)
+
+  18 Jul 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.67.7.ebuild,
+  +ceph-0.67.9.ebuild, -ceph-0.72.2-r3.ebuild, -ceph-0.80.1.ebuild,
+  +ceph-0.80.4.ebuild, ceph-9999.ebuild:
+  revision bump, clean old, bug 517122. thanks @babykart
+
+  06 Jul 2014; Michał Górny <mgorny@gentoo.org> ceph-0.67.7.ebuild,
+  ceph-0.72.2-r3.ebuild, ceph-0.80.1.ebuild, ceph-9999.ebuild:
+  Clean up obsolete dependencies on virtual/python-argparse and virtual/python-
+  unittest2 (those packages were only required for <=python-2.6).
+
+  20 Jun 2014; Yixun Lan <dlan@gentoo.org> ceph-0.67.7.ebuild,
+  ceph-0.72.2-r3.ebuild, ceph-0.80.1.ebuild:
+  fix python shebang, bug 512148, thanks Stefan Junker
+
+  25 May 2014; Yixun Lan <dlan@gentoo.org> ceph-0.80.1.ebuild:
+  fix bug #511124, thanks @reivzy
+
+*ceph-0.80.1 (21 May 2014)
+
+  21 May 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.79.ebuild,
+  +ceph-0.80.1.ebuild, ceph-9999.ebuild, +files/ceph.confd-r1,
+  +files/ceph.initd-r1, +files/ceph.logrotate, metadata.xml:
+  version bump 0.80.1, fix bug #510396, #507956, thanks @babykart, @Changyuan
+  Yu, @LeeL
+
+*ceph-0.79 (17 Apr 2014)
+
+  17 Apr 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.77.ebuild,
+  -ceph-0.78.ebuild, +ceph-0.79.ebuild, ceph-9999.ebuild,
+  +files/ceph-0.79-libzfs.patch, metadata.xml:
+  bump 0.79, fix libxfs dep, bug #507924, thanks @LeeL
+
+*ceph-0.78 (29 Mar 2014)
+
+  29 Mar 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.78.ebuild:
+  version bump
+
+*ceph-0.77 (20 Feb 2014)
+*ceph-0.72.2-r3 (20 Feb 2014)
+*ceph-0.67.7 (20 Feb 2014)
+
+  20 Feb 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.67.5-r2.ebuild,
+  +ceph-0.67.7.ebuild, -ceph-0.72.2-r2.ebuild, +ceph-0.72.2-r3.ebuild,
+  -ceph-0.75.ebuild, +ceph-0.77.ebuild, +files/ceph-fix-gnustack.patch:
+  bump 0.67.7, 0.77, drop old; fix bug #500514, #500974
+
+  26 Jan 2014; Yixun Lan <dlan@gentoo.org> ceph-0.67.5-r2.ebuild,
+  ceph-0.72.2-r2.ebuild, ceph-0.75.ebuild, ceph-9999.ebuild:
+  drop PYTHON_REQUIRED_USE for python-any-r1
+
+  23 Jan 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.56.4.ebuild,
+  -ceph-0.56.5.ebuild, -ceph-0.61.1.ebuild, -ceph-0.61.7-r1.ebuild,
+  -ceph-0.67.ebuild, -ceph-0.67.5-r1.ebuild, -ceph-0.72.2-r1.ebuild,
+  -files/ceph-0.61.7-install.patch:
+  prune old ebuilds
+
+*ceph-0.75 (23 Jan 2014)
+*ceph-0.72.2-r2 (23 Jan 2014)
+*ceph-0.67.5-r2 (23 Jan 2014)
+
+  23 Jan 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.67.5-r2.ebuild,
+  +ceph-0.72.2-r2.ebuild, +ceph-0.75.ebuild, ceph-9999.ebuild, metadata.xml:
+  use subslot, adjust deps, update to python-any-r1
+
+*ceph-0.67.5-r1 (15 Jan 2014)
+*ceph-0.72.2-r1 (15 Jan 2014)
+
+  15 Jan 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.67.5-r1.ebuild,
+  +ceph-0.72.2-r1.ebuild, -ceph-0.67.5.ebuild, -ceph-0.72.2.ebuild,
+  ceph-9999.ebuild:
+  fix python-r1 deps, thanks @jlec
+
+*ceph-0.67.5 (15 Jan 2014)
+*ceph-0.72.2 (15 Jan 2014)
+
+  15 Jan 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.67.5.ebuild,
+  +ceph-0.72.2.ebuild, ceph-9999.ebuild, metadata.xml:
+  vesrion bump, fix bug #496118, #469564  1) version 0.67.5, 0.72.2 added 2)
+  live ebuild updated 3) add myself as co-maintainer
+
+*ceph-0.61.7-r1 (18 Aug 2013)
+
+  18 Aug 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.61.7-r1.ebuild,
+  +files/ceph-0.61.7-install.patch, -ceph-0.61.7.ebuild:
+  Fix install. bug #481250
+
+*ceph-0.67 (16 Aug 2013)
+*ceph-0.61.7 (16 Aug 2013)
+
+  16 Aug 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.61.7.ebuild,
+  +ceph-0.67.ebuild:
+  Version bump per bug #479350
+
+*ceph-0.56.5 (09 May 2013)
+
+  09 May 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.56.5.ebuild:
+  Version bump
+
+*ceph-0.61.1 (09 May 2013)
+
+  09 May 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.61.1.ebuild,
+  -ceph-0.60-r1.ebuild, -files/ceph-0.60-mds_sessionmap.patch:
+  Version bump & clean up
+
+*ceph-0.60-r1 (12 Apr 2013)
+
+  12 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.60-r1.ebuild,
+  +files/ceph-0.60-mds_sessionmap.patch, -ceph-0.58.ebuild, -ceph-0.59.ebuild,
+  -ceph-0.60.ebuild, ceph-9999.ebuild:
+  Add patch to fix mds crash, also fix deps #465120
+
+  04 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> ceph-0.60.ebuild,
+  ceph-9999.ebuild:
+  Drop unneded line
+
+*ceph-0.60 (03 Apr 2013)
+
+  03 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.60.ebuild:
+  Version bump
+
+  26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -ceph-0.49.ebuild:
+  Remove old
+
+  26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> ceph-0.56.3.ebuild:
+  Stable for x86, wrt bug #463306
+
+  26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> ceph-0.56.3.ebuild:
+  Stable for amd64, wrt bug #463306
+
+  26 Mar 2013; Patrick Lauer <patrick@gentoo.org> ceph-0.59.ebuild:
+  Unbundling leveldb #463314
+
+*ceph-0.59 (26 Mar 2013)
+*ceph-0.56.4 (26 Mar 2013)
+
+  26 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.56.4.ebuild,
+  +ceph-0.59.ebuild:
+  Version bump
+
+*ceph-0.56.3 (11 Mar 2013)
+*ceph-0.58 (11 Mar 2013)
+
+  11 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.56.3.ebuild,
+  +ceph-0.58.ebuild, -ceph-0.51.ebuild, -ceph-0.55.1.ebuild,
+  -ceph-0.56.1.ebuild, -files/ceph-0.26-autotools.patch,
+  -files/ceph-issue1869.patch, ceph-9999.ebuild, files/ceph.initd:
+  Version bump. Also fix bugs #455582 #455584 #452842
+
+*ceph-9999 (14 Jan 2013)
+*ceph-0.56.1 (14 Jan 2013)
+
+  14 Jan 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.56.1.ebuild,
+  +ceph-9999.ebuild:
+  [sys-cluster/ceph] Version bump
+
+*ceph-0.55.1 (17 Dec 2012)
+
+  17 Dec 2012; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.55.1.ebuild:
+  [sys-cluster/ceph] Version bump
+
+*ceph-0.51 (14 Sep 2012)
+
+  14 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ceph-0.51.ebuild,
+  -ceph-0.38.ebuild, -ceph-0.40.ebuild, -ceph-0.41.ebuild, -ceph-0.44.ebuild,
+  -ceph-0.48.ebuild, ceph-0.49.ebuild:
+  Version bump to latest. Stabilise 0.49 on amd64 and x86 redux older versions.
+
+  06 Aug 2012; Alexey Shvetsov <alexxy@gentoo.org> ceph-0.48.ebuild,
+  ceph-0.49.ebuild:
+  [sys-cluster/ceph] Add missing dep as per Paweł Wojtal request
+
+*ceph-0.48 (04 Aug 2012)
+
+  04 Aug 2012; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.48.ebuild:
+  [sys-cluster/ceph] version bump per bug #424791
+
+*ceph-0.49 (04 Aug 2012)
+
+  04 Aug 2012; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.49.ebuild:
+  [sys-cluster/ceph] version bump per bug #424791
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> ceph-0.44.ebuild:
+  Missing dev-libs/fcgi and dev-libs/libaio dependencies wrt #410003 by Stoian
+  Ivanov. Fix building with sys-devel/automake >= 1.12 by removing -Werror from
+  AM_INIT_AUTOMAKE wrt #423755 by Diego Elio Pettenò.
+
+  04 May 2012; Jeff Horelick <jdhore@gentoo.org> ceph-0.38.ebuild,
+  ceph-0.40.ebuild, ceph-0.41.ebuild, ceph-0.44.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  11 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> ceph-0.41.ebuild:
+  x86 stable, see bug 369625
+
+*ceph-0.44 (23 Mar 2012)
+
+  23 Mar 2012; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.44.ebuild:
+  [sys-cluster/ceph] Version bump
+
+  11 Mar 2012; Agostino Sarubbo <ago@gentoo.org> ceph-0.41.ebuild:
+  Stable for amd64, wrt bug #369625
+
+*ceph-0.41 (07 Feb 2012)
+
+  07 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +ceph-0.41.ebuild,
+  ceph-0.40.ebuild, files/ceph.initd:
+  Version bump
+
+*ceph-0.40 (17 Jan 2012)
+
+  17 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> +ceph-0.40.ebuild:
+  Version bump, fixes bug #369627 and #394287 by Agostino Sarubbo
+  <ago@gentoo.org> and Emery Hemingway <emery@vfemail.net> respectively. Add
+  tcmalloc USE flag
+
+  03 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/ceph-issue1869.patch, -ceph-0.36.ebuild, ceph-0.38.ebuild:
+  Fix building with automake-1.11.2 wrt #397319 by Alphat-PC
+  <AlphatPC@gmail.com>. Drop old
+
+*ceph-0.38 (19 Nov 2011)
+
+  19 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.38.ebuild,
+  -ceph-0.34.ebuild:
+  Version bump and clean up
+
+*ceph-0.36 (05 Oct 2011)
+
+  05 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.36.ebuild:
+  Version bump
+
+*ceph-0.34 (31 Aug 2011)
+
+  31 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.31.ebuild,
+  +ceph-0.34.ebuild:
+  Version bump
+
+*ceph-0.31 (28 Jul 2011)
+
+  28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.30.ebuild,
+  +ceph-0.31.ebuild:
+  Version bump
+
+*ceph-0.30 (28 Jun 2011)
+
+  28 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.29.1.ebuild,
+  +ceph-0.30.ebuild:
+  Version bump
+
+  28 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> ceph-0.29.1.ebuild:
+  Add missing dependency wrt #373321 by Deniss Gaplevsky <slim@inbox.lv>
+
+*ceph-0.29.1 (17 Jun 2011)
+
+  17 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.26.ebuild,
+  +ceph-0.29.1.ebuild:
+  Version bump
+
+  26 Apr 2011; Ultrabug <ultrabug@gentoo.org>
+  -files/ceph-0.24.1-autotools.patch, ceph-0.26.ebuild,
+  +files/ceph-0.26-autotools.patch:
+  Fix autotools patch wrt #363497. Thanks to Peter Große for reporting.
+
+*ceph-0.26 (06 Apr 2011)
+
+  06 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.25.2.ebuild,
+  +ceph-0.26.ebuild:
+  Version bump. Also this will fix bug #354047
+
+  01 Apr 2011; Ultrabug <ultrabug@gentoo.org> ceph-0.25.2.ebuild:
+  fix Spinlock.h include path, wrt #361203, thanks to Ivan Chavero.
+
+*ceph-0.25.2 (28 Mar 2011)
+
+  28 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.23.1.ebuild,
+  -ceph-0.24.1.ebuild, +ceph-0.25.2.ebuild:
+  Version bump & clean up
+
+*ceph-0.24.1 (20 Jan 2011)
+
+  20 Jan 2011; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.24.1.ebuild,
+  +files/ceph-0.24.1-autotools.patch:
+  Version bump. Thanks to Alexys Jacob
+
+  19 Jan 2011; Ultrabug <ultrabug@gentoo.org> ceph-0.23.1.ebuild:
+  Disable tcmalloc switch until fixed by upstream. Fixes #351032. Thanks to
+  xarthisius.
+
+*ceph-0.23.1 (07 Dec 2010)
+
+  07 Dec 2010; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.23.1.ebuild,
+  +files/ceph.confd, +files/ceph.initd, +metadata.xml:
+  Initial import per bug #338008
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 9298929..8d0e4b5 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,24 +1,11 @@
-AUX ceph-0.26-autotools.patch 738 SHA256 ea8c32c83d460a8b4e6646896d32ab146b711631d4dac6c179a4a31927732dc0 SHA512 4d031a148423485a7d6a4aeafd21f296d1e754e4e8d98bd0996853420c4f13abdf68cf1866d79941f2a962e20a0c620dbdba1d7cdbd434688680f5819c168ca2 WHIRLPOOL 4467f929e3a1bbcec21f9f681d706f32601602b88ded45293a03ef814023332604ae431c93273ed6a085c4ea257dc388c9dc40a4d53652825860921fab5073af
-AUX ceph-0.60-mds_sessionmap.patch 979 SHA256 04018fdb183cd76d3271b9ecd6f2701aadc31873150fb5c3724a784ff51687e7 SHA512 b51966450eb0355562793c3561b6b6bd1d50be037255951b358782c96e6894bb1a811e0164124892c69d2a5a721c04448eae3b9a55aebe96a84215d8e564891c WHIRLPOOL 8b84bbe25968c827bce348884bd94b40418fbb0009e709db5a6c139d52460ff32a7a7cee1041224fe72a49a2c8da895762313b930974fa30ea979a45ddb11eae
-AUX ceph-0.61.7-install.patch 380 SHA256 12bf7caa3561401fd7ceb4323d58544319f0d8296facdd53c165ae8eae1b27b4 SHA512 68966c29f8ef27be1c422f35568d62a98fc60c03acdb834558eeb42fe9101413040a6d802813afac5985f275b4ae25756cf01eb52a35baab2ecdf4ada3b09b54 WHIRLPOOL 7394431ead772cb5c681cb495837617407fea79ac6e3b6fda567b973011c166c5ee10cd6b79341650fa57462e54b54ca47ad472b35530cb950f96092b9aa01a1
-AUX ceph-issue1869.patch 680 SHA256 a094f46dad5e3e2bf083f6110cc47b88c24b79963333bd778e44b0aba1f73bc3 SHA512 30c8a896521a67f7e7fdf09593d309337f25d82d760028e8b983d8cbeee686bd164f417454e7ed569eb8ca50e30fa29387d727b1e71e27c25997f079fb819e66 WHIRLPOOL 8dfa191eef2819e48fe3fd59ededdf775f6c37a33861f835bc98f07db1d4ee52a6195393a95161245059318c7edf086a216c0ef53a2cb2b1d9bf4dc707efd9db
-AUX ceph.confd 225 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 SHA512 64a68d9985a2dc87cfddc4c6dd5f2af7147b56a677c5b5451caf37b8a07ee49567c7aab368e30974bcd8d670d3471bc79488522a556788e0f2cbf350c272d120 WHIRLPOOL d46cc51dbcf77e17f57126c417955475b9fa2c883bada7c843cbda7c524622690a760795bc6c0af13331abd7e0eca8ba7b139f44b51ec9d5a560137f2f321328
-AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
-AUX ceph_init.sh 11337 SHA256 472035920acbc5381048ee900cdc13ed069b4f5f8b48215400285d8862118e98 SHA512 6ed4f88ad97e32824d86f633a94dda101051ac84c91e1ea054add6d1a84a47745e03860030d8d5a4c7e44b8f19621ecdc910a67ba41aa6dad4d305b5b01da7b9 WHIRLPOOL c04b56244c0c460087d81ee93c33317669b47575825d35344ddf183712fd804e5e0c516517a9ef0fe37ca92ceb705f468d654c8a16b06cfc36f3dd4795ecb0d4
-DIST ceph-0.56.3.tar.bz2 3214620 SHA256 5ea39c9fce4741e0a4adb04262fa02d491834996c5819709463748095c9ad1b5 SHA512 b5f3ad54c81a9412f9219f99abb72efc6bc2010ccb29f1bf8a540b15e817ea7f7ccfaddea2b190739a0fba3dd378ac366006879ca66d6c9cafefe8baac0248e8 WHIRLPOOL 82e30278e352adfe3dd38c6bda49f8ae9abe49bab9e40d271d43bad6ad14c299c46fb51089fdb7216df96bc143a82c0073e735e26ae39c471dbe2b5b82d2fd7c
-DIST ceph-0.58.tar.bz2 3334624 SHA256 6ed1e11373822fb24461fa74eca629adb2afcbb9c9bf7b7037068e08b56b5e62 SHA512 ca711a7c8989107bbff03bd07baf2b8b4f863e497ef4cf1dbeea0539e53aed146e8108aa6dc3d5072b9939caa37c08d62123612abc66b1e289c7654dd3ef713d WHIRLPOOL c0930c22fc36f86f6b763973a2be88fdb91bc702e7f8a7207a66b36feee5c134aecedc9686617e162b6debb34ed200ba5baf6cffb43722c63483e4378c132d75
-DIST ceph-0.61.2.tar.bz2 3149146 SHA256 5a4e3c40f0d26214552bc60463d8e3b2dfa438d503a73a1d0e2728fa769ade76 SHA512 b44289142421673b0278f588394db82ca10317b828cc5d608ac69ec0bfb19629967be37d7b1963b584a02be9947254e87efb33b6c19ba9877b03a1f4b1ec0118 WHIRLPOOL 6ce25e5d13a884ade75100f9aab1a5486a59ced22a6f92d40e96bcb05151a3aaeb471295268fcd7a4ff6172efbdb7fbdfe7c7f44ab3b31f2760ed050e7dc22c1
-DIST ceph-0.61.tar.bz2 3149924 SHA256 4cc228d289add962d7f70ca2eef7773bd8b1d86bd6ebfd74a8512d0102400230 SHA512 c0df02a5f89fbe58fdcd81be281f2299fdef8120acaa33e1af12c1c1c17c5207611b3d860e701a91333a9af8eac36aa192e0e734fd895e98927cf5149c42d19c WHIRLPOOL 4eb206a36cd84d204556605d57215e4af49bd27cf32a9cd9ce82223e61b13294e4616aa3f0c05f3ba5fc99db3d206979c09ebb4296b28e1a9f062133d306156e
-DIST ceph-0.63.tar.bz2 3152442 SHA256 43d3eb322404c5f0a2dec14066ac36b5b38e4330d06ffa75afe43974d33026ac SHA512 b8e41fdcf5251db86808afddfe778d72bff2a59b0ec315f22479cd14dee51961e016d79d9b22175ec758354ba0f8f94af824e8b94bb8afe1a67fb2a3b1846042 WHIRLPOOL 14aec6e306286207773651e871f4df38c54840b147a231abc8040181df69bb6e8c90ec27ec640589f07ee4f58abe92703e6dfae82d345f188c26214e0b4d3e62
-DIST ceph-0.67.2.tar.bz2 3305847 SHA256 6a05ea746621f2ef9db08720e3fc5a65decdd44af322b5b613041e10d58b5d81 SHA512 3b461c080fbda806bf1a0f79bee98210ff1a05c28b6293892dd9a47961147bfde4c14d42f5d47e5f68efa493a1feb19778bc67bc7b1e56d67fcfc80ac5c2273d WHIRLPOOL 92f394a1fa80160a07225837f81201e8a84bad5783a7cec1fac64fafe4f541778274c67b29a074d807a7727cb3ae304597316dc9d3d0655edd0a939c2f039ab4
-DIST ceph-0.67.tar.bz2 3305744 SHA256 0e568d591fcfc290fe015cc6cb819af0ad75358715c2835cdebce1ce145b8817 SHA512 f9235ae0a7ba6b95474e858dc8577fd81ff530044cff6488ccb84496806db754e1a49edeb3acb020c0cba7869aa5e9a91f9c8813866fde19c63075d233dbc2ca WHIRLPOOL d73103c14e47b39745c1538caca4e79e0dc97325ddbfe31a53d60c0f5cdcd333604b162c0f2b64ed70a76b588c76cb49ed9d1b7be6d3ab04b7ae17ba1d02b4f3
-DIST ceph-0.71.tar.bz2 3394161 SHA256 3b4b1b47c052754094dadd914e532635cc54934cc2948a5c8666bf1beaefdf70 SHA512 36ff70a521a65f28dbf6e1c1bbce59730b863b4ee31251a8fcc71ef1882cfca9e76f9c3d4079fc025973def292e0387ac874ab9c2e2c3d1e3227712398c4783d WHIRLPOOL 832831edc4216eca0735dd28ad981664b47c88711154cdb9547595f307c21ab547547a9985340cb5a6d311886002bddac4951fa5d148a40d5bfa4ea4188b7aa5
-EBUILD ceph-0.56.3.ebuild 2326 SHA256 c636dcae47ecca520e4c3dae9961c366d223946a8ca9c33d4afe6bc4926c5491 SHA512 b76b24ffa7b3dad7f5de0db98bfb656591c217533bc6aba5d14d851bb7a6189e420e10ba268a6695fe414cc989192cc0360ba464ec5478993cf2d1c8f4b82b2d WHIRLPOOL e2ebad4c6a17e61108c5c217f904d6aeff83a6f73bf5155b7ca8f474063609588be75e4a26e8469759a35f3c7c8ff3a32c4c364f41ee0bf0d3470f20a14a577d
-EBUILD ceph-0.58.ebuild 2326 SHA256 c636dcae47ecca520e4c3dae9961c366d223946a8ca9c33d4afe6bc4926c5491 SHA512 b76b24ffa7b3dad7f5de0db98bfb656591c217533bc6aba5d14d851bb7a6189e420e10ba268a6695fe414cc989192cc0360ba464ec5478993cf2d1c8f4b82b2d WHIRLPOOL e2ebad4c6a17e61108c5c217f904d6aeff83a6f73bf5155b7ca8f474063609588be75e4a26e8469759a35f3c7c8ff3a32c4c364f41ee0bf0d3470f20a14a577d
-EBUILD ceph-0.61.2.ebuild 2497 SHA256 dc63ae2a2c30a23cec1280b9afac5b15fecd9f890bb698b79beeaae37c89f693 SHA512 07d2aff486eb6574e19475e8c43da8c120a25c6a5c0cb20f9dcc0ed0c526c344afb1f8345c9fa40bda1918308eeb4863b5027d431a9e0666d904ee21faacb4be WHIRLPOOL 3483cbf5ddab77fa88f3d9ab5606acc342c586285752db03029f96ea4fe4e1966c480633f87860714efaa22280691708276a6a44ce575db109734d6e50674075
-EBUILD ceph-0.61.ebuild 2447 SHA256 f952a86f95a272ca9d3b58815215baf87a43e5f0556df37b7500f799ebc32fff SHA512 fee6f0e2ac3a3e64dab43f532da2e238e745273ef807f7b4991f378a01033e276dea02167b192426e59106d7b59b8b2efbfac9e3633b5267bc269324a035d395 WHIRLPOOL 7b80b24f807ab2afb9918f38a2470a7b6c69015374b3eb1f721dcf25411e6e3b5119d50e63aa830280ba7033a9c289b9e2dcc7ab940db309f2f4d0694e702679
-EBUILD ceph-0.63.ebuild 2447 SHA256 f952a86f95a272ca9d3b58815215baf87a43e5f0556df37b7500f799ebc32fff SHA512 fee6f0e2ac3a3e64dab43f532da2e238e745273ef807f7b4991f378a01033e276dea02167b192426e59106d7b59b8b2efbfac9e3633b5267bc269324a035d395 WHIRLPOOL 7b80b24f807ab2afb9918f38a2470a7b6c69015374b3eb1f721dcf25411e6e3b5119d50e63aa830280ba7033a9c289b9e2dcc7ab940db309f2f4d0694e702679
-EBUILD ceph-0.67.2.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
-EBUILD ceph-0.67.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
-EBUILD ceph-0.71.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
-EBUILD ceph-9999.ebuild 2324 SHA256 f5b674689d08f3c394d16deaaaa39a700f9fbd56d67d892b6d97fa1ce25361b3 SHA512 7e87331829980ac4e8af62caed0b5b003a4c9bc4d2bc2e2571256547d3e25bc650c954513a6aa3a4654c8095eb2064b8d19887baa21274d2ba3aa2f8bcb53bf3 WHIRLPOOL 1d03f5fe7b28bae57dab91da49dfcba77b20a2ee23fc13f9bbc0792f84dd7dd04c1091717681bd8b00b8f2a04be76cc2664882cc75476409a7dcf38216795857
+AUX README.gentoo 693 SHA256 fa99434d4b1141086cb6c8ec20251e0fc259e6a7f8c20f0a3b93eeff750ec888 SHA512 79eefaebf0d5a0f5e36a2cb0fb1c2433c9498f4bfa99222a124c349078f47583687dff0eede2d6e64af38431b90d519dc78d4142cbad1aa7699d00ab1c3a65b6 WHIRLPOOL d16e9219a964ccfe94dd4cd950420c6405386f249ee7156569e8d79aff749606c9835e04634a39a5cbed0c72d81617d0c28410c15717af59c4c43a00572acda3
+AUX ceph-0.79-libzfs.patch 446 SHA256 bab2247437de8fa0254a97d2224ee1dba2b43393984431910ff6513795a03598 SHA512 24e3da2e47a2c4fc0eb3a9b1d7e1c9da124b138ee1f1141f50a4dacf441aa63cf8a2407edc3d8e008534800f7289c48bb9d5b0207ce2a84c335730afc6ef72da WHIRLPOOL 169a81e9b7e9dc68eab5af9b0eac9f77caee206477a944303d4428e4e20c1793a4aff161a4d312981d496079dd2aa06c9acd1366a0c57c1040b13afc59396f53
+AUX ceph-fix-gnustack.patch 867 SHA256 6a92074666a849de2177b4d3a68b01028f8d61dcac598a22eb0a8937cf297ea1 SHA512 bbea19531662d500c483d71d32dfb911dc62b027e1c5de3faf4c705c4c07274f00ccdcff14fcac75d2e8a2190bef82d307eeb1fe49f919a8e570f4afbfe71f6b WHIRLPOOL 6c40204c606e06cc39fe25575f620029b6d4b81eaa9c74d539d13b66ccf1a07913e56cb4c3ea60cd527d671a61371b99c2d97bee09edc6fcf25b64a22adc9bcc
+AUX ceph.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
+AUX ceph.initd-r1 901 SHA256 6a2e95922ab41a61a1493a7105c31940bbb6942b2c6133718c0489e8f2276f37 SHA512 d9bd98637f8aab40a98f920d65bcceaa0aa4fff0c3cbba26b388b9567e40bce54f2c29d8dbae4dc282ed4b1ade86121bd376df6fbd8b058bce47cd6a6ee4dc9e WHIRLPOOL 1cc547ef8ce6a0c5184c14497e692d43ae48193dba57c81108f3b0e386328d53fa9230cdf410d9c737486a46c8b65569005d2916bf61ff6de19874de16edea5a
+AUX ceph.logrotate 491 SHA256 85f0b0c73a2c400bfff49609db45d995a2b2a2a0e64a88569deb3c353aa0b9d6 SHA512 7212fd04fd46ad2f86410cde145722ae15ca50ef1374d9c50fa8c980e869c1d2c9f68acbea94280223a489686f939d2ecc94dcf5607d8786671e8456a3174a3d WHIRLPOOL 88a04b5928da2a5461209f8799192f7970fed16cfd32891b98d825ecbbae850704ca4ff4dba560e92b2fb8189e36777430c391cfb2599d57f2a3318a0a8cce89
+DIST ceph-0.85.tar.bz2 5661831 SHA256 2b0d80898738443e1fa2449b0af814a9f467932f57e7109a16c8cad3e992c5ed SHA512 e42f20bdd2eb43ae2d9c45b8fb2afc8325728f9062bef83ba4fae0d7c179e993c4d47fb3e4b6ddd60f48a49dc3ad44b4efb04ef2188d18b5d875ed1715e6081c WHIRLPOOL fdb9cbe0f025cb25b854075cafa36a745200f120deecf43a52265a45abeea6881674edebe10822ae4c362748f5d6beb524ad8fdce12e508501f0eec4b2b3b8bc
+EBUILD ceph-0.85.ebuild 2924 SHA256 c54571c29bb6c06035a200575de43cd611d6e29878151c610baf2b0277d54d46 SHA512 4d57726f9c8fe801765e947150d5d102e9f67211191c5a0ae3f097a9e5a16561a291f26e8ac93f8319d1c60d48e0fffbd227a96b2c4eca3e755d62278ec53e96 WHIRLPOOL 8f7fd6bc51ec290d188f1c0d13e7aa2e771b4055da8432177fa68e0376b830ed657e76310f946407b93a2a07567654689c9cb32f3d1157ab0e1d8f355761cb54
+EBUILD ceph-9999.ebuild 2831 SHA256 53b9f5f999f58928106b4f778b766d06484ca2b3e4e435f30be204b57613657c SHA512 95a57fbc1a2db98090b5d33cd0e427f0d4a73bf2067a27bddba11d6e692858f47281a2036a2e90e5a6ca5956eb6abbf942e247afd43ee15b33f3ef5e59313fdd WHIRLPOOL 81296e442cbb1ee0bb48e4d9493a14df8fe4e59e412ee2ff5206464775397cb95582100c5d51b509eb343b190d9f0ca3d28f18ebf76d135e9d79cf9d009121e0
+MISC ChangeLog 11008 SHA256 2fef556cac089057f0475da1dc027dff1cfc1490accf643e96ec067b43f66dcc SHA512 45baf8ed5c1ac9d6c3e9350106a7e31d8e05f74854754f11e8696306bebfbc458ba01a2bdf72fcbdae7ebda2028e05b3b9c5beb6c35b9b3db9077a4699ba3dad WHIRLPOOL 6b2ab809dc0d86b55ff761fdc5435763a930be6bd5029c6aeced3beef10bc22acabefe2764312839e99964168b2ab6be972489bd6018001882e6ea0edbb13c1e
+MISC metadata.xml 948 SHA256 72989673dd794fc1d9e83509d15991407862cd2c4817bcad130018442ca4b866 SHA512 4bd4189f1f5f181c915a7afac73dd774a877aae27026cd5c2ad32a89591ec6dcc0deb4ca1fb572d5f517d1cfa1edb94a345c6b0c03a39b1904ab8882e972ff5c WHIRLPOOL a89a309c10b0422e5045b7a1e62561efeda3125e35172fb33feea87fb44c14ae08cdf4810bb0acdc8eda8f856987d11ed77c157809635fe0a984764ee3b73ce8
diff --git a/sys-cluster/ceph/ceph-0.56.3.ebuild b/sys-cluster/ceph/ceph-0.56.3.ebuild
deleted file mode 100644
index 13622fc..0000000
--- a/sys-cluster/ceph/ceph-0.56.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.56.1.ebuild,v 1.1 2013/01/14 09:02:08 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/crypto++
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/sys-cluster/ceph/ceph-0.58.ebuild b/sys-cluster/ceph/ceph-0.58.ebuild
deleted file mode 100644
index 13622fc..0000000
--- a/sys-cluster/ceph/ceph-0.58.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.56.1.ebuild,v 1.1 2013/01/14 09:02:08 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/crypto++
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/sys-cluster/ceph/ceph-0.61.2.ebuild b/sys-cluster/ceph/ceph-0.61.2.ebuild
deleted file mode 100644
index 480cf93..0000000
--- a/sys-cluster/ceph/ceph-0.61.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.60-r1.ebuild,v 1.1 2013/04/12 10:21:14 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/crypto++
-	dev-libs/leveldb
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-)
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-#	newexe src/init-ceph ceph_init.sh
-	newexe "${FILESDIR}/${PN}_init.sh" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.63.ebuild b/sys-cluster/ceph/ceph-0.63.ebuild
deleted file mode 100644
index 273f574..0000000
--- a/sys-cluster/ceph/ceph-0.63.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.60-r1.ebuild,v 1.1 2013/04/12 10:21:14 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/crypto++
-	dev-libs/leveldb
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-)
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.67.2.ebuild b/sys-cluster/ceph/ceph-0.67.2.ebuild
deleted file mode 100644
index 905cc76..0000000
--- a/sys-cluster/ceph/ceph-0.67.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.67.ebuild,v 1.1 2013/08/16 16:35:31 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb
-	dev-libs/crypto++
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.67.ebuild b/sys-cluster/ceph/ceph-0.67.ebuild
deleted file mode 100644
index 905cc76..0000000
--- a/sys-cluster/ceph/ceph-0.67.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.67.ebuild,v 1.1 2013/08/16 16:35:31 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb
-	dev-libs/crypto++
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.71.ebuild b/sys-cluster/ceph/ceph-0.71.ebuild
deleted file mode 100644
index 905cc76..0000000
--- a/sys-cluster/ceph/ceph-0.71.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.67.ebuild,v 1.1 2013/08/16 16:35:31 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb
-	dev-libs/crypto++
-	sys-apps/keyutils
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.61.ebuild b/sys-cluster/ceph/ceph-0.85.ebuild
similarity index 53%
rename from sys-cluster/ceph/ceph-0.61.ebuild
rename to sys-cluster/ceph/ceph-0.85.ebuild
index 273f574..246b64b 100644
--- a/sys-cluster/ceph/ceph-0.61.ebuild
+++ b/sys-cluster/ceph/ceph-0.85.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.60-r1.ebuild,v 1.1 2013/04/12 10:21:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.5.ebuild,v 1.2 2014/08/19 08:57:46 dlan Exp $
 
 EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
+	scm_eclass=git-r3
 	EGIT_REPO_URI="
 		git://github.com/ceph/ceph.git
 		https://github.com/ceph/ceph.git"
@@ -16,26 +17,31 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils multilib udev ${scm_eclass}
+inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
-	dev-libs/boost
+	dev-libs/boost:=[threads]
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
-	dev-libs/crypto++
-	dev-libs/leveldb
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
 	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -47,28 +53,37 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
+	$(python_gen_any_dep '
+	' )
+	${PYTHON_DEPS}
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
+	sys-apps/hdparm
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	"
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-fix-gnustack.patch
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+	epatch_user
 	eautoreconf
 }
 
@@ -79,11 +94,16 @@ src_configure() {
 		--includedir=/usr/include \
 		$(use_with debug) \
 		$(use_with fuse) \
+		$(use_with libaio) \
 		$(use_with libatomic libatomic-ops) \
+		$(use_with nss) \
+		$(use_with cryptopp) \
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
+		$(use_with tcmalloc) \
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -91,13 +111,11 @@ src_install() {
 
 	prune_libtool_files --all
 
-	rmdir "${ED}/usr/sbin"
-
 	exeinto /usr/$(get_libdir)/ceph
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -105,10 +123,16 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	python_fix_shebang \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
 
 	#install udev rules
 	udev_dorules udev/50-rbd.rules
 	udev_dorules udev/95-ceph-osd.rules
+
+	readme.gentoo_src_install
 }
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index abbc24f..049ef1e 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.1 2013/01/14 09:02:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.13 2014/08/19 08:57:46 dlan Exp $
 
 EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
+	scm_eclass=git-r3
 	EGIT_REPO_URI="
 		git://github.com/ceph/ceph.git
 		https://github.com/ceph/ceph.git"
@@ -16,24 +17,31 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils multilib ${scm_eclass}
+inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
-	dev-libs/boost
+	app-arch/snappy
+	dev-libs/boost:=[threads]
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
-	dev-libs/crypto++
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
 	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -45,23 +53,32 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
+	$(python_gen_any_dep '
+	' )
+	${PYTHON_DEPS}
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
+	sys-apps/hdparm
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	"
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+	epatch_user
 	eautoreconf
 }
 
@@ -72,11 +89,16 @@ src_configure() {
 		--includedir=/usr/include \
 		$(use_with debug) \
 		$(use_with fuse) \
+		$(use_with libaio) \
 		$(use_with libatomic libatomic-ops) \
+		$(use_with nss) \
+		$(use_with cryptopp) \
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
+		$(use_with tcmalloc) \
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -84,13 +106,11 @@ src_install() {
 
 	prune_libtool_files --all
 
-	rmdir "${ED}/usr/sbin"
-
 	exeinto /usr/$(get_libdir)/ceph
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -98,6 +118,16 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	python_fix_shebang \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#install udev rules
+	udev_dorules udev/50-rbd.rules
+	udev_dorules udev/95-ceph-osd.rules
+
+	readme.gentoo_src_install
 }
diff --git a/sys-cluster/ceph/files/README.gentoo b/sys-cluster/ceph/files/README.gentoo
new file mode 100644
index 0000000..b049515
--- /dev/null
+++ b/sys-cluster/ceph/files/README.gentoo
@@ -0,0 +1,18 @@
+1) We'd suggest you to install following packages
+   sys-block/parted		to manage disk partions
+   sys-fs/btrfs-progs	to use btrfs filesytem
+   sys-fs/cryptsetup		to use encrypted devices with dm-crypt
+
+2) To start several daemons of one specific type, create your own scripts
+   cd /etc/init.d
+   for dmn in mds.a mon.a osd.0 osd.1 osd.2; do
+     ln -s ceph ceph-${dmn};
+     rc-update add ceph-${dmn} default;
+   done
+
+3) If you spread ceph daemons over several different machines,
+ We'd highly recommend you to start ntp-client to keep the system time sync.
+ Try to choose one of following ntp client to install and add into runlevel.
+   net-misc/ntp
+   net-misc/openntpd
+   net-misc/chrony
diff --git a/sys-cluster/ceph/files/ceph-0.26-autotools.patch b/sys-cluster/ceph/files/ceph-0.26-autotools.patch
deleted file mode 100644
index 1ffa5d9..0000000
--- a/sys-cluster/ceph/files/ceph-0.26-autotools.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac	2011-04-26 12:17:33.318491903 +0200
-+++ b/configure.ac	2011-04-26 12:19:57.822776369 +0200
-@@ -48,10 +48,12 @@
-     [PKG_CHECK_MODULES([CRYPTOPP],
- 	    [libcrypto++],
- 	    [have_cryptopp=yes],
--	    [AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
-+	    [AC_LANG_PUSH([C++])
-+	    AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
- 		    [have_cryptopp=yes],
- 		    [true],
--		    [-lpthread])])])
-+		    [-lpthread])
-+	    AC_LANG_POP([C++])])])
- # bail out if given explicit --with-cryptopp
- if test "x$have_cryptopp" = "xno" -a "x$with_cryptopp" != "xcheck" -a "x$with_cryptopp" != "xno"; then
-     AC_MSG_FAILURE([--with-cryptopp was given, but library was not found])
diff --git a/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch b/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch
deleted file mode 100644
index 65cd8ca..0000000
--- a/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 01f99c9d6cc0c3494bcb81e914b28bcc4ca2f7a1
-Author: Yan, Zheng <zheng.z.yan@intel.com>
-Date:   Fri Apr 5 13:58:36 2013 +0800
-
-    mds: fix session_info_t decoding
-
-    commit 0bcf2ac081 changes session_info_t's format, but there is
-    a typo in the code that decodes old format. We also need to
-    decode struct_v == 1 in the same way as struct_v == 2.
-
-    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
-    Signed-off-by: Greg Farnum <greg@inktank.com>
-
-diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
-index ad4a71a..b1ce640 100644
---- a/src/mds/mdstypes.cc
-+++ b/src/mds/mdstypes.cc
-@@ -541,9 +541,9 @@ void session_info_t::decode(bufferlist::iterator& p)
- {
-   DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, p);
-   ::decode(inst, p);
--  if (struct_v == 2) {
-+  if (struct_v <= 2) {
-     set<tid_t> s;
--    ::decode(completed_requests, p);
-+    ::decode(s, p);
-     while (!s.empty()) {
-       completed_requests[*s.begin()] = inodeno_t();
-       s.erase(s.begin());
diff --git a/sys-cluster/ceph/files/ceph-0.61.7-install.patch b/sys-cluster/ceph/files/ceph-0.61.7-install.patch
deleted file mode 100644
index ad2b72a..0000000
--- a/sys-cluster/ceph/files/ceph-0.61.7-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index de76078..932851d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,7 @@ bin_PROGRAMS =
- bin_DEBUGPROGRAMS =
- sbin_PROGRAMS =
- # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
--ceph_sbindir = $(prefix)$(sbindir)
-+ceph_sbindir = $(sbindir)
- ceph_sbin_SCRIPTS = \
- 	ceph-disk \
- 	ceph-disk-prepare \
diff --git a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
new file mode 100644
index 0000000..6d79c17
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
@@ -0,0 +1,13 @@
+diff --git a/src/os/Makefile.am b/src/os/Makefile.am
+index 252c678..c28ad0a 100644
+--- a/src/os/Makefile.am
++++ b/src/os/Makefile.am
+@@ -61,7 +61,7 @@ noinst_HEADERS += \
+ 
+ if WITH_LIBZFS
+ libos_zfs_a_SOURCES = os/ZFS.cc
+-libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS}
++libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -I/usr/include/libzfs -I/usr/include/libspl
+ noinst_LIBRARIES += libos_zfs.a
+ noinst_HEADERS += os/ZFS.h
+ endif
diff --git a/sys-cluster/ceph/files/ceph-fix-gnustack.patch b/sys-cluster/ceph/files/ceph-fix-gnustack.patch
new file mode 100644
index 0000000..3e2eace
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-fix-gnustack.patch
@@ -0,0 +1,22 @@
+diff --git a/src/common/crc32c_intel_fast_asm.S b/src/common/crc32c_intel_fast_asm.S
+index 4ca5d65..68d3426 100644
+--- a/src/common/crc32c_intel_fast_asm.S
++++ b/src/common/crc32c_intel_fast_asm.S
+@@ -662,3 +662,6 @@ global %1_slver
+ %endmacro
+ ;;;       func            core, ver, snum
+ slversion crc32_iscsi_00, 00,   02,  0014
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endiF
+diff --git a/src/common/crc32c_intel_fast_zero_asm.S b/src/common/crc32c_intel_fast_zero_asm.S
+index b7246f2..9728be9 100644
+--- a/src/common/crc32c_intel_fast_zero_asm.S
++++ b/src/common/crc32c_intel_fast_zero_asm.S
+@@ -644,3 +644,6 @@ global %1_slver
+ %endmacro
+ ;;;       func            core, ver, snum
+ slversion crc32_iscsi_zero_00, 00,   02,  0014
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endiF
diff --git a/sys-cluster/ceph/files/ceph-issue1869.patch b/sys-cluster/ceph/files/ceph-issue1869.patch
deleted file mode 100644
index bf8749c..0000000
--- a/sys-cluster/ceph/files/ceph-issue1869.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix invalid docdir_SCRIPTS usage with >=automake-1.11.2
-
-https://bugs.gentoo.org/show_bug.cgi?id=397319
-http://tracker.newdream.net/issues/1869
-
-Patch written by "Alphat-PC" <AlphatPC@gmail.com>
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -769,8 +769,7 @@ EXTRA_DIST = $(srcdir)/verify-mds-journal.sh $(srcdir)/vstart.sh $(srcdir)/stop.
- # NOTE: this won't work on suse, where docdir is /usr/share/doc/packages/$package.
- docdir ?= ${datadir}/doc/ceph
- 
--doc_DATA = $(srcdir)/sample.ceph.conf
--doc_SCRIPTS = sample.fetch_config
-+doc_DATA = $(srcdir)/sample.ceph.conf sample.fetch_config
- 
- sample.fetch_config: fetch_config
- 	cp -f $(srcdir)/fetch_config ./sample.fetch_config
diff --git a/sys-cluster/ceph/files/ceph.confd b/sys-cluster/ceph/files/ceph.confd
deleted file mode 100644
index 1afc335..0000000
--- a/sys-cluster/ceph/files/ceph.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# These are passed as arguments to original ceph initscript
-#  see also http://ceph.newdream.net/wiki/Starting_and_stopping
-
-# CEPH_COMMON=( --hostname myhost )
-
-CEPH_START=( start )
-CEPH_STOP=( stop )
-CEPH_RELOAD=( reload )
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
new file mode 100644
index 0000000..3bdb8b4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.confd-r1
@@ -0,0 +1,4 @@
+# Example
+
+# default ceph conf file
+#ceph_conf="/etc/ceph/ceph.conf"
diff --git a/sys-cluster/ceph/files/ceph.initd b/sys-cluster/ceph/files/ceph.initd
deleted file mode 100644
index 993bb01..0000000
--- a/sys-cluster/ceph/files/ceph.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-
-extra_started_commands="reload"
-bin=/usr/lib/ceph/ceph_init.sh
-
-depend() {
-	after net
-	before netmount
-}
-
-start() {
-	ebegin "Initializing local Ceph node"
-	$bin "${CEPH_COMMON[@]}" "${CEPH_START[@]}"
-	eend 0
-}
-
-reload() {
-	ebegin "Reloading ceph configuration"
-	$bin "${CEPH_COMMON[@]}" "${CEPH_RELOAD[@]}"
-	eend 0
-}
-
-stop() {
-	ebegin "Stopping local Ceph node"
-	$bin "${CEPH_COMMON[@]}" "${CEPH_STOP[@]}"
-	eend 0
-}
diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1
new file mode 100644
index 0000000..ca5ab60
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r1
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+
+ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
+extra_commands="reload"
+type=${RC_SVCNAME:5:3}
+id=${RC_SVCNAME:9}
+id=${id:-"0"}
+command="/usr/bin/ceph-${type}"
+pidfile="/run/ceph/${type}.${id}.pid"
+command_args="-i ${id} --pid-file ${pidfile} -c ${ceph_conf}"
+
+depend() {
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${type} in
+		mon|mds|osd) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+        checkpath -d -q $(dirname ${pidfile})
+}
+
+start() {
+	ebegin "Starting Ceph ${type}.${id}"
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+	fi
+	${command} ${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Ceph ${type}.${id}"
+	start-stop-daemon --stop --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading Ceph ${type}.${id}"
+	start-stop-daemon --signal 1 --pidfile ${pidfile}
+	eend $?
+}
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
new file mode 100644
index 0000000..16028ae
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.logrotate
@@ -0,0 +1,22 @@
+/var/log/ceph/admin.log
+/var/log/ceph/ceph.log
+/var/log/ceph/ceph-mon.*
+/var/log/ceph/ceph-mds.*
+/var/log/ceph/ceph-osd.*
+{
+    rotate 7
+    daily
+    compress
+    sharedscripts
+    prerotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >&1
+	done
+    endscript
+    postrotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >&1
+        done
+    endscript
+    missingok
+}
diff --git a/sys-cluster/ceph/files/ceph_init.sh b/sys-cluster/ceph/files/ceph_init.sh
deleted file mode 100755
index 8c5b59b..0000000
--- a/sys-cluster/ceph/files/ceph_init.sh
+++ /dev/null
@@ -1,433 +0,0 @@
-#!/bin/sh
-# Start/stop ceph daemons
-# chkconfig: 2345 60 80
-
-### BEGIN INIT INFO
-# Provides:          ceph
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Required-Start:    $remote_fs $named $network $time
-# Required-Stop:     $remote_fs $named $network $time
-# Short-Description: Start Ceph distributed file system daemons at boot time
-# Description:       Enable Ceph distributed file system services.
-### END INIT INFO
-
-RUN_DIR=/var/run/ceph
-
-# if we start up as ./mkcephfs, assume everything else is in the
-# current directory too.
-if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
-    BINDIR=.
-    SBINDIR=.
-    LIBDIR=.
-    ETCDIR=.
-else
-    BINDIR=/usr/bin
-    SBINDIR=/usr/sbin
-    LIBDIR=/usr/lib64/ceph
-    ETCDIR=/etc/ceph
-fi
-
-usage_exit() {
-    echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
-    printf "\t-c ceph.conf\n"
-    printf "\t--valgrind\trun via valgrind\n"
-    printf "\t--hostname [hostname]\toverride hostname lookup\n"
-    exit
-}
-
-. $LIBDIR/ceph_common.sh
-
-EXIT_STATUS=0
-
-signal_daemon() {
-    name=$1
-    daemon=$2
-    pidfile=$3
-    signal=$4
-    action=$5
-    [ -z "$action" ] && action="Stopping"
-    echo -n "$action Ceph $name on $host..."
-    do_cmd "if [ -e $pidfile ]; then
-        pid=`cat $pidfile`
-        if [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; then
-	    cmd=\"kill $signal \$pid\"
-	    echo -n \$cmd...
-	    \$cmd
-        fi
-    fi"
-    echo done
-}
-
-daemon_is_running() {
-    name=$1
-    daemon=$2
-    daemon_id=$3
-    pidfile=$4
-    do_cmd "[ -e $pidfile ] || exit 1   # no pid, presumably not running
-	pid=\`cat $pidfile\`
-	[ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline && grep -qwe -i.$daemon_id /proc/\$pid/cmdline && exit 0 # running
-        exit 1  # pid is something else" "" "okfail"
-}
-
-stop_daemon() {
-    name=$1
-    daemon=$2
-    pidfile=$3
-    signal=$4
-    action=$5
-    [ -z "$action" ] && action="Stopping"
-    echo -n "$action Ceph $name on $host..."
-    do_cmd "while [ 1 ]; do 
-	[ -e $pidfile ] || break
-	pid=\`cat $pidfile\`
-	while [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; do
-	    cmd=\"kill $signal \$pid\"
-	    echo -n \$cmd...
-	    \$cmd
-	    sleep 1
-	    continue
-	done
-	break
-    done"
-    echo done
-}
-
-## command line options
-options=
-
-version=0
-dovalgrind=
-docrun=
-allhosts=0
-debug=0
-monaddr=
-dofsmount=1
-dofsumount=0
-verbose=0
-
-while echo $1 | grep -q '^-'; do     # FIXME: why not '^-'?
-case $1 in
-    -v | --verbose)
-	    verbose=1
-	    ;;
-    --valgrind)
-	    dovalgrind=1
-	    ;;
-    --novalgrind)
-	    dovalgrind=0
-	    ;;
-    --allhosts | -a)
-	    allhosts=1;
-	    ;;
-    --restart)
-	    docrun=1
-	    ;;
-    --norestart)
-	    docrun=0
-	    ;;
-    -m )
-	    [ -z "$2" ] && usage_exit
-	    options="$options $1"
-	    shift
-	    MON_ADDR=$1
-	    ;;
-    --btrfs | --fsmount)
-	    dofsmount=1
-	    ;;
-    --nobtrfs | --nofsmount)
-	    dofsmount=0
-	    ;;
-    --btrfsumount | --fsumount)
-	    dofsumount=1
-	    ;;
-    --conf | -c)
-	    [ -z "$2" ] && usage_exit
-	    options="$options $1"
-	    shift
-	    conf=$1
-	    ;;
-    --hostname )
-	    [ -z "$2" ] && usage_exit
-	    options="$options $1"
-	    shift
-	    hostname=$1
-            ;;
-    *)
-	    echo unrecognized option \'$1\'
-	    usage_exit
-	    ;;
-esac
-options="$options $1"
-shift
-done
-
-verify_conf
-
-command=$1
-[ -n "$*" ] && shift
-
-get_local_name_list "$@"
-get_name_list "$@"
-
-for name in $what; do
-    type=`echo $name | cut -c 1-3`   # e.g. 'mon', if $item is 'mon1'
-    id=`echo $name | cut -c 4- | sed 's/^\\.//'`
-    num=$id
-    name="$type.$id"
-
-    check_host || continue
-
-    binary="$BINDIR/ceph-$type"
-    cmd="$binary -i $id"
-
-    get_conf pid_file "$RUN_DIR/$type.$id.pid" "pid file"
-
-    if [ "$command" = "start" ]; then
-	if [ -n "$pid_file" ]; then
-	    do_cmd "mkdir -p "`dirname $pid_file`
-	    cmd="$cmd --pid-file $pid_file"
-	fi
-
-	get_conf log_dir "" "log dir"
-	[ -n "$log_dir" ] && do_cmd "mkdir -p $log_dir"
-
-        get_conf auto_start "" "auto start"
-        if [ "$auto_start" = "no" ] || [ "$auto_start" = "false" ] || [ "$auto_start" = "0" ]; then
-            if [ -z "$@" ]; then
-                echo "Skipping Ceph $name on $host... auto start is disabled"
-                continue
-            fi
-        fi
-
-	if daemon_is_running $name ceph-$type $id $pid_file; then
-	    echo "Starting Ceph $name on $host...already running"
-	    continue
-	fi
-
-	get_conf copy_executable_to "" "copy executable to"
-	if [ -n "$copy_executable_to" ]; then
-	    scp $binary "$host:$copy_executable_to"
-	    binary="$copy_executable_to"
-	fi
-    fi
-
-    # conf file
-    cmd="$cmd -c $conf"
-
-    if echo $name | grep -q ^osd; then
-	get_conf osd_data "/ceph/osd$id" "osd data"
-	get_conf fs_path "$osd_data" "fs path"  # mount point defaults so osd data
-        get_conf fs_devs "" "devs"
-	if [ -z "$fs_devs" ]; then
-	    # try to fallback to old keys
-	    get_conf tmp_btrfs_devs "" "btrfs devs"
-	    if [ -n "$tmp_btrfs_devs" ]; then
-		fs_devs="$tmp_btrfs_devs"
-	    fi
-	fi
-        first_dev=`echo $fs_devs | cut '-d ' -f 1`
-    fi
-
-    # do lockfile, if RH
-    get_conf lockfile "/var/lock/subsys/ceph" "lock file"
-    lockdir=`dirname $lockfile`
-    if [ ! -d "$lockdir" ]; then
-	lockfile=""
-    fi
-
-    get_conf asok "$RUN_DIR/ceph-$type.$id.asok" "admin socket"
-
-    case "$command" in
-	start)
-            # Increase max_open_files, if the configuration calls for it.
-            get_conf max_open_files "8192" "max open files"
-
-            # build final command
-	    wrap=""
-	    runmode=""
-	    runarg=""
-	    
-	    [ -z "$docrun" ] && get_conf_bool docrun "0" "restart on core dump"
-	    [ "$docrun" -eq 1 ] && wrap="$BINDIR/ceph-run"
-	    
-	    [ -z "$dovalgrind" ] && get_conf_bool valgrind "" "valgrind"
-	    [ -n "$valgrind" ] && wrap="$wrap valgrind $valgrind"
-	    
-	    [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
-	    [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
-
-	    cmd="$files $wrap $cmd $runmode"
-	    
-	    if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
-		get_conf pre_mount "true" "pre mount command"
-		get_conf fs_type "" "osd mkfs type"
-
-		if [ -z "$fs_type" ]; then
-		    # try to fallback to to old keys
-		    get_conf tmp_devs "" "btrfs devs"
-		    if [ -n "$tmp_devs" ]; then
-			fs_type="btrfs"
-		    else
-		        echo No filesystem type defined!
-		        exit 0
-                    fi
-		fi
-
-		get_conf fs_opt "" "osd mount options $fs_type"
-		if [ -z "$fs_opt" ]; then
-		    if [ "$fs_type" = "btrfs" ]; then
-		        #try to fallback to old keys
-			get_conf fs_opt "" "btrfs options"
-		    fi
-
-		    if [ -z "$fs_opt" ]; then
-			if [ "$fs_type" = "xfs" ]; then
-			    fs_opt="rw,noatime,inode64"
-			else
-		            #fallback to use at least noatime
-		            fs_opt="rw,noatime"
-			fi
-		    fi
-		fi
-
-		[ -n "$fs_opt" ] && fs_opt="-o $fs_opt"
-		[ -n "$pre_mount" ] && do_cmd "$pre_mount"
-
-		if [ "$fs_type" = "btrfs" ]; then
-		    echo Mounting Btrfs on $host:$fs_path
-		    do_root_cmd "modprobe btrfs ; btrfs device scan || btrfsctl -a ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t btrfs $fs_opt $first_dev $fs_path"
-		else
-		    echo Mounting $fs_type on $host:$fs_path
-		    do_root_cmd "modprobe $fs_type ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t $fs_type $fs_opt $first_dev $fs_path"
-		fi
-	    fi
-
-	    if [ "$type" = "osd" ]; then
-		get_conf update_crush "" "osd crush update on start"
-		if [ "${update_crush:-1}" = "1" -o "{$update_crush:-1}" = "true" ]; then
-		    # update location in crush; put in some suitable defaults on the
-                    # command line, ceph.conf can override what it wants
-		    get_conf osd_location "" "osd crush location"
-		    get_conf osd_weight "" "osd crush initial weight"
-		    defaultweight=`df $osd_data/. | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
-		    get_conf osd_keyring "$osd_data/keyring" "keyring"
-		    $BINDIR/ceph \
-			--name="osd.$id" \
-			--keyring="$osd_keyring" \
-			osd crush create-or-move \
-			-- \
-			"$id" \
-			"${osd_weight:-${defaultweight:-1}}" \
-			root=default \
-			host="$(hostname -s)" \
-			$osd_location \
-			|| :
-		fi
-	    fi
-
-	    echo Starting Ceph $name on $host...
-	    mkdir -p $RUN_DIR
-	    get_conf pre_start_eval "" "pre start eval"
-	    [ -n "$pre_start_eval" ] && $pre_start_eval
-	    get_conf pre_start "" "pre start command"
-	    get_conf post_start "" "post start command"
-	    [ -n "$pre_start" ] && do_cmd "$pre_start"
-	    do_cmd_okfail "$cmd" $runarg
-	    if [ "$ERR" != "0" ]; then
-		EXIT_STATUS=$ERR
-	    fi
-
-	    if [ "$type" = "mon" ]; then
-		# this will only work if we are using default paths
-		# for the mon data and admin socket.  if so, run
-		# ceph-create-keys.  this is the case for (normal)
-		# chef and ceph-deploy clusters, which is who needs
-		# these keys.  it's also true for default installs
-		# via mkcephfs, which is fine too; there is no harm
-		# in creating these keys.
-		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
-		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
-		    echo Starting ceph-create-keys on $host...
-		    cmd2="$SBINDIR/ceph-create-keys -i $id 2> /dev/null &"
-		    do_cmd "$cmd2"
-		fi
-	    fi
-
-	    [ -n "$post_start" ] && do_cmd "$post_start"
-	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && touch $lockfile
-	    ;;
-	
-	stop)
-	    get_conf pre_stop "" "pre stop command"
-	    get_conf post_stop "" "post stop command"
-	    [ -n "$pre_stop" ] && do_cmd "$pre_stop"
-	    stop_daemon $name ceph-$type $pid_file
-	    [ -n "$post_stop" ] && do_cmd "$post_stop"
-	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
-	    if [ $dofsumount -eq 1 ] && [ -n "$fs_devs" ]; then
-		echo Unmounting OSD volume on $host:$fs_path
-		do_root_cmd "umount $fs_path || true"
-	    fi
-	    ;;
-
-	status)
-	    if daemon_is_running $name ceph-$type $id $pid_file; then
-		echo -n "$name: running "
-		do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown
-            elif [ -e "$pid_file" ]; then
-                # daemon is dead, but pid file still exists
-                echo "$name: dead."
-                EXIT_STATUS=1
-            else
-                # daemon is dead, and pid file is gone
-                echo "$name: not running."
-                EXIT_STATUS=3
-            fi
-	    ;;
-
-	ssh)
-	    $ssh
-	    ;;
-
-	forcestop)
-	    get_conf pre_forcestop "" "pre forcestop command"
-	    get_conf post_forcestop "" "post forcestop command"
-	    [ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
-	    stop_daemon $name ceph-$type $pid_file -9
-	    [ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
-	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
-	    ;;
-	    
-	killall)
-	    echo "killall ceph-$type on $host"
-	    do_cmd "pkill ^ceph-$type || true"
-	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
-	    ;;
-	
-	force-reload | reload)
-	    signal_daemon $name ceph-$type $pid_file -1 "Reloading"
-	    ;;
-
-	restart)
-	    $0 $options stop $name
-	    $0 $options start $name
-	    ;;
-
-	cleanlogs)
-	    echo removing logs
-	    [ -n "$log_dir" ] && do_cmd "rm -f $log_dir/$type.$id.*"
-	    ;;
-
-	cleanalllogs)
-	    echo removing all logs
-	    [ -n "$log_dir" ] && do_cmd "rm -f $log_dir/* || true"
-	    ;;
-
-	*)
-	    usage_exit
-	    ;;
-    esac
-done
-
-exit $EXIT_STATUS
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
new file mode 100644
index 0000000..ef95520
--- /dev/null
+++ b/sys-cluster/ceph/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+    <description>Co Maintainer</description>
+  </maintainer>
+<longdescription>
+Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability.
+</longdescription>
+<use>
+	<flag name='cryptopp'>Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag>
+	<flag name='fuse'>Build fuse client</flag>
+	<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
+	<flag name='libaio'>Use libaio as asynchronous input/output library</flag>
+	<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+	<flag name='radosgw'>Add radosgw support</flag>
+	<flag name='xfs'>Add xfs support</flag>
+	<flag name='zfs'>Add zfs support</flag>
+</use>
+</pkgmetadata>

From d47575d41b4ee2b406c7478c26be631e3b77cd7a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 16 Oct 2014 03:31:06 -0700
Subject: [PATCH 042/261] fixed digest for our version fo asterisk

---
 net-misc/asterisk/Manifest | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index ed0f907..df15615 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,7 +1,11 @@
+AUX 1.8.0/patches/vicidial.patch 55603 SHA256 5923bed77ef4a9d29d4e0e196ccd571c0bb6c7bb4b7dae46ebc50ea82215ad3a SHA512 3db13bd173d3de6ad7d3e384f3eeaf24da04410783cc0fb26891ba2bc0176e627703f9bc48c01bc9c773cfc883e03c6fb3b7fe1d762582c2d6efaf3a2a423e19 WHIRLPOOL 0b69e0e0ef30fbf058a0f5f55452e51573e0e84856f61eeb91d007cff29458ca07e76f0589fb9ca8763b6892a81443b59b710035bb60bd7889176023a3148b44
+AUX 11.10.0/patches/asterisk-11.10.0-dtls.patch 97191 SHA256 1172f44f698b0b9a028037380f2597acc78862de28a79626c24310cb96e944b1 SHA512 fb618143dd797181e85fd6da859d74799ed5be87e1b45613a1fbeb261d80a6e8a45d24175ee71f98e59ba206b0cfff5ebd6b72b8edc8592550512fe90fab4f97 WHIRLPOOL b231581bffcb96387b2b9f0982045662346d6c7d84fd80dcb083a2563d509d8fd59c30851dd7ae48a6d6017a1a4eff46470770ee8ba2b23068a8a9a64c199c27
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
-DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
 DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
 DIST asterisk-11.6.0.tar.gz 24828582 SHA256 c128ce24416b236fd73c403ad1e2da33c3816cf6db1beb6f97509659f8b281a0 SHA512 6a14d92d6a263edac0da23b091961adf54be9d5ff042117c5f1255241744a3f9a10cd851d46326f58c18932d5dfe8bff38bd760b4ca63aeae15d4eed222d6612 WHIRLPOOL eed712b55af394a2c4a9873bc39e8dee23b022530f290030bb08f2feb735188a1b6789067d6f149bf8065976af457b5795960259790fae8339e059a6eda0f117
 DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
-DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
+EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
+EBUILD asterisk-11.10.0.ebuild 9571 SHA256 9354bf11f69ecf36fd438bcda04a7f0950c30a88a8d4e138fc361ae536bcbf65 SHA512 2c7373f7bc54291b3f0bad39e23225bf733197642cfe08a1f7323ce4a1a3c7592dd13e41aeb7cd99ce73f647bbce04e53b22356d660b6fa8a51ac51a355934d5 WHIRLPOOL 2366705c63d7bbcecaaecb108161e81cf5283dcae904ef12bd97dfc62fb1d5bb0257e6301f75463ea4b34f3b511dcb58d3d2966bff4092c36cc7758a08b5e51e
+EBUILD asterisk-11.6.0.ebuild 9501 SHA256 00ce68bfe742e929e4b8078db178db91e39572e7748ddc95871b275dca7a7d1d SHA512 f8775c265a54725fc3e7db586e60a333603c2d287c3da9f9f2ab36dbbd3842f2b09b4f475c9780209a1acfab232ffd64c66048a3843eb77aa3aeb4833c1dd72c WHIRLPOOL 0628f1c107439391f8480a43f6b666d1d669dfd6ce8ceb03ab6f2aded4d563d1298bf6a1f377031174791531fc0a1fc60e40183cdf6333e1b9a6dc0853bed40b
+EBUILD asterisk-11.8.1.ebuild 9502 SHA256 4305b03116e5198852dfcd04546684a81a07d9d547c76e3699fe6cf8f46b4f9e SHA512 21048ddb1e669e7c092921e3d9671640657f7547a2f6d78e8e7c4c0f525007d1a5eccd547e24697b38c63bff596ffe7bca6299c5122df91c9940da91cbb124be WHIRLPOOL 2de4f09270d24b42c23661eb9d9a4262f6cf2b3713252f376a820b807afa216eff4ef5bcfebd4310ec68f74760da2bcdda94c1edffe253fd15f557cb51ece3f4

From e2fc51927305866853e48d7cdd4800d15011976e Mon Sep 17 00:00:00 2001
From: Drew Matthews <drew@scurvynet.com>
Date: Thu, 16 Oct 2014 03:36:56 -0700
Subject: [PATCH 043/261] added missing asteirsk files

---
 .../ADDONS/codecs/ilbc/FrameClassify.c        |   114 +
 .../ADDONS/codecs/ilbc/FrameClassify.h        |    27 +
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c   |   158 +
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h   |    52 +
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c   |   241 +
 .../1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h   |    28 +
 .../ADDONS/codecs/ilbc/StateConstructW.c      |    86 +
 .../ADDONS/codecs/ilbc/StateConstructW.h      |    31 +
 .../ADDONS/codecs/ilbc/StateSearchW.c         |   211 +
 .../ADDONS/codecs/ilbc/StateSearchW.h         |    52 +
 .../1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c   |    72 +
 .../1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h   |    30 +
 .../1.4.39.1/ADDONS/codecs/ilbc/constants.c   |   770 ++
 .../1.4.39.1/ADDONS/codecs/ilbc/constants.h   |    80 +
 .../1.4.39.1/ADDONS/codecs/ilbc/createCB.c    |   231 +
 .../1.4.39.1/ADDONS/codecs/ilbc/createCB.h    |    58 +
 .../1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c      |   270 +
 .../1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h      |    29 +
 .../1.4.39.1/ADDONS/codecs/ilbc/enhancer.c    |   701 +
 .../1.4.39.1/ADDONS/codecs/ilbc/enhancer.h    |    36 +
 .../ADDONS/codecs/ilbc/extract-cfile.awk      |    24 +
 .../1.4.39.1/ADDONS/codecs/ilbc/filter.c      |   175 +
 .../1.4.39.1/ADDONS/codecs/ilbc/filter.h      |    80 +
 .../1.4.39.1/ADDONS/codecs/ilbc/gainquant.c   |   116 +
 .../1.4.39.1/ADDONS/codecs/ilbc/gainquant.h   |    30 +
 .../1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c    |   193 +
 .../1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h    |    25 +
 .../1.4.39.1/ADDONS/codecs/ilbc/helpfun.c     |   326 +
 .../1.4.39.1/ADDONS/codecs/ilbc/helpfun.h     |   106 +
 .../1.4.39.1/ADDONS/codecs/ilbc/hpInput.c     |    65 +
 .../1.4.39.1/ADDONS/codecs/ilbc/hpInput.h     |    24 +
 .../1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c    |    61 +
 .../1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h    |    24 +
 .../ADDONS/codecs/ilbc/iCBConstruct.c         |   112 +
 .../ADDONS/codecs/ilbc/iCBConstruct.h         |    40 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c   |   512 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h   |    37 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c |   652 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h |    42 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h |   217 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c |   543 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h |    39 +
 .../1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c   |   310 +
 .../files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c   |   283 +
 .../files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h   |    27 +
 .../1.4.39.1/ADDONS/codecs/ilbc/packing.c     |   182 +
 .../1.4.39.1/ADDONS/codecs/ilbc/packing.h     |    68 +
 .../1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt   | 10867 ++++++++++++++++
 .../1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c  |    80 +
 .../1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h  |    24 +
 .../asterisk/files/1.4.39.1/asterisk.confd    |    95 +
 .../asterisk/files/1.4.39.1/asterisk.initd    |   295 +
 .../files/1.4.39.1/asterisk.logrotate         |     8 +
 net-misc/asterisk/files/1.4.39.1/dahdi.initd  |   229 +
 .../1.4.39.1/patches/apps_.moduleinfo.patch   |   281 +
 .../1.4.39.1/patches/apps_app_meetme.c.patch  |    13 +
 .../patches/apps_app_waitforsilence.c.patch   |    32 +
 .../build_tools_menuselect-deps.in.patch      |    10 +
 .../channels_.chan_dahdi.moduleinfo.patch     |     8 +
 .../patches/channels_.moduleinfo.patch        |    10 +
 .../patches/channels_chan_dahdi.c.patch       |  1909 +++
 .../patches/channels_chan_sip.c.patch         |    76 +
 .../files/1.4.39.1/patches/configure.ac.patch |    19 +
 .../contrib_scripts_get_ilbc_source.sh.patch  |    11 +
 .../patches/include_asterisk_channel.h.patch  |    39 +
 .../include_asterisk_dahdi_compat.h.patch     |    12 +
 .../1.4.39.1/patches/main_channel.c.patch     |    60 +
 .../1.4.39.1/patches/main_manager.c.patch     |    38 +
 .../files/1.4.39.1/patches/main_pbx.c.patch   |    44 +
 .../files/1.4.39.1/patches/main_utils.c.patch |    25 +
 .../files/1.4.39.1/patches/makeopts.in.patch  |    12 +
 .../1.4.39.1/patches/menuselect-tree.patch    |   292 +
 .../1.4.39.1/patches/res_res_features.c.patch |    10 +
 .../patches/res_res_musiconhold.c.patch       |   155 +
 net-misc/asterisk/files/get_ilbc_source.sh    |    13 +
 75 files changed, 22257 insertions(+)
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
 create mode 100644 net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
 create mode 100644 net-misc/asterisk/files/1.4.39.1/asterisk.confd
 create mode 100755 net-misc/asterisk/files/1.4.39.1/asterisk.initd
 create mode 100644 net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
 create mode 100755 net-misc/asterisk/files/1.4.39.1/dahdi.initd
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
 create mode 100644 net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
 create mode 100644 net-misc/asterisk/files/get_ilbc_source.sh

diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
new file mode 100644
index 0000000..80d72d9
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c
@@ -0,0 +1,114 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       FrameClassify.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*---------------------------------------------------------------*
+    *  Classification of subframes to localize start state
+    *--------------------------------------------------------------*/
+
+   int FrameClassify(      /* index to the max-energy sub-frame */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i/o) the encoder state structure */
+       float *residual     /* (i) lpc residual signal */
+   ) {
+       float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
+       int n, l, max_ssqEn_n;
+       const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
+           (float)1.0,(float)0.9,(float)0.8};
+       const float sampEn_win[5]={(float)1.0/(float)6.0,
+           (float)2.0/(float)6.0, (float)3.0/(float)6.0,
+           (float)4.0/(float)6.0, (float)5.0/(float)6.0};
+
+       /* init the front and back energies to zero */
+
+       memset(fssqEn, 0, NSUB_MAX*sizeof(float));
+       memset(bssqEn, 0, NSUB_MAX*sizeof(float));
+
+       /* Calculate front of first seqence */
+
+       n=0;
+       pp=residual;
+       for (l=0; l<5; l++) {
+           fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
+           pp++;
+       }
+       for (l=5; l<SUBL; l++) {
+
+
+
+
+
+           fssqEn[n] += (*pp) * (*pp);
+           pp++;
+       }
+
+       /* Calculate front and back of all middle sequences */
+
+       for (n=1; n<iLBCenc_inst->nsub-1; n++) {
+           pp=residual+n*SUBL;
+           for (l=0; l<5; l++) {
+               fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
+               bssqEn[n] += (*pp) * (*pp);
+               pp++;
+           }
+           for (l=5; l<SUBL-5; l++) {
+               fssqEn[n] += (*pp) * (*pp);
+               bssqEn[n] += (*pp) * (*pp);
+               pp++;
+           }
+           for (l=SUBL-5; l<SUBL; l++) {
+               fssqEn[n] += (*pp) * (*pp);
+               bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
+               pp++;
+           }
+       }
+
+       /* Calculate back of last seqence */
+
+       n=iLBCenc_inst->nsub-1;
+       pp=residual+n*SUBL;
+       for (l=0; l<SUBL-5; l++) {
+           bssqEn[n] += (*pp) * (*pp);
+           pp++;
+       }
+       for (l=SUBL-5; l<SUBL; l++) {
+           bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
+           pp++;
+       }
+
+       /* find the index to the weighted 80 sample with
+          most energy */
+
+       if (iLBCenc_inst->mode==20) l=1;
+       else                        l=0;
+
+       max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
+       max_ssqEn_n=1;
+       for (n=2; n<iLBCenc_inst->nsub; n++) {
+
+
+
+
+
+
+           l++;
+           if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
+               max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
+                               ssqEn_win[l];
+               max_ssqEn_n=n;
+           }
+       }
+
+       return max_ssqEn_n;
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
new file mode 100644
index 0000000..018ddbe
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h
@@ -0,0 +1,27 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       FrameClassify.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_FRAMECLASSIFY_H
+   #define __iLBC_FRAMECLASSIFY_H
+
+   int FrameClassify(      /* index to the max-energy sub-frame */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i/o) the encoder state structure */
+       float *residual     /* (i) lpc residual signal */
+   );
+
+
+
+
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
new file mode 100644
index 0000000..81bab90
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c
@@ -0,0 +1,158 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPC_decode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "helpfun.h"
+   #include "lsf.h"
+   #include "iLBC_define.h"
+   #include "constants.h"
+
+   /*---------------------------------------------------------------*
+    *  interpolation of lsf coefficients for the decoder
+    *--------------------------------------------------------------*/
+
+   void LSFinterpolate2a_dec(
+       float *a,           /* (o) lpc coefficients for a sub-frame */
+       float *lsf1,    /* (i) first lsf coefficient vector */
+       float *lsf2,    /* (i) second lsf coefficient vector */
+       float coef,         /* (i) interpolation weight */
+       int length          /* (i) length of lsf vectors */
+   ){
+       float  lsftmp[LPC_FILTERORDER];
+
+       interpolate(lsftmp, lsf1, lsf2, coef, length);
+       lsf2a(a, lsftmp);
+   }
+
+   /*---------------------------------------------------------------*
+    *  obtain dequantized lsf coefficients from quantization index
+    *--------------------------------------------------------------*/
+
+   void SimplelsfDEQ(
+       float *lsfdeq,    /* (o) dequantized lsf coefficients */
+       int *index,         /* (i) quantization index */
+       int lpc_n           /* (i) number of LPCs */
+   ){
+       int i, j, pos, cb_pos;
+
+
+
+
+
+       /* decode first LSF */
+
+       pos = 0;
+       cb_pos = 0;
+       for (i = 0; i < LSF_NSPLIT; i++) {
+           for (j = 0; j < dim_lsfCbTbl[i]; j++) {
+               lsfdeq[pos + j] = lsfCbTbl[cb_pos +
+                   (long)(index[i])*dim_lsfCbTbl[i] + j];
+           }
+           pos += dim_lsfCbTbl[i];
+           cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
+       }
+
+       if (lpc_n>1) {
+
+           /* decode last LSF */
+
+           pos = 0;
+           cb_pos = 0;
+           for (i = 0; i < LSF_NSPLIT; i++) {
+               for (j = 0; j < dim_lsfCbTbl[i]; j++) {
+                   lsfdeq[LPC_FILTERORDER + pos + j] =
+                       lsfCbTbl[cb_pos +
+                       (long)(index[LSF_NSPLIT + i])*
+                       dim_lsfCbTbl[i] + j];
+               }
+               pos += dim_lsfCbTbl[i];
+               cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  obtain synthesis and weighting filters form lsf coefficients
+    *---------------------------------------------------------------*/
+
+   void DecoderInterpolateLSF(
+       float *syntdenum, /* (o) synthesis filter coefficients */
+       float *weightdenum, /* (o) weighting denumerator
+                                  coefficients */
+       float *lsfdeq,       /* (i) dequantized lsf coefficients */
+       int length,         /* (i) length of lsf coefficient vector */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i) the decoder state structure */
+   ){
+       int    i, pos, lp_length;
+       float  lp[LPC_FILTERORDER + 1], *lsfdeq2;
+
+
+
+
+
+
+       lsfdeq2 = lsfdeq + length;
+       lp_length = length + 1;
+
+       if (iLBCdec_inst->mode==30) {
+           /* sub-frame 1: Interpolation between old and first */
+
+           LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq,
+               lsf_weightTbl_30ms[0], length);
+           memcpy(syntdenum,lp,lp_length*sizeof(float));
+           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM,
+               lp_length);
+
+           /* sub-frames 2 to 6: interpolation between first
+              and last LSF */
+
+           pos = lp_length;
+           for (i = 1; i < 6; i++) {
+               LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2,
+                   lsf_weightTbl_30ms[i], length);
+               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
+               bwexpand(weightdenum + pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+       else {
+           pos = 0;
+           for (i = 0; i < iLBCdec_inst->nsub; i++) {
+               LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold,
+                   lsfdeq, lsf_weightTbl_20ms[i], length);
+               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
+               bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM,
+                   lp_length);
+               pos += lp_length;
+           }
+       }
+
+       /* update memory */
+
+       if (iLBCdec_inst->mode==30)
+           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2,
+                       length*sizeof(float));
+       else
+           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq,
+                       length*sizeof(float));
+
+   }
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
new file mode 100644
index 0000000..abe1d7b
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h
@@ -0,0 +1,52 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPC_decode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LPC_DECODE_H
+   #define __iLBC_LPC_DECODE_H
+
+   void LSFinterpolate2a_dec(
+       float *a,           /* (o) lpc coefficients for a sub-frame */
+       float *lsf1,    /* (i) first lsf coefficient vector */
+       float *lsf2,    /* (i) second lsf coefficient vector */
+       float coef,         /* (i) interpolation weight */
+       int length          /* (i) length of lsf vectors */
+   );
+
+   void SimplelsfDEQ(
+       float *lsfdeq,      /* (o) dequantized lsf coefficients */
+       int *index,         /* (i) quantization index */
+       int lpc_n           /* (i) number of LPCs */
+   );
+
+   void DecoderInterpolateLSF(
+       float *syntdenum,   /* (o) synthesis filter coefficients */
+       float *weightdenum, /* (o) weighting denumerator
+                                  coefficients */
+       float *lsfdeq,      /* (i) dequantized lsf coefficients */
+       int length,         /* (i) length of lsf coefficient vector */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i) the decoder state structure */
+   );
+
+   #endif
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
new file mode 100644
index 0000000..19695c0
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c
@@ -0,0 +1,241 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPCencode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "helpfun.h"
+   #include "lsf.h"
+   #include "constants.h"
+
+
+
+
+
+   /*----------------------------------------------------------------*
+    *  lpc analysis (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimpleAnalysis(
+       float *lsf,         /* (o) lsf coefficients */
+       float *data,    /* (i) new data vector */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       int k, is;
+       float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
+       float lp2[LPC_FILTERORDER + 1];
+       float r[LPC_FILTERORDER + 1];
+
+       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
+       memcpy(iLBCenc_inst->lpc_buffer+is,data,
+           iLBCenc_inst->blockl*sizeof(float));
+
+       /* No lookahead, last window is asymmetric */
+
+       for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
+
+           is = LPC_LOOKBACK;
+
+           if (k < (iLBCenc_inst->lpc_n - 1)) {
+               window(temp, lpc_winTbl,
+                   iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
+           } else {
+               window(temp, lpc_asymwinTbl,
+                   iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
+           }
+
+           autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
+           window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
+
+           levdurb(lp, temp, r, LPC_FILTERORDER);
+           bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
+
+           a2lsf(lsf + k*LPC_FILTERORDER, lp2);
+       }
+       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
+       memmove(iLBCenc_inst->lpc_buffer,
+           iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is,
+           is*sizeof(float));
+   }
+
+   /*----------------------------------------------------------------*
+
+
+
+
+
+    *  lsf interpolator and conversion from lsf to a coefficients
+    *  (subrutine to SimpleInterpolateLSF)
+    *---------------------------------------------------------------*/
+
+   void LSFinterpolate2a_enc(
+       float *a,       /* (o) lpc coefficients */
+       float *lsf1,/* (i) first set of lsf coefficients */
+       float *lsf2,/* (i) second set of lsf coefficients */
+       float coef,     /* (i) weighting coefficient to use between
+                              lsf1 and lsf2 */
+       long length      /* (i) length of coefficient vectors */
+   ){
+       float  lsftmp[LPC_FILTERORDER];
+
+       interpolate(lsftmp, lsf1, lsf2, coef, length);
+       lsf2a(a, lsftmp);
+   }
+
+   /*----------------------------------------------------------------*
+    *  lsf interpolator (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimpleInterpolateLSF(
+       float *syntdenum,   /* (o) the synthesis filter denominator
+                                  resulting from the quantized
+                                  interpolated lsf */
+       float *weightdenum, /* (o) the weighting filter denominator
+                                  resulting from the unquantized
+                                  interpolated lsf */
+       float *lsf,         /* (i) the unquantized lsf coefficients */
+       float *lsfdeq,      /* (i) the dequantized lsf coefficients */
+       float *lsfold,      /* (i) the unquantized lsf coefficients of
+                                  the previous signal frame */
+       float *lsfdeqold, /* (i) the dequantized lsf coefficients of
+                                  the previous signal frame */
+       int length,         /* (i) should equate LPC_FILTERORDER */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       int    i, pos, lp_length;
+       float  lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
+
+       lsf2 = lsf + length;
+       lsfdeq2 = lsfdeq + length;
+       lp_length = length + 1;
+
+       if (iLBCenc_inst->mode==30) {
+           /* sub-frame 1: Interpolation between old and first
+
+
+
+
+
+              set of lsf coefficients */
+
+           LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
+               lsf_weightTbl_30ms[0], length);
+           memcpy(syntdenum,lp,lp_length*sizeof(float));
+           LSFinterpolate2a_enc(lp, lsfold, lsf,
+               lsf_weightTbl_30ms[0], length);
+           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
+
+           /* sub-frame 2 to 6: Interpolation between first
+              and second set of lsf coefficients */
+
+           pos = lp_length;
+           for (i = 1; i < iLBCenc_inst->nsub; i++) {
+               LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2,
+                   lsf_weightTbl_30ms[i], length);
+               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
+
+               LSFinterpolate2a_enc(lp, lsf, lsf2,
+                   lsf_weightTbl_30ms[i], length);
+               bwexpand(weightdenum + pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+       else {
+           pos = 0;
+           for (i = 0; i < iLBCenc_inst->nsub; i++) {
+               LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
+                   lsf_weightTbl_20ms[i], length);
+               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
+               LSFinterpolate2a_enc(lp, lsfold, lsf,
+                   lsf_weightTbl_20ms[i], length);
+               bwexpand(weightdenum+pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+
+       /* update memory */
+
+       if (iLBCenc_inst->mode==30) {
+           memcpy(lsfold, lsf2, length*sizeof(float));
+           memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
+       }
+       else {
+           memcpy(lsfold, lsf, length*sizeof(float));
+           memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
+
+
+
+
+
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lsf quantizer (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimplelsfQ(
+       float *lsfdeq,    /* (o) dequantized lsf coefficients
+                              (dimension FILTERORDER) */
+       int *index,     /* (o) quantization index */
+       float *lsf,      /* (i) the lsf coefficient vector to be
+                              quantized (dimension FILTERORDER ) */
+       int lpc_n     /* (i) number of lsf sets to quantize */
+   ){
+       /* Quantize first LSF with memoryless split VQ */
+       SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT,
+           dim_lsfCbTbl, size_lsfCbTbl);
+
+       if (lpc_n==2) {
+           /* Quantize second LSF with memoryless split VQ */
+           SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT,
+               lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT,
+               dim_lsfCbTbl, size_lsfCbTbl);
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lpc encoder
+    *---------------------------------------------------------------*/
+
+   void LPCencode(
+       float *syntdenum, /* (i/o) synthesis filter coefficients
+                                  before/after encoding */
+       float *weightdenum, /* (i/o) weighting denumerator
+                                  coefficients before/after
+                                  encoding */
+       int *lsf_index,     /* (o) lsf quantization index */
+       float *data,    /* (i) lsf coefficients to quantize */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       float lsf[LPC_FILTERORDER * LPC_N_MAX];
+       float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
+       int change=0;
+
+       SimpleAnalysis(lsf, data, iLBCenc_inst);
+       SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
+
+
+
+
+
+       change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
+       SimpleInterpolateLSF(syntdenum, weightdenum,
+           lsf, lsfdeq, iLBCenc_inst->lsfold,
+           iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
new file mode 100644
index 0000000..39a9b04
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h
@@ -0,0 +1,28 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPCencode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LPCENCOD_H
+   #define __iLBC_LPCENCOD_H
+
+   void LPCencode(
+       float *syntdenum,   /* (i/o) synthesis filter coefficients
+                                  before/after encoding */
+       float *weightdenum, /* (i/o) weighting denumerator coefficients
+                                  before/after encoding */
+       int *lsf_index,     /* (o) lsf quantization index */
+       float *data,    /* (i) lsf coefficients to quantize */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
new file mode 100644
index 0000000..1d3e65f
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c
@@ -0,0 +1,86 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateConstructW.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    *  decoding of the start state
+    *---------------------------------------------------------------*/
+
+   void StateConstructW(
+       int idxForMax,      /* (i) 6-bit index for the quantization of
+                                  max amplitude */
+       int *idxVec,    /* (i) vector of quantization indexes */
+       float *syntDenum,   /* (i) synthesis filter denumerator */
+
+
+
+
+
+       float *out,         /* (o) the decoded state vector */
+       int len             /* (i) length of a state vector */
+   ){
+       float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp,
+           numerator[LPC_FILTERORDER+1];
+       float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
+       int k,tmpi;
+
+       /* decoding of the maximum value */
+
+       maxVal = state_frgqTbl[idxForMax];
+       maxVal = (float)pow(10,maxVal)/(float)4.5;
+
+       /* initialization of buffers and coefficients */
+
+       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
+       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
+       for (k=0; k<LPC_FILTERORDER; k++) {
+           numerator[k]=syntDenum[LPC_FILTERORDER-k];
+       }
+       numerator[LPC_FILTERORDER]=syntDenum[0];
+       tmp = &tmpbuf[LPC_FILTERORDER];
+       fout = &foutbuf[LPC_FILTERORDER];
+
+       /* decoding of the sample values */
+
+       for (k=0; k<len; k++) {
+           tmpi = len-1-k;
+           /* maxVal = 1/scal */
+           tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
+       }
+
+       /* circular convolution with all-pass filter */
+
+       memset(tmp+len, 0, len*sizeof(float));
+       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
+           LPC_FILTERORDER, fout);
+       for (k=0;k<len;k++) {
+           out[k] = fout[len-1-k]+fout[2*len-1-k];
+       }
+   }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
new file mode 100644
index 0000000..08f93d2
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h
@@ -0,0 +1,31 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateConstructW.h
+
+
+
+
+
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_STATECONSTRUCTW_H
+   #define __iLBC_STATECONSTRUCTW_H
+
+   void StateConstructW(
+       int idxForMax,      /* (i) 6-bit index for the quantization of
+                                  max amplitude */
+       int *idxVec,    /* (i) vector of quantization indexes */
+       float *syntDenum,   /* (i) synthesis filter denumerator */
+       float *out,         /* (o) the decoded state vector */
+       int len             /* (i) length of a state vector */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
new file mode 100644
index 0000000..1eeee93
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c
@@ -0,0 +1,211 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateSearchW.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+   #include "helpfun.h"
+
+   /*----------------------------------------------------------------*
+    *  predictive noise shaping encoding of scaled start state
+    *  (subrutine for StateSearchW)
+    *---------------------------------------------------------------*/
+
+   void AbsQuantW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *in,          /* (i) vector to encode */
+       float *syntDenum,   /* (i) denominator of synthesis filter */
+       float *weightDenum, /* (i) denominator of weighting filter */
+       int *out,           /* (o) vector of quantizer indexes */
+       int len,        /* (i) length of vector to encode and
+                                  vector of quantizer indexes */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   ){
+       float *syntOut;
+       float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
+       float toQ, xq;
+       int n;
+       int index;
+
+       /* initialization of buffer for filtering */
+
+       memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
+
+
+
+
+
+
+       /* initialization of pointer for filtering */
+
+       syntOut = &syntOutBuf[LPC_FILTERORDER];
+
+       /* synthesis and weighting filters on input */
+
+       if (state_first) {
+           AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
+       } else {
+           AllPoleFilter (in, weightDenum,
+               iLBCenc_inst->state_short_len-SUBL,
+               LPC_FILTERORDER);
+       }
+
+       /* encoding loop */
+
+       for (n=0; n<len; n++) {
+
+           /* time update of filter coefficients */
+
+           if ((state_first)&&(n==SUBL)){
+               syntDenum += (LPC_FILTERORDER+1);
+               weightDenum += (LPC_FILTERORDER+1);
+
+               /* synthesis and weighting filters on input */
+               AllPoleFilter (&in[n], weightDenum, len-n,
+                   LPC_FILTERORDER);
+
+           } else if ((state_first==0)&&
+               (n==(iLBCenc_inst->state_short_len-SUBL))) {
+               syntDenum += (LPC_FILTERORDER+1);
+               weightDenum += (LPC_FILTERORDER+1);
+
+               /* synthesis and weighting filters on input */
+               AllPoleFilter (&in[n], weightDenum, len-n,
+                   LPC_FILTERORDER);
+
+           }
+
+           /* prediction of synthesized and weighted input */
+
+           syntOut[n] = 0.0;
+           AllPoleFilter (&syntOut[n], weightDenum, 1,
+               LPC_FILTERORDER);
+
+           /* quantization */
+
+           toQ = in[n]-syntOut[n];
+
+
+
+
+
+           sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
+           out[n]=index;
+           syntOut[n] = state_sq3Tbl[out[n]];
+
+           /* update of the prediction filter */
+
+           AllPoleFilter(&syntOut[n], weightDenum, 1,
+               LPC_FILTERORDER);
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  encoding of start state
+    *---------------------------------------------------------------*/
+
+   void StateSearchW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *residual,/* (i) target residual vector */
+       float *syntDenum,   /* (i) lpc synthesis filter */
+       float *weightDenum, /* (i) weighting filter denuminator */
+       int *idxForMax,     /* (o) quantizer index for maximum
+                                  amplitude */
+       int *idxVec,    /* (o) vector of quantization indexes */
+       int len,        /* (i) length of all vectors */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   ){
+       float dtmp, maxVal;
+       float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
+       float *tmp, numerator[1+LPC_FILTERORDER];
+       float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
+       int k;
+       float qmax, scal;
+
+       /* initialization of buffers and filter coefficients */
+
+       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
+       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
+       for (k=0; k<LPC_FILTERORDER; k++) {
+           numerator[k]=syntDenum[LPC_FILTERORDER-k];
+       }
+       numerator[LPC_FILTERORDER]=syntDenum[0];
+       tmp = &tmpbuf[LPC_FILTERORDER];
+       fout = &foutbuf[LPC_FILTERORDER];
+
+       /* circular convolution with the all-pass filter */
+
+
+
+
+
+
+       memcpy(tmp, residual, len*sizeof(float));
+       memset(tmp+len, 0, len*sizeof(float));
+       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
+           LPC_FILTERORDER, fout);
+       for (k=0; k<len; k++) {
+           fout[k] += fout[k+len];
+       }
+
+       /* identification of the maximum amplitude value */
+
+       maxVal = fout[0];
+       for (k=1; k<len; k++) {
+
+           if (fout[k]*fout[k] > maxVal*maxVal){
+               maxVal = fout[k];
+           }
+       }
+       maxVal=(float)fabs(maxVal);
+
+       /* encoding of the maximum amplitude value */
+
+       if (maxVal < 10.0) {
+           maxVal = 10.0;
+       }
+       maxVal = (float)log10(maxVal);
+       sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
+
+       /* decoding of the maximum amplitude representation value,
+          and corresponding scaling of start state */
+
+       maxVal=state_frgqTbl[*idxForMax];
+       qmax = (float)pow(10,maxVal);
+       scal = (float)(4.5)/qmax;
+       for (k=0; k<len; k++){
+           fout[k] *= scal;
+       }
+
+       /* predictive noise shaping encoding of scaled start state */
+
+       AbsQuantW(iLBCenc_inst, fout,syntDenum,
+           weightDenum,idxVec, len, state_first);
+   }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
new file mode 100644
index 0000000..9036daa
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h
@@ -0,0 +1,52 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateSearchW.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_STATESEARCHW_H
+   #define __iLBC_STATESEARCHW_H
+
+   void AbsQuantW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *in,          /* (i) vector to encode */
+       float *syntDenum,   /* (i) denominator of synthesis filter */
+       float *weightDenum, /* (i) denominator of weighting filter */
+       int *out,           /* (o) vector of quantizer indexes */
+       int len,        /* (i) length of vector to encode and
+                                  vector of quantizer indexes */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   );
+
+   void StateSearchW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *residual,/* (i) target residual vector */
+       float *syntDenum,   /* (i) lpc synthesis filter */
+       float *weightDenum, /* (i) weighting filter denuminator */
+       int *idxForMax,     /* (o) quantizer index for maximum
+                                  amplitude */
+       int *idxVec,    /* (o) vector of quantization indexes */
+       int len,        /* (i) length of all vectors */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   );
+
+
+   #endif
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
new file mode 100644
index 0000000..c161f98
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c
@@ -0,0 +1,72 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       anaFilter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  LP analysis filter.
+    *---------------------------------------------------------------*/
+
+   void anaFilter(
+       float *In,  /* (i) Signal to be filtered */
+       float *a,   /* (i) LP parameters */
+       int len,/* (i) Length of signal */
+       float *Out, /* (o) Filtered signal */
+       float *mem  /* (i/o) Filter state */
+   ){
+       int i, j;
+       float *po, *pi, *pm, *pa;
+
+       po = Out;
+
+       /* Filter first part using memory from past */
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           pi = &In[i];
+           pm = &mem[LPC_FILTERORDER-1];
+           pa = a;
+           *po=0.0;
+
+
+
+
+
+           for (j=0; j<=i; j++) {
+               *po+=(*pa++)*(*pi--);
+           }
+           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
+
+               *po+=(*pa++)*(*pm--);
+           }
+           po++;
+       }
+
+       /* Filter last part where the state is entirely
+          in the input vector */
+
+       for (i=LPC_FILTERORDER; i<len; i++) {
+           pi = &In[i];
+           pa = a;
+           *po=0.0;
+           for (j=0; j<LPC_FILTERORDER+1; j++) {
+               *po+=(*pa++)*(*pi--);
+           }
+           po++;
+       }
+
+       /* Update state vector */
+
+       memcpy(mem, &In[len-LPC_FILTERORDER],
+           LPC_FILTERORDER*sizeof(float));
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
new file mode 100644
index 0000000..91367f9
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h
@@ -0,0 +1,30 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       anaFilter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ANAFILTER_H
+   #define __iLBC_ANAFILTER_H
+
+   void anaFilter(
+
+
+
+
+
+       float *In,  /* (i) Signal to be filtered */
+       float *a,   /* (i) LP parameters */
+       int len,/* (i) Length of signal */
+       float *Out, /* (o) Filtered signal */
+       float *mem  /* (i/o) Filter state */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
new file mode 100644
index 0000000..d43dac4
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.c
@@ -0,0 +1,770 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       constants.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /* ULP bit allocation */
+
+       /* 20 ms frame */
+
+   const iLBC_ULP_Inst_t ULP_20msTbl = {
+       /* LSF */
+       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
+           {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+       /* Start state location, gain and samples */
+       {2,0,0,0,0},
+       {1,0,0,0,0},
+       {6,0,0,0,0},
+       {0,1,2,0,0},
+       /* extra CB index and extra CB gain */
+       {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+       {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+       /* CB index and CB gain */
+       {   {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+           {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
+       {   {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+           {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
+   };
+
+       /* 30 ms frame */
+
+   const iLBC_ULP_Inst_t ULP_30msTbl = {
+       /* LSF */
+
+
+
+
+
+       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
+           {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
+       /* Start state location, gain and samples */
+       {3,0,0,0,0},
+       {1,0,0,0,0},
+       {6,0,0,0,0},
+       {0,1,2,0,0},
+       /* extra CB index and extra CB gain */
+       {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+       {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+       /* CB index and CB gain */
+       {   {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
+       {   {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
+           {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
+           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
+           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
+   };
+
+   /* HP Filters */
+
+   float hpi_zero_coefsTbl[3] = {
+       (float)0.92727436, (float)-1.8544941, (float)0.92727436
+   };
+   float hpi_pole_coefsTbl[3] = {
+       (float)1.0, (float)-1.9059465, (float)0.9114024
+   };
+   float hpo_zero_coefsTbl[3] = {
+       (float)0.93980581, (float)-1.8795834, (float)0.93980581
+   };
+   float hpo_pole_coefsTbl[3] = {
+       (float)1.0, (float)-1.9330735, (float)0.93589199
+   };
+
+   /* LP Filter */
+
+   float lpFilt_coefsTbl[FILTERORDER_DS]={
+       (float)-0.066650, (float)0.125000, (float)0.316650,
+       (float)0.414063, (float)0.316650,
+       (float)0.125000, (float)-0.066650
+   };
+
+   /* State quantization tables */
+
+   float state_sq3Tbl[8] = {
+       (float)-3.719849, (float)-2.177490, (float)-1.130005,
+
+
+
+
+
+       (float)-0.309692, (float)0.444214, (float)1.329712,
+       (float)2.436279, (float)3.983887
+   };
+
+   float state_frgqTbl[64] = {
+       (float)1.000085, (float)1.071695, (float)1.140395,
+       (float)1.206868, (float)1.277188, (float)1.351503,
+       (float)1.429380, (float)1.500727, (float)1.569049,
+       (float)1.639599, (float)1.707071, (float)1.781531,
+       (float)1.840799, (float)1.901550, (float)1.956695,
+       (float)2.006750, (float)2.055474, (float)2.102787,
+       (float)2.142819, (float)2.183592, (float)2.217962,
+       (float)2.257177, (float)2.295739, (float)2.332967,
+       (float)2.369248, (float)2.402792, (float)2.435080,
+       (float)2.468598, (float)2.503394, (float)2.539284,
+       (float)2.572944, (float)2.605036, (float)2.636331,
+       (float)2.668939, (float)2.698780, (float)2.729101,
+       (float)2.759786, (float)2.789834, (float)2.818679,
+       (float)2.848074, (float)2.877470, (float)2.906899,
+       (float)2.936655, (float)2.967804, (float)3.000115,
+       (float)3.033367, (float)3.066355, (float)3.104231,
+       (float)3.141499, (float)3.183012, (float)3.222952,
+       (float)3.265433, (float)3.308441, (float)3.350823,
+       (float)3.395275, (float)3.442793, (float)3.490801,
+       (float)3.542514, (float)3.604064, (float)3.666050,
+       (float)3.740994, (float)3.830749, (float)3.938770,
+       (float)4.101764
+   };
+
+   /* CB tables */
+
+   int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44},
+               {108,108,108}, {108,108,108}, {108,108,108}};
+   int stMemLTbl=85;
+   int memLfTbl[NASUB_MAX]={147,147,147,147};
+
+   /* expansion filter(s) */
+
+   float cbfiltersTbl[CB_FILTERLEN]={
+       (float)-0.034180, (float)0.108887, (float)-0.184326,
+       (float)0.806152,  (float)0.713379, (float)-0.144043,
+       (float)0.083740,  (float)-0.033691
+   };
+
+   /* Gain Quantization */
+
+   float gain_sq3Tbl[8]={
+       (float)-1.000000,  (float)-0.659973,  (float)-0.330017,
+
+
+
+
+
+       (float)0.000000, (float)0.250000, (float)0.500000,
+       (float)0.750000, (float)1.00000};
+
+   float gain_sq4Tbl[16]={
+       (float)-1.049988, (float)-0.900024, (float)-0.750000,
+       (float)-0.599976, (float)-0.450012, (float)-0.299988,
+       (float)-0.150024, (float)0.000000, (float)0.150024,
+       (float)0.299988, (float)0.450012, (float)0.599976,
+       (float)0.750000, (float)0.900024, (float)1.049988,
+       (float)1.200012};
+
+   float gain_sq5Tbl[32]={
+       (float)0.037476, (float)0.075012, (float)0.112488,
+       (float)0.150024, (float)0.187500, (float)0.224976,
+       (float)0.262512, (float)0.299988, (float)0.337524,
+       (float)0.375000, (float)0.412476, (float)0.450012,
+       (float)0.487488, (float)0.525024, (float)0.562500,
+       (float)0.599976, (float)0.637512, (float)0.674988,
+       (float)0.712524, (float)0.750000, (float)0.787476,
+       (float)0.825012, (float)0.862488, (float)0.900024,
+       (float)0.937500, (float)0.974976, (float)1.012512,
+       (float)1.049988, (float)1.087524, (float)1.125000,
+       (float)1.162476, (float)1.200012};
+
+   /* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
+   float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={
+       (float)0.000000, (float)0.000000, (float)0.000000,
+   (float)1.000000,
+           (float)0.000000, (float)0.000000, (float)0.000000,
+       (float)0.015625, (float)-0.076904, (float)0.288330,
+   (float)0.862061,
+           (float)-0.106445, (float)0.018799, (float)-0.015625,
+       (float)0.023682, (float)-0.124268, (float)0.601563,
+   (float)0.601563,
+           (float)-0.124268, (float)0.023682, (float)-0.023682,
+       (float)0.018799, (float)-0.106445, (float)0.862061,
+   (float)0.288330,
+           (float)-0.076904, (float)0.015625, (float)-0.018799};
+
+   float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0,
+               (float)200.0, (float)280.0, (float)360.0,
+               (float)440.0, (float)520.0, (float)600.0};
+
+   /* LPC analysis and quantization */
+
+   int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
+   int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
+
+
+
+
+
+
+   float lsfmeanTbl[LPC_FILTERORDER] = {
+       (float)0.281738, (float)0.445801, (float)0.663330,
+       (float)0.962524, (float)1.251831, (float)1.533081,
+       (float)1.850586, (float)2.137817, (float)2.481445,
+       (float)2.777344};
+
+   float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
+   (float)(2.0/3.0),
+       (float)(1.0/3.0), (float)0.0, (float)0.0};
+
+   float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0),
+       (float)(1.0/4.0), (float)(0.0)};
+
+   /* Hanning LPC window */
+   float lpc_winTbl[BLOCKL_MAX]={
+       (float)0.000183, (float)0.000671, (float)0.001526,
+       (float)0.002716, (float)0.004242, (float)0.006104,
+       (float)0.008301, (float)0.010834, (float)0.013702,
+       (float)0.016907, (float)0.020416, (float)0.024261,
+       (float)0.028442, (float)0.032928, (float)0.037750,
+       (float)0.042877, (float)0.048309, (float)0.054047,
+       (float)0.060089, (float)0.066437, (float)0.073090,
+       (float)0.080017, (float)0.087219, (float)0.094727,
+       (float)0.102509, (float)0.110535, (float)0.118835,
+       (float)0.127411, (float)0.136230, (float)0.145294,
+       (float)0.154602, (float)0.164154, (float)0.173920,
+       (float)0.183899, (float)0.194122, (float)0.204529,
+       (float)0.215149, (float)0.225952, (float)0.236938,
+       (float)0.248108, (float)0.259460, (float)0.270966,
+       (float)0.282654, (float)0.294464, (float)0.306396,
+       (float)0.318481, (float)0.330688, (float)0.343018,
+       (float)0.355438, (float)0.367981, (float)0.380585,
+       (float)0.393280, (float)0.406067, (float)0.418884,
+       (float)0.431763, (float)0.444702, (float)0.457672,
+       (float)0.470673, (float)0.483704, (float)0.496735,
+       (float)0.509766, (float)0.522797, (float)0.535828,
+       (float)0.548798, (float)0.561768, (float)0.574677,
+       (float)0.587524, (float)0.600342, (float)0.613068,
+       (float)0.625732, (float)0.638306, (float)0.650787,
+       (float)0.663147, (float)0.675415, (float)0.687561,
+       (float)0.699585, (float)0.711487, (float)0.723206,
+       (float)0.734802, (float)0.746216, (float)0.757477,
+       (float)0.768585, (float)0.779480, (float)0.790192,
+       (float)0.800720, (float)0.811005, (float)0.821106,
+       (float)0.830994, (float)0.840668, (float)0.850067,
+       (float)0.859253, (float)0.868225, (float)0.876892,
+       (float)0.885345, (float)0.893524, (float)0.901428,
+       (float)0.909058, (float)0.916412, (float)0.923492,
+
+
+
+
+
+       (float)0.930267, (float)0.936768, (float)0.942963,
+       (float)0.948853, (float)0.954437, (float)0.959717,
+       (float)0.964691, (float)0.969360, (float)0.973694,
+       (float)0.977692, (float)0.981384, (float)0.984741,
+       (float)0.987762, (float)0.990479, (float)0.992828,
+       (float)0.994873, (float)0.996552, (float)0.997925,
+       (float)0.998932, (float)0.999603, (float)0.999969,
+       (float)0.999969, (float)0.999603, (float)0.998932,
+       (float)0.997925, (float)0.996552, (float)0.994873,
+       (float)0.992828, (float)0.990479, (float)0.987762,
+       (float)0.984741, (float)0.981384, (float)0.977692,
+       (float)0.973694, (float)0.969360, (float)0.964691,
+       (float)0.959717, (float)0.954437, (float)0.948853,
+       (float)0.942963, (float)0.936768, (float)0.930267,
+       (float)0.923492, (float)0.916412, (float)0.909058,
+       (float)0.901428, (float)0.893524, (float)0.885345,
+       (float)0.876892, (float)0.868225, (float)0.859253,
+       (float)0.850067, (float)0.840668, (float)0.830994,
+       (float)0.821106, (float)0.811005, (float)0.800720,
+       (float)0.790192, (float)0.779480, (float)0.768585,
+       (float)0.757477, (float)0.746216, (float)0.734802,
+       (float)0.723206, (float)0.711487, (float)0.699585,
+       (float)0.687561, (float)0.675415, (float)0.663147,
+       (float)0.650787, (float)0.638306, (float)0.625732,
+       (float)0.613068, (float)0.600342, (float)0.587524,
+       (float)0.574677, (float)0.561768, (float)0.548798,
+       (float)0.535828, (float)0.522797, (float)0.509766,
+       (float)0.496735, (float)0.483704, (float)0.470673,
+       (float)0.457672, (float)0.444702, (float)0.431763,
+       (float)0.418884, (float)0.406067, (float)0.393280,
+       (float)0.380585, (float)0.367981, (float)0.355438,
+       (float)0.343018, (float)0.330688, (float)0.318481,
+       (float)0.306396, (float)0.294464, (float)0.282654,
+       (float)0.270966, (float)0.259460, (float)0.248108,
+       (float)0.236938, (float)0.225952, (float)0.215149,
+       (float)0.204529, (float)0.194122, (float)0.183899,
+       (float)0.173920, (float)0.164154, (float)0.154602,
+       (float)0.145294, (float)0.136230, (float)0.127411,
+       (float)0.118835, (float)0.110535, (float)0.102509,
+       (float)0.094727, (float)0.087219, (float)0.080017,
+       (float)0.073090, (float)0.066437, (float)0.060089,
+       (float)0.054047, (float)0.048309, (float)0.042877,
+       (float)0.037750, (float)0.032928, (float)0.028442,
+       (float)0.024261, (float)0.020416, (float)0.016907,
+       (float)0.013702, (float)0.010834, (float)0.008301,
+       (float)0.006104, (float)0.004242, (float)0.002716,
+       (float)0.001526, (float)0.000671, (float)0.000183
+   };
+
+
+
+
+
+   /* Asymmetric LPC window */
+   float lpc_asymwinTbl[BLOCKL_MAX]={
+       (float)0.000061, (float)0.000214, (float)0.000458,
+       (float)0.000824, (float)0.001282, (float)0.001831,
+       (float)0.002472, (float)0.003235, (float)0.004120,
+       (float)0.005066, (float)0.006134, (float)0.007294,
+       (float)0.008545, (float)0.009918, (float)0.011383,
+       (float)0.012939, (float)0.014587, (float)0.016357,
+       (float)0.018219, (float)0.020172, (float)0.022217,
+       (float)0.024353, (float)0.026611, (float)0.028961,
+       (float)0.031372, (float)0.033905, (float)0.036530,
+       (float)0.039276, (float)0.042084, (float)0.044983,
+       (float)0.047974, (float)0.051086, (float)0.054260,
+       (float)0.057526, (float)0.060883, (float)0.064331,
+       (float)0.067871, (float)0.071503, (float)0.075226,
+       (float)0.079010, (float)0.082916, (float)0.086884,
+       (float)0.090942, (float)0.095062, (float)0.099304,
+       (float)0.103607, (float)0.107971, (float)0.112427,
+       (float)0.116974, (float)0.121582, (float)0.126282,
+       (float)0.131073, (float)0.135895, (float)0.140839,
+       (float)0.145813, (float)0.150879, (float)0.156006,
+       (float)0.161224, (float)0.166504, (float)0.171844,
+       (float)0.177246, (float)0.182709, (float)0.188263,
+       (float)0.193848, (float)0.199524, (float)0.205231,
+       (float)0.211029, (float)0.216858, (float)0.222778,
+       (float)0.228729, (float)0.234741, (float)0.240814,
+       (float)0.246918, (float)0.253082, (float)0.259308,
+       (float)0.265564, (float)0.271881, (float)0.278259,
+       (float)0.284668, (float)0.291107, (float)0.297607,
+       (float)0.304138, (float)0.310730, (float)0.317322,
+       (float)0.323975, (float)0.330658, (float)0.337372,
+       (float)0.344147, (float)0.350922, (float)0.357727,
+       (float)0.364594, (float)0.371460, (float)0.378357,
+       (float)0.385284, (float)0.392212, (float)0.399170,
+       (float)0.406158, (float)0.413177, (float)0.420197,
+       (float)0.427246, (float)0.434296, (float)0.441376,
+       (float)0.448456, (float)0.455536, (float)0.462646,
+       (float)0.469757, (float)0.476868, (float)0.483978,
+       (float)0.491089, (float)0.498230, (float)0.505341,
+       (float)0.512451, (float)0.519592, (float)0.526703,
+       (float)0.533813, (float)0.540924, (float)0.548004,
+       (float)0.555084, (float)0.562164, (float)0.569244,
+       (float)0.576294, (float)0.583313, (float)0.590332,
+       (float)0.597321, (float)0.604309, (float)0.611267,
+       (float)0.618195, (float)0.625092, (float)0.631989,
+       (float)0.638855, (float)0.645660, (float)0.652466,
+       (float)0.659241, (float)0.665985, (float)0.672668,
+       (float)0.679352, (float)0.685974, (float)0.692566,
+
+
+
+
+
+       (float)0.699127, (float)0.705658, (float)0.712128,
+       (float)0.718536, (float)0.724945, (float)0.731262,
+       (float)0.737549, (float)0.743805, (float)0.750000,
+       (float)0.756134, (float)0.762238, (float)0.768280,
+       (float)0.774261, (float)0.780182, (float)0.786072,
+       (float)0.791870, (float)0.797638, (float)0.803314,
+       (float)0.808960, (float)0.814514, (float)0.820038,
+       (float)0.825470, (float)0.830841, (float)0.836151,
+       (float)0.841400, (float)0.846558, (float)0.851654,
+       (float)0.856689, (float)0.861633, (float)0.866516,
+       (float)0.871338, (float)0.876068, (float)0.880737,
+       (float)0.885315, (float)0.889801, (float)0.894226,
+       (float)0.898560, (float)0.902832, (float)0.907013,
+       (float)0.911102, (float)0.915100, (float)0.919037,
+       (float)0.922882, (float)0.926636, (float)0.930328,
+       (float)0.933899, (float)0.937408, (float)0.940796,
+       (float)0.944122, (float)0.947357, (float)0.950470,
+       (float)0.953522, (float)0.956482, (float)0.959351,
+       (float)0.962097, (float)0.964783, (float)0.967377,
+       (float)0.969849, (float)0.972229, (float)0.974518,
+       (float)0.976715, (float)0.978821, (float)0.980835,
+       (float)0.982727, (float)0.984528, (float)0.986237,
+       (float)0.987854, (float)0.989380, (float)0.990784,
+       (float)0.992096, (float)0.993317, (float)0.994415,
+       (float)0.995422, (float)0.996338, (float)0.997162,
+       (float)0.997864, (float)0.998474, (float)0.998962,
+       (float)0.999390, (float)0.999695, (float)0.999878,
+       (float)0.999969, (float)0.999969, (float)0.996918,
+       (float)0.987701, (float)0.972382, (float)0.951050,
+       (float)0.923889, (float)0.891022, (float)0.852631,
+       (float)0.809021, (float)0.760406, (float)0.707092,
+       (float)0.649445, (float)0.587799, (float)0.522491,
+       (float)0.453979, (float)0.382690, (float)0.309021,
+       (float)0.233459, (float)0.156433, (float)0.078461
+   };
+
+   /* Lag window for LPC */
+   float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
+       (float)1.000100, (float)0.998890, (float)0.995569,
+           (float)0.990057, (float)0.982392,
+       (float)0.972623, (float)0.960816, (float)0.947047,
+           (float)0.931405, (float)0.913989, (float)0.894909};
+
+   /* LSF quantization*/
+   float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
+   (float)0.155396, (float)0.273193, (float)0.451172,
+   (float)0.390503, (float)0.648071, (float)1.002075,
+   (float)0.440186, (float)0.692261, (float)0.955688,
+
+
+
+
+
+   (float)0.343628, (float)0.642334, (float)1.071533,
+   (float)0.318359, (float)0.491577, (float)0.670532,
+   (float)0.193115, (float)0.375488, (float)0.725708,
+   (float)0.364136, (float)0.510376, (float)0.658691,
+   (float)0.297485, (float)0.527588, (float)0.842529,
+   (float)0.227173, (float)0.365967, (float)0.563110,
+   (float)0.244995, (float)0.396729, (float)0.636475,
+   (float)0.169434, (float)0.300171, (float)0.520264,
+   (float)0.312866, (float)0.464478, (float)0.643188,
+   (float)0.248535, (float)0.429932, (float)0.626099,
+   (float)0.236206, (float)0.491333, (float)0.817139,
+   (float)0.334961, (float)0.625122, (float)0.895752,
+   (float)0.343018, (float)0.518555, (float)0.698608,
+   (float)0.372803, (float)0.659790, (float)0.945435,
+   (float)0.176880, (float)0.316528, (float)0.581421,
+   (float)0.416382, (float)0.625977, (float)0.805176,
+   (float)0.303223, (float)0.568726, (float)0.915039,
+   (float)0.203613, (float)0.351440, (float)0.588135,
+   (float)0.221191, (float)0.375000, (float)0.614746,
+   (float)0.199951, (float)0.323364, (float)0.476074,
+   (float)0.300781, (float)0.433350, (float)0.566895,
+   (float)0.226196, (float)0.354004, (float)0.507568,
+   (float)0.300049, (float)0.508179, (float)0.711670,
+   (float)0.312012, (float)0.492676, (float)0.763428,
+   (float)0.329956, (float)0.541016, (float)0.795776,
+   (float)0.373779, (float)0.604614, (float)0.928833,
+   (float)0.210571, (float)0.452026, (float)0.755249,
+   (float)0.271118, (float)0.473267, (float)0.662476,
+   (float)0.285522, (float)0.436890, (float)0.634399,
+   (float)0.246704, (float)0.565552, (float)0.859009,
+   (float)0.270508, (float)0.406250, (float)0.553589,
+   (float)0.361450, (float)0.578491, (float)0.813843,
+   (float)0.342651, (float)0.482788, (float)0.622437,
+   (float)0.340332, (float)0.549438, (float)0.743164,
+   (float)0.200439, (float)0.336304, (float)0.540894,
+   (float)0.407837, (float)0.644775, (float)0.895142,
+   (float)0.294678, (float)0.454834, (float)0.699097,
+   (float)0.193115, (float)0.344482, (float)0.643188,
+   (float)0.275757, (float)0.420776, (float)0.598755,
+   (float)0.380493, (float)0.608643, (float)0.861084,
+   (float)0.222778, (float)0.426147, (float)0.676514,
+   (float)0.407471, (float)0.700195, (float)1.053101,
+   (float)0.218384, (float)0.377197, (float)0.669922,
+   (float)0.313232, (float)0.454102, (float)0.600952,
+   (float)0.347412, (float)0.571533, (float)0.874146,
+   (float)0.238037, (float)0.405396, (float)0.729492,
+   (float)0.223877, (float)0.412964, (float)0.822021,
+   (float)0.395264, (float)0.582153, (float)0.743896,
+
+
+
+
+
+   (float)0.247925, (float)0.485596, (float)0.720581,
+   (float)0.229126, (float)0.496582, (float)0.907715,
+   (float)0.260132, (float)0.566895, (float)1.012695,
+   (float)0.337402, (float)0.611572, (float)0.978149,
+   (float)0.267822, (float)0.447632, (float)0.769287,
+   (float)0.250610, (float)0.381714, (float)0.530029,
+   (float)0.430054, (float)0.805054, (float)1.221924,
+   (float)0.382568, (float)0.544067, (float)0.701660,
+   (float)0.383545, (float)0.710327, (float)1.149170,
+   (float)0.271362, (float)0.529053, (float)0.775513,
+   (float)0.246826, (float)0.393555, (float)0.588623,
+   (float)0.266846, (float)0.422119, (float)0.676758,
+   (float)0.311523, (float)0.580688, (float)0.838623,
+   (float)1.331177, (float)1.576782, (float)1.779541,
+   (float)1.160034, (float)1.401978, (float)1.768188,
+   (float)1.161865, (float)1.525146, (float)1.715332,
+   (float)0.759521, (float)0.913940, (float)1.119873,
+   (float)0.947144, (float)1.121338, (float)1.282471,
+   (float)1.015015, (float)1.557007, (float)1.804932,
+   (float)1.172974, (float)1.402100, (float)1.692627,
+   (float)1.087524, (float)1.474243, (float)1.665405,
+   (float)0.899536, (float)1.105225, (float)1.406250,
+   (float)1.148438, (float)1.484741, (float)1.796265,
+   (float)0.785645, (float)1.209839, (float)1.567749,
+   (float)0.867798, (float)1.166504, (float)1.450684,
+   (float)0.922485, (float)1.229858, (float)1.420898,
+   (float)0.791260, (float)1.123291, (float)1.409546,
+   (float)0.788940, (float)0.966064, (float)1.340332,
+   (float)1.051147, (float)1.272827, (float)1.556641,
+   (float)0.866821, (float)1.181152, (float)1.538818,
+   (float)0.906738, (float)1.373535, (float)1.607910,
+   (float)1.244751, (float)1.581421, (float)1.933838,
+   (float)0.913940, (float)1.337280, (float)1.539673,
+   (float)0.680542, (float)0.959229, (float)1.662720,
+   (float)0.887207, (float)1.430542, (float)1.800781,
+   (float)0.912598, (float)1.433594, (float)1.683960,
+   (float)0.860474, (float)1.060303, (float)1.455322,
+   (float)1.005127, (float)1.381104, (float)1.706909,
+   (float)0.800781, (float)1.363892, (float)1.829102,
+   (float)0.781860, (float)1.124390, (float)1.505981,
+   (float)1.003662, (float)1.471436, (float)1.684692,
+   (float)0.981323, (float)1.309570, (float)1.618042,
+   (float)1.228760, (float)1.554321, (float)1.756470,
+   (float)0.734375, (float)0.895752, (float)1.225586,
+   (float)0.841797, (float)1.055664, (float)1.249268,
+   (float)0.920166, (float)1.119385, (float)1.486206,
+   (float)0.894409, (float)1.539063, (float)1.828979,
+   (float)1.283691, (float)1.543335, (float)1.858276,
+
+
+
+
+
+   (float)0.676025, (float)0.933105, (float)1.490845,
+   (float)0.821289, (float)1.491821, (float)1.739868,
+   (float)0.923218, (float)1.144653, (float)1.580566,
+   (float)1.057251, (float)1.345581, (float)1.635864,
+   (float)0.888672, (float)1.074951, (float)1.353149,
+   (float)0.942749, (float)1.195435, (float)1.505493,
+   (float)1.492310, (float)1.788086, (float)2.039673,
+   (float)1.070313, (float)1.634399, (float)1.860962,
+   (float)1.253296, (float)1.488892, (float)1.686035,
+   (float)0.647095, (float)0.864014, (float)1.401855,
+   (float)0.866699, (float)1.254883, (float)1.453369,
+   (float)1.063965, (float)1.532593, (float)1.731323,
+   (float)1.167847, (float)1.521484, (float)1.884033,
+   (float)0.956055, (float)1.502075, (float)1.745605,
+   (float)0.928711, (float)1.288574, (float)1.479614,
+   (float)1.088013, (float)1.380737, (float)1.570801,
+   (float)0.905029, (float)1.186768, (float)1.371948,
+   (float)1.057861, (float)1.421021, (float)1.617432,
+   (float)1.108276, (float)1.312500, (float)1.501465,
+   (float)0.979492, (float)1.416992, (float)1.624268,
+   (float)1.276001, (float)1.661011, (float)2.007935,
+   (float)0.993042, (float)1.168579, (float)1.331665,
+   (float)0.778198, (float)0.944946, (float)1.235962,
+   (float)1.223755, (float)1.491333, (float)1.815674,
+   (float)0.852661, (float)1.350464, (float)1.722290,
+   (float)1.134766, (float)1.593140, (float)1.787354,
+   (float)1.051392, (float)1.339722, (float)1.531006,
+   (float)0.803589, (float)1.271240, (float)1.652100,
+   (float)0.755737, (float)1.143555, (float)1.639404,
+   (float)0.700928, (float)0.837280, (float)1.130371,
+   (float)0.942749, (float)1.197876, (float)1.669800,
+   (float)0.993286, (float)1.378296, (float)1.566528,
+   (float)0.801025, (float)1.095337, (float)1.298950,
+   (float)0.739990, (float)1.032959, (float)1.383667,
+   (float)0.845703, (float)1.072266, (float)1.543823,
+   (float)0.915649, (float)1.072266, (float)1.224487,
+   (float)1.021973, (float)1.226196, (float)1.481323,
+   (float)0.999878, (float)1.204102, (float)1.555908,
+   (float)0.722290, (float)0.913940, (float)1.340210,
+   (float)0.673340, (float)0.835938, (float)1.259521,
+   (float)0.832397, (float)1.208374, (float)1.394165,
+   (float)0.962158, (float)1.576172, (float)1.912842,
+   (float)1.166748, (float)1.370850, (float)1.556763,
+   (float)0.946289, (float)1.138550, (float)1.400391,
+   (float)1.035034, (float)1.218262, (float)1.386475,
+   (float)1.393799, (float)1.717773, (float)2.000244,
+   (float)0.972656, (float)1.260986, (float)1.760620,
+   (float)1.028198, (float)1.288452, (float)1.484619,
+
+
+
+
+
+   (float)0.773560, (float)1.258057, (float)1.756714,
+   (float)1.080322, (float)1.328003, (float)1.742676,
+   (float)0.823975, (float)1.450806, (float)1.917725,
+   (float)0.859009, (float)1.016602, (float)1.191895,
+   (float)0.843994, (float)1.131104, (float)1.645020,
+   (float)1.189697, (float)1.702759, (float)1.894409,
+   (float)1.346680, (float)1.763184, (float)2.066040,
+   (float)0.980469, (float)1.253784, (float)1.441650,
+   (float)1.338135, (float)1.641968, (float)1.932739,
+   (float)1.223267, (float)1.424194, (float)1.626465,
+   (float)0.765747, (float)1.004150, (float)1.579102,
+   (float)1.042847, (float)1.269165, (float)1.647461,
+   (float)0.968750, (float)1.257568, (float)1.555786,
+   (float)0.826294, (float)0.993408, (float)1.275146,
+   (float)0.742310, (float)0.950439, (float)1.430542,
+   (float)1.054321, (float)1.439819, (float)1.828003,
+   (float)1.072998, (float)1.261719, (float)1.441895,
+   (float)0.859375, (float)1.036377, (float)1.314819,
+   (float)0.895752, (float)1.267212, (float)1.605591,
+   (float)0.805420, (float)0.962891, (float)1.142334,
+   (float)0.795654, (float)1.005493, (float)1.468506,
+   (float)1.105347, (float)1.313843, (float)1.584839,
+   (float)0.792236, (float)1.221802, (float)1.465698,
+   (float)1.170532, (float)1.467651, (float)1.664063,
+   (float)0.838257, (float)1.153198, (float)1.342163,
+   (float)0.968018, (float)1.198242, (float)1.391235,
+   (float)1.250122, (float)1.623535, (float)1.823608,
+   (float)0.711670, (float)1.058350, (float)1.512085,
+   (float)1.204834, (float)1.454468, (float)1.739136,
+   (float)1.137451, (float)1.421753, (float)1.620117,
+   (float)0.820435, (float)1.322754, (float)1.578247,
+   (float)0.798706, (float)1.005005, (float)1.213867,
+   (float)0.980713, (float)1.324951, (float)1.512939,
+   (float)1.112305, (float)1.438843, (float)1.735596,
+   (float)1.135498, (float)1.356689, (float)1.635742,
+   (float)1.101318, (float)1.387451, (float)1.686523,
+   (float)0.849854, (float)1.276978, (float)1.523438,
+   (float)1.377930, (float)1.627563, (float)1.858154,
+   (float)0.884888, (float)1.095459, (float)1.287476,
+   (float)1.289795, (float)1.505859, (float)1.756592,
+   (float)0.817505, (float)1.384155, (float)1.650513,
+   (float)1.446655, (float)1.702148, (float)1.931885,
+   (float)0.835815, (float)1.023071, (float)1.385376,
+   (float)0.916626, (float)1.139038, (float)1.335327,
+   (float)0.980103, (float)1.174072, (float)1.453735,
+   (float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
+   (float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
+   (float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
+
+
+
+
+
+   (float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
+   (float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
+   (float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
+   (float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
+   (float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
+   (float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
+   (float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
+   (float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
+   (float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
+   (float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
+   (float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
+   (float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
+   (float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
+   (float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
+   (float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
+   (float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
+   (float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
+   (float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
+   (float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
+   (float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
+   (float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
+   (float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
+   (float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
+   (float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
+   (float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
+   (float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
+   (float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
+   (float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
+   (float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
+   (float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
+   (float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
+   (float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
+   (float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
+   (float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
+   (float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
+   (float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
+   (float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
+   (float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
+   (float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
+   (float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
+   (float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
+   (float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
+   (float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
+   (float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
+   (float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
+   (float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
+   (float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
+   (float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
+
+
+
+
+
+   (float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
+   (float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
+   (float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
+   (float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
+   (float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
+   (float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
+   (float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
+   (float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
+   (float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
+   (float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
+   (float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
+   (float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
+   (float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
+   (float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
+   (float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
+   (float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
+   (float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
+   (float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
+   (float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
+   (float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
+   (float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
+   (float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
+   (float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
+   (float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
+   (float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
+   (float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
+   (float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
+   (float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
+   (float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
+   (float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
+   (float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
+   (float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
+   (float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
+   (float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
+   (float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
+   (float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
+   (float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
+   (float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
+   (float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
+   (float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
+   (float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
+   (float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
+   (float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
+   (float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
+   (float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
+   (float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
+   (float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
+   (float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
+
+
+
+
+
+   (float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
+   (float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
+   (float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
+   (float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
+   (float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
+   (float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
+   (float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
+   (float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
+   (float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
+   (float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
+   (float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
+   (float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
+   (float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
+   (float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
+   (float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
+   (float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
+   (float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
+   (float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
+   (float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
+   (float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
+   (float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
+   (float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
+   (float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
+   (float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
+   (float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
+   (float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
+   (float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
+   (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
+   (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
+   };
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
new file mode 100644
index 0000000..3487d52
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/constants.h
@@ -0,0 +1,80 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       constants.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_CONSTANTS_H
+   #define __iLBC_CONSTANTS_H
+
+   #include "iLBC_define.h"
+
+
+   /* ULP bit allocation */
+
+
+
+
+
+
+   extern const iLBC_ULP_Inst_t ULP_20msTbl;
+   extern const iLBC_ULP_Inst_t ULP_30msTbl;
+
+   /* high pass filters */
+
+   extern float hpi_zero_coefsTbl[];
+   extern float hpi_pole_coefsTbl[];
+   extern float hpo_zero_coefsTbl[];
+   extern float hpo_pole_coefsTbl[];
+
+   /* low pass filters */
+   extern float lpFilt_coefsTbl[];
+
+   /* LPC analysis and quantization */
+
+   extern float lpc_winTbl[];
+   extern float lpc_asymwinTbl[];
+   extern float lpc_lagwinTbl[];
+   extern float lsfCbTbl[];
+   extern float lsfmeanTbl[];
+   extern int   dim_lsfCbTbl[];
+   extern int   size_lsfCbTbl[];
+   extern float lsf_weightTbl_30ms[];
+   extern float lsf_weightTbl_20ms[];
+
+   /* state quantization tables */
+
+   extern float state_sq3Tbl[];
+   extern float state_frgqTbl[];
+
+   /* gain quantization tables */
+
+   extern float gain_sq3Tbl[];
+   extern float gain_sq4Tbl[];
+   extern float gain_sq5Tbl[];
+
+   /* adaptive codebook definitions */
+
+   extern int search_rangeTbl[5][CB_NSTAGES];
+   extern int memLfTbl[];
+   extern int stMemLTbl;
+   extern float cbfiltersTbl[CB_FILTERLEN];
+
+   /* enhancer definitions */
+
+   extern float polyphaserTbl[];
+   extern float enh_plocsTbl[];
+
+
+
+
+
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
new file mode 100644
index 0000000..aefacf2
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.c
@@ -0,0 +1,231 @@
+
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       createCB.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+
+
+
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include <string.h>
+   #include <math.h>
+
+   /*----------------------------------------------------------------*
+    *  Construct an additional codebook vector by filtering the
+    *  initial codebook buffer. This vector is then used to expand
+    *  the codebook with an additional section.
+    *---------------------------------------------------------------*/
+
+   void filteredCBvecs(
+       float *cbvectors,   /* (o) Codebook vectors for the
+                                  higher section */
+       float *mem,         /* (i) Buffer to create codebook
+                                  vector from */
+       int lMem        /* (i) Length of buffer */
+   ){
+       int j, k;
+       float *pp, *pp1;
+       float tempbuff2[CB_MEML+CB_FILTERLEN];
+       float *pos;
+
+       memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
+       memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
+       memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0,
+           (CB_HALFFILTERLEN+1)*sizeof(float));
+
+       /* Create codebook vector for higher section by filtering */
+
+       /* do filtering */
+       pos=cbvectors;
+       memset(pos, 0, lMem*sizeof(float));
+       for (k=0; k<lMem; k++) {
+           pp=&tempbuff2[k];
+           pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+           for (j=0;j<CB_FILTERLEN;j++) {
+               (*pos)+=(*pp++)*(*pp1--);
+           }
+           pos++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  Search the augmented part of the codebook to find the best
+    *  measure.
+    *----------------------------------------------------------------*/
+
+
+
+
+
+
+   void searchAugmentedCB(
+       int low,        /* (i) Start index for the search */
+       int high,           /* (i) End index for the search */
+       int stage,          /* (i) Current stage */
+       int startIndex,     /* (i) Codebook index for the first
+                                  aug vector */
+       float *target,      /* (i) Target vector for encoding */
+       float *buffer,      /* (i) Pointer to the end of the buffer for
+                                  augmented codebook construction */
+       float *max_measure, /* (i/o) Currently maximum measure */
+       int *best_index,/* (o) Currently the best index */
+       float *gain,    /* (o) Currently the best gain */
+       float *energy,      /* (o) Energy of augmented codebook
+                                  vectors */
+       float *invenergy/* (o) Inv energy of augmented codebook
+                                  vectors */
+   ) {
+       int icount, ilow, j, tmpIndex;
+       float *pp, *ppo, *ppi, *ppe, crossDot, alfa;
+       float weighted, measure, nrjRecursive;
+       float ftmp;
+
+       /* Compute the energy for the first (low-5)
+          noninterpolated samples */
+       nrjRecursive = (float) 0.0;
+       pp = buffer - low + 1;
+       for (j=0; j<(low-5); j++) {
+           nrjRecursive += ( (*pp)*(*pp) );
+           pp++;
+       }
+       ppe = buffer - low;
+
+
+       for (icount=low; icount<=high; icount++) {
+
+           /* Index of the codebook vector used for retrieving
+              energy values */
+           tmpIndex = startIndex+icount-20;
+
+           ilow = icount-4;
+
+           /* Update the energy recursively to save complexity */
+           nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
+           ppe--;
+           energy[tmpIndex] = nrjRecursive;
+
+           /* Compute cross dot product for the first (low-5)
+              samples */
+
+
+
+
+
+           crossDot = (float) 0.0;
+           pp = buffer-icount;
+           for (j=0; j<ilow; j++) {
+               crossDot += target[j]*(*pp++);
+           }
+
+           /* interpolation */
+           alfa = (float) 0.2;
+           ppo = buffer-4;
+           ppi = buffer-icount-4;
+           for (j=ilow; j<icount; j++) {
+               weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
+               ppo++;
+               ppi++;
+               energy[tmpIndex] += weighted*weighted;
+               crossDot += target[j]*weighted;
+               alfa += (float)0.2;
+           }
+
+           /* Compute energy and cross dot product for the
+              remaining samples */
+           pp = buffer - icount;
+           for (j=icount; j<SUBL; j++) {
+               energy[tmpIndex] += (*pp)*(*pp);
+               crossDot += target[j]*(*pp++);
+           }
+
+           if (energy[tmpIndex]>0.0) {
+               invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
+           } else {
+               invenergy[tmpIndex] = (float) 0.0;
+           }
+
+           if (stage==0) {
+               measure = (float)-10000000.0;
+
+               if (crossDot > 0.0) {
+                   measure = crossDot*crossDot*invenergy[tmpIndex];
+               }
+           }
+           else {
+               measure = crossDot*crossDot*invenergy[tmpIndex];
+           }
+
+           /* check if measure is better */
+           ftmp = crossDot*invenergy[tmpIndex];
+
+           if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+
+
+
+
+
+               *best_index = tmpIndex;
+               *max_measure = measure;
+               *gain = ftmp;
+           }
+       }
+   }
+
+
+   /*----------------------------------------------------------------*
+    *  Recreate a specific codebook vector from the augmented part.
+    *
+    *----------------------------------------------------------------*/
+
+   void createAugmentedVec(
+       int index,      /* (i) Index for the augmented vector
+                              to be created */
+       float *buffer,  /* (i) Pointer to the end of the buffer for
+                              augmented codebook construction */
+       float *cbVec/* (o) The construced codebook vector */
+   ) {
+       int ilow, j;
+       float *pp, *ppo, *ppi, alfa, alfa1, weighted;
+
+       ilow = index-5;
+
+       /* copy the first noninterpolated part */
+
+       pp = buffer-index;
+       memcpy(cbVec,pp,sizeof(float)*index);
+
+       /* interpolation */
+
+       alfa1 = (float)0.2;
+       alfa = 0.0;
+       ppo = buffer-5;
+       ppi = buffer-index-5;
+       for (j=ilow; j<index; j++) {
+           weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
+           ppo++;
+           ppi++;
+           cbVec[j] = weighted;
+           alfa += alfa1;
+       }
+
+       /* copy the second noninterpolated part */
+
+       pp = buffer - index;
+       memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
+
+
+
+
+
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
new file mode 100644
index 0000000..eda547c
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/createCB.h
@@ -0,0 +1,58 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       createCB.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_CREATECB_H
+   #define __iLBC_CREATECB_H
+
+   void filteredCBvecs(
+       float *cbvectors,   /* (o) Codebook vector for the
+                                  higher section */
+
+
+
+
+
+       float *mem,         /* (i) Buffer to create codebook
+                                  vectors from */
+       int lMem        /* (i) Length of buffer */
+   );
+
+   void searchAugmentedCB(
+       int low,        /* (i) Start index for the search */
+       int high,           /* (i) End index for the search */
+       int stage,          /* (i) Current stage */
+       int startIndex,     /* (i) CB index for the first
+                                  augmented vector */
+       float *target,      /* (i) Target vector for encoding */
+       float *buffer,      /* (i) Pointer to the end of the
+                                  buffer for augmented codebook
+                                  construction */
+       float *max_measure, /* (i/o) Currently maximum measure */
+       int *best_index,/* (o) Currently the best index */
+       float *gain,    /* (o) Currently the best gain */
+       float *energy,      /* (o) Energy of augmented
+                                  codebook vectors */
+       float *invenergy/* (o) Inv energy of aug codebook
+                                  vectors */
+   );
+
+   void createAugmentedVec(
+       int index,          /* (i) Index for the aug vector
+                                  to be created */
+       float *buffer,      /* (i) Pointer to the end of the
+                                  buffer for augmented codebook
+                                  construction */
+       float *cbVec    /* (o) The construced codebook vector */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
new file mode 100644
index 0000000..adbfac7
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c
@@ -0,0 +1,270 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       doCPLC.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+   #include <stdio.h>
+
+
+
+
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  Compute cross correlation and pitch gain for pitch prediction
+    *  of last subframe at given lag.
+    *---------------------------------------------------------------*/
+
+   void compCorr(
+       float *cc,      /* (o) cross correlation coefficient */
+       float *gc,      /* (o) gain */
+       float *pm,
+       float *buffer,  /* (i) signal buffer */
+       int lag,    /* (i) pitch lag */
+       int bLen,       /* (i) length of buffer */
+       int sRange      /* (i) correlation search length */
+   ){
+       int i;
+       float ftmp1, ftmp2, ftmp3;
+
+       /* Guard against getting outside buffer */
+       if ((bLen-sRange-lag)<0) {
+           sRange=bLen-lag;
+       }
+
+       ftmp1 = 0.0;
+       ftmp2 = 0.0;
+       ftmp3 = 0.0;
+       for (i=0; i<sRange; i++) {
+           ftmp1 += buffer[bLen-sRange+i] *
+               buffer[bLen-sRange+i-lag];
+           ftmp2 += buffer[bLen-sRange+i-lag] *
+                   buffer[bLen-sRange+i-lag];
+           ftmp3 += buffer[bLen-sRange+i] *
+                   buffer[bLen-sRange+i];
+       }
+
+       if (ftmp2 > 0.0) {
+           *cc = ftmp1*ftmp1/ftmp2;
+           *gc = (float)fabs(ftmp1/ftmp2);
+           *pm=(float)fabs(ftmp1)/
+               ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
+       }
+       else {
+           *cc = 0.0;
+           *gc = 0.0;
+           *pm=0.0;
+       }
+   }
+
+
+
+
+
+   /*----------------------------------------------------------------*
+    *  Packet loss concealment routine. Conceals a residual signal
+    *  and LP parameters. If no packet loss, update state.
+    *---------------------------------------------------------------*/
+
+   void doThePLC(
+       float *PLCresidual, /* (o) concealed residual */
+       float *PLClpc,      /* (o) concealed LP parameters */
+       int PLI,        /* (i) packet loss indicator
+                                  0 - no PL, 1 = PL */
+       float *decresidual, /* (i) decoded residual */
+       float *lpc,         /* (i) decoded LPC (only used for no PL) */
+       int inlag,          /* (i) pitch lag */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) decoder instance */
+   ){
+       int lag=20, randlag;
+       float gain, maxcc;
+       float use_gain;
+       float gain_comp, maxcc_comp, per, max_per;
+       int i, pick, use_lag;
+       float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
+
+       /* Packet Loss */
+
+       if (PLI == 1) {
+
+           iLBCdec_inst->consPLICount += 1;
+
+           /* if previous frame not lost,
+              determine pitch pred. gain */
+
+           if (iLBCdec_inst->prevPLI != 1) {
+
+               /* Search around the previous lag to find the
+                  best pitch period */
+
+               lag=inlag-3;
+               compCorr(&maxcc, &gain, &max_per,
+                   iLBCdec_inst->prevResidual,
+                   lag, iLBCdec_inst->blockl, 60);
+               for (i=inlag-2;i<=inlag+3;i++) {
+                   compCorr(&maxcc_comp, &gain_comp, &per,
+                       iLBCdec_inst->prevResidual,
+                       i, iLBCdec_inst->blockl, 60);
+
+                   if (maxcc_comp>maxcc) {
+                       maxcc=maxcc_comp;
+
+
+
+
+
+                       gain=gain_comp;
+                       lag=i;
+                       max_per=per;
+                   }
+               }
+
+           }
+
+           /* previous frame lost, use recorded lag and periodicity */
+
+           else {
+               lag=iLBCdec_inst->prevLag;
+               max_per=iLBCdec_inst->per;
+           }
+
+           /* downscaling */
+
+           use_gain=1.0;
+           if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
+               use_gain=(float)0.9;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>2*320)
+               use_gain=(float)0.7;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>3*320)
+               use_gain=(float)0.5;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>4*320)
+               use_gain=(float)0.0;
+
+           /* mix noise and pitch repeatition */
+           ftmp=(float)sqrt(max_per);
+           if (ftmp>(float)0.7)
+               pitchfact=(float)1.0;
+           else if (ftmp>(float)0.4)
+               pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
+           else
+               pitchfact=0.0;
+
+
+           /* avoid repetition of same pitch cycle */
+           use_lag=lag;
+           if (lag<80) {
+               use_lag=2*lag;
+           }
+
+           /* compute concealed residual */
+
+
+
+
+
+
+           energy = 0.0;
+           for (i=0; i<iLBCdec_inst->blockl; i++) {
+
+               /* noise component */
+
+               iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) &
+                   (0x80000000L-1);
+               randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
+               pick = i - randlag;
+
+               if (pick < 0) {
+                   randvec[i] =
+                       iLBCdec_inst->prevResidual[
+                                   iLBCdec_inst->blockl+pick];
+               } else {
+                   randvec[i] =  randvec[pick];
+               }
+
+               /* pitch repeatition component */
+               pick = i - use_lag;
+
+               if (pick < 0) {
+                   PLCresidual[i] =
+                       iLBCdec_inst->prevResidual[
+                                   iLBCdec_inst->blockl+pick];
+               } else {
+                   PLCresidual[i] = PLCresidual[pick];
+               }
+
+               /* mix random and periodicity component */
+
+               if (i<80)
+                   PLCresidual[i] = use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+               else if (i<160)
+                   PLCresidual[i] = (float)0.95*use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+               else
+                   PLCresidual[i] = (float)0.9*use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+
+               energy += PLCresidual[i] * PLCresidual[i];
+           }
+
+           /* less than 30 dB, use only noise */
+
+
+
+
+
+
+           if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) {
+               gain=0.0;
+               for (i=0; i<iLBCdec_inst->blockl; i++) {
+                   PLCresidual[i] = randvec[i];
+               }
+           }
+
+           /* use old LPC */
+
+           memcpy(PLClpc,iLBCdec_inst->prevLpc,
+               (LPC_FILTERORDER+1)*sizeof(float));
+
+       }
+
+       /* no packet loss, copy input */
+
+       else {
+           memcpy(PLCresidual, decresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+           memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
+           iLBCdec_inst->consPLICount = 0;
+       }
+
+       /* update state */
+
+       if (PLI) {
+           iLBCdec_inst->prevLag = lag;
+           iLBCdec_inst->per=max_per;
+       }
+
+       iLBCdec_inst->prevPLI = PLI;
+       memcpy(iLBCdec_inst->prevLpc, PLClpc,
+           (LPC_FILTERORDER+1)*sizeof(float));
+       memcpy(iLBCdec_inst->prevResidual, PLCresidual,
+           iLBCdec_inst->blockl*sizeof(float));
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
new file mode 100644
index 0000000..2bda7a1
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h
@@ -0,0 +1,29 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       doCPLC.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_DOLPC_H
+   #define __iLBC_DOLPC_H
+
+   void doThePLC(
+       float *PLCresidual, /* (o) concealed residual */
+       float *PLClpc,      /* (o) concealed LP parameters */
+       int PLI,        /* (i) packet loss indicator
+                                  0 - no PL, 1 = PL */
+       float *decresidual, /* (i) decoded residual */
+       float *lpc,         /* (i) decoded LPC (only used for no PL) */
+       int inlag,          /* (i) pitch lag */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) decoder instance */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
new file mode 100644
index 0000000..1770207
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.c
@@ -0,0 +1,701 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       enhancer.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    * Find index in array such that the array element with said
+    * index is the element of said array closest to "value"
+    * according to the squared-error criterion
+    *---------------------------------------------------------------*/
+
+   void NearestNeighbor(
+
+
+
+
+
+       int   *index,   /* (o) index of array element closest
+                              to value */
+       float *array,   /* (i) data array */
+       float value,/* (i) value */
+       int arlength/* (i) dimension of data array */
+   ){
+       int i;
+       float bestcrit,crit;
+
+       crit=array[0]-value;
+       bestcrit=crit*crit;
+       *index=0;
+       for (i=1; i<arlength; i++) {
+           crit=array[i]-value;
+           crit=crit*crit;
+
+           if (crit<bestcrit) {
+               bestcrit=crit;
+               *index=i;
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * compute cross correlation between sequences
+    *---------------------------------------------------------------*/
+
+   void mycorr1(
+       float* corr,    /* (o) correlation of seq1 and seq2 */
+       float* seq1,    /* (i) first sequence */
+       int dim1,           /* (i) dimension first seq1 */
+       const float *seq2,  /* (i) second sequence */
+       int dim2        /* (i) dimension seq2 */
+   ){
+       int i,j;
+
+       for (i=0; i<=dim1-dim2; i++) {
+           corr[i]=0.0;
+           for (j=0; j<dim2; j++) {
+               corr[i] += seq1[i+j] * seq2[j];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * upsample finite array assuming zeros outside bounds
+    *---------------------------------------------------------------*/
+
+
+
+
+
+
+   void enh_upsample(
+       float* useq1,   /* (o) upsampled output sequence */
+       float* seq1,/* (i) unupsampled sequence */
+       int dim1,       /* (i) dimension seq1 */
+       int hfl         /* (i) polyphase filter length=2*hfl+1 */
+   ){
+       float *pu,*ps;
+       int i,j,k,q,filterlength,hfl2;
+       const float *polyp[ENH_UPS0]; /* pointers to
+                                        polyphase columns */
+       const float *pp;
+
+       /* define pointers for filter */
+
+       filterlength=2*hfl+1;
+
+       if ( filterlength > dim1 ) {
+           hfl2=(int) (dim1/2);
+           for (j=0; j<ENH_UPS0; j++) {
+               polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
+           }
+           hfl=hfl2;
+           filterlength=2*hfl+1;
+       }
+       else {
+           for (j=0; j<ENH_UPS0; j++) {
+               polyp[j]=polyphaserTbl+j*filterlength;
+           }
+       }
+
+       /* filtering: filter overhangs left side of sequence */
+
+       pu=useq1;
+       for (i=hfl; i<filterlength; i++) {
+           for (j=0; j<ENH_UPS0; j++) {
+               *pu=0.0;
+               pp = polyp[j];
+               ps = seq1+i;
+               for (k=0; k<=i; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+
+       /* filtering: simple convolution=inner products */
+
+       for (i=filterlength; i<dim1; i++) {
+
+
+
+
+
+           for (j=0;j<ENH_UPS0; j++){
+               *pu=0.0;
+               pp = polyp[j];
+               ps = seq1+i;
+               for (k=0; k<filterlength; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+
+       /* filtering: filter overhangs right side of sequence */
+
+       for (q=1; q<=hfl; q++) {
+           for (j=0; j<ENH_UPS0; j++) {
+               *pu=0.0;
+               pp = polyp[j]+q;
+               ps = seq1+dim1-1;
+               for (k=0; k<filterlength-q; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+   }
+
+
+   /*----------------------------------------------------------------*
+    * find segment starting near idata+estSegPos that has highest
+    * correlation with idata+centerStartPos through
+    * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a
+    * resolution of ENH_UPSO times the original of the original
+    * sampling rate
+    *---------------------------------------------------------------*/
+
+   void refiner(
+       float *seg,         /* (o) segment array */
+       float *updStartPos, /* (o) updated start point */
+       float* idata,       /* (i) original data buffer */
+       int idatal,         /* (i) dimension of idata */
+       int centerStartPos, /* (i) beginning center segment */
+       float estSegPos,/* (i) estimated beginning other segment */
+       float period    /* (i) estimated pitch period */
+   ){
+       int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
+       int tloc,tloc2,i,st,en,fraction;
+       float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
+       float corrVecUps[ENH_CORRDIM*ENH_UPS0];
+
+
+
+
+
+       /* defining array bounds */
+
+       estSegPosRounded=(int)(estSegPos - 0.5);
+
+       searchSegStartPos=estSegPosRounded-ENH_SLOP;
+
+       if (searchSegStartPos<0) {
+           searchSegStartPos=0;
+       }
+       searchSegEndPos=estSegPosRounded+ENH_SLOP;
+
+       if (searchSegEndPos+ENH_BLOCKL >= idatal) {
+           searchSegEndPos=idatal-ENH_BLOCKL-1;
+       }
+       corrdim=searchSegEndPos-searchSegStartPos+1;
+
+       /* compute upsampled correlation (corr33) and find
+          location of max */
+
+       mycorr1(corrVec,idata+searchSegStartPos,
+           corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
+       enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
+       tloc=0; maxv=corrVecUps[0];
+       for (i=1; i<ENH_UPS0*corrdim; i++) {
+
+           if (corrVecUps[i]>maxv) {
+               tloc=i;
+               maxv=corrVecUps[i];
+           }
+       }
+
+       /* make vector can be upsampled without ever running outside
+          bounds */
+
+       *updStartPos= (float)searchSegStartPos +
+           (float)tloc/(float)ENH_UPS0+(float)1.0;
+       tloc2=(int)(tloc/ENH_UPS0);
+
+       if (tloc>tloc2*ENH_UPS0) {
+           tloc2++;
+       }
+       st=searchSegStartPos+tloc2-ENH_FL0;
+
+       if (st<0) {
+           memset(vect,0,-st*sizeof(float));
+           memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
+       }
+       else {
+
+
+
+
+
+           en=st+ENH_VECTL;
+
+           if (en>idatal) {
+               memcpy(vect, &idata[st],
+                   (ENH_VECTL-(en-idatal))*sizeof(float));
+               memset(&vect[ENH_VECTL-(en-idatal)], 0,
+                   (en-idatal)*sizeof(float));
+           }
+           else {
+               memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
+           }
+       }
+       fraction=tloc2*ENH_UPS0-tloc;
+
+       /* compute the segment (this is actually a convolution) */
+
+       mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
+           2*ENH_FL0+1);
+   }
+
+   /*----------------------------------------------------------------*
+    * find the smoothed output data
+    *---------------------------------------------------------------*/
+
+   void smath(
+       float *odata,   /* (o) smoothed output */
+       float *sseq,/* (i) said second sequence of waveforms */
+       int hl,         /* (i) 2*hl+1 is sseq dimension */
+       float alpha0/* (i) max smoothing energy fraction */
+   ){
+       int i,k;
+       float w00,w10,w11,A,B,C,*psseq,err,errs;
+       float surround[BLOCKL_MAX]; /* shape contributed by other than
+                                      current */
+       float wt[2*ENH_HL+1];       /* waveform weighting to get
+                                      surround shape */
+       float denom;
+
+       /* create shape of contribution from all waveforms except the
+          current one */
+
+       for (i=1; i<=2*hl+1; i++) {
+           wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2)));
+       }
+       wt[hl]=0.0; /* for clarity, not used */
+       for (i=0; i<ENH_BLOCKL; i++) {
+           surround[i]=sseq[i]*wt[0];
+       }
+
+
+
+
+
+       for (k=1; k<hl; k++) {
+           psseq=sseq+k*ENH_BLOCKL;
+           for(i=0;i<ENH_BLOCKL; i++) {
+               surround[i]+=psseq[i]*wt[k];
+           }
+       }
+       for (k=hl+1; k<=2*hl; k++) {
+           psseq=sseq+k*ENH_BLOCKL;
+           for(i=0;i<ENH_BLOCKL; i++) {
+               surround[i]+=psseq[i]*wt[k];
+           }
+       }
+
+       /* compute some inner products */
+
+       w00 = w10 = w11 = 0.0;
+       psseq=sseq+hl*ENH_BLOCKL; /* current block  */
+       for (i=0; i<ENH_BLOCKL;i++) {
+           w00+=psseq[i]*psseq[i];
+           w11+=surround[i]*surround[i];
+           w10+=surround[i]*psseq[i];
+       }
+
+       if (fabs(w11) < 1.0) {
+           w11=1.0;
+       }
+       C = (float)sqrt( w00/w11);
+
+       /* first try enhancement without power-constraint */
+
+       errs=0.0;
+       psseq=sseq+hl*ENH_BLOCKL;
+       for (i=0; i<ENH_BLOCKL; i++) {
+           odata[i]=C*surround[i];
+           err=psseq[i]-odata[i];
+           errs+=err*err;
+       }
+
+       /* if constraint violated by first try, add constraint */
+
+       if (errs > alpha0 * w00) {
+           if ( w00 < 1) {
+               w00=1;
+           }
+           denom = (w11*w00-w10*w10)/(w00*w00);
+
+           if (denom > 0.0001) { /* eliminates numerical problems
+                                    for if smooth */
+
+
+
+
+
+               A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
+               B = -alpha0/2 - A * w10/w00;
+               B = B+1;
+           }
+           else { /* essentially no difference between cycles;
+                     smoothing not needed */
+               A= 0.0;
+               B= 1.0;
+           }
+
+           /* create smoothed sequence */
+
+           psseq=sseq+hl*ENH_BLOCKL;
+           for (i=0; i<ENH_BLOCKL; i++) {
+               odata[i]=A*surround[i]+B*psseq[i];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * get the pitch-synchronous sample sequence
+    *---------------------------------------------------------------*/
+
+   void getsseq(
+       float *sseq,    /* (o) the pitch-synchronous sequence */
+       float *idata,       /* (i) original data */
+       int idatal,         /* (i) dimension of data */
+       int centerStartPos, /* (i) where current block starts */
+       float *period,      /* (i) rough-pitch-period array */
+       float *plocs,       /* (i) where periods of period array
+                                  are taken */
+       int periodl,    /* (i) dimension period array */
+       int hl              /* (i) 2*hl+1 is the number of sequences */
+   ){
+       int i,centerEndPos,q;
+       float blockStartPos[2*ENH_HL+1];
+       int lagBlock[2*ENH_HL+1];
+       float plocs2[ENH_PLOCSL];
+       float *psseq;
+
+       centerEndPos=centerStartPos+ENH_BLOCKL-1;
+
+       /* present */
+
+       NearestNeighbor(lagBlock+hl,plocs,
+           (float)0.5*(centerStartPos+centerEndPos),periodl);
+
+       blockStartPos[hl]=(float)centerStartPos;
+
+
+
+
+
+       psseq=sseq+ENH_BLOCKL*hl;
+       memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
+
+       /* past */
+
+       for (q=hl-1; q>=0; q--) {
+           blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
+           NearestNeighbor(lagBlock+q,plocs,
+               blockStartPos[q]+
+               ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
+
+
+           if (blockStartPos[q]-ENH_OVERHANG>=0) {
+               refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
+                   idatal, centerStartPos, blockStartPos[q],
+                   period[lagBlock[q+1]]);
+           } else {
+               psseq=sseq+q*ENH_BLOCKL;
+               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
+           }
+       }
+
+       /* future */
+
+       for (i=0; i<periodl; i++) {
+           plocs2[i]=plocs[i]-period[i];
+       }
+       for (q=hl+1; q<=2*hl; q++) {
+           NearestNeighbor(lagBlock+q,plocs2,
+               blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
+
+           blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
+           if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
+               refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
+                   idatal, centerStartPos, blockStartPos[q],
+                   period[lagBlock[q]]);
+           }
+           else {
+               psseq=sseq+q*ENH_BLOCKL;
+               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * perform enhancement on idata+centerStartPos through
+    * idata+centerStartPos+ENH_BLOCKL-1
+    *---------------------------------------------------------------*/
+
+
+
+
+
+   void enhancer(
+       float *odata,       /* (o) smoothed block, dimension blockl */
+       float *idata,       /* (i) data buffer used for enhancing */
+       int idatal,         /* (i) dimension idata */
+       int centerStartPos, /* (i) first sample current block
+                                  within idata */
+       float alpha0,       /* (i) max correction-energy-fraction
+                                 (in [0,1]) */
+       float *period,      /* (i) pitch period array */
+       float *plocs,       /* (i) locations where period array
+                                  values valid */
+       int periodl         /* (i) dimension of period and plocs */
+   ){
+       float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
+
+       /* get said second sequence of segments */
+
+       getsseq(sseq,idata,idatal,centerStartPos,period,
+           plocs,periodl,ENH_HL);
+
+       /* compute the smoothed output from said second sequence */
+
+       smath(odata,sseq,ENH_HL,alpha0);
+
+   }
+
+   /*----------------------------------------------------------------*
+    * cross correlation
+    *---------------------------------------------------------------*/
+
+   float xCorrCoef(
+       float *target,      /* (i) first array */
+       float *regressor,   /* (i) second array */
+       int subl        /* (i) dimension arrays */
+   ){
+       int i;
+       float ftmp1, ftmp2;
+
+       ftmp1 = 0.0;
+       ftmp2 = 0.0;
+       for (i=0; i<subl; i++) {
+           ftmp1 += target[i]*regressor[i];
+           ftmp2 += regressor[i]*regressor[i];
+       }
+
+       if (ftmp1 > 0.0) {
+           return (float)(ftmp1*ftmp1/ftmp2);
+       }
+
+
+
+
+
+       else {
+           return (float)0.0;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * interface for enhancer
+    *---------------------------------------------------------------*/
+
+   int enhancerInterface(
+       float *out,                     /* (o) enhanced signal */
+       float *in,                      /* (i) unenhanced signal */
+       iLBC_Dec_Inst_t *iLBCdec_inst   /* (i) buffers etc */
+   ){
+       float *enh_buf, *enh_period;
+       int iblock, isample;
+       int lag=0, ilag, i, ioffset;
+       float cc, maxcc;
+       float ftmp1, ftmp2;
+       float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
+       float plc_pred[ENH_BLOCKL];
+
+       float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
+       int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
+       int start, plc_blockl, inlag;
+
+       enh_buf=iLBCdec_inst->enh_buf;
+       enh_period=iLBCdec_inst->enh_period;
+
+       memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
+           (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
+
+       memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
+           iLBCdec_inst->blockl*sizeof(float));
+
+       if (iLBCdec_inst->mode==30)
+           plc_blockl=ENH_BLOCKL;
+       else
+           plc_blockl=40;
+
+       /* when 20 ms frame, move processing one block */
+       ioffset=0;
+       if (iLBCdec_inst->mode==20) ioffset=1;
+
+       i=3-ioffset;
+       memmove(enh_period, &enh_period[i],
+           (ENH_NBLOCKS_TOT-i)*sizeof(float));
+
+
+
+
+
+
+       /* Set state information to the 6 samples right before
+          the samples to be downsampled. */
+
+       memcpy(lpState,
+           enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126,
+           6*sizeof(float));
+
+       /* Down sample a factor 2 to save computations */
+
+       DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
+                   lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
+                   lpState, downsampled);
+
+       /* Estimate the pitch in the down sampled domain. */
+       for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
+
+           lag = 10;
+           maxcc = xCorrCoef(downsampled+60+iblock*
+               ENH_BLOCKL_HALF, downsampled+60+iblock*
+               ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
+           for (ilag=11; ilag<60; ilag++) {
+               cc = xCorrCoef(downsampled+60+iblock*
+                   ENH_BLOCKL_HALF, downsampled+60+iblock*
+                   ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+
+           /* Store the estimated lag in the non-downsampled domain */
+           enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
+
+
+       }
+
+
+       /* PLC was performed on the previous packet */
+       if (iLBCdec_inst->prev_enh_pl==1) {
+
+           inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
+
+           lag = inlag-1;
+           maxcc = xCorrCoef(in, in+lag, plc_blockl);
+           for (ilag=inlag; ilag<=inlag+1; ilag++) {
+               cc = xCorrCoef(in, in+ilag, plc_blockl);
+
+
+
+
+
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+
+           enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
+
+           /* compute new concealed residual for the old lookahead,
+              mix the forward PLC with a backward PLC from
+              the new frame */
+
+           inPtr=&in[lag-1];
+
+           enh_bufPtr1=&plc_pred[plc_blockl-1];
+
+           if (lag>plc_blockl) {
+               start=plc_blockl;
+           } else {
+               start=lag;
+           }
+
+           for (isample = start; isample>0; isample--) {
+               *enh_bufPtr1-- = *inPtr--;
+           }
+
+           enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
+           for (isample = (plc_blockl-1-lag); isample>=0; isample--) {
+               *enh_bufPtr1-- = *enh_bufPtr2--;
+           }
+
+           /* limit energy change */
+           ftmp2=0.0;
+           ftmp1=0.0;
+           for (i=0;i<plc_blockl;i++) {
+               ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
+                   enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
+               ftmp1+=plc_pred[i]*plc_pred[i];
+           }
+           ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
+           ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
+           if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
+               for (i=0;i<plc_blockl-10;i++) {
+                   plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
+               }
+               for (i=plc_blockl-10;i<plc_blockl;i++) {
+                   plc_pred[i]*=(float)(i-plc_blockl+10)*
+                       ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
+
+
+
+
+
+                       (float)2.0*ftmp2/ftmp1;
+               }
+           }
+
+           enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
+           for (i=0; i<plc_blockl; i++) {
+               ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
+               *enh_bufPtr1 *= ftmp1;
+               *enh_bufPtr1 += ((float)1.0-ftmp1)*
+                                   plc_pred[plc_blockl-1-i];
+               enh_bufPtr1--;
+           }
+       }
+
+       if (iLBCdec_inst->mode==20) {
+           /* Enhancer with 40 samples delay */
+           for (iblock = 0; iblock<2; iblock++) {
+               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
+                   ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
+                   ENH_ALPHA0, enh_period, enh_plocsTbl,
+                       ENH_NBLOCKS_TOT);
+           }
+       } else if (iLBCdec_inst->mode==30) {
+           /* Enhancer with 80 samples delay */
+           for (iblock = 0; iblock<3; iblock++) {
+               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
+                   ENH_BUFL, (4+iblock)*ENH_BLOCKL,
+                   ENH_ALPHA0, enh_period, enh_plocsTbl,
+                       ENH_NBLOCKS_TOT);
+           }
+       }
+
+       return (lag*2);
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
new file mode 100644
index 0000000..8a081fb
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/enhancer.h
@@ -0,0 +1,36 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       enhancer.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+
+
+
+
+   ******************************************************************/
+
+   #ifndef __ENHANCER_H
+   #define __ENHANCER_H
+
+   #include "iLBC_define.h"
+
+   float xCorrCoef(
+       float *target,      /* (i) first array */
+       float *regressor,   /* (i) second array */
+       int subl        /* (i) dimension arrays */
+   );
+
+   int enhancerInterface(
+       float *out,         /* (o) the enhanced recidual signal */
+       float *in,          /* (i) the recidual signal to enhance */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) the decoder state structure */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
new file mode 100644
index 0000000..e4b07bc
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk
@@ -0,0 +1,24 @@
+BEGIN { srcname = "nothing"; }
+{ if (/^A\.[0-9][0-9]*\.* *[a-zA-Z][a-zA-Z_0-9]*\.[ch]/) {
+    if (srcname != "nothing")
+      close(srcname);
+    srcname = $2;
+    printf("creating source file %s\n", srcname);
+  }else if (srcname != "nothing") {
+    if (/Andersen,* *et* *al\./) 
+      printf("skipping %s\n", $0);
+    else if (//)
+      printf("skipping2 %s\n", $0);
+    else if (/Internet Low Bit Rate Codec *December 2004/)
+      printf("skipping3 %s\n", $0);
+    else if (/Authors' *Addresses/){
+      close(srcname);
+      exit;}
+    else
+      print $0 >> srcname;
+  }
+}
+END {
+  printf("ending file %s\n", srcname);
+  close(srcname);
+}
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
new file mode 100644
index 0000000..6565c2b
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.c
@@ -0,0 +1,175 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       filter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  all-pole filter
+    *---------------------------------------------------------------*/
+
+   void AllPoleFilter(
+       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
+                              InOut[-1] contain the state of the
+                              filter (delayed samples). InOut[0] to
+                              InOut[lengthInOut-1] contain the filter
+                              input, on en exit InOut[-orderCoef] to
+                              InOut[-1] is unchanged and InOut[0] to
+                              InOut[lengthInOut-1] contain filtered
+                              samples */
+       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
+                              to be 1.0 */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef   /* (i) number of filter coefficients */
+   ){
+       int n,k;
+
+       for(n=0;n<lengthInOut;n++){
+           for(k=1;k<=orderCoef;k++){
+               *InOut -= Coef[k]*InOut[-k];
+
+
+
+
+
+           }
+           InOut++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  all-zero filter
+    *---------------------------------------------------------------*/
+
+   void AllZeroFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples */
+       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
+                              to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain the filter state, on exit Out[0]
+                              to Out[lengthInOut-1] contain filtered
+                              samples */
+   ){
+       int n,k;
+
+       for(n=0;n<lengthInOut;n++){
+           *Out = Coef[0]*In[0];
+           for(k=1;k<=orderCoef;k++){
+               *Out += Coef[k]*In[-k];
+           }
+           Out++;
+           In++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  pole-zero filter
+    *---------------------------------------------------------------*/
+
+   void ZeroPoleFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples In[-orderCoef] to
+                              In[-1] contain state of all-zero
+                              section */
+       float *ZeroCoef,/* (i) filter coefficients for all-zero
+                              section (ZeroCoef[0] is assumed to
+                              be 1.0) */
+       float *PoleCoef,/* (i) filter coefficients for all-pole section
+                              (ZeroCoef[0] is assumed to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+
+
+
+
+
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain state of all-pole section. On
+                              exit Out[0] to Out[lengthInOut-1]
+                              contain filtered samples */
+   ){
+       AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
+       AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
+   }
+
+   /*----------------------------------------------------------------*
+    * downsample (LP filter and decimation)
+    *---------------------------------------------------------------*/
+
+   void DownSample (
+       float  *In,     /* (i) input samples */
+       float  *Coef,   /* (i) filter coefficients */
+       int lengthIn,   /* (i) number of input samples */
+       float  *state,  /* (i) filter state */
+       float  *Out     /* (o) downsampled output */
+   ){
+       float   o;
+       float *Out_ptr = Out;
+       float *Coef_ptr, *In_ptr;
+       float *state_ptr;
+       int i, j, stop;
+
+       /* LP filter and decimate at the same time */
+
+       for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
+       {
+           Coef_ptr = &Coef[0];
+           In_ptr = &In[i];
+           state_ptr = &state[FILTERORDER_DS-2];
+
+           o = (float)0.0;
+
+           stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
+
+           for (j = 0; j < stop; j++)
+           {
+               o += *Coef_ptr++ * (*In_ptr--);
+           }
+           for (j = i + 1; j < FILTERORDER_DS; j++)
+           {
+               o += *Coef_ptr++ * (*state_ptr--);
+           }
+
+
+
+
+
+
+           *Out_ptr++ = o;
+       }
+
+       /* Get the last part (use zeros as input for the future) */
+
+       for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS);
+               i+=FACTOR_DS) {
+
+           o=(float)0.0;
+
+           if (i<lengthIn) {
+               Coef_ptr = &Coef[0];
+               In_ptr = &In[i];
+               for (j=0; j<FILTERORDER_DS; j++) {
+                       o += *Coef_ptr++ * (*Out_ptr--);
+               }
+           } else {
+               Coef_ptr = &Coef[i-lengthIn];
+               In_ptr = &In[lengthIn-1];
+               for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
+                       o += *Coef_ptr++ * (*In_ptr--);
+               }
+           }
+           *Out_ptr++ = o;
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
new file mode 100644
index 0000000..4c512cd
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/filter.h
@@ -0,0 +1,80 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       filter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+
+
+
+
+
+   #ifndef __iLBC_FILTER_H
+   #define __iLBC_FILTER_H
+
+   void AllPoleFilter(
+       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
+                              InOut[-1] contain the state of the
+                              filter (delayed samples). InOut[0] to
+                              InOut[lengthInOut-1] contain the filter
+                              input, on en exit InOut[-orderCoef] to
+                              InOut[-1] is unchanged and InOut[0] to
+                              InOut[lengthInOut-1] contain filtered
+                              samples */
+       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
+                              to be 1.0 */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef   /* (i) number of filter coefficients */
+   );
+
+   void AllZeroFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples */
+       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
+                              to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain the filter state, on exit Out[0]
+                              to Out[lengthInOut-1] contain filtered
+                              samples */
+   );
+
+   void ZeroPoleFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain filter
+                              input samples In[-orderCoef] to In[-1]
+                              contain state of all-zero section */
+       float *ZeroCoef,/* (i) filter coefficients for all-zero
+                              section (ZeroCoef[0] is assumed to
+                              be 1.0) */
+       float *PoleCoef,/* (i) filter coefficients for all-pole section
+                              (ZeroCoef[0] is assumed to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain state of all-pole section. On
+                              exit Out[0] to Out[lengthInOut-1]
+                              contain filtered samples */
+   );
+
+
+
+
+
+
+   void DownSample (
+       float  *In,     /* (i) input samples */
+       float  *Coef,   /* (i) filter coefficients */
+       int lengthIn,   /* (i) number of input samples */
+       float  *state,  /* (i) filter state */
+       float  *Out     /* (o) downsampled output */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
new file mode 100644
index 0000000..0e74ff8
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.c
@@ -0,0 +1,116 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+
+
+
+
+
+       gainquant.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+   #include <math.h>
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    *  quantizer for the gain in the gain-shape coding of residual
+    *---------------------------------------------------------------*/
+
+   float gainquant(/* (o) quantized gain value */
+       float in,       /* (i) gain value */
+       float maxIn,/* (i) maximum of gain value */
+       int cblen,      /* (i) number of quantization indices */
+       int *index      /* (o) quantization index */
+   ){
+       int i, tindex;
+       float minmeasure,measure, *cb, scale;
+
+       /* ensure a lower bound on the scaling factor */
+
+       scale=maxIn;
+
+       if (scale<0.1) {
+           scale=(float)0.1;
+       }
+
+       /* select the quantization table */
+
+       if (cblen == 8) {
+           cb = gain_sq3Tbl;
+       } else if (cblen == 16) {
+           cb = gain_sq4Tbl;
+       } else  {
+           cb = gain_sq5Tbl;
+       }
+
+       /* select the best index in the quantization table */
+
+       minmeasure=10000000.0;
+       tindex=0;
+       for (i=0; i<cblen; i++) {
+
+
+
+
+
+           measure=(in-scale*cb[i])*(in-scale*cb[i]);
+
+           if (measure<minmeasure) {
+               tindex=i;
+               minmeasure=measure;
+           }
+       }
+       *index=tindex;
+
+       /* return the quantized value */
+
+       return scale*cb[tindex];
+   }
+
+   /*----------------------------------------------------------------*
+    *  decoder for quantized gains in the gain-shape coding of
+    *  residual
+    *---------------------------------------------------------------*/
+
+   float gaindequant(  /* (o) quantized gain value */
+       int index,      /* (i) quantization index */
+       float maxIn,/* (i) maximum of unquantized gain */
+       int cblen       /* (i) number of quantization indices */
+   ){
+       float scale;
+
+       /* obtain correct scale factor */
+
+       scale=(float)fabs(maxIn);
+
+       if (scale<0.1) {
+           scale=(float)0.1;
+       }
+
+       /* select the quantization table and return the decoded value */
+
+       if (cblen==8) {
+           return scale*gain_sq3Tbl[index];
+       } else if (cblen==16) {
+           return scale*gain_sq4Tbl[index];
+       }
+       else if (cblen==32) {
+           return scale*gain_sq5Tbl[index];
+       }
+
+       return 0.0;
+   }
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
new file mode 100644
index 0000000..0d02424
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/gainquant.h
@@ -0,0 +1,30 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       gainquant.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_GAINQUANT_H
+   #define __iLBC_GAINQUANT_H
+
+   float gainquant(/* (o) quantized gain value */
+       float in,       /* (i) gain value */
+       float maxIn,/* (i) maximum of gain value */
+       int cblen,      /* (i) number of quantization indices */
+       int *index      /* (o) quantization index */
+   );
+
+   float gaindequant(  /* (o) quantized gain value */
+       int index,      /* (i) quantization index */
+       float maxIn,/* (i) maximum of unquantized gain */
+       int cblen       /* (i) number of quantization indices */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
new file mode 100644
index 0000000..4f2d291
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c
@@ -0,0 +1,193 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       getCBvec.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include <string.h>
+
+   /*----------------------------------------------------------------*
+    *  Construct codebook vector for given index.
+    *---------------------------------------------------------------*/
+
+   void getCBvec(
+
+
+
+
+
+       float *cbvec,   /* (o) Constructed codebook vector */
+       float *mem,     /* (i) Codebook buffer */
+       int index,      /* (i) Codebook index */
+       int lMem,       /* (i) Length of codebook buffer */
+       int cbveclen/* (i) Codebook vector length */
+   ){
+       int j, k, n, memInd, sFilt;
+       float tmpbuf[CB_MEML];
+       int base_size;
+       int ilow, ihigh;
+       float alfa, alfa1;
+
+       /* Determine size of codebook sections */
+
+       base_size=lMem-cbveclen+1;
+
+       if (cbveclen==SUBL) {
+           base_size+=cbveclen/2;
+       }
+
+       /* No filter -> First codebook section */
+
+       if (index<lMem-cbveclen+1) {
+
+           /* first non-interpolated vectors */
+
+           k=index+cbveclen;
+           /* get vector */
+           memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
+
+       } else if (index < base_size) {
+
+           k=2*(index-(lMem-cbveclen+1))+cbveclen;
+
+           ihigh=k/2;
+           ilow=ihigh-5;
+
+           /* Copy first noninterpolated part */
+
+           memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
+
+           /* interpolation */
+
+           alfa1=(float)0.2;
+           alfa=0.0;
+           for (j=ilow; j<ihigh; j++) {
+               cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
+                   alfa*mem[lMem-k+j];
+
+
+
+
+
+               alfa+=alfa1;
+           }
+
+           /* Copy second noninterpolated part */
+
+           memcpy(cbvec+ihigh, mem+lMem-k+ihigh,
+               (cbveclen-ihigh)*sizeof(float));
+
+       }
+
+       /* Higher codebook section based on filtering */
+
+       else {
+
+           /* first non-interpolated vectors */
+
+           if (index-base_size<lMem-cbveclen+1) {
+               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
+               float *pos;
+               float *pp, *pp1;
+
+               memset(tempbuff2, 0,
+                   CB_HALFFILTERLEN*sizeof(float));
+               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
+                   lMem*sizeof(float));
+               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
+                   (CB_HALFFILTERLEN+1)*sizeof(float));
+
+               k=index-base_size+cbveclen;
+               sFilt=lMem-k;
+               memInd=sFilt+1-CB_HALFFILTERLEN;
+
+               /* do filtering */
+               pos=cbvec;
+               memset(pos, 0, cbveclen*sizeof(float));
+               for (n=0; n<cbveclen; n++) {
+                   pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
+                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+                   for (j=0; j<CB_FILTERLEN; j++) {
+                       (*pos)+=(*pp++)*(*pp1--);
+                   }
+                   pos++;
+               }
+           }
+
+           /* interpolated vectors */
+
+           else {
+
+
+
+
+
+               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
+
+               float *pos;
+               float *pp, *pp1;
+               int i;
+
+               memset(tempbuff2, 0,
+                   CB_HALFFILTERLEN*sizeof(float));
+               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
+                   lMem*sizeof(float));
+               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
+                   (CB_HALFFILTERLEN+1)*sizeof(float));
+
+               k=2*(index-base_size-
+                   (lMem-cbveclen+1))+cbveclen;
+               sFilt=lMem-k;
+               memInd=sFilt+1-CB_HALFFILTERLEN;
+
+               /* do filtering */
+               pos=&tmpbuf[sFilt];
+               memset(pos, 0, k*sizeof(float));
+               for (i=0; i<k; i++) {
+                   pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
+                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+                   for (j=0; j<CB_FILTERLEN; j++) {
+                       (*pos)+=(*pp++)*(*pp1--);
+                   }
+                   pos++;
+               }
+
+               ihigh=k/2;
+               ilow=ihigh-5;
+
+               /* Copy first noninterpolated part */
+
+               memcpy(cbvec, tmpbuf+lMem-k/2,
+                   ilow*sizeof(float));
+
+               /* interpolation */
+
+               alfa1=(float)0.2;
+               alfa=0.0;
+               for (j=ilow; j<ihigh; j++) {
+                   cbvec[j]=((float)1.0-alfa)*
+                       tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
+                   alfa+=alfa1;
+               }
+
+
+
+
+
+
+               /* Copy second noninterpolated part */
+
+               memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh,
+                   (cbveclen-ihigh)*sizeof(float));
+           }
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
new file mode 100644
index 0000000..0080907
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h
@@ -0,0 +1,25 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       getCBvec.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_GETCBVEC_H
+   #define __iLBC_GETCBVEC_H
+
+   void getCBvec(
+       float *cbvec,   /* (o) Constructed codebook vector */
+       float *mem,     /* (i) Codebook buffer */
+       int index,      /* (i) Codebook index */
+       int lMem,       /* (i) Length of codebook buffer */
+       int cbveclen/* (i) Codebook vector length */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
new file mode 100644
index 0000000..1aba657
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.c
@@ -0,0 +1,326 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       helpfun.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  calculation of auto correlation
+    *---------------------------------------------------------------*/
+
+   void autocorr(
+       float *r,       /* (o) autocorrelation vector */
+       const float *x, /* (i) data vector */
+       int N,          /* (i) length of data vector */
+       int order       /* largest lag for calculated
+                          autocorrelations */
+   ){
+       int     lag, n;
+       float   sum;
+
+       for (lag = 0; lag <= order; lag++) {
+           sum = 0;
+           for (n = 0; n < N - lag; n++) {
+               sum += x[n] * x[n+lag];
+           }
+           r[lag] = sum;
+       }
+
+
+
+
+
+   }
+
+   /*----------------------------------------------------------------*
+    *  window multiplication
+    *---------------------------------------------------------------*/
+
+   void window(
+       float *z,       /* (o) the windowed data */
+       const float *x, /* (i) the original data vector */
+       const float *y, /* (i) the window */
+       int N           /* (i) length of all vectors */
+   ){
+       int     i;
+
+       for (i = 0; i < N; i++) {
+           z[i] = x[i] * y[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  levinson-durbin solution for lpc coefficients
+    *---------------------------------------------------------------*/
+
+   void levdurb(
+       float *a,       /* (o) lpc coefficient vector starting
+                              with 1.0 */
+       float *k,       /* (o) reflection coefficients */
+       float *r,       /* (i) autocorrelation vector */
+       int order       /* (i) order of lpc filter */
+   ){
+       float  sum, alpha;
+       int     m, m_h, i;
+
+       a[0] = 1.0;
+
+       if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
+           for (i = 0; i < order; i++) {
+               k[i] = 0;
+               a[i+1] = 0;
+           }
+       } else {
+           a[1] = k[0] = -r[1]/r[0];
+           alpha = r[0] + r[1] * k[0];
+           for (m = 1; m < order; m++){
+               sum = r[m + 1];
+               for (i = 0; i < m; i++){
+                   sum += a[i+1] * r[m - i];
+               }
+
+
+
+
+
+               k[m] = -sum / alpha;
+               alpha += k[m] * sum;
+               m_h = (m + 1) >> 1;
+               for (i = 0; i < m_h; i++){
+                   sum = a[i+1] + k[m] * a[m - i];
+                   a[m - i] += k[m] * a[i+1];
+                   a[i+1] = sum;
+               }
+               a[m+1] = k[m];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  interpolation between vectors
+    *---------------------------------------------------------------*/
+
+   void interpolate(
+       float *out,      /* (o) the interpolated vector */
+       float *in1,     /* (i) the first vector for the
+                              interpolation */
+       float *in2,     /* (i) the second vector for the
+                              interpolation */
+       float coef,      /* (i) interpolation weights */
+       int length      /* (i) length of all vectors */
+   ){
+       int i;
+       float invcoef;
+
+       invcoef = (float)1.0 - coef;
+       for (i = 0; i < length; i++) {
+           out[i] = coef * in1[i] + invcoef * in2[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lpc bandwidth expansion
+    *---------------------------------------------------------------*/
+
+   void bwexpand(
+       float *out,      /* (o) the bandwidth expanded lpc
+                              coefficients */
+       float *in,      /* (i) the lpc coefficients before bandwidth
+                              expansion */
+       float coef,     /* (i) the bandwidth expansion factor */
+       int length      /* (i) the length of lpc coefficient vectors */
+   ){
+       int i;
+
+
+
+
+
+       float  chirp;
+
+       chirp = coef;
+
+       out[0] = in[0];
+       for (i = 1; i < length; i++) {
+           out[i] = chirp * in[i];
+           chirp *= coef;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  vector quantization
+    *---------------------------------------------------------------*/
+
+   void vq(
+       float *Xq,      /* (o) the quantized vector */
+       int *index,     /* (o) the quantization index */
+       const float *CB,/* (i) the vector quantization codebook */
+       float *X,       /* (i) the vector to quantize */
+       int n_cb,       /* (i) the number of vectors in the codebook */
+       int dim         /* (i) the dimension of all vectors */
+   ){
+       int     i, j;
+       int     pos, minindex;
+       float   dist, tmp, mindist;
+
+       pos = 0;
+       mindist = FLOAT_MAX;
+       minindex = 0;
+       for (j = 0; j < n_cb; j++) {
+           dist = X[0] - CB[pos];
+           dist *= dist;
+           for (i = 1; i < dim; i++) {
+               tmp = X[i] - CB[pos + i];
+               dist += tmp*tmp;
+           }
+
+           if (dist < mindist) {
+               mindist = dist;
+               minindex = j;
+           }
+           pos += dim;
+       }
+       for (i = 0; i < dim; i++) {
+           Xq[i] = CB[minindex*dim + i];
+       }
+       *index = minindex;
+
+
+
+
+
+   }
+
+   /*----------------------------------------------------------------*
+    *  split vector quantization
+    *---------------------------------------------------------------*/
+
+   void SplitVQ(
+       float *qX,      /* (o) the quantized vector */
+       int *index,     /* (o) a vector of indexes for all vector
+                              codebooks in the split */
+       float *X,       /* (i) the vector to quantize */
+       const float *CB,/* (i) the quantizer codebook */
+       int nsplit,     /* the number of vector splits */
+       const int *dim, /* the dimension of X and qX */
+       const int *cbsize /* the number of vectors in the codebook */
+   ){
+       int    cb_pos, X_pos, i;
+
+       cb_pos = 0;
+       X_pos= 0;
+       for (i = 0; i < nsplit; i++) {
+           vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos,
+               cbsize[i], dim[i]);
+           X_pos += dim[i];
+           cb_pos += dim[i] * cbsize[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  scalar quantization
+    *---------------------------------------------------------------*/
+
+   void sort_sq(
+       float *xq,      /* (o) the quantized value */
+       int *index,     /* (o) the quantization index */
+       float x,    /* (i) the value to quantize */
+       const float *cb,/* (i) the quantization codebook */
+       int cb_size      /* (i) the size of the quantization codebook */
+   ){
+       int i;
+
+       if (x <= cb[0]) {
+           *index = 0;
+           *xq = cb[0];
+       } else {
+           i = 0;
+           while ((x > cb[i]) && i < cb_size - 1) {
+               i++;
+
+
+
+
+
+           }
+
+           if (x > ((cb[i] + cb[i - 1])/2)) {
+               *index = i;
+               *xq = cb[i];
+           } else {
+               *index = i - 1;
+               *xq = cb[i - 1];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  check for stability of lsf coefficients
+    *---------------------------------------------------------------*/
+
+   int LSF_check(    /* (o) 1 for stable lsf vectors and 0 for
+                              nonstable ones */
+       float *lsf,     /* (i) a table of lsf vectors */
+       int dim,    /* (i) the dimension of each lsf vector */
+       int NoAn    /* (i) the number of lsf vectors in the
+                              table */
+   ){
+       int k,n,m, Nit=2, change=0,pos;
+       float tmp;
+       static float eps=(float)0.039; /* 50 Hz */
+       static float eps2=(float)0.0195;
+       static float maxlsf=(float)3.14; /* 4000 Hz */
+       static float minlsf=(float)0.01; /* 0 Hz */
+
+       /* LSF separation check*/
+
+       for (n=0; n<Nit; n++) { /* Run through a couple of times */
+           for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
+               for (k=0; k<(dim-1); k++) {
+                   pos=m*dim+k;
+
+                   if ((lsf[pos+1]-lsf[pos])<eps) {
+
+                       if (lsf[pos+1]<lsf[pos]) {
+                           tmp=lsf[pos+1];
+                           lsf[pos+1]= lsf[pos]+eps2;
+                           lsf[pos]= lsf[pos+1]-eps2;
+                       } else {
+                           lsf[pos]-=eps2;
+                           lsf[pos+1]+=eps2;
+                       }
+                       change=1;
+
+
+
+
+
+                   }
+
+                   if (lsf[pos]<minlsf) {
+                       lsf[pos]=minlsf;
+                       change=1;
+                   }
+
+                   if (lsf[pos]>maxlsf) {
+                       lsf[pos]=maxlsf;
+                       change=1;
+                   }
+               }
+           }
+       }
+
+       return change;
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
new file mode 100644
index 0000000..931ca68
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/helpfun.h
@@ -0,0 +1,106 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       helpfun.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HELPFUN_H
+   #define __iLBC_HELPFUN_H
+
+   void autocorr(
+       float *r,       /* (o) autocorrelation vector */
+       const float *x, /* (i) data vector */
+       int N,          /* (i) length of data vector */
+       int order       /* largest lag for calculated
+                          autocorrelations */
+   );
+
+   void window(
+       float *z,       /* (o) the windowed data */
+       const float *x, /* (i) the original data vector */
+       const float *y, /* (i) the window */
+       int N           /* (i) length of all vectors */
+   );
+
+   void levdurb(
+       float *a,       /* (o) lpc coefficient vector starting
+                              with 1.0 */
+       float *k,       /* (o) reflection coefficients */
+       float *r,       /* (i) autocorrelation vector */
+       int order       /* (i) order of lpc filter */
+   );
+
+   void interpolate(
+
+
+
+
+
+       float *out,     /* (o) the interpolated vector */
+       float *in1,     /* (i) the first vector for the
+                              interpolation */
+       float *in2,     /* (i) the second vector for the
+                              interpolation */
+       float coef,     /* (i) interpolation weights */
+       int length      /* (i) length of all vectors */
+   );
+
+   void bwexpand(
+       float *out,     /* (o) the bandwidth expanded lpc
+                              coefficients */
+       float *in,      /* (i) the lpc coefficients before bandwidth
+                              expansion */
+       float coef,     /* (i) the bandwidth expansion factor */
+       int length      /* (i) the length of lpc coefficient vectors */
+   );
+
+   void vq(
+       float *Xq,      /* (o) the quantized vector */
+       int *index,     /* (o) the quantization index */
+       const float *CB,/* (i) the vector quantization codebook */
+       float *X,       /* (i) the vector to quantize */
+       int n_cb,       /* (i) the number of vectors in the codebook */
+       int dim         /* (i) the dimension of all vectors */
+   );
+
+   void SplitVQ(
+       float *qX,      /* (o) the quantized vector */
+       int *index,     /* (o) a vector of indexes for all vector
+                              codebooks in the split */
+       float *X,       /* (i) the vector to quantize */
+       const float *CB,/* (i) the quantizer codebook */
+       int nsplit,     /* the number of vector splits */
+       const int *dim, /* the dimension of X and qX */
+       const int *cbsize /* the number of vectors in the codebook */
+   );
+
+
+   void sort_sq(
+       float *xq,      /* (o) the quantized value */
+       int *index,     /* (o) the quantization index */
+       float x,    /* (i) the value to quantize */
+       const float *cb,/* (i) the quantization codebook */
+       int cb_size     /* (i) the size of the quantization codebook */
+   );
+
+   int LSF_check(      /* (o) 1 for stable lsf vectors and 0 for
+
+
+
+
+
+                              nonstable ones */
+       float *lsf,     /* (i) a table of lsf vectors */
+       int dim,    /* (i) the dimension of each lsf vector */
+       int NoAn    /* (i) the number of lsf vectors in the
+                              table */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
new file mode 100644
index 0000000..7ceee09
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.c
@@ -0,0 +1,65 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+
+
+
+
+       hpInput.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Input high-pass filter
+    *---------------------------------------------------------------*/
+
+   void hpInput(
+       float *In,  /* (i) vector to filter */
+       int len,    /* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   ){
+       int i;
+       float *pi, *po;
+
+       /* all-zero section*/
+
+       pi = &In[0];
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po = hpi_zero_coefsTbl[0] * (*pi);
+           *po += hpi_zero_coefsTbl[1] * mem[0];
+           *po += hpi_zero_coefsTbl[2] * mem[1];
+
+           mem[1] = mem[0];
+           mem[0] = *pi;
+           po++;
+           pi++;
+
+       }
+
+       /* all-pole section*/
+
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po -= hpi_pole_coefsTbl[1] * mem[2];
+           *po -= hpi_pole_coefsTbl[2] * mem[3];
+
+           mem[3] = mem[2];
+           mem[2] = *po;
+           po++;
+
+
+
+
+
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
new file mode 100644
index 0000000..3b020d1
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpInput.h
@@ -0,0 +1,24 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpInput.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HPINPUT_H
+   #define __iLBC_HPINPUT_H
+
+   void hpInput(
+       float *In,  /* (i) vector to filter */
+       int len,    /* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
new file mode 100644
index 0000000..756160a
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c
@@ -0,0 +1,61 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpOutput.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Output high-pass filter
+    *---------------------------------------------------------------*/
+
+   void hpOutput(
+
+
+
+
+
+       float *In,  /* (i) vector to filter */
+       int len,/* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   ){
+       int i;
+       float *pi, *po;
+
+       /* all-zero section*/
+
+       pi = &In[0];
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po = hpo_zero_coefsTbl[0] * (*pi);
+           *po += hpo_zero_coefsTbl[1] * mem[0];
+           *po += hpo_zero_coefsTbl[2] * mem[1];
+
+           mem[1] = mem[0];
+           mem[0] = *pi;
+           po++;
+           pi++;
+
+       }
+
+       /* all-pole section*/
+
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po -= hpo_pole_coefsTbl[1] * mem[2];
+           *po -= hpo_pole_coefsTbl[2] * mem[3];
+
+           mem[3] = mem[2];
+           mem[2] = *po;
+           po++;
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
new file mode 100644
index 0000000..b213a19
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h
@@ -0,0 +1,24 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpOutput.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HPOUTPUT_H
+   #define __iLBC_HPOUTPUT_H
+
+   void hpOutput(
+       float *In,  /* (i) vector to filter */
+       int len,/* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
new file mode 100644
index 0000000..ee9a73c
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c
@@ -0,0 +1,112 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBConstruct.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+   #include "gainquant.h"
+   #include "getCBvec.h"
+
+   /*----------------------------------------------------------------*
+    *  Convert the codebook indexes to make the search easier
+    *---------------------------------------------------------------*/
+
+
+
+
+
+
+   void index_conv_enc(
+       int *index          /* (i/o) Codebook indexes */
+   ){
+       int k;
+
+       for (k=1; k<CB_NSTAGES; k++) {
+
+           if ((index[k]>=108)&&(index[k]<172)) {
+               index[k]-=64;
+           } else if (index[k]>=236) {
+               index[k]-=128;
+           } else {
+               /* ERROR */
+           }
+       }
+   }
+
+   void index_conv_dec(
+       int *index          /* (i/o) Codebook indexes */
+   ){
+       int k;
+
+       for (k=1; k<CB_NSTAGES; k++) {
+
+           if ((index[k]>=44)&&(index[k]<108)) {
+               index[k]+=64;
+           } else if ((index[k]>=108)&&(index[k]<128)) {
+               index[k]+=128;
+           } else {
+               /* ERROR */
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  Construct decoded vector from codebook and gains.
+    *---------------------------------------------------------------*/
+
+   void iCBConstruct(
+       float *decvector,   /* (o) Decoded vector */
+       int *index,         /* (i) Codebook indices */
+       int *gain_index,/* (i) Gain quantization indices */
+       float *mem,         /* (i) Buffer for codevector construction */
+       int lMem,           /* (i) Length of buffer */
+       int veclen,         /* (i) Length of vector */
+       int nStages         /* (i) Number of codebook stages */
+   ){
+       int j,k;
+
+
+
+
+
+       float gain[CB_NSTAGES];
+       float cbvec[SUBL];
+
+       /* gain de-quantization */
+
+       gain[0] = gaindequant(gain_index[0], 1.0, 32);
+       if (nStages > 1) {
+           gain[1] = gaindequant(gain_index[1],
+               (float)fabs(gain[0]), 16);
+       }
+       if (nStages > 2) {
+           gain[2] = gaindequant(gain_index[2],
+               (float)fabs(gain[1]), 8);
+       }
+
+       /* codebook vector construction and construction of
+       total vector */
+
+       getCBvec(cbvec, mem, index[0], lMem, veclen);
+       for (j=0;j<veclen;j++){
+           decvector[j] = gain[0]*cbvec[j];
+       }
+       if (nStages > 1) {
+           for (k=1; k<nStages; k++) {
+               getCBvec(cbvec, mem, index[k], lMem, veclen);
+               for (j=0;j<veclen;j++) {
+                   decvector[j] += gain[k]*cbvec[j];
+               }
+           }
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
new file mode 100644
index 0000000..143501e
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h
@@ -0,0 +1,40 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBConstruct.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+
+
+
+
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ICBCONSTRUCT_H
+   #define __iLBC_ICBCONSTRUCT_H
+
+   void index_conv_enc(
+       int *index          /* (i/o) Codebook indexes */
+   );
+
+   void index_conv_dec(
+       int *index          /* (i/o) Codebook indexes */
+   );
+
+   void iCBConstruct(
+       float *decvector,   /* (o) Decoded vector */
+       int *index,         /* (i) Codebook indices */
+       int *gain_index,/* (i) Gain quantization indices */
+       float *mem,         /* (i) Buffer for codevector construction */
+       int lMem,           /* (i) Length of buffer */
+       int veclen,         /* (i) Length of vector */
+       int nStages         /* (i) Number of codebook stages */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
new file mode 100644
index 0000000..0f65e44
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c
@@ -0,0 +1,512 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBSearch.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "gainquant.h"
+   #include "createCB.h"
+   #include "filter.h"
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Search routine for codebook encoding and gain quantization.
+    *---------------------------------------------------------------*/
+
+   void iCBSearch(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) the encoder state structure */
+       int *index,         /* (o) Codebook indices */
+       int *gain_index,/* (o) Gain quantization indices */
+
+
+
+
+
+       float *intarget,/* (i) Target vector for encoding */
+       float *mem,         /* (i) Buffer for codebook construction */
+       int lMem,           /* (i) Length of buffer */
+       int lTarget,    /* (i) Length of vector */
+       int nStages,    /* (i) Number of codebook stages */
+       float *weightDenum, /* (i) weighting filter coefficients */
+       float *weightState, /* (i) weighting filter state */
+       int block           /* (i) the sub-block number */
+   ){
+       int i, j, icount, stage, best_index, range, counter;
+       float max_measure, gain, measure, crossDot, ftmp;
+       float gains[CB_NSTAGES];
+       float target[SUBL];
+       int base_index, sInd, eInd, base_size;
+       int sIndAug=0, eIndAug=0;
+       float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
+       float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
+       float *pp, *ppi=0, *ppo=0, *ppe=0;
+       float cbvectors[CB_MEML];
+       float tene, cene, cvec[SUBL];
+       float aug_vec[SUBL];
+
+       memset(cvec,0,SUBL*sizeof(float));
+
+       /* Determine size of codebook sections */
+
+       base_size=lMem-lTarget+1;
+
+       if (lTarget==SUBL) {
+           base_size=lMem-lTarget+1+lTarget/2;
+       }
+
+       /* setup buffer for weighting */
+
+       memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
+       memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
+       memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
+
+       /* weighting */
+
+       AllPoleFilter(buf+LPC_FILTERORDER, weightDenum,
+           lMem+lTarget, LPC_FILTERORDER);
+
+       /* Construct the codebook and target needed */
+
+       memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
+
+       tene=0.0;
+
+
+
+
+
+       for (i=0; i<lTarget; i++) {
+           tene+=target[i]*target[i];
+       }
+
+       /* Prepare search over one more codebook section. This section
+          is created by filtering the original buffer with a filter. */
+
+       filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
+
+       /* The Main Loop over stages */
+
+       for (stage=0; stage<nStages; stage++) {
+
+           range = search_rangeTbl[block][stage];
+
+           /* initialize search measure */
+
+           max_measure = (float)-10000000.0;
+           gain = (float)0.0;
+           best_index = 0;
+
+           /* Compute cross dot product between the target
+              and the CB memory */
+
+           crossDot=0.0;
+           pp=buf+LPC_FILTERORDER+lMem-lTarget;
+           for (j=0; j<lTarget; j++) {
+               crossDot += target[j]*(*pp++);
+           }
+
+           if (stage==0) {
+
+               /* Calculate energy in the first block of
+                 'lTarget' samples. */
+               ppe = energy;
+               ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
+               ppo = buf+LPC_FILTERORDER+lMem-1;
+
+               *ppe=0.0;
+               pp=buf+LPC_FILTERORDER+lMem-lTarget;
+               for (j=0; j<lTarget; j++) {
+                   *ppe+=(*pp)*(*pp++);
+               }
+
+               if (*ppe>0.0) {
+                   invenergy[0] = (float) 1.0 / (*ppe + EPS);
+               } else {
+                   invenergy[0] = (float) 0.0;
+
+
+
+
+
+               }
+               ppe++;
+
+               measure=(float)-10000000.0;
+
+               if (crossDot > 0.0) {
+                      measure = crossDot*crossDot*invenergy[0];
+               }
+           }
+           else {
+               measure = crossDot*crossDot*invenergy[0];
+           }
+
+           /* check if measure is better */
+           ftmp = crossDot*invenergy[0];
+
+           if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+               best_index = 0;
+               max_measure = measure;
+               gain = ftmp;
+           }
+
+           /* loop over the main first codebook section,
+              full search */
+
+           for (icount=1; icount<range; icount++) {
+
+               /* calculate measure */
+
+               crossDot=0.0;
+               pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
+
+               for (j=0; j<lTarget; j++) {
+                   crossDot += target[j]*(*pp++);
+               }
+
+               if (stage==0) {
+                   *ppe++ = energy[icount-1] + (*ppi)*(*ppi) -
+                       (*ppo)*(*ppo);
+                   ppo--;
+                   ppi--;
+
+                   if (energy[icount]>0.0) {
+                       invenergy[icount] =
+                           (float)1.0/(energy[icount]+EPS);
+                   } else {
+                       invenergy[icount] = (float) 0.0;
+                   }
+
+
+
+
+
+                   measure=(float)-10000000.0;
+
+                   if (crossDot > 0.0) {
+                       measure = crossDot*crossDot*invenergy[icount];
+                   }
+               }
+               else {
+                   measure = crossDot*crossDot*invenergy[icount];
+               }
+
+               /* check if measure is better */
+               ftmp = crossDot*invenergy[icount];
+
+               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+                   best_index = icount;
+                   max_measure = measure;
+                   gain = ftmp;
+               }
+           }
+
+           /* Loop over augmented part in the first codebook
+            * section, full search.
+            * The vectors are interpolated.
+            */
+
+           if (lTarget==SUBL) {
+
+               /* Search for best possible cb vector and
+                  compute the CB-vectors' energy. */
+               searchAugmentedCB(20, 39, stage, base_size-lTarget/2,
+                   target, buf+LPC_FILTERORDER+lMem,
+                   &max_measure, &best_index, &gain, energy,
+                   invenergy);
+           }
+
+           /* set search range for following codebook sections */
+
+           base_index=best_index;
+
+           /* unrestricted search */
+
+           if (CB_RESRANGE == -1) {
+               sInd=0;
+               eInd=range-1;
+               sIndAug=20;
+               eIndAug=39;
+           }
+
+
+
+
+
+
+           /* restricted search around best index from first
+           codebook section */
+
+           else {
+               /* Initialize search indices */
+               sIndAug=0;
+               eIndAug=0;
+               sInd=base_index-CB_RESRANGE/2;
+               eInd=sInd+CB_RESRANGE;
+
+               if (lTarget==SUBL) {
+
+                   if (sInd<0) {
+
+                       sIndAug = 40 + sInd;
+                       eIndAug = 39;
+                       sInd=0;
+
+                   } else if ( base_index < (base_size-20) ) {
+
+                       if (eInd > range) {
+                           sInd -= (eInd-range);
+                           eInd = range;
+                       }
+                   } else { /* base_index >= (base_size-20) */
+
+                       if (sInd < (base_size-20)) {
+                           sIndAug = 20;
+                           sInd = 0;
+                           eInd = 0;
+                           eIndAug = 19 + CB_RESRANGE;
+
+                           if(eIndAug > 39) {
+                               eInd = eIndAug-39;
+                               eIndAug = 39;
+                           }
+                       } else {
+                           sIndAug = 20 + sInd - (base_size-20);
+                           eIndAug = 39;
+                           sInd = 0;
+                           eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
+                       }
+                   }
+
+               } else { /* lTarget = 22 or 23 */
+
+                   if (sInd < 0) {
+                       eInd -= sInd;
+
+
+
+
+
+                       sInd = 0;
+                   }
+
+                   if(eInd > range) {
+                       sInd -= (eInd - range);
+                       eInd = range;
+                   }
+               }
+           }
+
+           /* search of higher codebook section */
+
+           /* index search range */
+           counter = sInd;
+           sInd += base_size;
+           eInd += base_size;
+
+
+           if (stage==0) {
+               ppe = energy+base_size;
+               *ppe=0.0;
+
+               pp=cbvectors+lMem-lTarget;
+               for (j=0; j<lTarget; j++) {
+                   *ppe+=(*pp)*(*pp++);
+               }
+
+               ppi = cbvectors + lMem - 1 - lTarget;
+               ppo = cbvectors + lMem - 1;
+
+               for (j=0; j<(range-1); j++) {
+                   *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
+                   ppo--;
+                   ppi--;
+                   ppe++;
+               }
+           }
+
+           /* loop over search range */
+
+           for (icount=sInd; icount<eInd; icount++) {
+
+               /* calculate measure */
+
+               crossDot=0.0;
+               pp=cbvectors + lMem - (counter++) - lTarget;
+
+               for (j=0;j<lTarget;j++) {
+
+
+
+
+
+                   crossDot += target[j]*(*pp++);
+               }
+
+               if (energy[icount]>0.0) {
+                   invenergy[icount] =(float)1.0/(energy[icount]+EPS);
+               } else {
+                   invenergy[icount] =(float)0.0;
+               }
+
+               if (stage==0) {
+
+                   measure=(float)-10000000.0;
+
+                   if (crossDot > 0.0) {
+                       measure = crossDot*crossDot*
+                           invenergy[icount];
+                   }
+               }
+               else {
+                   measure = crossDot*crossDot*invenergy[icount];
+               }
+
+               /* check if measure is better */
+               ftmp = crossDot*invenergy[icount];
+
+               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+                   best_index = icount;
+                   max_measure = measure;
+                   gain = ftmp;
+               }
+           }
+
+           /* Search the augmented CB inside the limited range. */
+
+           if ((lTarget==SUBL)&&(sIndAug!=0)) {
+               searchAugmentedCB(sIndAug, eIndAug, stage,
+                   2*base_size-20, target, cbvectors+lMem,
+                   &max_measure, &best_index, &gain, energy,
+                   invenergy);
+           }
+
+           /* record best index */
+
+           index[stage] = best_index;
+
+           /* gain quantization */
+
+           if (stage==0){
+
+
+
+
+
+
+               if (gain<0.0){
+                   gain = 0.0;
+               }
+
+               if (gain>CB_MAXGAIN) {
+                   gain = (float)CB_MAXGAIN;
+               }
+               gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
+           }
+           else {
+               if (stage==1) {
+                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
+                       16, &gain_index[stage]);
+               } else {
+                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
+                       8, &gain_index[stage]);
+               }
+           }
+
+           /* Extract the best (according to measure)
+              codebook vector */
+
+           if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
+
+               if (index[stage]<base_size) {
+                   pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
+               } else {
+                   pp=cbvectors+lMem-lTarget-
+                       index[stage]+base_size;
+               }
+           } else {
+
+               if (index[stage]<base_size) {
+                   if (index[stage]<(base_size-20)) {
+                       pp=buf+LPC_FILTERORDER+lMem-
+                           lTarget-index[stage];
+                   } else {
+                       createAugmentedVec(index[stage]-base_size+40,
+                               buf+LPC_FILTERORDER+lMem,aug_vec);
+                       pp=aug_vec;
+                   }
+               } else {
+                   int filterno, position;
+
+                   filterno=index[stage]/base_size;
+                   position=index[stage]-filterno*base_size;
+
+
+
+
+
+
+
+                   if (position<(base_size-20)) {
+                       pp=cbvectors+filterno*lMem-lTarget-
+                           index[stage]+filterno*base_size;
+                   } else {
+                       createAugmentedVec(
+                           index[stage]-(filterno+1)*base_size+40,
+                           cbvectors+filterno*lMem,aug_vec);
+                       pp=aug_vec;
+                   }
+               }
+           }
+
+           /* Subtract the best codebook vector, according
+              to measure, from the target vector */
+
+           for (j=0;j<lTarget;j++) {
+               cvec[j] += gain*(*pp);
+               target[j] -= gain*(*pp++);
+           }
+
+           /* record quantized gain */
+
+           gains[stage]=gain;
+
+       }/* end of Main Loop. for (stage=0;... */
+
+       /* Gain adjustment for energy matching */
+       cene=0.0;
+       for (i=0; i<lTarget; i++) {
+           cene+=cvec[i]*cvec[i];
+       }
+       j=gain_index[0];
+
+       for (i=gain_index[0]; i<32; i++) {
+           ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
+
+           if ((ftmp<(tene*gains[0]*gains[0])) &&
+               (gain_sq5Tbl[j]<(2.0*gains[0]))) {
+               j=i;
+           }
+       }
+       gain_index[0]=j;
+   }
+
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
new file mode 100644
index 0000000..a61db15
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h
@@ -0,0 +1,37 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBSearch.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ICBSEARCH_H
+   #define __iLBC_ICBSEARCH_H
+
+
+
+
+
+
+   void iCBSearch(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) the encoder state structure */
+       int *index,         /* (o) Codebook indices */
+       int *gain_index,/* (o) Gain quantization indices */
+       float *intarget,/* (i) Target vector for encoding */
+       float *mem,         /* (i) Buffer for codebook construction */
+       int lMem,           /* (i) Length of buffer */
+       int lTarget,    /* (i) Length of vector */
+       int nStages,    /* (i) Number of codebook stages */
+       float *weightDenum, /* (i) weighting filter coefficients */
+       float *weightState, /* (i) weighting filter state */
+       int block           /* (i) the sub-block number */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
new file mode 100644
index 0000000..ae62bf4
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c
@@ -0,0 +1,652 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_decode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+
+   #include "iLBC_define.h"
+   #include "StateConstructW.h"
+   #include "LPCdecode.h"
+   #include "iCBConstruct.h"
+   #include "doCPLC.h"
+   #include "helpfun.h"
+   #include "constants.h"
+   #include "packing.h"
+   #include "string.h"
+   #include "enhancer.h"
+   #include "hpOutput.h"
+   #include "syntFilter.h"
+
+   /*----------------------------------------------------------------*
+    *  Initiation of decoder instance.
+    *---------------------------------------------------------------*/
+
+   short initDecode(                   /* (o) Number of decoded
+                                              samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       int mode,                       /* (i) frame size mode */
+       int use_enhancer                /* (i) 1 to use enhancer
+                                              0 to run without
+                                                enhancer */
+   ){
+       int i;
+
+       iLBCdec_inst->mode = mode;
+
+
+
+
+
+       if (mode==30) {
+           iLBCdec_inst->blockl = BLOCKL_30MS;
+           iLBCdec_inst->nsub = NSUB_30MS;
+           iLBCdec_inst->nasub = NASUB_30MS;
+           iLBCdec_inst->lpc_n = LPC_N_30MS;
+           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
+           iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
+           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
+           /* ULP init */
+           iLBCdec_inst->ULP_inst=&ULP_30msTbl;
+       }
+       else if (mode==20) {
+           iLBCdec_inst->blockl = BLOCKL_20MS;
+           iLBCdec_inst->nsub = NSUB_20MS;
+           iLBCdec_inst->nasub = NASUB_20MS;
+           iLBCdec_inst->lpc_n = LPC_N_20MS;
+           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
+           iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
+           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
+           /* ULP init */
+           iLBCdec_inst->ULP_inst=&ULP_20msTbl;
+       }
+       else {
+           exit(2);
+       }
+
+       memset(iLBCdec_inst->syntMem, 0,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+
+       memset(iLBCdec_inst->old_syntdenum, 0,
+           ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
+       for (i=0; i<NSUB_MAX; i++)
+           iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
+
+       iLBCdec_inst->last_lag = 20;
+
+       iLBCdec_inst->prevLag = 120;
+       iLBCdec_inst->per = 0.0;
+       iLBCdec_inst->consPLICount = 0;
+       iLBCdec_inst->prevPLI = 0;
+       iLBCdec_inst->prevLpc[0] = 1.0;
+       memset(iLBCdec_inst->prevLpc+1,0,
+           LPC_FILTERORDER*sizeof(float));
+       memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
+       iLBCdec_inst->seed=777;
+
+
+
+
+
+
+       memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
+
+       iLBCdec_inst->use_enhancer = use_enhancer;
+       memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
+       for (i=0;i<ENH_NBLOCKS_TOT;i++)
+           iLBCdec_inst->enh_period[i]=(float)40.0;
+
+       iLBCdec_inst->prev_enh_pl = 0;
+
+       return (iLBCdec_inst->blockl);
+   }
+
+   /*----------------------------------------------------------------*
+    *  frame residual decoder function (subrutine to iLBC_decode)
+    *---------------------------------------------------------------*/
+
+   void Decode(
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       float *decresidual,             /* (o) decoded residual frame */
+       int start,                      /* (i) location of start
+                                              state */
+       int idxForMax,                  /* (i) codebook index for the
+                                              maximum value */
+       int *idxVec,                /* (i) codebook indexes for the
+                                              samples  in the start
+                                              state */
+       float *syntdenum,               /* (i) the decoded synthesis
+                                              filter coefficients */
+       int *cb_index,                  /* (i) the indexes for the
+                                              adaptive codebook */
+       int *gain_index,            /* (i) the indexes for the
+                                              corresponding gains */
+       int *extra_cb_index,        /* (i) the indexes for the
+                                              adaptive codebook part
+                                              of start state */
+       int *extra_gain_index,          /* (i) the indexes for the
+                                              corresponding gains */
+       int state_first                 /* (i) 1 if non adaptive part
+                                              of start state comes
+                                              first 0 if that part
+                                              comes last */
+   ){
+       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
+       int k, meml_gotten, Nfor, Nback, i;
+       int diff, start_pos;
+       int subcount, subframe;
+
+
+
+
+
+
+       diff = STATE_LEN - iLBCdec_inst->state_short_len;
+
+       if (state_first == 1) {
+           start_pos = (start-1)*SUBL;
+       } else {
+           start_pos = (start-1)*SUBL + diff;
+       }
+
+       /* decode scalar part of start state */
+
+       StateConstructW(idxForMax, idxVec,
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &decresidual[start_pos], iLBCdec_inst->state_short_len);
+
+
+       if (state_first) { /* put adaptive part in the end */
+
+           /* setup memory */
+
+           memset(mem, 0,
+               (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
+           memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len,
+               decresidual+start_pos,
+               iLBCdec_inst->state_short_len*sizeof(float));
+
+           /* construct decoded vector */
+
+           iCBConstruct(
+               &decresidual[start_pos+iLBCdec_inst->state_short_len],
+               extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES);
+
+       }
+       else {/* put adaptive part in the beginning */
+
+           /* create reversed vectors for prediction */
+
+           for (k=0; k<diff; k++) {
+               reverseDecresidual[k] =
+                   decresidual[(start+1)*SUBL-1-
+                           (k+iLBCdec_inst->state_short_len)];
+           }
+
+           /* setup memory */
+
+           meml_gotten = iLBCdec_inst->state_short_len;
+           for (k=0; k<meml_gotten; k++){
+               mem[CB_MEML-1-k] = decresidual[start_pos + k];
+
+
+
+
+
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+
+           /* construct decoded vector */
+
+           iCBConstruct(reverseDecresidual, extra_cb_index,
+               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES);
+
+           /* get decoded residual from reversed vector */
+
+           for (k=0; k<diff; k++) {
+               decresidual[start_pos-1-k] = reverseDecresidual[k];
+           }
+       }
+
+       /* counter for predicted sub-frames */
+
+       subcount=0;
+
+       /* forward prediction of sub-frames */
+
+       Nfor = iLBCdec_inst->nsub-start-1;
+
+       if ( Nfor > 0 ){
+
+           /* setup memory */
+
+           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
+           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
+               STATE_LEN*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nfor; subframe++) {
+
+               /* construct decoded vector */
+
+               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+
+
+
+
+
+                   &decresidual[(start+1+subframe)*SUBL],
+                   SUBL*sizeof(float));
+
+               subcount++;
+
+           }
+
+       }
+
+       /* backward prediction of sub-frames */
+
+       Nback = start-1;
+
+       if ( Nback > 0 ) {
+
+           /* setup memory */
+
+           meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
+
+           if ( meml_gotten > CB_MEML ) {
+               meml_gotten=CB_MEML;
+           }
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+
+           /* loop over subframes to decode */
+
+           for (subframe=0; subframe<Nback; subframe++) {
+
+               /* construct decoded vector */
+
+               iCBConstruct(&reverseDecresidual[subframe*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount],
+                   SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+                   &reverseDecresidual[subframe*SUBL],
+                   SUBL*sizeof(float));
+
+               subcount++;
+           }
+
+
+
+
+
+           /* get decoded residual from reversed vector */
+
+           for (i=0; i<SUBL*Nback; i++)
+               decresidual[SUBL*Nback - i - 1] =
+               reverseDecresidual[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  main decoder function
+    *---------------------------------------------------------------*/
+
+   void iLBC_decode(
+       float *decblock,            /* (o) decoded signal block */
+       unsigned char *bytes,           /* (i) encoded signal bits */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       int mode                    /* (i) 0: bad packet, PLC,
+                                              1: normal */
+   ){
+       float data[BLOCKL_MAX];
+       float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
+       float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
+       float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
+       int k, i, start, idxForMax, pos, lastpart, ulp;
+       int lag, ilag;
+       float cc, maxcc;
+       int idxVec[STATE_LEN];
+       int check;
+       int gain_index[NASUB_MAX*CB_NSTAGES],
+           extra_gain_index[CB_NSTAGES];
+       int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
+       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
+       int state_first;
+       int last_bit;
+       unsigned char *pbytes;
+       float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
+       int order_plus_one;
+       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float decresidual[BLOCKL_MAX];
+
+       if (mode>0) { /* the data are good */
+
+           /* decode data */
+
+           pbytes=bytes;
+           pos=0;
+
+
+
+
+
+
+           /* Set everything to zero before decoding */
+
+           for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
+               lsf_i[k]=0;
+           }
+           start=0;
+           state_first=0;
+           idxForMax=0;
+           for (k=0; k<iLBCdec_inst->state_short_len; k++) {
+               idxVec[k]=0;
+           }
+           for (k=0; k<CB_NSTAGES; k++) {
+               extra_cb_index[k]=0;
+           }
+           for (k=0; k<CB_NSTAGES; k++) {
+               extra_gain_index[k]=0;
+           }
+           for (i=0; i<iLBCdec_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   cb_index[i*CB_NSTAGES+k]=0;
+               }
+           }
+           for (i=0; i<iLBCdec_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   gain_index[i*CB_NSTAGES+k]=0;
+               }
+           }
+
+           /* loop over ULP classes */
+
+           for (ulp=0; ulp<3; ulp++) {
+
+               /* LSF */
+               for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
+                   packcombine(&lsf_i[k], lastpart,
+                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
+               }
+
+               /* Start block info */
+
+               unpack( &pbytes, &lastpart,
+                   iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
+               packcombine(&start, lastpart,
+                   iLBCdec_inst->ULP_inst->start_bits[ulp]);
+
+               unpack( &pbytes, &lastpart,
+
+
+
+
+
+                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
+               packcombine(&state_first, lastpart,
+                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
+
+               unpack( &pbytes, &lastpart,
+                   iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
+               packcombine(&idxForMax, lastpart,
+                   iLBCdec_inst->ULP_inst->scale_bits[ulp]);
+
+               for (k=0; k<iLBCdec_inst->state_short_len; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
+                   packcombine(idxVec+k, lastpart,
+                       iLBCdec_inst->ULP_inst->state_bits[ulp]);
+               }
+
+               /* 23/22 (20ms/30ms) sample block */
+
+               for (k=0; k<CB_NSTAGES; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp],
+                       &pos);
+                   packcombine(extra_cb_index+k, lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
+               }
+               for (k=0; k<CB_NSTAGES; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp],
+                       &pos);
+                   packcombine(extra_gain_index+k, lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
+               }
+
+               /* The two/four (20ms/30ms) 40 sample sub-blocks */
+
+               for (i=0; i<iLBCdec_inst->nasub; i++) {
+                   for (k=0; k<CB_NSTAGES; k++) {
+                       unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp],
+                           &pos);
+                       packcombine(cb_index+i*CB_NSTAGES+k, lastpart,
+                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
+                   }
+               }
+
+               for (i=0; i<iLBCdec_inst->nasub; i++) {
+                   for (k=0; k<CB_NSTAGES; k++) {
+                       unpack( &pbytes, &lastpart,
+
+
+
+
+
+                       iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp],
+                           &pos);
+                       packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
+                           iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
+                   }
+               }
+           }
+           /* Extract last bit. If it is 1 this indicates an
+              empty/lost frame */
+           unpack( &pbytes, &last_bit, 1, &pos);
+
+           /* Check for bit errors or empty/lost frames */
+           if (start<1)
+               mode = 0;
+           if (iLBCdec_inst->mode==20 && start>3)
+               mode = 0;
+           if (iLBCdec_inst->mode==30 && start>5)
+               mode = 0;
+           if (last_bit==1)
+               mode = 0;
+
+           if (mode==1) { /* No bit errors was detected,
+                             continue decoding */
+
+               /* adjust index */
+               index_conv_dec(cb_index);
+
+               /* decode the lsf */
+
+               SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
+               check=LSF_check(lsfdeq, LPC_FILTERORDER,
+                   iLBCdec_inst->lpc_n);
+               DecoderInterpolateLSF(syntdenum, weightdenum,
+                   lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
+
+               Decode(iLBCdec_inst, decresidual, start, idxForMax,
+                   idxVec, syntdenum, cb_index, gain_index,
+                   extra_cb_index, extra_gain_index,
+                   state_first);
+
+               /* preparing the plc for a future loss! */
+
+               doThePLC(PLCresidual, PLClpc, 0, decresidual,
+                   syntdenum +
+                   (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
+                   (*iLBCdec_inst).last_lag, iLBCdec_inst);
+
+
+
+
+
+
+
+               memcpy(decresidual, PLCresidual,
+                   iLBCdec_inst->blockl*sizeof(float));
+           }
+
+       }
+
+       if (mode == 0) {
+           /* the data is bad (either a PLC call
+            * was made or a severe bit error was detected)
+            */
+
+           /* packet loss conceal */
+
+           memset(zeros, 0, BLOCKL_MAX*sizeof(float));
+
+           one[0] = 1;
+           memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
+
+           start=0;
+
+           doThePLC(PLCresidual, PLClpc, 1, zeros, one,
+               (*iLBCdec_inst).last_lag, iLBCdec_inst);
+           memcpy(decresidual, PLCresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+
+           order_plus_one = LPC_FILTERORDER + 1;
+           for (i = 0; i < iLBCdec_inst->nsub; i++) {
+               memcpy(syntdenum+(i*order_plus_one), PLClpc,
+                   order_plus_one*sizeof(float));
+           }
+       }
+
+       if (iLBCdec_inst->use_enhancer == 1) {
+
+           /* post filtering */
+
+           iLBCdec_inst->last_lag =
+               enhancerInterface(data, decresidual, iLBCdec_inst);
+
+           /* synthesis filtering */
+
+           if (iLBCdec_inst->mode==20) {
+               /* Enhancer has 40 samples delay */
+               i=0;
+               syntFilter(data + i*SUBL,
+                   iLBCdec_inst->old_syntdenum +
+                   (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1),
+                   SUBL, iLBCdec_inst->syntMem);
+
+
+
+
+
+               for (i=1; i < iLBCdec_inst->nsub; i++) {
+                   syntFilter(data + i*SUBL,
+                       syntdenum + (i-1)*(LPC_FILTERORDER+1),
+                       SUBL, iLBCdec_inst->syntMem);
+               }
+           } else if (iLBCdec_inst->mode==30) {
+               /* Enhancer has 80 samples delay */
+               for (i=0; i < 2; i++) {
+                   syntFilter(data + i*SUBL,
+                       iLBCdec_inst->old_syntdenum +
+                       (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
+                       SUBL, iLBCdec_inst->syntMem);
+               }
+               for (i=2; i < iLBCdec_inst->nsub; i++) {
+                   syntFilter(data + i*SUBL,
+                       syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
+                       iLBCdec_inst->syntMem);
+               }
+           }
+
+       } else {
+
+           /* Find last lag */
+           lag = 20;
+           maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
+               &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
+
+           for (ilag=21; ilag<120; ilag++) {
+               cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
+                   &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag],
+                   ENH_BLOCKL);
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+           iLBCdec_inst->last_lag = lag;
+
+           /* copy data and run synthesis filter */
+
+           memcpy(data, decresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+           for (i=0; i < iLBCdec_inst->nsub; i++) {
+               syntFilter(data + i*SUBL,
+                   syntdenum + i*(LPC_FILTERORDER+1), SUBL,
+                   iLBCdec_inst->syntMem);
+           }
+
+
+
+
+
+       }
+
+       /* high pass filtering on output if desired, otherwise
+          copy to out */
+
+       hpOutput(data, iLBCdec_inst->blockl,
+                   decblock,iLBCdec_inst->hpomem);
+
+       /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
+
+       memcpy(iLBCdec_inst->old_syntdenum, syntdenum,
+
+           iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
+
+       iLBCdec_inst->prev_enh_pl=0;
+
+       if (mode==0) { /* PLC was used */
+           iLBCdec_inst->prev_enh_pl=1;
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
new file mode 100644
index 0000000..5f4384d
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h
@@ -0,0 +1,42 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_decode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ILBCDECODE_H
+   #define __iLBC_ILBCDECODE_H
+
+   #include "iLBC_define.h"
+
+   short initDecode(                   /* (o) Number of decoded
+                                              samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       int mode,                       /* (i) frame size mode */
+       int use_enhancer                /* (i) 1 to use enhancer
+                                              0 to run without
+                                                enhancer */
+   );
+
+   void iLBC_decode(
+       float *decblock,            /* (o) decoded signal block */
+       unsigned char *bytes,           /* (i) encoded signal bits */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       int mode                    /* (i) 0: bad packet, PLC,
+                                              1: normal */
+
+
+
+
+
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
new file mode 100644
index 0000000..480c834
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h
@@ -0,0 +1,217 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_define.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+   #include <string.h>
+
+   #ifndef __iLBC_ILBCDEFINE_H
+   #define __iLBC_ILBCDEFINE_H
+
+   /* general codec settings */
+
+   #define FS                      (float)8000.0
+   #define BLOCKL_20MS             160
+   #define BLOCKL_30MS             240
+   #define BLOCKL_MAX              240
+   #define NSUB_20MS               4
+   #define NSUB_30MS               6
+   #define NSUB_MAX            6
+   #define NASUB_20MS              2
+
+
+
+
+
+   #define NASUB_30MS              4
+   #define NASUB_MAX               4
+   #define SUBL                40
+   #define STATE_LEN               80
+   #define STATE_SHORT_LEN_30MS    58
+   #define STATE_SHORT_LEN_20MS    57
+
+   /* LPC settings */
+
+   #define LPC_FILTERORDER         10
+   #define LPC_CHIRP_SYNTDENUM     (float)0.9025
+   #define LPC_CHIRP_WEIGHTDENUM   (float)0.4222
+   #define LPC_LOOKBACK        60
+   #define LPC_N_20MS              1
+   #define LPC_N_30MS              2
+   #define LPC_N_MAX               2
+   #define LPC_ASYMDIFF        20
+   #define LPC_BW                  (float)60.0
+   #define LPC_WN                  (float)1.0001
+   #define LSF_NSPLIT              3
+   #define LSF_NUMBER_OF_STEPS     4
+   #define LPC_HALFORDER           (LPC_FILTERORDER/2)
+
+   /* cb settings */
+
+   #define CB_NSTAGES              3
+   #define CB_EXPAND               2
+   #define CB_MEML                 147
+   #define CB_FILTERLEN        2*4
+   #define CB_HALFFILTERLEN    4
+   #define CB_RESRANGE             34
+   #define CB_MAXGAIN              (float)1.3
+
+   /* enhancer */
+
+   #define ENH_BLOCKL              80  /* block length */
+   #define ENH_BLOCKL_HALF         (ENH_BLOCKL/2)
+   #define ENH_HL                  3   /* 2*ENH_HL+1 is number blocks
+                                          in said second sequence */
+   #define ENH_SLOP            2   /* max difference estimated and
+                                          correct pitch period */
+   #define ENH_PLOCSL              20  /* pitch-estimates and pitch-
+                                          locations buffer length */
+   #define ENH_OVERHANG        2
+   #define ENH_UPS0            4   /* upsampling rate */
+   #define ENH_FL0                 3   /* 2*FLO+1 is the length of
+                                          each filter */
+   #define ENH_VECTL               (ENH_BLOCKL+2*ENH_FL0)
+
+
+
+
+
+   #define ENH_CORRDIM             (2*ENH_SLOP+1)
+   #define ENH_NBLOCKS             (BLOCKL_MAX/ENH_BLOCKL)
+   #define ENH_NBLOCKS_EXTRA       5
+   #define ENH_NBLOCKS_TOT         8   /* ENH_NBLOCKS +
+                                          ENH_NBLOCKS_EXTRA */
+   #define ENH_BUFL            (ENH_NBLOCKS_TOT)*ENH_BLOCKL
+   #define ENH_ALPHA0              (float)0.05
+
+   /* Down sampling */
+
+   #define FILTERORDER_DS          7
+   #define DELAY_DS            3
+   #define FACTOR_DS               2
+
+   /* bit stream defs */
+
+   #define NO_OF_BYTES_20MS    38
+   #define NO_OF_BYTES_30MS    50
+   #define NO_OF_WORDS_20MS    19
+   #define NO_OF_WORDS_30MS    25
+   #define STATE_BITS              3
+   #define BYTE_LEN            8
+   #define ULP_CLASSES             3
+
+   /* help parameters */
+
+   #define FLOAT_MAX               (float)1.0e37
+   #define EPS                     (float)2.220446049250313e-016
+   #define PI                      (float)3.14159265358979323846
+   #define MIN_SAMPLE              -32768
+   #define MAX_SAMPLE              32767
+   #define TWO_PI                  (float)6.283185307
+   #define PI2                     (float)0.159154943
+
+   /* type definition encoder instance */
+   typedef struct iLBC_ULP_Inst_t_ {
+       int lsf_bits[6][ULP_CLASSES+2];
+       int start_bits[ULP_CLASSES+2];
+       int startfirst_bits[ULP_CLASSES+2];
+       int scale_bits[ULP_CLASSES+2];
+       int state_bits[ULP_CLASSES+2];
+       int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
+       int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
+       int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
+       int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
+   } iLBC_ULP_Inst_t;
+
+   /* type definition encoder instance */
+
+
+
+
+
+   typedef struct iLBC_Enc_Inst_t_ {
+
+       /* flag for frame size mode */
+       int mode;
+
+       /* basic parameters for different frame sizes */
+       int blockl;
+       int nsub;
+       int nasub;
+       int no_of_bytes, no_of_words;
+       int lpc_n;
+       int state_short_len;
+       const iLBC_ULP_Inst_t *ULP_inst;
+
+       /* analysis filter state */
+       float anaMem[LPC_FILTERORDER];
+
+       /* old lsf parameters for interpolation */
+       float lsfold[LPC_FILTERORDER];
+       float lsfdeqold[LPC_FILTERORDER];
+
+       /* signal buffer for LP analysis */
+       float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
+
+       /* state of input HP filter */
+       float hpimem[4];
+
+   } iLBC_Enc_Inst_t;
+
+   /* type definition decoder instance */
+   typedef struct iLBC_Dec_Inst_t_ {
+
+       /* flag for frame size mode */
+       int mode;
+
+       /* basic parameters for different frame sizes */
+       int blockl;
+       int nsub;
+       int nasub;
+       int no_of_bytes, no_of_words;
+       int lpc_n;
+       int state_short_len;
+       const iLBC_ULP_Inst_t *ULP_inst;
+
+       /* synthesis filter state */
+       float syntMem[LPC_FILTERORDER];
+
+       /* old LSF for interpolation */
+
+
+
+
+
+       float lsfdeqold[LPC_FILTERORDER];
+
+       /* pitch lag estimated in enhancer and used in PLC */
+       int last_lag;
+
+       /* PLC state information */
+       int prevLag, consPLICount, prevPLI, prev_enh_pl;
+       float prevLpc[LPC_FILTERORDER+1];
+       float prevResidual[NSUB_MAX*SUBL];
+       float per;
+       unsigned long seed;
+
+       /* previous synthesis filter parameters */
+       float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
+
+       /* state of output HP filter */
+       float hpomem[4];
+
+       /* enhancer state information */
+       int use_enhancer;
+       float enh_buf[ENH_BUFL];
+       float enh_period[ENH_NBLOCKS_TOT];
+
+   } iLBC_Dec_Inst_t;
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
new file mode 100644
index 0000000..4636414
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c
@@ -0,0 +1,543 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_encode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "LPCencode.h"
+   #include "FrameClassify.h"
+   #include "StateSearchW.h"
+   #include "StateConstructW.h"
+   #include "helpfun.h"
+   #include "constants.h"
+   #include "packing.h"
+   #include "iCBSearch.h"
+   #include "iCBConstruct.h"
+   #include "hpInput.h"
+   #include "anaFilter.h"
+   #include "syntFilter.h"
+
+   /*----------------------------------------------------------------*
+    *  Initiation of encoder instance.
+    *---------------------------------------------------------------*/
+
+   short initEncode(                   /* (o) Number of bytes
+                                              encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
+       int mode                    /* (i) frame size mode */
+   ){
+       iLBCenc_inst->mode = mode;
+       if (mode==30) {
+           iLBCenc_inst->blockl = BLOCKL_30MS;
+           iLBCenc_inst->nsub = NSUB_30MS;
+           iLBCenc_inst->nasub = NASUB_30MS;
+           iLBCenc_inst->lpc_n = LPC_N_30MS;
+           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
+           iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
+
+
+
+
+
+           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
+           /* ULP init */
+           iLBCenc_inst->ULP_inst=&ULP_30msTbl;
+       }
+       else if (mode==20) {
+           iLBCenc_inst->blockl = BLOCKL_20MS;
+           iLBCenc_inst->nsub = NSUB_20MS;
+           iLBCenc_inst->nasub = NASUB_20MS;
+           iLBCenc_inst->lpc_n = LPC_N_20MS;
+           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
+           iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
+           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
+           /* ULP init */
+           iLBCenc_inst->ULP_inst=&ULP_20msTbl;
+       }
+       else {
+           exit(2);
+       }
+
+       memset((*iLBCenc_inst).anaMem, 0,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+       memset((*iLBCenc_inst).lpc_buffer, 0,
+           (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
+       memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
+
+       return (iLBCenc_inst->no_of_bytes);
+   }
+
+   /*----------------------------------------------------------------*
+    *  main encoder function
+    *---------------------------------------------------------------*/
+
+   void iLBC_encode(
+       unsigned char *bytes,           /* (o) encoded data bits iLBC */
+       float *block,                   /* (o) speech vector to
+                                              encode */
+       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
+                                              state */
+   ){
+
+       float data[BLOCKL_MAX];
+       float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
+
+       int start, idxForMax, idxVec[STATE_LEN];
+
+
+
+
+
+       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
+       int n, k, meml_gotten, Nfor, Nback, i, pos;
+       int gain_index[CB_NSTAGES*NASUB_MAX],
+           extra_gain_index[CB_NSTAGES];
+       int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
+       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
+       unsigned char *pbytes;
+       int diff, start_pos, state_first;
+       float en1, en2;
+       int index, ulp, firstpart;
+       int subcount, subframe;
+       float weightState[LPC_FILTERORDER];
+       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float decresidual[BLOCKL_MAX];
+
+       /* high pass filtering of input signal if such is not done
+              prior to calling this function */
+
+       hpInput(block, iLBCenc_inst->blockl,
+                   data, (*iLBCenc_inst).hpimem);
+
+       /* otherwise simply copy */
+
+       /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
+
+       /* LPC of hp filtered input data */
+
+       LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
+
+
+       /* inverse filter to get residual */
+
+       for (n=0; n<iLBCenc_inst->nsub; n++) {
+           anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)],
+               SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
+       }
+
+       /* find state location */
+
+       start = FrameClassify(iLBCenc_inst, residual);
+
+       /* check if state should be in first or last part of the
+       two subframes */
+
+       diff = STATE_LEN - iLBCenc_inst->state_short_len;
+       en1 = 0;
+       index = (start-1)*SUBL;
+
+
+
+
+
+       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
+           en1 += residual[index+i]*residual[index+i];
+       }
+       en2 = 0;
+       index = (start-1)*SUBL+diff;
+       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
+           en2 += residual[index+i]*residual[index+i];
+       }
+
+
+       if (en1 > en2) {
+           state_first = 1;
+           start_pos = (start-1)*SUBL;
+       } else {
+           state_first = 0;
+           start_pos = (start-1)*SUBL + diff;
+       }
+
+       /* scalar quantization of state */
+
+       StateSearchW(iLBCenc_inst, &residual[start_pos],
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax,
+           idxVec, iLBCenc_inst->state_short_len, state_first);
+
+       StateConstructW(idxForMax, idxVec,
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &decresidual[start_pos], iLBCenc_inst->state_short_len);
+
+       /* predictive quantization in state */
+
+       if (state_first) { /* put adaptive part in the end */
+
+           /* setup memory */
+
+           memset(mem, 0,
+               (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
+           memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len,
+               decresidual+start_pos,
+               iLBCenc_inst->state_short_len*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* encode sub-frames */
+
+           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
+               &residual[start_pos+iLBCenc_inst->state_short_len],
+               mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES,
+
+
+
+
+
+               &weightdenum[start*(LPC_FILTERORDER+1)],
+               weightState, 0);
+
+           /* construct decoded vector */
+
+           iCBConstruct(
+               &decresidual[start_pos+iLBCenc_inst->state_short_len],
+               extra_cb_index, extra_gain_index,
+               mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES);
+
+       }
+       else { /* put adaptive part in the beginning */
+
+           /* create reversed vectors for prediction */
+
+           for (k=0; k<diff; k++) {
+               reverseResidual[k] = residual[(start+1)*SUBL-1
+                   -(k+iLBCenc_inst->state_short_len)];
+           }
+
+           /* setup memory */
+
+           meml_gotten = iLBCenc_inst->state_short_len;
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[start_pos + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* encode sub-frames */
+
+           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
+               reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES,
+               &weightdenum[(start-1)*(LPC_FILTERORDER+1)],
+               weightState, 0);
+
+           /* construct decoded vector */
+
+           iCBConstruct(reverseDecresidual, extra_cb_index,
+               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES);
+
+           /* get decoded residual from reversed vector */
+
+           for (k=0; k<diff; k++) {
+               decresidual[start_pos-1-k] = reverseDecresidual[k];
+
+
+
+
+
+           }
+       }
+
+       /* counter for predicted sub-frames */
+
+       subcount=0;
+
+       /* forward prediction of sub-frames */
+
+       Nfor = iLBCenc_inst->nsub-start-1;
+
+
+       if ( Nfor > 0 ) {
+
+           /* setup memory */
+
+           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
+           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
+               STATE_LEN*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nfor; subframe++) {
+
+               /* encode sub-frame */
+
+               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   &residual[(start+1+subframe)*SUBL],
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES,
+                   &weightdenum[(start+1+subframe)*
+                               (LPC_FILTERORDER+1)],
+                   weightState, subcount+1);
+
+               /* construct decoded vector */
+
+               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+
+
+
+
+
+                   &decresidual[(start+1+subframe)*SUBL],
+                   SUBL*sizeof(float));
+               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+               subcount++;
+           }
+       }
+
+
+       /* backward prediction of sub-frames */
+
+       Nback = start-1;
+
+
+       if ( Nback > 0 ) {
+
+           /* create reverse order vectors */
+
+           for (n=0; n<Nback; n++) {
+               for (k=0; k<SUBL; k++) {
+                   reverseResidual[n*SUBL+k] =
+                       residual[(start-1)*SUBL-1-n*SUBL-k];
+                   reverseDecresidual[n*SUBL+k] =
+                       decresidual[(start-1)*SUBL-1-n*SUBL-k];
+               }
+           }
+
+           /* setup memory */
+
+           meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
+
+
+           if ( meml_gotten > CB_MEML ) {
+               meml_gotten=CB_MEML;
+           }
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nback; subframe++) {
+
+               /* encode sub-frame */
+
+               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
+
+
+
+
+
+                   gain_index+subcount*CB_NSTAGES,
+                   &reverseResidual[subframe*SUBL],
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES,
+                   &weightdenum[(start-2-subframe)*
+                               (LPC_FILTERORDER+1)],
+                   weightState, subcount+1);
+
+               /* construct decoded vector */
+
+               iCBConstruct(&reverseDecresidual[subframe*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+                   &reverseDecresidual[subframe*SUBL],
+                   SUBL*sizeof(float));
+               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+               subcount++;
+
+           }
+
+           /* get decoded residual from reversed vector */
+
+           for (i=0; i<SUBL*Nback; i++) {
+               decresidual[SUBL*Nback - i - 1] =
+                   reverseDecresidual[i];
+           }
+       }
+       /* end encoding part */
+
+       /* adjust index */
+       index_conv_enc(cb_index);
+
+       /* pack bytes */
+
+       pbytes=bytes;
+       pos=0;
+
+       /* loop over the 3 ULP classes */
+
+       for (ulp=0; ulp<3; ulp++) {
+
+
+
+
+
+
+           /* LSF */
+           for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
+               packsplit(&lsf_i[k], &firstpart, &lsf_i[k],
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp],
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
+           }
+
+           /* Start block info */
+
+           packsplit(&start, &firstpart, &start,
+               iLBCenc_inst->ULP_inst->start_bits[ulp],
+               iLBCenc_inst->ULP_inst->start_bits[ulp]+
+               iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
+
+           packsplit(&state_first, &firstpart, &state_first,
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp],
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
+
+           packsplit(&idxForMax, &firstpart, &idxForMax,
+               iLBCenc_inst->ULP_inst->scale_bits[ulp],
+               iLBCenc_inst->ULP_inst->scale_bits[ulp]+
+               iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
+
+           for (k=0; k<iLBCenc_inst->state_short_len; k++) {
+               packsplit(idxVec+k, &firstpart, idxVec+k,
+                   iLBCenc_inst->ULP_inst->state_bits[ulp],
+                   iLBCenc_inst->ULP_inst->state_bits[ulp]+
+                   iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
+                   iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
+           }
+
+
+
+
+
+
+           /* 23/22 (20ms/30ms) sample block */
+
+           for (k=0;k<CB_NSTAGES;k++) {
+               packsplit(extra_cb_index+k, &firstpart,
+                   extra_cb_index+k,
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
+                   &pos);
+           }
+
+           for (k=0;k<CB_NSTAGES;k++) {
+               packsplit(extra_gain_index+k, &firstpart,
+                   extra_gain_index+k,
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
+                   &pos);
+           }
+
+           /* The two/four (20ms/30ms) 40 sample sub-blocks */
+
+           for (i=0; i<iLBCenc_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   packsplit(cb_index+i*CB_NSTAGES+k, &firstpart,
+                       cb_index+i*CB_NSTAGES+k,
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
+                   dopack( &pbytes, firstpart,
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
+                       &pos);
+               }
+           }
+
+           for (i=0; i<iLBCenc_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   packsplit(gain_index+i*CB_NSTAGES+k, &firstpart,
+                       gain_index+i*CB_NSTAGES+k,
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
+
+
+
+
+
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
+                   dopack( &pbytes, firstpart,
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
+                       &pos);
+               }
+           }
+       }
+
+       /* set the last bit to zero (otherwise the decoder
+          will treat it as a lost frame) */
+       dopack( &pbytes, 0, 1, &pos);
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
new file mode 100644
index 0000000..a3ab55f
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h
@@ -0,0 +1,39 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_encode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ILBCENCODE_H
+   #define __iLBC_ILBCENCODE_H
+
+   #include "iLBC_define.h"
+
+   short initEncode(                   /* (o) Number of bytes
+                                              encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
+       int mode                    /* (i) frame size mode */
+   );
+
+   void iLBC_encode(
+
+       unsigned char *bytes,           /* (o) encoded data bits iLBC */
+       float *block,                   /* (o) speech vector to
+                                              encode */
+       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
+                                              state */
+   );
+
+   #endif
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
new file mode 100644
index 0000000..473cc7b
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c
@@ -0,0 +1,310 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_test.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+   #include <stdio.h>
+   #include <string.h>
+   #include "iLBC_define.h"
+   #include "iLBC_encode.h"
+   #include "iLBC_decode.h"
+
+   /* Runtime statistics */
+   #include <time.h>
+
+   #define ILBCNOOFWORDS_MAX   (NO_OF_BYTES_30MS/2)
+
+   /*----------------------------------------------------------------*
+    *  Encoder interface function
+
+
+
+
+
+    *---------------------------------------------------------------*/
+
+   short encode(   /* (o) Number of bytes encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                                   /* (i/o) Encoder instance */
+       short *encoded_data,    /* (o) The encoded bytes */
+       short *data                 /* (i) The signal block to encode*/
+   ){
+       float block[BLOCKL_MAX];
+       int k;
+
+       /* convert signal to float */
+
+       for (k=0; k<iLBCenc_inst->blockl; k++)
+           block[k] = (float)data[k];
+
+       /* do the actual encoding */
+
+       iLBC_encode((unsigned char *)encoded_data, block, iLBCenc_inst);
+
+
+       return (iLBCenc_inst->no_of_bytes);
+   }
+
+   /*----------------------------------------------------------------*
+    *  Decoder interface function
+    *---------------------------------------------------------------*/
+
+   short decode(       /* (o) Number of decoded samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       short *decoded_data,        /* (o) Decoded signal block*/
+       short *encoded_data,        /* (i) Encoded bytes */
+       short mode                       /* (i) 0=PL, 1=Normal */
+   ){
+       int k;
+       float decblock[BLOCKL_MAX], dtmp;
+
+       /* check if mode is valid */
+
+       if (mode<0 || mode>1) {
+           printf("\nERROR - Wrong mode - 0, 1 allowed\n"); exit(3);}
+
+       /* do actual decoding of block */
+
+       iLBC_decode(decblock, (unsigned char *)encoded_data,
+           iLBCdec_inst, mode);
+
+       /* convert to short */
+
+
+
+
+
+       for (k=0; k<iLBCdec_inst->blockl; k++){
+           dtmp=decblock[k];
+
+           if (dtmp<MIN_SAMPLE)
+               dtmp=MIN_SAMPLE;
+           else if (dtmp>MAX_SAMPLE)
+               dtmp=MAX_SAMPLE;
+           decoded_data[k] = (short) dtmp;
+       }
+
+       return (iLBCdec_inst->blockl);
+   }
+
+   /*---------------------------------------------------------------*
+    *  Main program to test iLBC encoding and decoding
+    *
+    *  Usage:
+    *    exefile_name.exe <infile> <bytefile> <outfile> <channel>
+    *
+    *    <infile>   : Input file, speech for encoder (16-bit pcm file)
+    *    <bytefile> : Bit stream output from the encoder
+    *    <outfile>  : Output file, decoded speech (16-bit pcm file)
+    *    <channel>  : Bit error file, optional (16-bit)
+    *                     1 - Packet received correctly
+    *                     0 - Packet Lost
+    *
+    *--------------------------------------------------------------*/
+
+   int main(int argc, char* argv[])
+   {
+
+       /* Runtime statistics */
+
+       float starttime;
+       float runtime;
+       float outtime;
+
+       FILE *ifileid,*efileid,*ofileid, *cfileid;
+       short data[BLOCKL_MAX];
+       short encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
+       int len;
+       short pli, mode;
+       int blockcount = 0;
+       int packetlosscount = 0;
+
+       /* Create structs */
+       iLBC_Enc_Inst_t Enc_Inst;
+       iLBC_Dec_Inst_t Dec_Inst;
+
+
+
+
+
+       /* get arguments and open files */
+
+       if ((argc!=5) && (argc!=6)) {
+           fprintf(stderr,
+           "\n*-----------------------------------------------*\n");
+           fprintf(stderr,
+           "   %s <20,30> input encoded decoded (channel)\n\n",
+               argv[0]);
+           fprintf(stderr,
+           "   mode    : Frame size for the encoding/decoding\n");
+           fprintf(stderr,
+           "                 20 - 20 ms\n");
+           fprintf(stderr,
+           "                 30 - 30 ms\n");
+           fprintf(stderr,
+           "   input   : Speech for encoder (16-bit pcm file)\n");
+           fprintf(stderr,
+           "   encoded : Encoded bit stream\n");
+           fprintf(stderr,
+           "   decoded : Decoded speech (16-bit pcm file)\n");
+           fprintf(stderr,
+           "   channel : Packet loss pattern, optional (16-bit)\n");
+           fprintf(stderr,
+           "                  1 - Packet received correctly\n");
+           fprintf(stderr,
+           "                  0 - Packet Lost\n");
+           fprintf(stderr,
+           "*-----------------------------------------------*\n\n");
+           exit(1);
+       }
+       mode=atoi(argv[1]);
+       if (mode != 20 && mode != 30) {
+           fprintf(stderr,"Wrong mode %s, must be 20, or 30\n",
+               argv[1]);
+           exit(2);
+       }
+       if ( (ifileid=fopen(argv[2],"rb")) == NULL) {
+           fprintf(stderr,"Cannot open input file %s\n", argv[2]);
+           exit(2);}
+       if ( (efileid=fopen(argv[3],"wb")) == NULL) {
+           fprintf(stderr, "Cannot open encoded file %s\n",
+               argv[3]); exit(1);}
+       if ( (ofileid=fopen(argv[4],"wb")) == NULL) {
+           fprintf(stderr, "Cannot open decoded file %s\n",
+               argv[4]); exit(1);}
+       if (argc==6) {
+           if( (cfileid=fopen(argv[5],"rb")) == NULL) {
+               fprintf(stderr, "Cannot open channel file %s\n",
+
+
+
+
+
+                   argv[5]);
+               exit(1);
+           }
+       } else {
+           cfileid=NULL;
+       }
+
+       /* print info */
+
+       fprintf(stderr, "\n");
+       fprintf(stderr,
+           "*---------------------------------------------------*\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*      iLBC test program                            *\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*---------------------------------------------------*\n");
+       fprintf(stderr,"\nMode           : %2d ms\n", mode);
+       fprintf(stderr,"Input file     : %s\n", argv[2]);
+       fprintf(stderr,"Encoded file   : %s\n", argv[3]);
+       fprintf(stderr,"Output file    : %s\n", argv[4]);
+       if (argc==6) {
+           fprintf(stderr,"Channel file   : %s\n", argv[5]);
+       }
+       fprintf(stderr,"\n");
+
+       /* Initialization */
+
+       initEncode(&Enc_Inst, mode);
+       initDecode(&Dec_Inst, mode, 1);
+
+       /* Runtime statistics */
+
+       starttime=clock()/(float)CLOCKS_PER_SEC;
+
+       /* loop over input blocks */
+
+       while (fread(data,sizeof(short),Enc_Inst.blockl,ifileid)==
+               Enc_Inst.blockl) {
+
+           blockcount++;
+
+           /* encoding */
+
+
+
+
+
+           fprintf(stderr, "--- Encoding block %i --- ",blockcount);
+           len=encode(&Enc_Inst, encoded_data, data);
+           fprintf(stderr, "\r");
+
+           /* write byte file */
+
+           fwrite(encoded_data, sizeof(unsigned char), len, efileid);
+
+           /* get channel data if provided */
+           if (argc==6) {
+               if (fread(&pli, sizeof(short), 1, cfileid)) {
+                   if ((pli!=0)&&(pli!=1)) {
+                       fprintf(stderr, "Error in channel file\n");
+                       exit(0);
+                   }
+                   if (pli==0) {
+                       /* Packet loss -> remove info from frame */
+                       memset(encoded_data, 0,
+                           sizeof(short)*ILBCNOOFWORDS_MAX);
+                       packetlosscount++;
+                   }
+               } else {
+                   fprintf(stderr, "Error. Channel file too short\n");
+                   exit(0);
+               }
+           } else {
+               pli=1;
+           }
+
+           /* decoding */
+
+           fprintf(stderr, "--- Decoding block %i --- ",blockcount);
+
+           len=decode(&Dec_Inst, decoded_data, encoded_data, pli);
+           fprintf(stderr, "\r");
+
+           /* write output file */
+
+           fwrite(decoded_data,sizeof(short),len,ofileid);
+       }
+
+       /* Runtime statistics */
+
+       runtime = (float)(clock()/(float)CLOCKS_PER_SEC-starttime);
+       outtime = (float)((float)blockcount*(float)mode/1000.0);
+       printf("\n\nLength of speech file: %.1f s\n", outtime);
+       printf("Packet loss          : %.1f%%\n",
+           100.0*(float)packetlosscount/(float)blockcount);
+
+
+
+
+
+       printf("Time to run iLBC     :");
+       printf(" %.1f s (%.1f %% of realtime)\n\n", runtime,
+           (100*runtime/outtime));
+
+       /* close files */
+
+       fclose(ifileid);  fclose(efileid); fclose(ofileid);
+       if (argc==6) {
+           fclose(cfileid);
+       }
+       return(0);
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
new file mode 100644
index 0000000..b4fe0ed
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.c
@@ -0,0 +1,283 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       lsf.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+
+
+
+
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  conversion from lpc coefficients to lsf coefficients
+    *---------------------------------------------------------------*/
+
+   void a2lsf(
+       float *freq,/* (o) lsf coefficients */
+       float *a    /* (i) lpc coefficients */
+   ){
+       float steps[LSF_NUMBER_OF_STEPS] =
+           {(float)0.00635, (float)0.003175, (float)0.0015875,
+           (float)0.00079375};
+       float step;
+       int step_idx;
+       int lsp_index;
+       float p[LPC_HALFORDER];
+       float q[LPC_HALFORDER];
+       float p_pre[LPC_HALFORDER];
+       float q_pre[LPC_HALFORDER];
+       float old_p, old_q, *old;
+       float *pq_coef;
+       float omega, old_omega;
+       int i;
+       float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
+
+       for (i=0; i<LPC_HALFORDER; i++) {
+           p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
+           q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
+       }
+
+       p_pre[0] = (float)-1.0 - p[0];
+       p_pre[1] = - p_pre[0] - p[1];
+       p_pre[2] = - p_pre[1] - p[2];
+       p_pre[3] = - p_pre[2] - p[3];
+       p_pre[4] = - p_pre[3] - p[4];
+       p_pre[4] = p_pre[4] / 2;
+
+       q_pre[0] = (float)1.0 - q[0];
+       q_pre[1] = q_pre[0] - q[1];
+       q_pre[2] = q_pre[1] - q[2];
+       q_pre[3] = q_pre[2] - q[3];
+       q_pre[4] = q_pre[3] - q[4];
+       q_pre[4] = q_pre[4] / 2;
+
+       omega = 0.0;
+
+
+
+
+
+       old_omega = 0.0;
+
+       old_p = FLOAT_MAX;
+       old_q = FLOAT_MAX;
+
+       /* Here we loop through lsp_index to find all the
+          LPC_FILTERORDER roots for omega. */
+
+       for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
+
+           /* Depending on lsp_index being even or odd, we
+           alternatively solve the roots for the two LSP equations. */
+
+
+           if ((lsp_index & 0x1) == 0) {
+               pq_coef = p_pre;
+               old = &old_p;
+           } else {
+               pq_coef = q_pre;
+               old = &old_q;
+           }
+
+           /* Start with low resolution grid */
+
+           for (step_idx = 0, step = steps[step_idx];
+               step_idx < LSF_NUMBER_OF_STEPS;){
+
+               /*  cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) +
+               pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
+
+               hlp = (float)cos(omega * TWO_PI);
+               hlp1 = (float)2.0 * hlp + pq_coef[0];
+               hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 +
+                   pq_coef[1];
+               hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
+               hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
+               hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
+
+
+               if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
+
+                   if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
+
+                       if (fabs(hlp5) >= fabs(*old)) {
+                           freq[lsp_index] = omega - step;
+                       } else {
+                           freq[lsp_index] = omega;
+                       }
+
+
+
+
+
+
+
+                       if ((*old) >= 0.0){
+                           *old = (float)-1.0 * FLOAT_MAX;
+                       } else {
+                           *old = FLOAT_MAX;
+                       }
+
+                       omega = old_omega;
+                       step_idx = 0;
+
+                       step_idx = LSF_NUMBER_OF_STEPS;
+                   } else {
+
+                       if (step_idx == 0) {
+                           old_omega = omega;
+                       }
+
+                       step_idx++;
+                       omega -= steps[step_idx];
+
+                       /* Go back one grid step */
+
+                       step = steps[step_idx];
+                   }
+               } else {
+
+               /* increment omega until they are of different sign,
+               and we know there is at least one root between omega
+               and old_omega */
+                   *old = hlp5;
+                   omega += step;
+               }
+           }
+       }
+
+       for (i = 0; i<LPC_FILTERORDER; i++) {
+           freq[i] = freq[i] * TWO_PI;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  conversion from lsf coefficients to lpc coefficients
+    *---------------------------------------------------------------*/
+
+   void lsf2a(
+       float *a_coef,  /* (o) lpc coefficients */
+       float *freq     /* (i) lsf coefficients */
+
+
+
+
+
+   ){
+       int i, j;
+       float hlp;
+       float p[LPC_HALFORDER], q[LPC_HALFORDER];
+       float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
+           a2[LPC_HALFORDER];
+       float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER],
+           b2[LPC_HALFORDER];
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           freq[i] = freq[i] * PI2;
+       }
+
+       /* Check input for ill-conditioned cases.  This part is not
+       found in the TIA standard.  It involves the following 2 IF
+       blocks.  If "freq" is judged ill-conditioned, then we first
+       modify freq[0] and freq[LPC_HALFORDER-1] (normally
+       LPC_HALFORDER = 10 for LPC applications), then we adjust
+       the other "freq" values slightly */
+
+
+       if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
+
+
+           if (freq[0] <= 0.0) {
+               freq[0] = (float)0.022;
+           }
+
+
+           if (freq[LPC_FILTERORDER - 1] >= 0.5) {
+               freq[LPC_FILTERORDER - 1] = (float)0.499;
+           }
+
+           hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) /
+               (float) (LPC_FILTERORDER - 1);
+
+           for (i=1; i<LPC_FILTERORDER; i++) {
+               freq[i] = freq[i - 1] + hlp;
+           }
+       }
+
+       memset(a1, 0, LPC_HALFORDER*sizeof(float));
+       memset(a2, 0, LPC_HALFORDER*sizeof(float));
+       memset(b1, 0, LPC_HALFORDER*sizeof(float));
+       memset(b2, 0, LPC_HALFORDER*sizeof(float));
+       memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
+       memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
+
+
+
+
+
+
+       /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and
+       cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.
+       Note that for this code p[i] specifies the coefficients
+       used in .Q_A(z) while q[i] specifies the coefficients used
+       in .P_A(z) */
+
+       for (i=0; i<LPC_HALFORDER; i++) {
+           p[i] = (float)cos(TWO_PI * freq[2 * i]);
+           q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
+       }
+
+       a[0] = 0.25;
+       b[0] = 0.25;
+
+       for (i= 0; i<LPC_HALFORDER; i++) {
+           a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
+           b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
+           a2[i] = a1[i];
+           a1[i] = a[i];
+           b2[i] = b1[i];
+           b1[i] = b[i];
+       }
+
+       for (j=0; j<LPC_FILTERORDER; j++) {
+
+           if (j == 0) {
+               a[0] = 0.25;
+               b[0] = -0.25;
+           } else {
+               a[0] = b[0] = 0.0;
+           }
+
+           for (i=0; i<LPC_HALFORDER; i++) {
+               a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
+               b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
+               a2[i] = a1[i];
+               a1[i] = a[i];
+               b2[i] = b1[i];
+               b1[i] = b[i];
+           }
+
+           a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
+       }
+
+       a_coef[0] = 1.0;
+   }
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
new file mode 100644
index 0000000..caff77e
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/lsf.h
@@ -0,0 +1,27 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       lsf.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LSF_H
+   #define __iLBC_LSF_H
+
+   void a2lsf(
+       float *freq,/* (o) lsf coefficients */
+       float *a    /* (i) lpc coefficients */
+   );
+
+   void lsf2a(
+       float *a_coef,  /* (o) lpc coefficients */
+       float *freq     /* (i) lsf coefficients */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
new file mode 100644
index 0000000..b7496a4
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.c
@@ -0,0 +1,182 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       packing.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "helpfun.h"
+   #include "string.h"
+
+   /*----------------------------------------------------------------*
+    *  splitting an integer into first most significant bits and
+    *  remaining least significant bits
+    *---------------------------------------------------------------*/
+
+   void packsplit(
+       int *index,                 /* (i) the value to split */
+       int *firstpart,             /* (o) the value specified by most
+                                          significant bits */
+       int *rest,                  /* (o) the value specified by least
+                                          significant bits */
+
+
+
+
+
+       int bitno_firstpart,    /* (i) number of bits in most
+                                          significant part */
+       int bitno_total             /* (i) number of bits in full range
+                                          of value */
+   ){
+       int bitno_rest = bitno_total-bitno_firstpart;
+
+       *firstpart = *index>>(bitno_rest);
+       *rest = *index-(*firstpart<<(bitno_rest));
+   }
+
+   /*----------------------------------------------------------------*
+    *  combining a value corresponding to msb's with a value
+    *  corresponding to lsb's
+    *---------------------------------------------------------------*/
+
+   void packcombine(
+       int *index,                 /* (i/o) the msb value in the
+                                          combined value out */
+       int rest,                   /* (i) the lsb value */
+       int bitno_rest              /* (i) the number of bits in the
+                                          lsb part */
+   ){
+       *index = *index<<bitno_rest;
+       *index += rest;
+   }
+
+   /*----------------------------------------------------------------*
+    *  packing of bits into bitstream, i.e., vector of bytes
+    *---------------------------------------------------------------*/
+
+   void dopack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to pack
+                                          new data, on exit pointer
+                                          to place in bitstream to
+                                          pack future data */
+       int index,                  /* (i) the value to pack */
+       int bitno,                  /* (i) the number of bits that the
+                                          value will fit within */
+       int *pos                /* (i/o) write position in the
+                                          current byte */
+   ){
+       int posLeft;
+
+       /* Clear the bits before starting in a new byte */
+
+       if ((*pos)==0) {
+
+
+
+
+
+           **bitstream=0;
+       }
+
+       while (bitno>0) {
+
+           /* Jump to the next byte if end of this byte is reached*/
+
+           if (*pos==8) {
+               *pos=0;
+               (*bitstream)++;
+               **bitstream=0;
+           }
+
+           posLeft=8-(*pos);
+
+           /* Insert index into the bitstream */
+
+           if (bitno <= posLeft) {
+               **bitstream |= (unsigned char)(index<<(posLeft-bitno));
+               *pos+=bitno;
+               bitno=0;
+           } else {
+               **bitstream |= (unsigned char)(index>>(bitno-posLeft));
+
+               *pos=8;
+               index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
+
+               bitno-=posLeft;
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  unpacking of bits from bitstream, i.e., vector of bytes
+    *---------------------------------------------------------------*/
+
+   void unpack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to
+                                          unpack new data from, on
+                                          exit pointer to place in
+                                          bitstream to unpack future
+                                          data from */
+       int *index,                 /* (o) resulting value */
+       int bitno,                  /* (i) number of bits used to
+                                          represent the value */
+       int *pos                /* (i/o) read position in the
+                                          current byte */
+
+
+
+
+
+   ){
+       int BitsLeft;
+
+       *index=0;
+
+       while (bitno>0) {
+
+           /* move forward in bitstream when the end of the
+              byte is reached */
+
+           if (*pos==8) {
+               *pos=0;
+               (*bitstream)++;
+           }
+
+           BitsLeft=8-(*pos);
+
+           /* Extract bits to index */
+
+           if (BitsLeft>=bitno) {
+               *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
+
+               *pos+=bitno;
+               bitno=0;
+           } else {
+
+               if ((8-bitno)>0) {
+                   *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
+                       (8-bitno));
+                   *pos=8;
+               } else {
+                   *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
+                       (bitno-8));
+                   *pos=8;
+               }
+               bitno-=BitsLeft;
+           }
+       }
+   }
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
new file mode 100644
index 0000000..cbb9f82
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/packing.h
@@ -0,0 +1,68 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       packing.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __PACKING_H
+   #define __PACKING_H
+
+   void packsplit(
+       int *index,                 /* (i) the value to split */
+       int *firstpart,             /* (o) the value specified by most
+                                          significant bits */
+       int *rest,                  /* (o) the value specified by least
+                                          significant bits */
+       int bitno_firstpart,    /* (i) number of bits in most
+                                          significant part */
+       int bitno_total             /* (i) number of bits in full range
+                                          of value */
+   );
+
+   void packcombine(
+       int *index,                 /* (i/o) the msb value in the
+                                          combined value out */
+       int rest,                   /* (i) the lsb value */
+       int bitno_rest              /* (i) the number of bits in the
+                                          lsb part */
+   );
+
+   void dopack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to pack
+                                          new data, on exit pointer
+                                          to place in bitstream to
+                                          pack future data */
+       int index,                  /* (i) the value to pack */
+       int bitno,                  /* (i) the number of bits that the
+                                          value will fit within */
+       int *pos                /* (i/o) write position in the
+                                          current byte */
+   );
+
+
+
+
+
+   void unpack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to
+                                          unpack new data from, on
+                                          exit pointer to place in
+                                          bitstream to unpack future
+                                          data from */
+       int *index,                 /* (o) resulting value */
+       int bitno,                  /* (i) number of bits used to
+                                          represent the value */
+       int *pos                /* (i/o) read position in the
+                                          current byte */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
new file mode 100644
index 0000000..d4fba08
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt
@@ -0,0 +1,10867 @@
+
+
+
+
+
+
+Network Working Group                                        S. Andersen
+Request for Comments: 3951                            Aalborg University
+Category: Experimental                                          A. Duric
+                                                                   Telio
+                                                               H. Astrom
+                                                                R. Hagen
+                                                               W. Kleijn
+                                                               J. Linden
+                                                         Global IP Sound
+                                                           December 2004
+
+
+                   Internet Low Bit Rate Codec (iLBC)
+
+Status of this Memo
+
+   This memo defines an Experimental Protocol for the Internet
+   community.  It does not specify an Internet standard of any kind.
+   Discussion and suggestions for improvement are requested.
+   Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2004).
+
+Abstract
+
+   This document specifies a speech codec suitable for robust voice
+   communication over IP.  The codec is developed by Global IP Sound
+   (GIPS).  It is designed for narrow band speech and results in a
+   payload bit rate of 13.33 kbit/s for 30 ms frames and 15.20 kbit/s
+   for 20 ms frames.  The codec enables graceful speech quality
+   degradation in the case of lost frames, which occurs in connection
+   with lost or delayed IP packets.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                      [Page 1]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+Table of Contents
+
+   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4
+   2.  Outline of the Codec . . . . . . . . . . . . . . . . . . . . .  5
+       2.1.  Encoder. . . . . . . . . . . . . . . . . . . . . . . . .  5
+       2.2.  Decoder. . . . . . . . . . . . . . . . . . . . . . . . .  7
+   3.  Encoder Principles . . . . . . . . . . . . . . . . . . . . . .  7
+       3.1.  Pre-processing . . . . . . . . . . . . . . . . . . . . .  9
+       3.2.  LPC Analysis and Quantization. . . . . . . . . . . . . .  9
+             3.2.1.  Computation of Autocorrelation Coefficients. . . 10
+             3.2.2.  Computation of LPC Coefficients. . . . . . . . . 11
+             3.2.3.  Computation of LSF Coefficients from LPC
+                     Coefficients . . . . . . . . . . . . . . . . . . 11
+             3.2.4.  Quantization of LSF Coefficients . . . . . . . . 12
+             3.2.5.  Stability Check of LSF Coefficients. . . . . . . 13
+             3.2.6.  Interpolation of LSF Coefficients. . . . . . . . 13
+             3.2.7.  LPC Analysis and Quantization for 20 ms Frames . 14
+       3.3.  Calculation of the Residual. . . . . . . . . . . . . . . 15
+       3.4.  Perceptual Weighting Filter. . . . . . . . . . . . . . . 15
+       3.5.  Start State Encoder. . . . . . . . . . . . . . . . . . . 15
+             3.5.1.  Start State Estimation . . . . . . . . . . . . . 16
+             3.5.2.  All-Pass Filtering and Scale Quantization. . . . 17
+             3.5.3.  Scalar Quantization. . . . . . . . . . . . . . . 18
+       3.6.  Encoding the Remaining Samples . . . . . . . . . . . . . 19
+             3.6.1.  Codebook Memory. . . . . . . . . . . . . . . . . 20
+             3.6.2.  Perceptual Weighting of Codebook Memory
+                     and Target . . . . . . . . . . . . . . . . . . . 22
+             3.6.3.  Codebook Creation. . . . . . . . . . . . . . . . 23
+                     3.6.3.1. Creation of a Base Codebook . . . . . . 23
+                     3.6.3.2. Codebook Expansion. . . . . . . . . . . 24
+                     3.6.3.3. Codebook Augmentation . . . . . . . . . 24
+             3.6.4.  Codebook Search. . . . . . . . . . . . . . . . . 26
+                     3.6.4.1. Codebook Search at Each Stage . . . . . 26
+                     3.6.4.2. Gain Quantization at Each Stage . . . . 27
+                     3.6.4.3. Preparation of Target for Next Stage. . 28
+       3.7.  Gain Correction Encoding . . . . . . . . . . . . . . . . 28
+       3.8.  Bitstream Definition . . . . . . . . . . . . . . . . . . 29
+   4.  Decoder Principles . . . . . . . . . . . . . . . . . . . . . . 32
+       4.1.  LPC Filter Reconstruction. . . . . . . . . . . . . . . . 33
+       4.2.  Start State Reconstruction . . . . . . . . . . . . . . . 33
+       4.3.  Excitation Decoding Loop . . . . . . . . . . . . . . . . 34
+       4.4.  Multistage Adaptive Codebook Decoding. . . . . . . . . . 35
+             4.4.1.  Construction of the Decoded Excitation Signal. . 35
+       4.5.  Packet Loss Concealment. . . . . . . . . . . . . . . . . 35
+             4.5.1.  Block Received Correctly and Previous Block
+                     Also Received. . . . . . . . . . . . . . . . . . 35
+             4.5.2.  Block Not Received . . . . . . . . . . . . . . . 36
+
+
+
+
+Andersen, et al.              Experimental                      [Page 2]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+             4.5.3.  Block Received Correctly When Previous Block
+                     Not Received . . . . . . . . . . . . . . . . . . 36
+       4.6.  Enhancement. . . . . . . . . . . . . . . . . . . . . . . 37
+             4.6.1.  Estimating the Pitch . . . . . . . . . . . . . . 39
+             4.6.2.  Determination of the Pitch-Synchronous
+                     Sequences. . . . . . . . . . . . . . . . . . . . 39
+             4.6.3.  Calculation of the Smoothed Excitation . . . . . 41
+             4.6.4.  Enhancer Criterion . . . . . . . . . . . . . . . 41
+             4.6.5.  Enhancing the Excitation . . . . . . . . . . . . 42
+       4.7.  Synthesis Filtering. . . . . . . . . . . . . . . . . . . 43
+       4.8.  Post Filtering . . . . . . . . . . . . . . . . . . . . . 43
+   5.  Security Considerations. . . . . . . . . . . . . . . . . . . . 43
+   6.  Evaluation of the iLBC Implementations . . . . . . . . . . . . 43
+   7.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 43
+       7.1.  Normative References . . . . . . . . . . . . . . . . . . 43
+       7.2.  Informative References . . . . . . . . . . . . . . . . . 44
+   8.  ACKNOWLEDGEMENTS . . . . . . . . . . . . . . . . . . . . . . . 44
+   APPENDIX A: Reference Implementation . . . . . . . . . . . . . . . 45
+       A.1.  iLBC_test.c. . . . . . . . . . . . . . . . . . . . . . . 46
+       A.2   iLBC_encode.h. . . . . . . . . . . . . . . . . . . . . . 52
+       A.3.  iLBC_encode.c. . . . . . . . . . . . . . . . . . . . . . 53
+       A.4.  iLBC_decode.h. . . . . . . . . . . . . . . . . . . . . . 63
+       A.5.  iLBC_decode.c. . . . . . . . . . . . . . . . . . . . . . 64
+       A.6.  iLBC_define.h. . . . . . . . . . . . . . . . . . . . . . 76
+       A.7.  constants.h. . . . . . . . . . . . . . . . . . . . . . . 80
+       A.8.  constants.c. . . . . . . . . . . . . . . . . . . . . . . 82
+       A.9.  anaFilter.h. . . . . . . . . . . . . . . . . . . . . . . 96
+       A.10. anaFilter.c. . . . . . . . . . . . . . . . . . . . . . . 97
+       A.11. createCB.h . . . . . . . . . . . . . . . . . . . . . . . 98
+       A.12. createCB.c . . . . . . . . . . . . . . . . . . . . . . . 99
+       A.13. doCPLC.h . . . . . . . . . . . . . . . . . . . . . . . .104
+       A.14. doCPLC.c . . . . . . . . . . . . . . . . . . . . . . . .104
+       A.15. enhancer.h . . . . . . . . . . . . . . . . . . . . . . .109
+       A.16. enhancer.c . . . . . . . . . . . . . . . . . . . . . . .110
+       A.17. filter.h . . . . . . . . . . . . . . . . . . . . . . . .123
+       A.18. filter.c . . . . . . . . . . . . . . . . . . . . . . . .125
+       A.19. FrameClassify.h. . . . . . . . . . . . . . . . . . . . .128
+       A.20. FrameClassify.c. . . . . . . . . . . . . . . . . . . . .129
+       A.21. gainquant.h. . . . . . . . . . . . . . . . . . . . . . .131
+       A.22. gainquant.c. . . . . . . . . . . . . . . . . . . . . . .131
+       A.23. getCBvec.h . . . . . . . . . . . . . . . . . . . . . . .134
+       A.24. getCBvec.c . . . . . . . . . . . . . . . . . . . . . . .134
+       A.25. helpfun.h. . . . . . . . . . . . . . . . . . . . . . . .138
+       A.26. helpfun.c. . . . . . . . . . . . . . . . . . . . . . . .140
+       A.27. hpInput.h. . . . . . . . . . . . . . . . . . . . . . . .146
+       A.28. hpInput.c. . . . . . . . . . . . . . . . . . . . . . . .146
+       A.29. hpOutput.h . . . . . . . . . . . . . . . . . . . . . . .148
+       A.30. hpOutput.c . . . . . . . . . . . . . . . . . . . . . . .148
+
+
+
+Andersen, et al.              Experimental                      [Page 3]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       A.31. iCBConstruct.h . . . . . . . . . . . . . . . . . . . . .149
+       A.32. iCBConstruct.c . . . . . . . . . . . . . . . . . . . . .150
+       A.33. iCBSearch.h. . . . . . . . . . . . . . . . . . . . . . .152
+       A.34. iCBSearch.c. . . . . . . . . . . . . . . . . . . . . . .153
+       A.35. LPCdecode.h. . . . . . . . . . . . . . . . . . . . . . .163
+       A.36. LPCdecode.c. . . . . . . . . . . . . . . . . . . . . . .164
+       A.37. LPCencode.h. . . . . . . . . . . . . . . . . . . . . . .167
+       A.38. LPCencode.c. . . . . . . . . . . . . . . . . . . . . . .167
+       A.39. lsf.h. . . . . . . . . . . . . . . . . . . . . . . . . .172
+       A.40. lsf.c. . . . . . . . . . . . . . . . . . . . . . . . . .172
+       A.41. packing.h. . . . . . . . . . . . . . . . . . . . . . . .178
+       A.42. packing.c. . . . . . . . . . . . . . . . . . . . . . . .179
+       A.43. StateConstructW.h. . . . . . . . . . . . . . . . . . . .182
+       A.44. StateConstructW.c. . . . . . . . . . . . . . . . . . . .183
+       A.45. StateSearchW.h . . . . . . . . . . . . . . . . . . . . .185
+       A.46. StateSearchW.c . . . . . . . . . . . . . . . . . . . . .186
+       A.47. syntFilter.h . . . . . . . . . . . . . . . . . . . . . .190
+       A.48. syntFilter.c . . . . . . . . . . . . . . . . . . . . . .190
+   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . .192
+   Full Copyright Statement . . . . . . . . . . . . . . . . . . . . .194
+
+1.  Introduction
+
+   This document contains the description of an algorithm for the coding
+   of speech signals sampled at 8 kHz.  The algorithm, called iLBC, uses
+   a block-independent linear-predictive coding (LPC) algorithm and has
+   support for two basic frame lengths: 20 ms at 15.2 kbit/s and 30 ms
+   at 13.33 kbit/s.  When the codec operates at block lengths of 20 ms,
+   it produces 304 bits per block, which SHOULD be packetized as in [1].
+   Similarly, for block lengths of 30 ms it produces 400 bits per block,
+   which SHOULD be packetized as in [1].  The two modes for the
+   different frame sizes operate in a very similar way.  When they
+   differ it is explicitly stated in the text, usually with the notation
+   x/y, where x refers to the 20 ms mode and y refers to the 30 ms mode.
+
+   The described algorithm results in a speech coding system with a
+   controlled response to packet losses similar to what is known from
+   pulse code modulation (PCM) with packet loss concealment (PLC), such
+   as the ITU-T G.711 standard [4], which operates at a fixed bit rate
+   of 64 kbit/s.  At the same time, the described algorithm enables
+   fixed bit rate coding with a quality-versus-bit rate tradeoff close
+   to state-of-the-art.  A suitable RTP payload format for the iLBC
+   codec is specified in [1].
+
+   Some of the applications for which this coder is suitable are real
+   time communications such as telephony and videoconferencing,
+   streaming audio, archival, and messaging.
+
+
+
+
+Andersen, et al.              Experimental                      [Page 4]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   Cable Television Laboratories (CableLabs(R)) has adopted iLBC as a
+   mandatory PacketCable(TM) audio codec standard for VoIP over Cable
+   applications [3].
+
+   This document is organized as follows.  Section 2 gives a brief
+   outline of the codec.  The specific encoder and decoder algorithms
+   are explained in sections 3 and 4, respectively.  Appendix A provides
+   a c-code reference implementation.
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in BCP 14, RFC 2119 [2].
+
+2.  Outline of the Codec
+
+   The codec consists of an encoder and a decoder as described in
+   sections 2.1 and 2.2, respectively.
+
+   The essence of the codec is LPC and block-based coding of the LPC
+   residual signal.  For each 160/240 (20 ms/30 ms) sample block, the
+   following major steps are performed: A set of LPC filters are
+   computed, and the speech signal is filtered through them to produce
+   the residual signal.  The codec uses scalar quantization of the
+   dominant part, in terms of energy, of the residual signal for the
+   block.  The dominant state is of length 57/58 (20 ms/30 ms) samples
+   and forms a start state for dynamic codebooks constructed from the
+   already coded parts of the residual signal.  These dynamic codebooks
+   are used to code the remaining parts of the residual signal.  By this
+   method, coding independence between blocks is achieved, resulting in
+   elimination of propagation of perceptual degradations due to packet
+   loss.  The method facilitates high-quality packet loss concealment
+   (PLC).
+
+2.1.  Encoder
+
+   The input to the encoder SHOULD be 16 bit uniform PCM sampled at 8
+   kHz.  It SHOULD be partitioned into blocks of BLOCKL=160/240 samples
+   for the 20/30 ms frame size.  Each block is divided into NSUB=4/6
+   consecutive sub-blocks of SUBL=40 samples each.  For 30 ms frame
+   size, the encoder performs two LPC_FILTERORDER=10 linear-predictive
+   coding (LPC) analyses.  The first analysis applies a smooth window
+   centered over the second sub-block and extending to the middle of the
+   fifth sub-block.  The second LPC analysis applies a smooth asymmetric
+   window centered over the fifth sub-block and extending to the end of
+   the sixth sub-block.  For 20 ms frame size, one LPC_FILTERORDER=10
+   linear-predictive coding (LPC) analysis is performed with a smooth
+   window centered over the third sub-frame.
+
+
+
+
+Andersen, et al.              Experimental                      [Page 5]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   For each of the LPC analyses, a set of line-spectral frequencies
+   (LSFs) are obtained, quantized, and interpolated to obtain LSF
+   coefficients for each sub-block.  Subsequently, the LPC residual is
+   computed by using the quantized and interpolated LPC analysis
+   filters.
+
+   The two consecutive sub-blocks of the residual exhibiting the maximal
+   weighted energy are identified.  Within these two sub-blocks, the
+   start state (segment) is selected from two choices: the first 57/58
+   samples or the last 57/58 samples of the two consecutive sub-blocks.
+   The selected segment is the one of higher energy.  The start state is
+   encoded with scalar quantization.
+
+   A dynamic codebook encoding procedure is used to encode 1) the 23/22
+   (20 ms/30 ms) remaining samples in the two sub-blocks containing the
+   start state; 2) the sub-blocks after the start state in time; and 3)
+   the sub-blocks before the start state in time.  Thus, the encoding
+   target can be either the 23/22 samples remaining of the two sub-
+   blocks containing the start state or a 40-sample sub-block.  This
+   target can consist of samples indexed forward in time or backward in
+   time, depending on the location of the start state.
+
+   The codebook coding is based on an adaptive codebook built from a
+   codebook memory that contains decoded LPC excitation samples from the
+   already encoded part of the block.  These samples are indexed in the
+   same time direction as the target vector, ending at the sample
+   instant prior to the first sample instant represented in the target
+   vector.  The codebook is used in CB_NSTAGES=3 stages in a successive
+   refinement approach, and the resulting three code vector gains are
+   encoded with 5-, 4-, and 3-bit scalar quantization, respectively.
+
+   The codebook search method employs noise shaping derived from the LPC
+   filters, and the main decision criterion is to minimize the squared
+   error between the target vector and the code vectors.  Each code
+   vector in this codebook comes from one of CB_EXPAND=2 codebook
+   sections.  The first section is filled with delayed, already encoded
+   residual vectors.  The code vectors of the second codebook section
+   are constructed by predefined linear combinations of vectors in the
+   first section of the codebook.
+
+   As codebook encoding with squared-error matching is known to produce
+   a coded signal of less power than does the scalar quantized start
+   state signal, a gain re-scaling method is implemented by a refined
+   search for a better set of codebook gains in terms of power matching
+   after encoding.  This is done by searching for a higher value of the
+   gain factor for the first stage codebook, as the subsequent stage
+   codebook gains are scaled by the first stage gain.
+
+
+
+
+Andersen, et al.              Experimental                      [Page 6]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+2.2.  Decoder
+
+   Typically for packet communications, a jitter buffer placed at the
+   receiving end decides whether the packet containing an encoded signal
+   block has been received or lost.  This logic is not part of the codec
+   described here.  For each encoded signal block received the decoder
+   performs a decoding.  For each lost signal block, the decoder
+   performs a PLC operation.
+
+   The decoding for each block starts by decoding and interpolating the
+   LPC coefficients.  Subsequently the start state is decoded.
+
+   For codebook-encoded segments, each segment is decoded by
+   constructing the three code vectors given by the received codebook
+   indices in the same way that the code vectors were constructed in the
+   encoder.  The three gain factors are also decoded and the resulting
+   decoded signal is given by the sum of the three codebook vectors
+   scaled with respective gain.
+
+   An enhancement algorithm is applied to the reconstructed excitation
+   signal.  This enhancement augments the periodicity of voiced speech
+   regions.  The enhancement is optimized under the constraint that the
+   modification signal (defined as the difference between the enhanced
+   excitation and the excitation signal prior to enhancement) has a
+   short-time energy that does not exceed a preset fraction of the
+   short-time energy of the excitation signal prior to enhancement.
+
+   A packet loss concealment (PLC) operation is easily embedded in the
+   decoder.  The PLC operation can, e.g., be based on repeating LPC
+   filters and obtaining the LPC residual signal by using a long-term
+   prediction estimate from previous residual blocks.
+
+3.  Encoder Principles
+
+   The following block diagram is an overview of all the components of
+   the iLBC encoding procedure.  The description of the blocks contains
+   references to the section where that particular procedure is further
+   described.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                      [Page 7]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+             +-----------+    +---------+    +---------+
+   speech -> | 1. Pre P  | -> | 2. LPC  | -> | 3. Ana  | ->
+             +-----------+    +---------+    +---------+
+
+             +---------------+   +--------------+
+          -> | 4. Start Sel  | ->| 5. Scalar Qu | ->
+             +---------------+   +--------------+
+
+             +--------------+    +---------------+
+          -> |6. CB Search  | -> | 7. Packetize  | -> payload
+          |  +--------------+ |  +---------------+
+          ----<---------<------
+       sub-frame 0..2/4 (20 ms/30 ms)
+
+   Figure 3.1. Flow chart of the iLBC encoder
+
+   1. Pre-process speech with a HP filter, if needed (section 3.1).
+
+   2. Compute LPC parameters, quantize, and interpolate (section 3.2).
+
+   3. Use analysis filters on speech to compute residual (section 3.3).
+
+   4. Select position of 57/58-sample start state (section 3.5).
+
+   5. Quantize the 57/58-sample start state with scalar quantization
+      (section 3.5).
+
+   6. Search the codebook for each sub-frame.  Start with 23/22 sample
+      block, then encode sub-blocks forward in time, and then encode
+      sub-blocks backward in time.  For each block, the steps in Figure
+      3.4 are performed (section 3.6).
+
+   7. Packetize the bits into the payload specified in Table 3.2.
+
+   The input to the encoder SHOULD be 16-bit uniform PCM sampled at 8
+   kHz.  Also it SHOULD be partitioned into blocks of BLOCKL=160/240
+   samples.  Each block input to the encoder is divided into NSUB=4/6
+   consecutive sub-blocks of SUBL=40 samples each.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                      [Page 8]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+             0        39        79       119       159
+             +---------------------------------------+
+             |    1    |    2    |    3    |    4    |
+             +---------------------------------------+
+                            20 ms frame
+
+   0        39        79       119       159       199       239
+   +-----------------------------------------------------------+
+   |    1    |    2    |    3    |    4    |    5    |    6    |
+   +-----------------------------------------------------------+
+                                  30 ms frame
+   Figure 3.2. One input block to the encoder for 20 ms (with four sub-
+   frames) and 30 ms (with six sub-frames).
+
+3.1.  Pre-processing
+
+   In some applications, the recorded speech signal contains DC level
+   and/or 50/60 Hz noise.  If these components have not been removed
+   prior to the encoder call, they should be removed by a high-pass
+   filter.  A reference implementation of this, using a filter with a
+   cutoff frequency of 90 Hz, can be found in Appendix A.28.
+
+3.2.  LPC Analysis and Quantization
+
+   The input to the LPC analysis module is a possibly high-pass filtered
+   speech buffer, speech_hp, that contains 240/300 (LPC_LOOKBACK +
+   BLOCKL = 80/60 + 160/240 = 240/300) speech samples, where samples 0
+   through 79/59 are from the previous block and samples 80/60 through
+   239/299 are from the current block.  No look-ahead into the next
+   block is used.  For the very first block processed, the look-back
+   samples are assumed to be zeros.
+
+   For each input block, the LPC analysis calculates one/two set(s) of
+   LPC_FILTERORDER=10 LPC filter coefficients using the autocorrelation
+   method and the Levinson-Durbin recursion.  These coefficients are
+   converted to the Line Spectrum Frequency representation.  In the 20
+   ms case, the single lsf set represents the spectral characteristics
+   as measured at the center of the third sub-block.  For 30 ms frames,
+   the first set, lsf1, represents the spectral properties of the input
+   signal at the center of the second sub-block, and the other set,
+   lsf2, represents the spectral characteristics as measured at the
+   center of the fifth sub-block.  The details of the computation for 30
+   ms frames are described in sections 3.2.1 through 3.2.6.  Section
+   3.2.7 explains how the LPC Analysis and Quantization differs for 20
+   ms frames.
+
+
+
+
+
+
+Andersen, et al.              Experimental                      [Page 9]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+3.2.1.  Computation of Autocorrelation Coefficients
+
+   The first step in the LPC analysis procedure is to calculate
+   autocorrelation coefficients by using windowed speech samples.  This
+   windowing is the only difference in the LPC analysis procedure for
+   the two sets of coefficients.  For the first set, a 240-sample-long
+   standard symmetric Hanning window is applied to samples 0 through 239
+   of the input data.  The first window, lpc_winTbl, is defined as
+
+      lpc_winTbl[i]= 0.5 * (1.0 - cos((2*PI*(i+1))/(BLOCKL+1)));
+               i=0,...,119
+      lpc_winTbl[i] = winTbl[BLOCKL - i - 1]; i=120,...,239
+
+   The windowed speech speech_hp_win1 is then obtained by multiplying
+   the first 240 samples of the input speech buffer with the window
+   coefficients:
+
+      speech_hp_win1[i] = speech_hp[i] * lpc_winTbl[i];
+               i=0,...,BLOCKL-1
+
+   From these 240 windowed speech samples, 11 (LPC_FILTERORDER + 1)
+   autocorrelation coefficients, acf1, are calculated:
+
+      acf1[lag] += speech_hp_win1[n] * speech_hp_win1[n + lag];
+               lag=0,...,LPC_FILTERORDER; n=0,...,BLOCKL-lag-1
+
+   In order to make the analysis more robust against numerical precision
+   problems, a spectral smoothing procedure is applied by windowing the
+   autocorrelation coefficients before the LPC coefficients are
+   computed.  Also, a white noise floor is added to the autocorrelation
+   function by multiplying coefficient zero by 1.0001 (40dB below the
+   energy of the windowed speech signal).  These two steps are
+   implemented by multiplying the autocorrelation coefficients with the
+   following window:
+
+      lpc_lagwinTbl[0] = 1.0001;
+      lpc_lagwinTbl[i] = exp(-0.5 * ((2 * PI * 60.0 * i) /FS)^2);
+               i=1,...,LPC_FILTERORDER
+               where FS=8000 is the sampling frequency
+
+   Then, the windowed acf function acf1_win is obtained by
+
+      acf1_win[i] = acf1[i] * lpc_lagwinTbl[i];
+               i=0,...,LPC_FILTERORDER
+
+   The second set of autocorrelation coefficients, acf2_win, are
+   obtained in a similar manner.  The window, lpc_asymwinTbl, is applied
+   to samples 60 through 299, i.e., the entire current block.  The
+
+
+
+Andersen, et al.              Experimental                     [Page 10]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   window consists of two segments, the first (samples 0 to 219) being
+   half a Hanning window with length 440 and the second a quarter of a
+   cycle of a cosine wave.  By using this asymmetric window, an LPC
+   analysis centered in the fifth sub-block is obtained without the need
+   for any look-ahead, which would add delay.  The asymmetric window is
+   defined as
+
+      lpc_asymwinTbl[i] = (sin(PI * (i + 1) / 441))^2; i=0,...,219
+
+      lpc_asymwinTbl[i] = cos((i - 220) * PI / 40); i=220,...,239
+
+   and the windowed speech is computed by
+
+      speech_hp_win2[i] = speech_hp[i + LPC_LOOKBACK] *
+               lpc_asymwinTbl[i];  i=0,....BLOCKL-1
+
+   The windowed autocorrelation coefficients are then obtained in
+   exactly the same way as for the first analysis instance.
+
+   The generation of the windows lpc_winTbl, lpc_asymwinTbl, and
+   lpc_lagwinTbl are typically done in advance, and the arrays are
+   stored in ROM rather than repeating the calculation for every block.
+
+3.2.2.  Computation of LPC Coefficients
+
+   From the 2 x 11 smoothed autocorrelation coefficients, acf1_win and
+   acf2_win, the 2 x 11 LPC coefficients, lp1 and lp2, are calculated
+   in the same way for both analysis locations by using the well known
+   Levinson-Durbin recursion.  The first LPC coefficient is always 1.0,
+   resulting in ten unique coefficients.
+
+   After determining the LPC coefficients, a bandwidth expansion
+   procedure is applied to smooth the spectral peaks in the
+   short-term spectrum.  The bandwidth addition is obtained by the
+   following modification of the LPC coefficients:
+
+      lp1_bw[i] = lp1[i] * chirp^i; i=0,...,LPC_FILTERORDER
+      lp2_bw[i] = lp2[i] * chirp^i; i=0,...,LPC_FILTERORDER
+
+   where "chirp" is a real number between 0 and 1.  It is RECOMMENDED to
+   use a value of 0.9.
+
+3.2.3.  Computation of LSF Coefficients from LPC Coefficients
+
+   Thus far, two sets of LPC coefficients that represent the short-term
+   spectral characteristics of the speech signal for two different time
+   locations within the current block have been determined.  These
+   coefficients SHOULD be quantized and interpolated.  Before this is
+
+
+
+Andersen, et al.              Experimental                     [Page 11]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   done, it is advantageous to convert the LPC parameters into another
+   type of representation called Line Spectral Frequencies (LSF).  The
+   LSF parameters are used because they are better suited for
+   quantization and interpolation than the regular LPC coefficients.
+   Many computationally efficient methods for calculating the LSFs from
+   the LPC coefficients have been proposed in the literature.  The
+   detailed implementation of one applicable method can be found in
+   Appendix A.26.  The two arrays of LSF coefficients obtained, lsf1 and
+   lsf2, are of dimension 10 (LPC_FILTERORDER).
+
+3.2.4.  Quantization of LSF Coefficients
+
+   Because the LPC filters defined by the two sets of LSFs are also
+   needed in the decoder, the LSF parameters need to be quantized and
+   transmitted as side information.  The total number of bits required
+   to represent the quantization of the two LSF representations for one
+   block of speech is 40, with 20 bits used for each of lsf1 and lsf2.
+
+   For computational and storage reasons, the LSF vectors are quantized
+   using three-split vector quantization (VQ).  That is, the LSF vectors
+   are split into three sub-vectors that are each quantized with a
+   regular VQ.  The quantized versions of lsf1 and lsf2, qlsf1 and
+   qlsf2, are obtained by using the same memoryless split VQ.  The
+   length of each of these two LSF vectors is 10, and they are split
+   into three sub-vectors containing 3, 3, and 4 values, respectively.
+
+   For each of the sub-vectors, a separate codebook of quantized values
+   has been designed with a standard VQ training method for a large
+   database containing speech from a large number of speakers recorded
+   under various conditions.  The size of each of the three codebooks
+   associated with the split definitions above is
+
+      int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
+
+   The actual values of the vector quantization codebook that must be
+   used can be found in the reference code of Appendix A.  Both sets of
+   LSF coefficients, lsf1 and lsf2, are quantized with a standard
+   memoryless split vector quantization (VQ) structure using the squared
+   error criterion in the LSF domain.  The split VQ quantization
+   consists of the following steps:
+
+   1) Quantize the first three LSF coefficients (1 - 3) with a VQ
+      codebook of size 64.
+   2) Quantize the next three LSF coefficients 4 - 6 with VQ a codebook
+      of size 128.
+   3) Quantize the last four LSF coefficients (7 - 10) with a VQ
+      codebook of size 128.
+
+
+
+
+Andersen, et al.              Experimental                     [Page 12]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   This procedure, repeated for lsf1 and lsf2, gives six quantization
+   indices and the quantized sets of LSF coefficients qlsf1 and qlsf2.
+   Each set of three indices is encoded with 6 + 7 + 7 = 20 bits.  The
+   total number of bits used for LSF quantization in a block is thus 40
+   bits.
+
+3.2.5.  Stability Check of LSF Coefficients
+
+   The LSF representation of the LPC filter has the convenient property
+   that the coefficients are ordered by increasing value, i.e., lsf(n-1)
+   < lsf(n), 0 < n < 10, if the corresponding synthesis filter is
+   stable.  As we are employing a split VQ scheme, it is possible that
+   at the split boundaries the LSF coefficients are not ordered
+   correctly and hence that the corresponding LP filter is unstable.  To
+   ensure that the filter used is stable, a stability check is performed
+   for the quantized LSF vectors.  If it turns out that the coefficients
+   are not ordered appropriately (with a safety margin of 50 Hz to
+   ensure that formant peaks are not too narrow), they will be moved
+   apart.  The detailed method for this can be found in Appendix A.40.
+   The same procedure is performed in the decoder.  This ensures that
+   exactly the same LSF representations are used in both encoder and
+   decoder.
+
+3.2.6.  Interpolation of LSF Coefficients
+
+   From the two sets of LSF coefficients that are computed for each
+   block of speech, different LSFs are obtained for each sub-block by
+   means of interpolation.  This procedure is performed for the original
+   LSFs (lsf1 and lsf2), as well as the quantized versions qlsf1 and
+   qlsf2, as both versions are used in the encoder.  Here follows a
+   brief summary of the interpolation scheme; the details are found in
+   the c-code of Appendix A.  In the first sub-block, the average of the
+   second LSF vector from the previous block and the first LSF vector in
+   the current block is used.  For sub-blocks two through five, the LSFs
+   used are obtained by linear interpolation from lsf1 (and qlsf1) to
+   lsf2 (and qlsf2), with lsf1 used in sub-block two and lsf2 in sub-
+   block five.  In the last sub-block, lsf2 is used.  For the very first
+   block it is assumed that the last LSF vector of the previous block is
+   equal to a predefined vector, lsfmeanTbl, obtained by calculating the
+   mean LSF vector of the LSF design database.
+
+   lsfmeanTbl[LPC_FILTERORDER] = {0.281738, 0.445801, 0.663330,
+                  0.962524, 1.251831, 1.533081, 1.850586, 2.137817,
+                  2.481445, 2.777344}
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 13]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   The interpolation method is standard linear interpolation in the LSF
+   domain.  The interpolated LSF values are converted to LPC
+   coefficients for each sub-block.  The unquantized and quantized LPC
+   coefficients form two sets of filters respectively.  The unquantized
+   analysis filter for sub-block k is defined as follows
+
+                ___
+                \
+      Ak(z)= 1 + > ak(i)*z^(-i)
+                /__
+             i=1...LPC_FILTERORDER
+
+   The quantized analysis filter for sub-block k is defined as follows
+                 ___
+                 \
+      A~k(z)= 1 + > a~k(i)*z^(-i)
+                 /__
+             i=1...LPC_FILTERORDER
+
+   A reference implementation of the lsf encoding is given in Appendix
+   A.38.  A reference implementation of the corresponding decoding can
+   be found in Appendix A.36.
+
+3.2.7.  LPC Analysis and Quantization for 20 ms Frames
+
+   As previously stated, the codec only calculates one set of LPC
+   parameters for the 20 ms frame size as opposed to two sets for 30 ms
+   frames.  A single set of autocorrelation coefficients is calculated
+   on the LPC_LOOKBACK + BLOCKL = 80 + 160 = 240 samples.  These samples
+   are windowed with the asymmetric window lpc_asymwinTbl, centered over
+   the third sub-frame, to form speech_hp_win.  Autocorrelation
+   coefficients, acf, are calculated on the 240 samples in speech_hp_win
+   and then windowed exactly as in section 3.2.1 (resulting in
+   acf_win).
+
+   This single set of windowed autocorrelation coefficients is used to
+   calculate LPC coefficients, LSF coefficients, and quantized LSF
+   coefficients in exactly the same manner as in sections 3.2.3 through
+   3.2.4.  As for the 30 ms frame size, the ten LSF coefficients are
+   divided into three sub-vectors of size 3, 3, and 4 and quantized by
+   using the same scheme and codebook as in section 3.2.4 to finally get
+   3 quantization indices.  The quantized LSF coefficients are
+   stabilized with the algorithm described in section 3.2.5.
+
+   From the set of LSF coefficients computed for this block and those
+   from the previous block, different LSFs are obtained for each sub-
+   block by means of interpolation.  The interpolation is done linearly
+   in the LSF domain over the four sub-blocks, so that the n-th sub-
+
+
+
+Andersen, et al.              Experimental                     [Page 14]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   frame uses the weight (4-n)/4 for the LSF from old frame and the
+   weight n/4 of the LSF from the current frame.  For the very first
+   block the mean LSF, lsfmeanTbl, is used as the LSF from the previous
+   block.  Similarly as seen in section 3.2.6, both unquantized, A(z),
+   and quantized, A~(z), analysis filters are calculated for each of the
+   four sub-blocks.
+
+3.3.  Calculation of the Residual
+
+   The block of speech samples is filtered by the quantized and
+   interpolated LPC analysis filters to yield the residual signal.  In
+   particular, the corresponding LPC analysis filter for each 40 sample
+   sub-block is used to filter the speech samples for the same sub-
+   block.  The filter memory at the end of each sub-block is carried
+   over to the LPC filter of the next sub-block.  The signal at the
+   output of each LP analysis filter constitutes the residual signal for
+   the corresponding sub-block.
+
+   A reference implementation of the LPC analysis filters is given in
+   Appendix A.10.
+
+3.4.  Perceptual Weighting Filter
+
+   In principle any good design of a perceptual weighting filter can be
+   applied in the encoder without compromising this codec definition.
+   However, it is RECOMMENDED to use the perceptual weighting filter Wk
+   for sub-block k specified below:
+
+      Wk(z)=1/Ak(z/LPC_CHIRP_WEIGHTDENUM), where
+                               LPC_CHIRP_WEIGHTDENUM = 0.4222
+
+   This is a simple design with low complexity that is applied in the
+   LPC residual domain.  Here Ak(z) is the filter obtained for sub-block
+   k from unquantized but interpolated LSF coefficients.
+
+3.5.  Start State Encoder
+
+   The start state is quantized by using a common 6-bit scalar quantizer
+   for the block and a 3-bit scalar quantizer operating on scaled
+   samples in the weighted speech domain.  In the following we describe
+   the state encoding in greater detail.
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 15]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+3.5.1.  Start State Estimation
+
+   The two sub-blocks containing the start state are determined by
+   finding the two consecutive sub-blocks in the block having the
+   highest power.  Advantageously, down-weighting is used in the
+   beginning and end of the sub-frames, i.e., the following measure is
+   computed (NSUB=4/6 for 20/30 ms frame size):
+
+      nsub=1,...,NSUB-1
+      ssqn[nsub] = 0.0;
+      for (i=(nsub-1)*SUBL; i<(nsub-1)*SUBL+5; i++)
+               ssqn[nsub] += sampEn_win[i-(nsub-1)*SUBL]*
+                                 residual[i]*residual[i];
+      for (i=(nsub-1)*SUBL+5; i<(nsub+1)*SUBL-5; i++)
+               ssqn[nsub] += residual[i]*residual[i];
+      for (i=(nsub+1)*SUBL-5; i<(nsub+1)*SUBL; i++)
+               ssqn[nsub] += sampEn_win[(nsub+1)*SUBL-i-1]*
+                                 residual[i]*residual[i];
+
+   where sampEn_win[5]={1/6, 2/6, 3/6, 4/6, 5/6}; MAY be used.  The
+   sub-frame number corresponding to the maximum value of
+   ssqEn_win[nsub-1]*ssqn[nsub] is selected as the start state
+   indicator.  A weighting of ssqEn_win[]={0.8,0.9,1.0,0.9,0.8} for 30
+   ms frames and ssqEn_win[]={0.9,1.0,0.9} for 20 ms frames; MAY
+   advantageously be used to bias the start state towards the middle of
+   the frame.
+
+   For 20 ms frames there are three possible positions for the two-sub-
+   block length maximum power segment; the start state position is
+   encoded with 2 bits.  The start state position, start, MUST be
+   encoded as
+
+      start=1: start state in sub-frame 0 and 1
+      start=2: start state in sub-frame 1 and 2
+      start=3: start state in sub-frame 2 and 3
+
+   For 30 ms frames there are five possible positions of the two-sub-
+   block length maximum power segment, the start state position is
+   encoded with 3 bits.  The start state position, start, MUST be
+   encoded as
+
+      start=1: start state in sub-frame 0 and 1
+      start=2: start state in sub-frame 1 and 2
+      start=3: start state in sub-frame 2 and 3
+      start=4: start state in sub-frame 3 and 4
+      start=5: start state in sub-frame 4 and 5
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 16]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   Hence, in both cases, index 0 is not used.  In order to shorten the
+   start state for bit rate efficiency, the start state is brought down
+   to STATE_SHORT_LEN=57 samples for 20 ms frames and STATE_SHORT_LEN=58
+   samples for 30 ms frames.  The power of the first 23/22 and last
+   23/22 samples of the two sub-frame blocks identified above is
+   computed as the sum of the squared signal sample values, and the
+   23/22-sample segment with the lowest power is excluded from the start
+   state.  One bit is transmitted to indicate which of the two possible
+   57/58 sample segments is used.  The start state position within the
+   two sub-frames determined above, state_first, MUST be encoded as
+
+      state_first=1: start state is first STATE_SHORT_LEN samples
+      state_first=0: start state is last STATE_SHORT_LEN samples
+
+3.5.2.  All-Pass Filtering and Scale Quantization
+
+   The block of residual samples in the start state is first filtered by
+   an all-pass filter with the quantized LPC coefficients as denominator
+   and reversed quantized LPC coefficients as numerator.  The purpose of
+   this phase-dispersion filter is to get a more even distribution of
+   the sample values in the residual signal.  The filtering is performed
+   by circular convolution, where the initial filter memory is set to
+   zero.
+
+      res(0..(STATE_SHORT_LEN-1))   = uncoded start state residual
+      res((STATE_SHORT_LEN)..(2*STATE_SHORT_LEN-1)) = 0
+
+      Pk(z) = A~rk(z)/A~k(z), where
+                                   ___
+                                   \
+      A~rk(z)= z^(-LPC_FILTERORDER)+>a~k(i+1)*z^(i-(LPC_FILTERORDER-1))
+                                   /__
+                               i=0...(LPC_FILTERORDER-1)
+
+      and A~k(z) is taken from the block where the start state begins
+
+      res -> Pk(z) -> filtered
+
+      ccres(k) = filtered(k) + filtered(k+STATE_SHORT_LEN),
+                                        k=0..(STATE_SHORT_LEN-1)
+
+   The all-pass filtered block is searched for its largest magnitude
+   sample.  The 10-logarithm of this magnitude is quantized with a 6-bit
+   quantizer, state_frgqTbl, by finding the nearest representation.
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 17]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   This results in an index, idxForMax, corresponding to a quantized
+   value, qmax.  The all-pass filtered residual samples in the block are
+   then multiplied with a scaling factor scal=4.5/(10^qmax) to yield
+   normalized samples.
+
+   state_frgqTbl[64] = {1.000085, 1.071695, 1.140395, 1.206868,
+                  1.277188, 1.351503, 1.429380, 1.500727, 1.569049,
+                  1.639599, 1.707071, 1.781531, 1.840799, 1.901550,
+                  1.956695, 2.006750, 2.055474, 2.102787, 2.142819,
+                  2.183592, 2.217962, 2.257177, 2.295739, 2.332967,
+                  2.369248, 2.402792, 2.435080, 2.468598, 2.503394,
+                  2.539284, 2.572944, 2.605036, 2.636331, 2.668939,
+                  2.698780, 2.729101, 2.759786, 2.789834, 2.818679,
+                  2.848074, 2.877470, 2.906899, 2.936655, 2.967804,
+                  3.000115, 3.033367, 3.066355, 3.104231, 3.141499,
+                  3.183012, 3.222952, 3.265433, 3.308441, 3.350823,
+                  3.395275, 3.442793, 3.490801, 3.542514, 3.604064,
+                  3.666050, 3.740994, 3.830749, 3.938770, 4.101764}
+
+3.5.3.  Scalar Quantization
+
+   The normalized samples are quantized in the perceptually weighted
+   speech domain by a sample-by-sample scalar DPCM quantization as
+   depicted in Figure 3.3.  Each sample in the block is filtered by a
+   weighting filter Wk(z), specified in section 3.4, to form a weighted
+   speech sample x[n].  The target sample d[n] is formed by subtracting
+   a predicted sample y[n], where the prediction filter is given by
+
+           Pk(z) = 1 - 1 / Wk(z).
+
+               +-------+  x[n] +    d[n] +-----------+ u[n]
+   residual -->| Wk(z) |-------->(+)---->| Quantizer |------> quantized
+               +-------+       - /|\     +-----------+    |   residual
+                                  |                      \|/
+                             y[n] +--------------------->(+)
+                                  |                       |
+                                  |        +------+       |
+                                  +--------| Pk(z)|<------+
+                                           +------+
+
+   Figure 3.3.  Quantization of start state samples by DPCM in weighted
+   speech domain.
+
+   The coded state sample u[n] is obtained by quantizing d[n] with a 3-
+   bit quantizer with quantization table state_sq3Tbl.
+
+   state_sq3Tbl[8] = {-3.719849, -2.177490, -1.130005, -0.309692,
+                  0.444214, 1.329712, 2.436279, 3.983887}
+
+
+
+Andersen, et al.              Experimental                     [Page 18]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   The quantized samples are transformed back to the residual domain by
+   1) scaling with 1/scal; 2) time-reversing the scaled samples; 3)
+   filtering the time-reversed samples by the same all-pass filter, as
+   in section 3.5.2, by using circular convolution; and 4) time-
+   reversing the filtered samples.  (More detail is in section 4.2.)
+
+   A reference implementation of the start-state encoding can be found
+   in Appendix A.46.
+
+3.6.  Encoding the Remaining Samples
+
+   A dynamic codebook is used to encode 1) the 23/22 remaining samples
+   in the two sub-blocks containing the start state; 2) the sub-blocks
+   after the start state in time; and 3) the sub-blocks before the start
+   state in time.  Thus, the encoding target can be either the 23/22
+   samples remaining of the 2 sub-blocks containing the start state, or
+   a 40-sample sub-block.  This target can consist of samples that are
+   indexed forward in time or backward in time, depending on the
+   location of the start state.  The length of the target is denoted by
+   lTarget.
+
+   The coding is based on an adaptive codebook that is built from a
+   codebook memory that contains decoded LPC excitation samples from the
+   already encoded part of the block.  These samples are indexed in the
+   same time direction as is the target vector and end at the sample
+   instant prior to the first sample instant represented in the target
+   vector.  The codebook memory has length lMem, which is equal to
+   CB_MEML=147 for the two/four 40-sample sub-blocks and 85 for the
+   23/22-sample sub-block.
+
+   The following figure shows an overview of the encoding procedure.
+
+         +------------+    +---------------+    +-------------+
+      -> | 1. Decode  | -> | 2. Mem setup  | -> | 3. Perc. W. | ->
+         +------------+    +---------------+    +-------------+
+
+         +------------+    +-----------------+
+      -> | 4. Search  | -> | 5. Upd. Target  | ------------------>
+       | +------------+    +------------------ |
+       ----<-------------<-----------<----------
+                     stage=0..2
+
+         +----------------+
+      -> | 6. Recalc G[0] | ---------------> gains and CB indices
+         +----------------+
+
+   Figure 3.4.  Flow chart of the codebook search in the iLBC encoder.
+
+
+
+
+Andersen, et al.              Experimental                     [Page 19]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   1. Decode the part of the residual that has been encoded so far,
+      using the codebook without perceptual weighting.
+
+   2. Set up the memory by taking data from the decoded residual.  This
+      memory is used to construct codebooks.  For blocks preceding the
+      start state, both the decoded residual and the target are time
+      reversed (section 3.6.1).
+   3. Filter the memory + target with the perceptual weighting filter
+      (section 3.6.2).
+
+   4. Search for the best match between the target and the codebook
+      vector.  Compute the optimal gain for this match and quantize that
+      gain (section 3.6.4).
+
+   5. Update the perceptually weighted target by subtracting the
+      contribution from the selected codebook vector from the
+      perceptually weighted memory (quantized gain times selected
+      vector).  Repeat 4 and 5 for the two additional stages.
+
+   6. Calculate the energy loss due to encoding of the residual.  If
+      needed, compensate for this loss by an upscaling and
+      requantization of the gain for the first stage (section 3.7).
+
+   The following sections provide an in-depth description of the
+   different blocks of Figure 3.4.
+
+3.6.1.  Codebook Memory
+
+   The codebook memory is based on the already encoded sub-blocks, so
+   the available data for encoding increases for each new sub-block that
+   has been encoded.  Until enough sub-blocks have been encoded to fill
+   the codebook memory with data, it is padded with zeros.  The
+   following figure shows an example of the order in which the sub-
+   blocks are encoded for the 30 ms frame size if the start state is
+   located in the last 58 samples of sub-block 2 and 3.
+
+   +-----------------------------------------------------+
+   |  5     | 1  |///|////////|    2   |    3   |    4   |
+   +-----------------------------------------------------+
+
+   Figure 3.5.  The order from 1 to 5 in which the sub-blocks are
+   encoded.  The slashed area is the start state.
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 20]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   The first target sub-block to be encoded is number 1, and the
+   corresponding codebook memory is shown in the following figure.  As
+   the target vector comes before the start state in time, the codebook
+   memory and target vector are time reversed; thus, after the block has
+   been time reversed the search algorithm can be reused.  As only the
+   start state has been encoded so far, the last samples of the codebook
+   memory are padded with zeros.
+
+   +-------------------------
+   |zeros|\\\\\\\\|\\\\|  1 |
+   +-------------------------
+
+   Figure 3.6.  The codebook memory, length lMem=85 samples, and the
+   target vector 1, length 22 samples.
+
+   The next step is to encode sub-block 2 by using the memory that now
+   has increased since sub-block 1 has been encoded.  The following
+   figure shows the codebook memory for encoding of sub-block 2.
+
+   +-----------------------------------
+   | zeros | 1  |///|////////|    2   |
+   +-----------------------------------
+
+   Figure 3.7.  The codebook memory, length lMem=147 samples, and the
+   target vector 2, length 40 samples.
+
+   The next step is to encode sub-block 3 by using the memory which has
+   been increased yet again since sub-blocks 1 and 2 have been encoded,
+   but the sub-block still has to be padded with a few zeros.  The
+   following figure shows the codebook memory for encoding of sub-block
+   3.
+
+   +------------------------------------------
+   |zeros| 1  |///|////////|    2   |   3    |
+   +------------------------------------------
+
+   Figure 3.8.  The codebook memory, length lMem=147 samples, and the
+   target vector 3, length 40 samples.
+
+   The next step is to encode sub-block 4 by using the memory which now
+   has increased yet again since sub-blocks 1, 2, and 3 have been
+   encoded.  This time, the memory does not have to be padded with
+   zeros.  The following figure shows the codebook memory for encoding
+   of sub-block 4.
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 21]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   +------------------------------------------
+   |1|///|////////|    2   |   3    |   4    |
+   +------------------------------------------
+
+   Figure 3.9.  The codebook memory, length lMem=147 samples, and the
+   target vector 4, length 40 samples.
+
+   The final target sub-block to be encoded is number 5, and the
+   following figure shows the corresponding codebook memory.  As the
+   target vector comes before the start state in time, the codebook
+   memory and target vector are time reversed.
+
+   +-------------------------------------------
+   |  3  |   2    |\\\\\\\\|\\\\|  1 |   5    |
+   +-------------------------------------------
+
+   Figure 3.10.  The codebook memory, length lMem=147 samples, and the
+   target vector 5, length 40 samples.
+
+   For the case of 20 ms frames, the encoding procedure looks almost
+   exactly the same.  The only difference is that the size of the start
+   state is 57 samples and that there are only three sub-blocks to be
+   encoded.  The encoding order is the same as above, starting with the
+   23-sample target and then encoding the two remaining 40-sample sub-
+   blocks, first going forward in time and then going backward in time
+   relative to the start state.
+
+3.6.2.  Perceptual Weighting of Codebook Memory and Target
+
+   To provide a perceptual weighting of the coding error, a
+   concatenation of the codebook memory and the target to be coded is
+   all-pole filtered with the perceptual weighting filter specified in
+   section 3.4.  The filter state of the weighting filter is set to
+   zero.
+
+      in(0..(lMem-1))            = unweighted codebook memory
+      in(lMem..(lMem+lTarget-1)) = unweighted target signal
+
+
+      in -> Wk(z) -> filtered,
+          where Wk(z) is taken from the sub-block of the target
+
+      weighted codebook memory = filtered(0..(lMem-1))
+      weighted target signal = filtered(lMem..(lMem+lTarget-1))
+
+   The codebook search is done with the weighted codebook memory and the
+   weighted target, whereas the decoding and the codebook memory update
+   uses the unweighted codebook memory.
+
+
+
+Andersen, et al.              Experimental                     [Page 22]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+3.6.3.  Codebook Creation
+
+   The codebook for the search is created from the perceptually weighted
+   codebook memory.  It consists of two sections, where the first is
+   referred to as the base codebook and the second as the expanded
+   codebook, as it is created by linear combinations of the first.  Each
+   of these two sections also has a subsection referred to as the
+   augmented codebook.  The augmented codebook is only created and used
+   for the coding of the 40-sample sub-blocks and not for the 23/22-
+   sample sub-block case.  The codebook size used for the different
+   sub-blocks and different stages are summarized in the table below.
+
+                              Stage
+                        1               2 & 3
+           --------------------------------------------
+                22     128  (64+0)*2     128 (64+0)*2
+   Sub-    1:st 40     256  (108+20)*2   128 (44+20)*2
+   Blocks  2:nd 40     256  (108+20)*2   256 (108+20)*2
+           3:rd 40     256  (108+20)*2   256 (108+20)*2
+           4:th 40     256  (108+20)*2   256 (108+20)*2
+
+   Table 3.1.  Codebook sizes for the 30 ms mode.
+
+   Table 3.1 shows the codebook size for the different sub-blocks and
+   stages for 30 ms frames.  Inside the parentheses it shows how the
+   number of codebook vectors is distributed, within the two sections,
+   between the base/expanded codebook and the augmented base/expanded
+   codebook.  It should be interpreted in the following way:
+   (base/expanded cb + augmented base/expanded cb).  The total number of
+   codebook vectors for a specific sub-block and stage is given by the
+   following formula:
+
+   Tot. cb vectors = base cb + aug. base cb + exp. cb + aug. exp. cb
+
+   The corresponding values to Figure 3.1 for 20 ms frames are only
+   slightly modified.  The short sub-block is 23 instead of 22 samples,
+   and the 3:rd and 4:th sub-frame are not present.
+
+3.6.3.1.  Creation of a Base Codebook
+
+   The base codebook is given by the perceptually weighted codebook
+   memory that is mentioned in section 3.5.3.  The different codebook
+   vectors are given by sliding a window of length 23/22 or 40, given by
+   variable lTarget, over the lMem-long perceptually weighted codebook
+   memory.  The indices are ordered so that the codebook vector
+   containing sample (lMem-lTarget-n) to (lMem-n-1) of the codebook
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 23]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   memory vector has index n, where n=0..lMem-lTarget.  Thus the total
+   number of base codebook vectors is lMem-lTarget+1, and the indices
+   are ordered from sample delay lTarget (23/22 or 40) to lMem+1 (86 or
+   148).
+
+3.6.3.2.  Codebook Expansion
+
+   The base codebook is expanded by a factor of 2, creating an
+   additional section in the codebook.  This new section is obtained by
+   filtering the base codebook, base_cb, with a FIR filter with filter
+   length CB_FILTERLEN=8.  The construction of the expanded codebook
+   compensates for the delay of four samples introduced by the FIR
+   filter.
+
+   cbfiltersTbl[CB_FILTERLEN]={-0.033691, 0.083740, -0.144043,
+                  0.713379, 0.806152, -0.184326,
+                  0.108887, -0.034180};
+
+                   ___
+                   \
+      exp_cb(k)=  + > cbfiltersTbl(i)*x(k-i+4)
+                   /__
+             i=0...(LPC_FILTERORDER-1)
+
+      where x(j) = base_cb(j) for j=0..lMem-1 and 0 otherwise
+
+   The individual codebook vectors of the new filtered codebook, exp_cb,
+   and their indices are obtained in the same fashion as described above
+   for the base codebook.
+
+3.6.3.3.  Codebook Augmentation
+
+   For cases where encoding entire sub-blocks, i.e., cbveclen=40, the
+   base and expanded codebooks are augmented to increase codebook
+   richness.  The codebooks are augmented by vectors produced by
+   interpolation of segments.  The base and expanded codebook,
+   constructed above, consists of vectors corresponding to sample delays
+   in the range from cbveclen to lMem.  The codebook augmentation
+   attempts to augment these codebooks with vectors corresponding to
+   sample delays from 20 to 39.  However, not all of these samples are
+   present in the base codebook and expanded codebook, respectively.
+   Therefore, the augmentation vectors are constructed as linear
+   combinations between samples corresponding to sample delays in the
+   range 20 to 39.  The general idea of this procedure is presented in
+   the following figures and text.  The procedure is performed for both
+   the base codebook and the expanded codebook.
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 24]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       - - ------------------------|
+    codebook memory                |
+       - - ------------------------|
+                  |-5-|---15---|-5-|
+                  pi  pp       po
+
+                      |        |                       Codebook vector
+                      |---15---|-5-|-----20-----|   <- corresponding to
+                          i     ii      iii            sample delay 20
+
+   Figure 3.11.  Generation of the first augmented codebook.
+
+   Figure 3.11 shows the codebook memory with pointers pi, pp, and po,
+   where pi points to sample 25, pp to sample 20, and po to sample 5.
+   Below the codebook memory, the augmented codebook vector
+   corresponding to sample delay 20 is drawn.  Segment i consists of
+   fifteen samples from pointer pp and forward in time.  Segment ii
+   consists of five interpolated samples from pi and forward and from po
+   and forward.  The samples are linearly interpolated with weights
+   [0.0, 0.2, 0.4, 0.6, 0.8] for pi and weights [1.0, 0.8, 0.6, 0.4,
+   0.2] for po.  Segment iii consists of twenty samples from pp and
+   forward.  The augmented codebook vector corresponding to sample delay
+   21 is produced by moving pointers pp and pi one sample backward in
+   time.  This gives us the following figure.
+
+       - - ------------------------|
+    codebook memory                |
+       - - ------------------------|
+                  |-5-|---16---|-5-|
+                  pi  pp       po
+
+                      |        |                       Codebook vector
+                      |---16---|-5-|-----19-----|   <- corresponding to
+                          i     ii      iii            sample delay 21
+
+   Figure 3.12.  Generation of the second augmented codebook.
+
+   Figure 3.12 shows the codebook memory with pointers pi, pp and po
+   where pi points to sample 26, pp to sample 21, and po to sample 5.
+   Below the codebook memory, the augmented codebook vector
+   corresponding to sample delay 21 is drawn.  Segment i now consists of
+   sixteen samples from pp and forward.  Segment ii consists of five
+   interpolated samples from pi and forward and from po and forward, and
+   the interpolation weights are the same throughout the procedure.
+   Segment iii consists of nineteen samples from pp and forward.  The
+   same procedure of moving the two pointers is continued until the last
+   augmented vector corresponding to sample delay 39 has been created.
+   This gives a total of twenty new codebook vectors to each of the two
+
+
+
+Andersen, et al.              Experimental                     [Page 25]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   sections.  Thus the total number of codebook vectors for each of the
+   two sections, when including the augmented codebook, becomes lMem-
+   SUBL+1+SUBL/2.  This is provided that augmentation is evoked, i.e.,
+   that lTarget=SUBL.
+
+3.6.4.  Codebook Search
+
+   The codebook search uses the codebooks described in the sections
+   above to find the best match of the perceptually weighted target, see
+   section 3.6.2.  The search method is a multi-stage gain-shape
+   matching performed as follows.  At each stage the best shape vector
+   is identified, then the gain is calculated and quantized, and finally
+   the target is updated in preparation for the next codebook search
+   stage.  The number of stages is CB_NSTAGES=3.
+
+   If the target is the 23/22-sample vector the codebooks are indexed so
+   that the base codebook is followed by the expanded codebook.  If the
+   target is 40 samples the order is as follows: base codebook,
+   augmented base codebook, expanded codebook, and augmented expanded
+   codebook.  The size of each codebook section and its corresponding
+   augmented section is given by Table 3.1 in section 3.6.3.
+
+   For example, when the second 40-sample sub-block is coded, indices 0
+   - 107 correspond to the base codebook, 108 - 127 correspond to the
+   augmented base codebook, 128 - 235 correspond to the expanded
+   codebook, and indices 236 - 255 correspond to the augmented expanded
+   codebook.  The indices are divided in the same fashion for all stages
+   in the example.  Only in the case of coding the first 40-sample sub-
+   block is there a difference between stages (see Table 3.1).
+
+3.6.4.1.  Codebook Search at Each Stage
+
+   The codebooks are searched to find the best match to the target at
+   each stage.  When the best match is found, the target is updated and
+   the next-stage search is started.  The three chosen codebook vectors
+   and their corresponding gains constitute the encoded sub-block.  The
+   best match is decided by the following three criteria:
+
+   1. Compute the measure
+
+      (target*cbvec)^2 / ||cbvec||^2
+
+   for all codebook vectors, cbvec, and choose the codebook vector
+   maximizing the measure.  The expression (target*cbvec) is the dot
+   product between the target vector to be coded and the codebook vector
+   for which we compute the measure.  The norm, ||x||, is defined as the
+   square root of (x*x).
+
+
+
+
+Andersen, et al.              Experimental                     [Page 26]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   2. The absolute value of the gain, corresponding to the chosen
+      codebook vector, cbvec, must be smaller than a fixed limit,
+      CB_MAXGAIN=1.3:
+
+            |gain| < CB_MAXGAIN
+
+      where the gain is computed in the following way:
+
+            gain = (target*cbvec) / ||cbvec||^2
+
+   3. For the first stage, the dot product of the chosen codebook vector
+      and target must be positive:
+
+      target*cbvec > 0
+
+   In practice the above criteria are used in a sequential search
+   through all codebook vectors.  The best match is found by registering
+   a new max measure and index whenever the previously registered max
+   measure is surpassed and all other criteria are fulfilled.  If none
+   of the codebook vectors fulfill (2) and (3), the first codebook
+   vector is selected.
+
+3.6.4.2.  Gain Quantization at Each Stage
+
+   The gain follows as a result of the computation
+
+      gain = (target*cbvec) / ||cbvec||^2
+
+   for the optimal codebook vector found by the procedure in section
+   3.6.4.1.
+
+   The three stages quantize the gain, using 5, 4, and 3 bits,
+   respectively.  In the first stage, the gain is limited to positive
+   values.  This gain is quantized by finding the nearest value in the
+   quantization table gain_sq5Tbl.
+
+   gain_sq5Tbl[32]={0.037476, 0.075012, 0.112488, 0.150024, 0.187500,
+                  0.224976, 0.262512, 0.299988, 0.337524, 0.375000,
+                  0.412476, 0.450012, 0.487488, 0.525024, 0.562500,
+                  0.599976, 0.637512, 0.674988, 0.712524, 0.750000,
+                  0.787476, 0.825012, 0.862488, 0.900024, 0.937500,
+                  0.974976, 1.012512, 1.049988, 1.087524, 1.125000,
+                  1.162476, 1.200012}
+
+   The gains of the subsequent two stages can be either positive or
+   negative.  The gains are quantized by using a quantization table
+   times a scale factor.  The second stage uses the table gain_sq4Tbl,
+   and the third stage uses gain_sq3Tbl.  The scale factor equates 0.1
+
+
+
+Andersen, et al.              Experimental                     [Page 27]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   or the absolute value of the quantized gain representation value
+   obtained in the previous stage, whichever is larger.  Again, the
+   resulting gain index is the index to the nearest value of the
+   quantization table times the scale factor.
+
+        gainQ = scaleFact * gain_sqXTbl[index]
+
+   gain_sq4Tbl[16]={-1.049988, -0.900024, -0.750000, -0.599976,
+                  -0.450012, -0.299988, -0.150024, 0.000000, 0.150024,
+                  0.299988, 0.450012, 0.599976, 0.750000, 0.900024,
+                  1.049988, 1.200012}
+
+   gain_sq3Tbl[8]={-1.000000, -0.659973, -0.330017,0.000000,
+                  0.250000, 0.500000, 0.750000, 1.00000}
+
+3.6.4.3.  Preparation of Target for Next Stage
+
+   Before performing the search for the next stage, the perceptually
+   weighted target vector is updated by subtracting from it the selected
+   codebook vector (from the perceptually weighted codebook) times the
+   corresponding quantized gain.
+
+      target[i] = target[i] - gainQ * selected_vec[i];
+
+   A reference implementation of the codebook encoding is found in
+   Appendix A.34.
+
+3.7.  Gain Correction Encoding
+
+   The start state is quantized in a relatively model independent manner
+   using 3 bits per sample.  In contrast, the remaining parts of the
+   block are encoded by using an adaptive codebook.  This codebook will
+   produce high matching accuracy whenever there is a high correlation
+   between the target and the best codebook vector.  For unvoiced speech
+   segments and background noises, this is not necessarily so, which,
+   due to the nature of the squared error criterion, results in a coded
+   signal with less power than the target signal.  As the coded start
+   state has good power matching to the target, the result is a power
+   fluctuation within the encoded frame.  Perceptually, the main problem
+   with this is that the time envelope of the signal energy becomes
+   unsteady.  To overcome this problem, the gains for the codebooks are
+   re-scaled after the codebook encoding by searching for a new gain
+   factor for the first stage codebook that provides better power
+   matching.
+
+   First, the energy for the target signal, tene, is computed along with
+   the energy for the coded signal, cene, given by the addition of the
+   three gain scaled codebook vectors.  Because the gains of the second
+
+
+
+Andersen, et al.              Experimental                     [Page 28]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   and third stage scale with the gain of the first stage, when the
+   first stage gain is changed from gain[0] to gain_sq5Tbl[i] the energy
+   of the coded signal changes from cene to
+
+      cene*(gain_sq5Tbl[i]*gain_sq5Tbl[i])/(gain[0]*gain[0])
+
+   where gain[0] is the gain for the first stage found in the original
+   codebook search.  A refined search is performed by testing the gain
+   indices i=0 to 31, and as long as the new codebook energy as given
+   above is less than tene, the gain index for stage 1 is increased.  A
+   restriction is applied so that the new gain value for stage 1 cannot
+   be more than two times higher than the original value found in the
+   codebook search.  Note that by using this method we do not change the
+   shape of the encoded vector, only the gain or amplitude.
+
+3.8.  Bitstream Definition
+
+   The total number of bits used to describe one frame of 20 ms speech
+   is 304, which fits in 38 bytes and results in a bit rate of 15.20
+   kbit/s.  For the case of a frame length of 30 ms speech, the total
+   number of bits used is 400, which fits in 50 bytes and results in a
+   bit rate of 13.33 kbit/s.  In the bitstream definition, the bits are
+   distributed into three classes according to their bit error or loss
+   sensitivity.  The most sensitive bits (class 1) are placed first in
+   the bitstream for each frame.  The less sensitive bits (class 2) are
+   placed after the class 1 bits.  The least sensitive bits (class 3)
+   are placed at the end of the bitstream for each frame.
+
+   In the 20/30 ms frame length cases for each class, the following hold
+   true: The class 1 bits occupy a total of 6/8 bytes (48/64 bits), the
+   class 2 bits occupy 8/12 bytes (64/96 bits), and the class 3 bits
+   occupy 24/30 bytes (191/239 bits).  This distribution of the bits
+   enables the use of uneven level protection (ULP) as is exploited in
+   the payload format definition for iLBC [1].  The detailed bit
+   allocation is shown in the table below.  When a quantization index is
+   distributed between more classes, the more significant bits belong to
+   the lowest class.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 29]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   Bitstream structure:
+
+   ------------------------------------------------------------------+
+   Parameter                         |       Bits Class <1,2,3>      |
+                                     |  20 ms frame  |  30 ms frame  |
+   ----------------------------------+---------------+---------------+
+                            Split 1  |   6 <6,0,0>   |   6 <6,0,0>   |
+                   LSF 1    Split 2  |   7 <7,0,0>   |   7 <7,0,0>   |
+   LSF                      Split 3  |   7 <7,0,0>   |   7 <7,0,0>   |
+                   ------------------+---------------+---------------+
+                            Split 1  | NA (Not Appl.)|   6 <6,0,0>   |
+                   LSF 2    Split 2  |      NA       |   7 <7,0,0>   |
+                            Split 3  |      NA       |   7 <7,0,0>   |
+                   ------------------+---------------+---------------+
+                   Sum               |  20 <20,0,0>  |  40 <40,0,0>  |
+   ----------------------------------+---------------+---------------+
+   Block Class                       |   2 <2,0,0>   |   3 <3,0,0>   |
+   ----------------------------------+---------------+---------------+
+   Position 22 sample segment        |   1 <1,0,0>   |   1 <1,0,0>   |
+   ----------------------------------+---------------+---------------+
+   Scale Factor State Coder          |   6 <6,0,0>   |   6 <6,0,0>   |
+   ----------------------------------+---------------+---------------+
+                   Sample 0          |   3 <0,1,2>   |   3 <0,1,2>   |
+   Quantized       Sample 1          |   3 <0,1,2>   |   3 <0,1,2>   |
+   Residual           :              |   :    :      |   :    :      |
+   State              :              |   :    :      |   :    :      |
+   Samples            :              |   :    :      |   :    :      |
+                   Sample 56         |   3 <0,1,2>   |   3 <0,1,2>   |
+                   Sample 57         |      NA       |   3 <0,1,2>   |
+                   ------------------+---------------+---------------+
+                   Sum               | 171 <0,57,114>| 174 <0,58,116>|
+   ----------------------------------+---------------+---------------+
+                            Stage 1  |   7 <6,0,1>   |   7 <4,2,1>   |
+   CB for 22/23             Stage 2  |   7 <0,0,7>   |   7 <0,0,7>   |
+   sample block             Stage 3  |   7 <0,0,7>   |   7 <0,0,7>   |
+                   ------------------+---------------+---------------+
+                   Sum               |  21 <6,0,15>  |  21 <4,2,15>  |
+   ----------------------------------+---------------+---------------+
+                            Stage 1  |   5 <2,0,3>   |   5 <1,1,3>   |
+   Gain for 22/23           Stage 2  |   4 <1,1,2>   |   4 <1,1,2>   |
+   sample block             Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
+                   ------------------+---------------+---------------+
+                   Sum               |  12 <3,1,8>   |  12 <2,2,8>   |
+   ----------------------------------+---------------+---------------+
+                            Stage 1  |   8 <7,0,1>   |   8 <6,1,1>   |
+               sub-block 1  Stage 2  |   7 <0,0,7>   |   7 <0,0,7>   |
+                            Stage 3  |   7 <0,0,7>   |   7 <0,0,7>   |
+                   ------------------+---------------+---------------+
+
+
+
+Andersen, et al.              Experimental                     [Page 30]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                            Stage 1  |   8 <0,0,8>   |   8 <0,7,1>   |
+               sub-block 2  Stage 2  |   8 <0,0,8>   |   8 <0,0,8>   |
+   Indices                  Stage 3  |   8 <0,0,8>   |   8 <0,0,8>   |
+   for CB          ------------------+---------------+---------------+
+   sub-blocks               Stage 1  |      NA       |   8 <0,7,1>   |
+               sub-block 3  Stage 2  |      NA       |   8 <0,0,8>   |
+                            Stage 3  |      NA       |   8 <0,0,8>   |
+                   ------------------+---------------+---------------+
+                            Stage 1  |      NA       |   8 <0,7,1>   |
+               sub-block 4  Stage 2  |      NA       |   8 <0,0,8>   |
+                            Stage 3  |      NA       |   8 <0,0,8>   |
+                   ------------------+---------------+---------------+
+                   Sum               |  46 <7,0,39>  |  94 <6,22,66> |
+   ----------------------------------+---------------+---------------+
+                            Stage 1  |   5 <1,2,2>   |   5 <1,2,2>   |
+               sub-block 1  Stage 2  |   4 <1,1,2>   |   4 <1,2,1>   |
+                            Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
+                   ------------------+---------------+---------------+
+                            Stage 1  |   5 <1,1,3>   |   5 <0,2,3>   |
+               sub-block 2  Stage 2  |   4 <0,2,2>   |   4 <0,2,2>   |
+                            Stage 3  |   3 <0,0,3>   |   3 <0,0,3>   |
+   Gains for       ------------------+---------------+---------------+
+   sub-blocks               Stage 1  |      NA       |   5 <0,1,4>   |
+               sub-block 3  Stage 2  |      NA       |   4 <0,1,3>   |
+                            Stage 3  |      NA       |   3 <0,0,3>   |
+                   ------------------+---------------+---------------+
+                            Stage 1  |      NA       |   5 <0,1,4>   |
+               sub-block 4  Stage 2  |      NA       |   4 <0,1,3>   |
+                            Stage 3  |      NA       |   3 <0,0,3>   |
+                   ------------------+---------------+---------------+
+                   Sum               |  24 <3,6,15>  |  48 <2,12,34> |
+   ----------------------------------+---------------+---------------+
+   Empty frame indicator             |   1 <0,0,1>   |   1 <0,0,1>   |
+   -------------------------------------------------------------------
+   SUM                                 304 <48,64,192> 400 <64,96,240>
+
+   Table 3.2.  The bitstream definition for iLBC for both the 20 ms
+   frame size mode and the 30 ms frame size mode.
+
+   When packetized into the payload, the bits MUST be sorted as follows:
+   All the class 1 bits in the order (from top to bottom) as specified
+   in the table, all the class 2 bits (from top to bottom), and all the
+   class 3 bits in the same sequential order.  The last bit, the empty
+   frame indicator, SHOULD be set to zero by the encoder.  If this bit
+   is set to 1 the decoder SHOULD treat the data as a lost frame.  For
+   example, this bit can be set to 1 to indicate lost frame for file
+   storage format, as in [1].
+
+
+
+
+Andersen, et al.              Experimental                     [Page 31]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.  Decoder Principles
+
+   This section describes the principles of each component of the
+   decoder algorithm.
+
+              +-------------+    +--------+    +---------------+
+   payload -> | 1. Get para | -> | 2. LPC | -> | 3. Sc Dequant | ->
+              +-------------+    +--------+    +---------------+
+
+              +-------------+    +------------------+
+           -> | 4. Mem setup| -> | 5. Construct res |------->
+           |  +-------------+    +-------------------   |
+           ---------<-----------<-----------<------------
+                     Sub-frame 0...2/4 (20 ms/30 ms)
+
+              +----------------+    +----------+
+           -> | 6. Enhance res | -> | 7. Synth | ------------>
+              +----------------+    +----------+
+
+              +-----------------+
+           -> | 8. Post Process | ----------------> decoded speech
+              +-----------------+
+
+   Figure 4.1.  Flow chart of the iLBC decoder.  If a frame was lost,
+   steps 1 to 5 SHOULD be replaced by a PLC algorithm.
+
+   1. Extract the parameters from the bitstream.
+
+   2. Decode the LPC and interpolate (section 4.1).
+
+   3. Construct the 57/58-sample start state (section 4.2).
+
+   4. Set up the memory by using data from the decoded residual.  This
+      memory is used for codebook construction.  For blocks preceding
+      the start state, both the decoded residual and the target are time
+      reversed.  Sub-frames are decoded in the same order as they were
+      encoded.
+
+   5. Construct the residuals of this sub-frame (gain[0]*cbvec[0] +
+      gain[1]*cbvec[1] + gain[2]*cbvec[2]).  Repeat 4 and 5 until the
+      residual of all sub-blocks has been constructed.
+
+   6. Enhance the residual with the post filter (section 4.6).
+
+   7. Synthesis of the residual (section 4.7).
+
+   8. Post process with HP filter, if desired (section 4.8).
+
+
+
+
+Andersen, et al.              Experimental                     [Page 32]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.1.  LPC Filter Reconstruction
+
+   The decoding of the LP filter parameters is very straightforward.
+   For a set of three/six indices, the corresponding LSF vector(s) are
+   found by simple table lookup.  For each of the LSF vectors, the three
+   split vectors are concatenated to obtain qlsf1 and qlsf2,
+   respectively (in the 20 ms mode only one LSF vector, qlsf, is
+   constructed).  The next step is the stability check described in
+   section 3.2.5 followed by the interpolation scheme described in
+   section 3.2.6 (3.2.7 for 20 ms frames).  The only difference is that
+   only the quantized LSFs are known at the decoder, and hence the
+   unquantized LSFs are not processed.
+
+   A reference implementation of the LPC filter reconstruction is given
+   in Appendix A.36.
+
+4.2.  Start State Reconstruction
+
+   The scalar encoded STATE_SHORT_LEN=58 (STATE_SHORT_LEN=57 in the 20
+   ms mode) state samples are reconstructed by 1) forming a set of
+   samples (by table lookup) from the index stream idxVec[n], 2)
+   multiplying the set with 1/scal=(10^qmax)/4.5, 3) time reversing the
+   57/58 samples, 4) filtering the time reversed block with the
+   dispersion (all-pass) filter used in the encoder (as described in
+   section 3.5.2); this compensates for the phase distortion of the
+   earlier filter operation, and 5 reversing the 57/58 samples from the
+   previous step.
+
+   in(0..(STATE_SHORT_LEN-1)) = time reversed samples from table
+                                look-up,
+                                idxVecDec((STATE_SHORT_LEN-1)..0)
+
+   in(STATE_SHORT_LEN..(2*STATE_SHORT_LEN-1)) = 0
+
+   Pk(z) = A~rk(z)/A~k(z), where
+                                  ___
+                                  \
+   A~rk(z)= z^(-LPC_FILTERORDER) + > a~ki*z^(i-(LPC_FILTERORDER-1))
+                                  /__
+                              i=0...(LPC_FILTERORDER-1)
+
+   and A~k(z) is taken from the block where the start state begins
+
+   in -> Pk(z) -> filtered
+
+   out(k) = filtered(STATE_SHORT_LEN-1-k) +
+                           filtered(2*STATE_SHORT_LEN-1-k),
+                                         k=0..(STATE_SHORT_LEN-1)
+
+
+
+Andersen, et al.              Experimental                     [Page 33]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   The remaining 23/22 samples in the state are reconstructed by the
+   same adaptive codebook technique described in section 4.3.  The
+   location bit determines whether these are the first or the last 23/22
+   samples of the 80-sample state vector.  If the remaining 23/22
+   samples are the first samples, then the scalar encoded
+   STATE_SHORT_LEN state samples are time-reversed before initialization
+   of the adaptive codebook memory vector.
+
+   A reference implementation of the start state reconstruction is given
+   in Appendix A.44.
+
+4.3.  Excitation Decoding Loop
+
+   The decoding of the LPC excitation vector proceeds in the same order
+   in which the residual was encoded at the encoder.  That is, after the
+   decoding of the entire 80-sample state vector, the forward sub-blocks
+   (corresponding to samples occurring after the state vector samples)
+   are decoded, and then the backward sub-blocks (corresponding to
+   samples occurring before the state vector) are decoded, resulting in
+   a fully decoded block of excitation signal samples.
+
+   In particular, each sub-block is decoded by using the multistage
+   adaptive codebook decoding module described in section 4.4.  This
+   module relies upon an adaptive codebook memory constructed before
+   each run of the adaptive codebook decoding.  The construction of the
+   adaptive codebook memory in the decoder is identical to the method
+   outlined in section 3.6.3, except that it is done on the codebook
+   memory without perceptual weighting.
+
+   For the initial forward sub-block, the last STATE_LEN=80 samples of
+   the length CB_LMEM=147 adaptive codebook memory are filled with the
+   samples of the state vector.  For subsequent forward sub-blocks, the
+   first SUBL=40 samples of the adaptive codebook memory are discarded,
+   the remaining samples are shifted by SUBL samples toward the
+   beginning of the vector, and the newly decoded SUBL=40 samples are
+   placed at the end of the adaptive codebook memory.  For backward
+   sub-blocks, the construction is similar, except that every vector of
+   samples involved is first time reversed.
+
+   A reference implementation of the excitation decoding loop is found
+   in Appendix A.5.
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 34]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.4.  Multistage Adaptive Codebook Decoding
+
+   The Multistage Adaptive Codebook Decoding module is used at both the
+   sender (encoder) and the receiver (decoder) ends to produce a
+   synthetic signal in the residual domain that is eventually used to
+   produce synthetic speech.  The module takes the index values used to
+   construct vectors that are scaled and summed together to produce a
+   synthetic signal that is the output of the module.
+
+4.4.1.  Construction of the Decoded Excitation Signal
+
+   The unpacked index values provided at the input to the module are
+   references to extended codebooks, which are constructed as described
+   in section 3.6.3, except that they are based on the codebook memory
+   without the perceptual weighting.  The unpacked three indices are
+   used to look up three codebook vectors.  The unpacked three gain
+   indices are used to decode the corresponding 3 gains.  In this
+   decoding, the successive rescaling, as described in section 3.6.4.2,
+   is applied.
+
+   A reference implementation of the adaptive codebook decoding is
+   listed in Appendix A.32.
+
+4.5.  Packet Loss Concealment
+
+   If packet loss occurs, the decoder receives a signal saying that
+   information regarding a block is lost.  For such blocks it is
+   RECOMMENDED to use a Packet Loss Concealment (PLC) unit to create a
+   decoded signal that masks the effect of that packet loss.  In the
+   following we will describe an example of a PLC unit that can be used
+   with the iLBC codec.  As the PLC unit is used only at the decoder,
+   the PLC unit does not affect interoperability between
+   implementations.  Other PLC implementations MAY therefore be used.
+
+   The PLC described operates on the LP filters and the excitation
+   signals and is based on the following principles:
+
+4.5.1.  Block Received Correctly and Previous Block Also Received
+
+   If the block is received correctly, the PLC only records state
+   information of the current block that can be used in case the next
+   block is lost.  The LP filter coefficients for each sub-block and the
+   entire decoded excitation signal are all saved in the decoder state
+   structure.  All of this information will be needed if the following
+   block is lost.
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 35]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.5.2.  Block Not Received
+
+   If the block is not received, the block substitution is based on a
+   pitch-synchronous repetition of the excitation signal, which is
+   filtered by the last LP filter of the previous block.  The previous
+   block's information is stored in the decoder state structure.
+
+   A correlation analysis is performed on the previous block's
+   excitation signal in order to detect the amount of pitch periodicity
+   and a pitch value.  The correlation measure is also used to decide on
+   the voicing level (the degree to which the previous block's
+   excitation was a voiced or roughly periodic signal).  The excitation
+   in the previous block is used to create an excitation for the block
+   to be substituted, such that the pitch of the previous block is
+   maintained.  Therefore, the new excitation is constructed in a
+   pitch-synchronous manner.  In order to avoid a buzzy-sounding
+   substituted block, a random excitation is mixed with the new pitch
+   periodic excitation, and the relative use of the two components is
+   computed from the correlation measure (voicing level).
+
+   For the block to be substituted, the newly constructed excitation
+   signal is then passed through the LP filter to produce the speech
+   that will be substituted for the lost block.
+
+   For several consecutive lost blocks, the packet loss concealment
+   continues in a similar manner.  The correlation measure of the last
+   block received is still used along with the same pitch value.  The LP
+   filters of the last block received are also used again.  The energy
+   of the substituted excitation for consecutive lost blocks is
+   decreased, leading to a dampened excitation, and therefore to
+   dampened speech.
+
+4.5.3.  Block Received Correctly When Previous Block Not Received
+
+   For the case in which a block is received correctly when the previous
+   block was not, the correctly received block's directly decoded speech
+   (based solely on the received block) is not used as the actual
+   output.  The reason for this is that the directly decoded speech does
+   not necessarily smoothly merge into the synthetic speech generated
+   for the previous lost block.  If the two signals are not smoothly
+   merged, an audible discontinuity is accidentally produced.
+   Therefore, a correlation analysis between the two blocks of
+   excitation signal (the excitation of the previous concealed block and
+   that of the current received block) is performed to find the best
+   phase match.  Then a simple overlap-add procedure is performed to
+   merge the previous excitation smoothly into the current block's
+   excitation.
+
+
+
+
+Andersen, et al.              Experimental                     [Page 36]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   The exact implementation of the packet loss concealment does not
+   influence interoperability of the codec.
+
+   A reference implementation of the packet loss concealment is
+   suggested in Appendix A.14.  Exact compliance with this suggested
+   algorithm is not needed for a reference implementation to be fully
+   compatible with the overall codec specification.
+
+4.6.  Enhancement
+
+   The decoder contains an enhancement unit that operates on the
+   reconstructed excitation signal.  The enhancement unit increases the
+   perceptual quality of the reconstructed signal by reducing the
+   speech-correlated noise in the voiced speech segments.  Compared to
+   traditional postfilters, the enhancer has an advantage in that it can
+   only modify the excitation signal slightly.  This means that there is
+   no risk of over enhancement.  The enhancer works very similarly for
+   both the 20 ms frame size mode and the 30 ms frame size mode.
+
+   For the mode with 20 ms frame size, the enhancer uses a memory of six
+   80-sample excitation blocks prior in time plus the two new 80-sample
+   excitation blocks.  For each block of 160 new unenhanced excitation
+   samples, 160 enhanced excitation samples are produced.  The enhanced
+   excitation is 40-sample delayed compared to the unenhanced
+   excitation, as the enhancer algorithm uses lookahead.
+
+   For the mode with 30 ms frame size, the enhancer uses a memory of
+   five 80-sample excitation blocks prior in time plus the three new
+   80-sample excitation blocks.  For each block of 240 new unenhanced
+   excitation samples, 240 enhanced excitation samples are produced.
+   The enhanced excitation is 80-sample delayed compared to the
+   unenhanced excitation, as the enhancer algorithm uses lookahead.
+
+   Outline of Enhancer
+
+   The speech enhancement unit operates on sub-blocks of 80 samples,
+   which means that there are two/three 80 sample sub-blocks per frame.
+   Each of these two/three sub-blocks is enhanced separately, but in an
+   analogous manner.
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 37]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   unenhanced residual
+           |
+           |   +---------------+    +--------------+
+           +-> | 1. Pitch Est  | -> | 2. Find PSSQ | -------->
+               +---------------+  | +--------------+
+                                  +-----<-------<------<--+
+               +------------+         enh block 0..1/2    |
+            -> | 3. Smooth  |                             |
+               +------------+                             |
+                 \                                        |
+                 /\                                       |
+                /  \   Already                            |
+               / 4. \----------->----------->-----------+ |
+               \Crit/ Fulfilled                         | |
+                \? /                                    v |
+                 \/                                     | |
+                  \  +-----------------+    +---------+ | |
+              Not +->| 5. Use Constr.  | -> | 6. Mix  | ----->
+           Fulfilled +-----------------+    +---------+
+
+            ---------------> enhanced residual
+
+   Figure 4.2.  Flow chart of the enhancer.
+
+   1. Pitch estimation of each of the two/three new 80-sample blocks.
+
+   2. Find the pitch-period-synchronous sequence n (for block k) by a
+      search around the estimated pitch value.  Do this for n=1,2,3,
+      -1,-2,-3.
+
+   3. Calculate the smoothed residual generated by the six pitch-
+      period-synchronous sequences from prior step.
+
+   4. Check if the smoothed residual satisfies the criterion (section
+      4.6.4).
+
+   5. Use constraint to calculate mixing factor (section 4.6.5).
+
+   6. Mix smoothed signal with unenhanced residual (pssq(n) n=0).
+
+   The main idea of the enhancer is to find three 80 sample blocks
+   before and three 80-sample blocks after the analyzed unenhanced sub-
+   block and to use these to improve the quality of the excitation in
+   that sub-block.  The six blocks are chosen so that they have the
+   highest possible correlation with the unenhanced sub-block that is
+   being enhanced.  In other words, the six blocks are pitch-period-
+   synchronous sequences to the unenhanced sub-block.
+
+
+
+
+Andersen, et al.              Experimental                     [Page 38]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   A linear combination of the six pitch-period-synchronous sequences is
+   calculated that approximates the sub-block.  If the squared error
+   between the approximation and the unenhanced sub-block is small
+   enough, the enhanced residual is set equal to this approximation.
+   For the cases when the squared error criterion is not fulfilled, a
+   linear combination of the approximation and the unenhanced residual
+   forms the enhanced residual.
+
+4.6.1.  Estimating the Pitch
+
+   Pitch estimates are needed to determine the locations of the pitch-
+   period-synchronous sequences in a complexity-efficient way.  For each
+   of the new two/three sub-blocks, a pitch estimate is calculated by
+   finding the maximum correlation in the range from lag 20 to lag 120.
+   These pitch estimates are used to narrow down the search for the best
+   possible pitch-period-synchronous sequences.
+
+4.6.2.  Determination of the Pitch-Synchronous Sequences
+
+   Upon receiving the pitch estimates from the prior step, the enhancer
+   analyzes and enhances one 80-sample sub-block at a time.  The pitch-
+   period-synchronous-sequences pssq(n) can be viewed as vectors of
+   length 80 samples each shifted n*lag samples from the current sub-
+   block.  The six pitch-period-synchronous-sequences, pssq(-3) to
+   pssq(-1) and pssq(1) to pssq(3), are found one at a time by the steps
+   below:
+
+   1) Calculate the estimate of the position of the pssq(n).  For
+      pssq(n) in front of pssq(0) (n > 0), the location of the pssq(n)
+      is estimated by moving one pitch estimate forward in time from the
+      exact location of pssq(n-1).  Similarly, pssq(n) behind pssq(0) (n
+      < 0) is estimated by moving one pitch estimate backward in time
+      from the exact location of pssq(n+1).  If the estimated pssq(n)
+      vector location is totally within the enhancer memory (Figure
+      4.3), steps 2, 3, and 4 are performed, otherwise the pssq(n) is
+      set to zeros.
+
+   2) Compute the correlation between the unenhanced excitation and
+      vectors around the estimated location interval of pssq(n).  The
+      correlation is calculated in the interval estimated location +/- 2
+      samples.  This results in five correlation values.
+
+   3) The five correlation values are upsampled by a factor of 4, by
+      using four simple upsampling filters (MA filters with coefficients
+      upsFilter1.. upsFilter4).  Within these the maximum value is
+      found, which specifies the best pitch-period with a resolution of
+      a quarter of a sample.
+
+
+
+
+Andersen, et al.              Experimental                     [Page 39]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+      upsFilter1[7]={0.000000 0.000000 0.000000 1.000000
+             0.000000 0.000000 0.000000}
+      upsFilter2[7]={0.015625 -0.076904 0.288330 0.862061
+            -0.106445 0.018799 -0.015625}
+      upsFilter3[7]={0.023682 -0.124268 0.601563 0.601563
+            -0.124268 0.023682 -0.023682}
+      upsFilter4[7]={0.018799 -0.106445 0.862061 0.288330
+            -0.076904 0.015625 -0.018799}
+
+   4) Generate the pssq(n) vector by upsampling of the excitation memory
+      and extracting the sequence that corresponds to the lag delay that
+      was calculated in prior step.
+
+   With the steps above, all the pssq(n) can be found in an iterative
+   manner, first moving backward in time from pssq(0) and then forward
+   in time from pssq(0).
+
+
+   0              159             319             479             639
+   +---------------------------------------------------------------+
+   |  -5   |  -4   |  -3   |  -2   |  -1   |   0   |   1   |   2   |
+   +---------------------------------------------------------------+
+                                               |pssq 0 |
+                                          |pssq -1| |pssq 1 |
+                                       |pssq -2|       |pssq 2 |
+                                    |pssq -3|             |pssq 3 |
+
+   Figure 4.3.  Enhancement for 20 ms frame size.
+
+   Figure 4.3 depicts pitch-period-synchronous sequences in the
+   enhancement of the first 80 sample block in the 20 ms frame size
+   mode.  The unenhanced signal input is stored in the last two sub-
+   blocks (1 - 2), and the six other sub-blocks contain unenhanced
+   residual prior-in-time.  We perform the enhancement algorithm on two
+   blocks of 80 samples, where the first of the two blocks consists of
+   the last 40 samples of sub-block 0 and the first 40 samples of sub-
+   block 1.  The second 80-sample block consists of the last 40 samples
+   of sub-block 1 and the first 40 samples of sub-block 2.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 40]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   0              159             319             479             639
+   +---------------------------------------------------------------+
+   |  -4   |  -3   |  -2   |  -1   |   0   |   1   |   2   |   3   |
+   +---------------------------------------------------------------+
+                                   |pssq 0 |
+                              |pssq -1| |pssq 1 |
+                           |pssq -2|       |pssq 2 |
+                        |pssq -3|             |pssq 3 |
+
+   Figure 4.4.  Enhancement for 30 ms frame size.
+
+   Figure 4.4 depicts pitch-period-synchronous sequences in the
+   enhancement of the first 80-sample block in the 30 ms frame size
+   mode.  The unenhanced signal input is stored in the last three sub-
+   blocks (1 - 3).  The five other sub-blocks contain unenhanced
+   residual prior-in-time.  The enhancement algorithm is performed on
+   the three 80 sample sub-blocks 0, 1, and 2.
+
+4.6.3.  Calculation of the Smoothed Excitation
+
+   A linear combination of the six pssq(n) (n!=0) form a smoothed
+   approximation, z, of pssq(0).  Most of the weight is put on the
+   sequences that are close to pssq(0), as these are likely to be most
+   similar to pssq(0).  The smoothed vector is also rescaled so that the
+   energy of z is the same as the energy of pssq(0).
+
+      ___
+      \
+   y = > pssq(i) * pssq_weight(i)
+      /__
+   i=-3,-2,-1,1,2,3
+
+   pssq_weight(i) = 0.5*(1-cos(2*pi*(i+4)/(2*3+2)))
+
+   z = C * y, where C = ||pssq(0)||/||y||
+
+4.6.4.  Enhancer Criterion
+
+   The criterion of the enhancer is that the enhanced excitation is not
+   allowed to differ much from the unenhanced excitation.  This
+   criterion is checked for each 80-sample sub-block.
+
+   e < (b * ||pssq(0)||^2), where b=0.05 and   (Constraint 1)
+
+   e = (pssq(0)-z)*(pssq(0)-z), and "*" means the dot product
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 41]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.6.5.  Enhancing the excitation
+
+   From the criterion in the previous section, it is clear that the
+   excitation is not allowed to change much.  The purpose of this
+   constraint is to prevent the creation of an enhanced signal
+   significantly different from the original signal.  This also means
+   that the constraint limits the numerical size of the errors that the
+   enhancement procedure can make.  That is especially important in
+   unvoiced segments and background noise segments for which increased
+   periodicity could lead to lower perceived quality.
+
+   When the constraint in the prior section is not met, the enhanced
+   residual is instead calculated through a constrained optimization by
+   using the Lagrange multiplier technique.  The new constraint is that
+
+      e = (b * ||pssq(0)||^2)                     (Constraint 2)
+
+   We distinguish two solution regions for the optimization: 1) the
+   region where the first constraint is fulfilled and 2) the region
+   where the first constraint is not fulfilled and the second constraint
+   must be used.
+
+   In the first case, where the second constraint is not needed, the
+   optimized re-estimated vector is simply z, the energy-scaled version
+   of y.
+
+   In the second case, where the second constraint is activated and
+   becomes an equality constraint, we have
+
+      z= A*y + B*pssq(0)
+
+   where
+
+      A = sqrt((b-b^2/4)*(w00*w00)/ (w11*w00 + w10*w10)) and
+
+      w11 = pssq(0)*pssq(0)
+      w00 = y*y
+      w10 = y*pssq(0)    (* symbolizes the dot product)
+
+   and
+
+      B = 1 - b/2 - A * w10/w00
+
+   Appendix A.16 contains a listing of a reference implementation for
+   the enhancement method.
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 42]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+4.7.  Synthesis Filtering
+
+   Upon decoding or PLC of the LP excitation block, the decoded speech
+   block is obtained by running the decoded LP synthesis filter,
+   1/A~k(z), over the block.  The synthesis filters have to be shifted
+   to compensate for the delay in the enhancer.  For 20 ms frame size
+   mode, they SHOULD be shifted one 40-sample sub-block, and for 30 ms
+   frame size mode, they SHOULD be shifted two 40-sample sub-blocks.
+   The LP coefficients SHOULD be changed at the first sample of every
+   sub-block while keeping the filter state.  For PLC blocks, one
+   solution is to apply the last LP coefficients of the last decoded
+   speech block for all sub-blocks.
+
+   The reference implementation for the synthesis filtering can be found
+   in Appendix A.48.
+
+4.8.  Post Filtering
+
+   If desired, the decoded block can be filtered by a high-pass filter.
+   This removes the low frequencies of the decoded signal.  A reference
+   implementation of this, with cutoff at 65 Hz, is shown in Appendix
+   A.30.
+
+5.  Security Considerations
+
+   This algorithm for the coding of speech signals is not subject to any
+   known security consideration; however, its RTP payload format [1] is
+   subject to several considerations, which are addressed there.
+   Confidentiality of the media streams is achieved by encryption;
+   therefore external mechanisms, such as SRTP [5], MAY be used for that
+   purpose.
+
+6.  Evaluation of the iLBC Implementations
+
+   It is possible and suggested to evaluate certain iLBC implementation
+   by utilizing methodology and tools available at
+   http://www.ilbcfreeware.org/evaluation.html
+
+7.  References
+
+7.1.  Normative References
+
+   [1] Duric, A. and S. Andersen, "Real-time Transport Protocol (RTP)
+       Payload Format for internet Low Bit Rate Codec (iLBC) Speech",
+       RFC 3952, December 2004.
+
+   [2] Bradner, S., "Key words for use in RFCs to Indicate Requirement
+       Levels", BCP 14, RFC 2119, March 1997.
+
+
+
+Andersen, et al.              Experimental                     [Page 43]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   [3] PacketCable(TM) Audio/Video Codecs Specification, Cable
+       Television Laboratories, Inc.
+
+7.2.  Informative References
+
+   [4] ITU-T Recommendation G.711, available online from the ITU
+       bookstore at http://www.itu.int.
+
+   [5] Baugher, M., McGrew, D., Naslund, M., Carrara, E., and K. Norman,
+       "The Secure Real Time Transport Protocol (SRTP)", RFC 3711, March
+       2004.
+
+8.  Acknowledgements
+
+   This extensive work, besides listed authors, has the following
+   authors, who could not have been listed among "official" authors (due
+   to IESG restrictions in the number of authors who can be listed):
+
+      Manohar N. Murthi (Department of Electrical and Computer
+      Engineering, University of Miami), Fredrik Galschiodt, Julian
+      Spittka, and Jan Skoglund (Global IP Sound).
+
+   The authors are deeply indebted to the following people and thank
+   them sincerely:
+
+      Henry Sinnreich, Patrik Faltstrom, Alan Johnston, and Jean-
+      Francois Mule for great support of the iLBC initiative and for
+      valuable feedback and comments.
+
+      Peter Vary, Frank Mertz, and Christoph Erdmann (RWTH Aachen);
+      Vladimir Cuperman (Niftybox LLC); Thomas Eriksson (Chalmers Univ
+      of Tech), and Gernot Kubin (TU Graz), for thorough review of the
+      iLBC document and their valuable feedback and remarks.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 44]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+APPENDIX A.  Reference Implementation
+
+   This appendix contains the complete c-code for a reference
+   implementation of encoder and decoder for the specified codec.
+
+   The c-code consists of the following files with highest-level
+   functions:
+
+         iLBC_test.c: main function for evaluation purpose
+         iLBC_encode.h: encoder header
+         iLBC_encode.c: encoder function
+         iLBC_decode.h: decoder header
+         iLBC_decode.c: decoder function
+
+   The following files contain global defines and constants:
+
+         iLBC_define.h: global defines
+         constants.h: global constants header
+         constants.c: global constants memory allocations
+
+   The following files contain subroutines:
+
+         anaFilter.h: lpc analysis filter header
+         anaFilter.c: lpc analysis filter function
+         createCB.h: codebook construction header
+         createCB.c: codebook construction function
+         doCPLC.h: packet loss concealment header
+         doCPLC.c: packet loss concealment function
+         enhancer.h: signal enhancement header
+         enhancer.c: signal enhancement function
+         filter.h: general filter header
+         filter.c: general filter functions
+         FrameClassify.h: start state classification header
+         FrameClassify.c: start state classification function
+         gainquant.h: gain quantization header
+         gainquant.c: gain quantization function
+         getCBvec.h: codebook vector construction header
+         getCBvec.c: codebook vector construction function
+         helpfun.h: general purpose header
+         helpfun.c: general purpose functions
+         hpInput.h: input high pass filter header
+         hpInput.c: input high pass filter function
+         hpOutput.h: output high pass filter header
+         hpOutput.c: output high pass filter function
+         iCBConstruct.h: excitation decoding header
+         iCBConstruct.c: excitation decoding function
+         iCBSearch.h: excitation encoding header
+         iCBSearch.c: excitation encoding function
+
+
+
+Andersen, et al.              Experimental                     [Page 45]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+         LPCdecode.h: lpc decoding header
+         LPCdecode.c: lpc decoding function
+         LPCencode.h: lpc encoding header
+         LPCencode.c: lpc encoding function
+         lsf.h: line spectral frequencies header
+         lsf.c: line spectral frequencies functions
+         packing.h: bitstream packetization header
+         packing.c: bitstream packetization functions
+         StateConstructW.h: state decoding header
+         StateConstructW.c: state decoding functions
+         StateSearchW.h: state encoding header
+         StateSearchW.c: state encoding function
+         syntFilter.h: lpc synthesis filter header
+         syntFilter.c: lpc synthesis filter function
+
+   The implementation is portable and should work on many different
+   platforms.  However, it is not difficult to optimize the
+   implementation on particular platforms, an exercise left to the
+   reader.
+
+A.1.  iLBC_test.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_test.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+   #include <stdio.h>
+   #include <string.h>
+   #include "iLBC_define.h"
+   #include "iLBC_encode.h"
+   #include "iLBC_decode.h"
+
+   /* Runtime statistics */
+   #include <time.h>
+
+   #define ILBCNOOFWORDS_MAX   (NO_OF_BYTES_30MS/2)
+
+   /*----------------------------------------------------------------*
+    *  Encoder interface function
+
+
+
+Andersen, et al.              Experimental                     [Page 46]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+    *---------------------------------------------------------------*/
+
+   short encode(   /* (o) Number of bytes encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                                   /* (i/o) Encoder instance */
+       short *encoded_data,    /* (o) The encoded bytes */
+       short *data                 /* (i) The signal block to encode*/
+   ){
+       float block[BLOCKL_MAX];
+       int k;
+
+       /* convert signal to float */
+
+       for (k=0; k<iLBCenc_inst->blockl; k++)
+           block[k] = (float)data[k];
+
+       /* do the actual encoding */
+
+       iLBC_encode((unsigned char *)encoded_data, block, iLBCenc_inst);
+
+
+       return (iLBCenc_inst->no_of_bytes);
+   }
+
+   /*----------------------------------------------------------------*
+    *  Decoder interface function
+    *---------------------------------------------------------------*/
+
+   short decode(       /* (o) Number of decoded samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       short *decoded_data,        /* (o) Decoded signal block*/
+       short *encoded_data,        /* (i) Encoded bytes */
+       short mode                       /* (i) 0=PL, 1=Normal */
+   ){
+       int k;
+       float decblock[BLOCKL_MAX], dtmp;
+
+       /* check if mode is valid */
+
+       if (mode<0 || mode>1) {
+           printf("\nERROR - Wrong mode - 0, 1 allowed\n"); exit(3);}
+
+       /* do actual decoding of block */
+
+       iLBC_decode(decblock, (unsigned char *)encoded_data,
+           iLBCdec_inst, mode);
+
+       /* convert to short */
+
+
+
+Andersen, et al.              Experimental                     [Page 47]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       for (k=0; k<iLBCdec_inst->blockl; k++){
+           dtmp=decblock[k];
+
+           if (dtmp<MIN_SAMPLE)
+               dtmp=MIN_SAMPLE;
+           else if (dtmp>MAX_SAMPLE)
+               dtmp=MAX_SAMPLE;
+           decoded_data[k] = (short) dtmp;
+       }
+
+       return (iLBCdec_inst->blockl);
+   }
+
+   /*---------------------------------------------------------------*
+    *  Main program to test iLBC encoding and decoding
+    *
+    *  Usage:
+    *    exefile_name.exe <infile> <bytefile> <outfile> <channel>
+    *
+    *    <infile>   : Input file, speech for encoder (16-bit pcm file)
+    *    <bytefile> : Bit stream output from the encoder
+    *    <outfile>  : Output file, decoded speech (16-bit pcm file)
+    *    <channel>  : Bit error file, optional (16-bit)
+    *                     1 - Packet received correctly
+    *                     0 - Packet Lost
+    *
+    *--------------------------------------------------------------*/
+
+   int main(int argc, char* argv[])
+   {
+
+       /* Runtime statistics */
+
+       float starttime;
+       float runtime;
+       float outtime;
+
+       FILE *ifileid,*efileid,*ofileid, *cfileid;
+       short data[BLOCKL_MAX];
+       short encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
+       int len;
+       short pli, mode;
+       int blockcount = 0;
+       int packetlosscount = 0;
+
+       /* Create structs */
+       iLBC_Enc_Inst_t Enc_Inst;
+       iLBC_Dec_Inst_t Dec_Inst;
+
+
+
+Andersen, et al.              Experimental                     [Page 48]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* get arguments and open files */
+
+       if ((argc!=5) && (argc!=6)) {
+           fprintf(stderr,
+           "\n*-----------------------------------------------*\n");
+           fprintf(stderr,
+           "   %s <20,30> input encoded decoded (channel)\n\n",
+               argv[0]);
+           fprintf(stderr,
+           "   mode    : Frame size for the encoding/decoding\n");
+           fprintf(stderr,
+           "                 20 - 20 ms\n");
+           fprintf(stderr,
+           "                 30 - 30 ms\n");
+           fprintf(stderr,
+           "   input   : Speech for encoder (16-bit pcm file)\n");
+           fprintf(stderr,
+           "   encoded : Encoded bit stream\n");
+           fprintf(stderr,
+           "   decoded : Decoded speech (16-bit pcm file)\n");
+           fprintf(stderr,
+           "   channel : Packet loss pattern, optional (16-bit)\n");
+           fprintf(stderr,
+           "                  1 - Packet received correctly\n");
+           fprintf(stderr,
+           "                  0 - Packet Lost\n");
+           fprintf(stderr,
+           "*-----------------------------------------------*\n\n");
+           exit(1);
+       }
+       mode=atoi(argv[1]);
+       if (mode != 20 && mode != 30) {
+           fprintf(stderr,"Wrong mode %s, must be 20, or 30\n",
+               argv[1]);
+           exit(2);
+       }
+       if ( (ifileid=fopen(argv[2],"rb")) == NULL) {
+           fprintf(stderr,"Cannot open input file %s\n", argv[2]);
+           exit(2);}
+       if ( (efileid=fopen(argv[3],"wb")) == NULL) {
+           fprintf(stderr, "Cannot open encoded file %s\n",
+               argv[3]); exit(1);}
+       if ( (ofileid=fopen(argv[4],"wb")) == NULL) {
+           fprintf(stderr, "Cannot open decoded file %s\n",
+               argv[4]); exit(1);}
+       if (argc==6) {
+           if( (cfileid=fopen(argv[5],"rb")) == NULL) {
+               fprintf(stderr, "Cannot open channel file %s\n",
+
+
+
+Andersen, et al.              Experimental                     [Page 49]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   argv[5]);
+               exit(1);
+           }
+       } else {
+           cfileid=NULL;
+       }
+
+       /* print info */
+
+       fprintf(stderr, "\n");
+       fprintf(stderr,
+           "*---------------------------------------------------*\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*      iLBC test program                            *\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*                                                   *\n");
+       fprintf(stderr,
+           "*---------------------------------------------------*\n");
+       fprintf(stderr,"\nMode           : %2d ms\n", mode);
+       fprintf(stderr,"Input file     : %s\n", argv[2]);
+       fprintf(stderr,"Encoded file   : %s\n", argv[3]);
+       fprintf(stderr,"Output file    : %s\n", argv[4]);
+       if (argc==6) {
+           fprintf(stderr,"Channel file   : %s\n", argv[5]);
+       }
+       fprintf(stderr,"\n");
+
+       /* Initialization */
+
+       initEncode(&Enc_Inst, mode);
+       initDecode(&Dec_Inst, mode, 1);
+
+       /* Runtime statistics */
+
+       starttime=clock()/(float)CLOCKS_PER_SEC;
+
+       /* loop over input blocks */
+
+       while (fread(data,sizeof(short),Enc_Inst.blockl,ifileid)==
+               Enc_Inst.blockl) {
+
+           blockcount++;
+
+           /* encoding */
+
+
+
+Andersen, et al.              Experimental                     [Page 50]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           fprintf(stderr, "--- Encoding block %i --- ",blockcount);
+           len=encode(&Enc_Inst, encoded_data, data);
+           fprintf(stderr, "\r");
+
+           /* write byte file */
+
+           fwrite(encoded_data, sizeof(unsigned char), len, efileid);
+
+           /* get channel data if provided */
+           if (argc==6) {
+               if (fread(&pli, sizeof(short), 1, cfileid)) {
+                   if ((pli!=0)&&(pli!=1)) {
+                       fprintf(stderr, "Error in channel file\n");
+                       exit(0);
+                   }
+                   if (pli==0) {
+                       /* Packet loss -> remove info from frame */
+                       memset(encoded_data, 0,
+                           sizeof(short)*ILBCNOOFWORDS_MAX);
+                       packetlosscount++;
+                   }
+               } else {
+                   fprintf(stderr, "Error. Channel file too short\n");
+                   exit(0);
+               }
+           } else {
+               pli=1;
+           }
+
+           /* decoding */
+
+           fprintf(stderr, "--- Decoding block %i --- ",blockcount);
+
+           len=decode(&Dec_Inst, decoded_data, encoded_data, pli);
+           fprintf(stderr, "\r");
+
+           /* write output file */
+
+           fwrite(decoded_data,sizeof(short),len,ofileid);
+       }
+
+       /* Runtime statistics */
+
+       runtime = (float)(clock()/(float)CLOCKS_PER_SEC-starttime);
+       outtime = (float)((float)blockcount*(float)mode/1000.0);
+       printf("\n\nLength of speech file: %.1f s\n", outtime);
+       printf("Packet loss          : %.1f%%\n",
+           100.0*(float)packetlosscount/(float)blockcount);
+
+
+
+Andersen, et al.              Experimental                     [Page 51]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       printf("Time to run iLBC     :");
+       printf(" %.1f s (%.1f %% of realtime)\n\n", runtime,
+           (100*runtime/outtime));
+
+       /* close files */
+
+       fclose(ifileid);  fclose(efileid); fclose(ofileid);
+       if (argc==6) {
+           fclose(cfileid);
+       }
+       return(0);
+   }
+
+A.2.  iLBC_encode.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_encode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ILBCENCODE_H
+   #define __iLBC_ILBCENCODE_H
+
+   #include "iLBC_define.h"
+
+   short initEncode(                   /* (o) Number of bytes
+                                              encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
+       int mode                    /* (i) frame size mode */
+   );
+
+   void iLBC_encode(
+
+       unsigned char *bytes,           /* (o) encoded data bits iLBC */
+       float *block,                   /* (o) speech vector to
+                                              encode */
+       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
+                                              state */
+   );
+
+   #endif
+
+
+
+
+Andersen, et al.              Experimental                     [Page 52]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.3.  iLBC_encode.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_encode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "LPCencode.h"
+   #include "FrameClassify.h"
+   #include "StateSearchW.h"
+   #include "StateConstructW.h"
+   #include "helpfun.h"
+   #include "constants.h"
+   #include "packing.h"
+   #include "iCBSearch.h"
+   #include "iCBConstruct.h"
+   #include "hpInput.h"
+   #include "anaFilter.h"
+   #include "syntFilter.h"
+
+   /*----------------------------------------------------------------*
+    *  Initiation of encoder instance.
+    *---------------------------------------------------------------*/
+
+   short initEncode(                   /* (o) Number of bytes
+                                              encoded */
+       iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
+       int mode                    /* (i) frame size mode */
+   ){
+       iLBCenc_inst->mode = mode;
+       if (mode==30) {
+           iLBCenc_inst->blockl = BLOCKL_30MS;
+           iLBCenc_inst->nsub = NSUB_30MS;
+           iLBCenc_inst->nasub = NASUB_30MS;
+           iLBCenc_inst->lpc_n = LPC_N_30MS;
+           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
+           iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
+
+
+
+Andersen, et al.              Experimental                     [Page 53]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
+           /* ULP init */
+           iLBCenc_inst->ULP_inst=&ULP_30msTbl;
+       }
+       else if (mode==20) {
+           iLBCenc_inst->blockl = BLOCKL_20MS;
+           iLBCenc_inst->nsub = NSUB_20MS;
+           iLBCenc_inst->nasub = NASUB_20MS;
+           iLBCenc_inst->lpc_n = LPC_N_20MS;
+           iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
+           iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
+           iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
+           /* ULP init */
+           iLBCenc_inst->ULP_inst=&ULP_20msTbl;
+       }
+       else {
+           exit(2);
+       }
+
+       memset((*iLBCenc_inst).anaMem, 0,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+       memset((*iLBCenc_inst).lpc_buffer, 0,
+           (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
+       memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
+
+       return (iLBCenc_inst->no_of_bytes);
+   }
+
+   /*----------------------------------------------------------------*
+    *  main encoder function
+    *---------------------------------------------------------------*/
+
+   void iLBC_encode(
+       unsigned char *bytes,           /* (o) encoded data bits iLBC */
+       float *block,                   /* (o) speech vector to
+                                              encode */
+       iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder
+                                              state */
+   ){
+
+       float data[BLOCKL_MAX];
+       float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
+
+       int start, idxForMax, idxVec[STATE_LEN];
+
+
+
+Andersen, et al.              Experimental                     [Page 54]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
+       int n, k, meml_gotten, Nfor, Nback, i, pos;
+       int gain_index[CB_NSTAGES*NASUB_MAX],
+           extra_gain_index[CB_NSTAGES];
+       int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
+       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
+       unsigned char *pbytes;
+       int diff, start_pos, state_first;
+       float en1, en2;
+       int index, ulp, firstpart;
+       int subcount, subframe;
+       float weightState[LPC_FILTERORDER];
+       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float decresidual[BLOCKL_MAX];
+
+       /* high pass filtering of input signal if such is not done
+              prior to calling this function */
+
+       hpInput(block, iLBCenc_inst->blockl,
+                   data, (*iLBCenc_inst).hpimem);
+
+       /* otherwise simply copy */
+
+       /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
+
+       /* LPC of hp filtered input data */
+
+       LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
+
+
+       /* inverse filter to get residual */
+
+       for (n=0; n<iLBCenc_inst->nsub; n++) {
+           anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)],
+               SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
+       }
+
+       /* find state location */
+
+       start = FrameClassify(iLBCenc_inst, residual);
+
+       /* check if state should be in first or last part of the
+       two subframes */
+
+       diff = STATE_LEN - iLBCenc_inst->state_short_len;
+       en1 = 0;
+       index = (start-1)*SUBL;
+
+
+
+Andersen, et al.              Experimental                     [Page 55]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
+           en1 += residual[index+i]*residual[index+i];
+       }
+       en2 = 0;
+       index = (start-1)*SUBL+diff;
+       for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
+           en2 += residual[index+i]*residual[index+i];
+       }
+
+
+       if (en1 > en2) {
+           state_first = 1;
+           start_pos = (start-1)*SUBL;
+       } else {
+           state_first = 0;
+           start_pos = (start-1)*SUBL + diff;
+       }
+
+       /* scalar quantization of state */
+
+       StateSearchW(iLBCenc_inst, &residual[start_pos],
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax,
+           idxVec, iLBCenc_inst->state_short_len, state_first);
+
+       StateConstructW(idxForMax, idxVec,
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &decresidual[start_pos], iLBCenc_inst->state_short_len);
+
+       /* predictive quantization in state */
+
+       if (state_first) { /* put adaptive part in the end */
+
+           /* setup memory */
+
+           memset(mem, 0,
+               (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
+           memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len,
+               decresidual+start_pos,
+               iLBCenc_inst->state_short_len*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* encode sub-frames */
+
+           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
+               &residual[start_pos+iLBCenc_inst->state_short_len],
+               mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES,
+
+
+
+Andersen, et al.              Experimental                     [Page 56]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               &weightdenum[start*(LPC_FILTERORDER+1)],
+               weightState, 0);
+
+           /* construct decoded vector */
+
+           iCBConstruct(
+               &decresidual[start_pos+iLBCenc_inst->state_short_len],
+               extra_cb_index, extra_gain_index,
+               mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES);
+
+       }
+       else { /* put adaptive part in the beginning */
+
+           /* create reversed vectors for prediction */
+
+           for (k=0; k<diff; k++) {
+               reverseResidual[k] = residual[(start+1)*SUBL-1
+                   -(k+iLBCenc_inst->state_short_len)];
+           }
+
+           /* setup memory */
+
+           meml_gotten = iLBCenc_inst->state_short_len;
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[start_pos + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* encode sub-frames */
+
+           iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
+               reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES,
+               &weightdenum[(start-1)*(LPC_FILTERORDER+1)],
+               weightState, 0);
+
+           /* construct decoded vector */
+
+           iCBConstruct(reverseDecresidual, extra_cb_index,
+               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES);
+
+           /* get decoded residual from reversed vector */
+
+           for (k=0; k<diff; k++) {
+               decresidual[start_pos-1-k] = reverseDecresidual[k];
+
+
+
+Andersen, et al.              Experimental                     [Page 57]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           }
+       }
+
+       /* counter for predicted sub-frames */
+
+       subcount=0;
+
+       /* forward prediction of sub-frames */
+
+       Nfor = iLBCenc_inst->nsub-start-1;
+
+
+       if ( Nfor > 0 ) {
+
+           /* setup memory */
+
+           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
+           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
+               STATE_LEN*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nfor; subframe++) {
+
+               /* encode sub-frame */
+
+               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   &residual[(start+1+subframe)*SUBL],
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES,
+                   &weightdenum[(start+1+subframe)*
+                               (LPC_FILTERORDER+1)],
+                   weightState, subcount+1);
+
+               /* construct decoded vector */
+
+               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+
+
+
+Andersen, et al.              Experimental                     [Page 58]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   &decresidual[(start+1+subframe)*SUBL],
+                   SUBL*sizeof(float));
+               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+               subcount++;
+           }
+       }
+
+
+       /* backward prediction of sub-frames */
+
+       Nback = start-1;
+
+
+       if ( Nback > 0 ) {
+
+           /* create reverse order vectors */
+
+           for (n=0; n<Nback; n++) {
+               for (k=0; k<SUBL; k++) {
+                   reverseResidual[n*SUBL+k] =
+                       residual[(start-1)*SUBL-1-n*SUBL-k];
+                   reverseDecresidual[n*SUBL+k] =
+                       decresidual[(start-1)*SUBL-1-n*SUBL-k];
+               }
+           }
+
+           /* setup memory */
+
+           meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
+
+
+           if ( meml_gotten > CB_MEML ) {
+               meml_gotten=CB_MEML;
+           }
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+           memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nback; subframe++) {
+
+               /* encode sub-frame */
+
+               iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
+
+
+
+Andersen, et al.              Experimental                     [Page 59]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   gain_index+subcount*CB_NSTAGES,
+                   &reverseResidual[subframe*SUBL],
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES,
+                   &weightdenum[(start-2-subframe)*
+                               (LPC_FILTERORDER+1)],
+                   weightState, subcount+1);
+
+               /* construct decoded vector */
+
+               iCBConstruct(&reverseDecresidual[subframe*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+                   &reverseDecresidual[subframe*SUBL],
+                   SUBL*sizeof(float));
+               memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
+
+               subcount++;
+
+           }
+
+           /* get decoded residual from reversed vector */
+
+           for (i=0; i<SUBL*Nback; i++) {
+               decresidual[SUBL*Nback - i - 1] =
+                   reverseDecresidual[i];
+           }
+       }
+       /* end encoding part */
+
+       /* adjust index */
+       index_conv_enc(cb_index);
+
+       /* pack bytes */
+
+       pbytes=bytes;
+       pos=0;
+
+       /* loop over the 3 ULP classes */
+
+       for (ulp=0; ulp<3; ulp++) {
+
+
+
+Andersen, et al.              Experimental                     [Page 60]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+
+           /* LSF */
+           for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
+               packsplit(&lsf_i[k], &firstpart, &lsf_i[k],
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp],
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
+           }
+
+           /* Start block info */
+
+           packsplit(&start, &firstpart, &start,
+               iLBCenc_inst->ULP_inst->start_bits[ulp],
+               iLBCenc_inst->ULP_inst->start_bits[ulp]+
+               iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
+
+           packsplit(&state_first, &firstpart, &state_first,
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp],
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
+
+           packsplit(&idxForMax, &firstpart, &idxForMax,
+               iLBCenc_inst->ULP_inst->scale_bits[ulp],
+               iLBCenc_inst->ULP_inst->scale_bits[ulp]+
+               iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
+               iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
+           dopack( &pbytes, firstpart,
+               iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
+
+           for (k=0; k<iLBCenc_inst->state_short_len; k++) {
+               packsplit(idxVec+k, &firstpart, idxVec+k,
+                   iLBCenc_inst->ULP_inst->state_bits[ulp],
+                   iLBCenc_inst->ULP_inst->state_bits[ulp]+
+                   iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
+                   iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
+           }
+
+
+
+
+Andersen, et al.              Experimental                     [Page 61]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           /* 23/22 (20ms/30ms) sample block */
+
+           for (k=0;k<CB_NSTAGES;k++) {
+               packsplit(extra_cb_index+k, &firstpart,
+                   extra_cb_index+k,
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
+                   &pos);
+           }
+
+           for (k=0;k<CB_NSTAGES;k++) {
+               packsplit(extra_gain_index+k, &firstpart,
+                   extra_gain_index+k,
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
+               dopack( &pbytes, firstpart,
+                   iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
+                   &pos);
+           }
+
+           /* The two/four (20ms/30ms) 40 sample sub-blocks */
+
+           for (i=0; i<iLBCenc_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   packsplit(cb_index+i*CB_NSTAGES+k, &firstpart,
+                       cb_index+i*CB_NSTAGES+k,
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
+                   dopack( &pbytes, firstpart,
+                       iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
+                       &pos);
+               }
+           }
+
+           for (i=0; i<iLBCenc_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   packsplit(gain_index+i*CB_NSTAGES+k, &firstpart,
+                       gain_index+i*CB_NSTAGES+k,
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
+
+
+
+Andersen, et al.              Experimental                     [Page 62]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
+                   dopack( &pbytes, firstpart,
+                       iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
+                       &pos);
+               }
+           }
+       }
+
+       /* set the last bit to zero (otherwise the decoder
+          will treat it as a lost frame) */
+       dopack( &pbytes, 0, 1, &pos);
+   }
+
+A.4.  iLBC_decode.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_decode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ILBCDECODE_H
+   #define __iLBC_ILBCDECODE_H
+
+   #include "iLBC_define.h"
+
+   short initDecode(                   /* (o) Number of decoded
+                                              samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       int mode,                       /* (i) frame size mode */
+       int use_enhancer                /* (i) 1 to use enhancer
+                                              0 to run without
+                                                enhancer */
+   );
+
+   void iLBC_decode(
+       float *decblock,            /* (o) decoded signal block */
+       unsigned char *bytes,           /* (i) encoded signal bits */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       int mode                    /* (i) 0: bad packet, PLC,
+                                              1: normal */
+
+
+
+Andersen, et al.              Experimental                     [Page 63]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   );
+
+   #endif
+
+A.5.  iLBC_decode.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_decode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+
+   #include "iLBC_define.h"
+   #include "StateConstructW.h"
+   #include "LPCdecode.h"
+   #include "iCBConstruct.h"
+   #include "doCPLC.h"
+   #include "helpfun.h"
+   #include "constants.h"
+   #include "packing.h"
+   #include "string.h"
+   #include "enhancer.h"
+   #include "hpOutput.h"
+   #include "syntFilter.h"
+
+   /*----------------------------------------------------------------*
+    *  Initiation of decoder instance.
+    *---------------------------------------------------------------*/
+
+   short initDecode(                   /* (o) Number of decoded
+                                              samples */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
+       int mode,                       /* (i) frame size mode */
+       int use_enhancer                /* (i) 1 to use enhancer
+                                              0 to run without
+                                                enhancer */
+   ){
+       int i;
+
+       iLBCdec_inst->mode = mode;
+
+
+
+Andersen, et al.              Experimental                     [Page 64]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       if (mode==30) {
+           iLBCdec_inst->blockl = BLOCKL_30MS;
+           iLBCdec_inst->nsub = NSUB_30MS;
+           iLBCdec_inst->nasub = NASUB_30MS;
+           iLBCdec_inst->lpc_n = LPC_N_30MS;
+           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
+           iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
+           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
+           /* ULP init */
+           iLBCdec_inst->ULP_inst=&ULP_30msTbl;
+       }
+       else if (mode==20) {
+           iLBCdec_inst->blockl = BLOCKL_20MS;
+           iLBCdec_inst->nsub = NSUB_20MS;
+           iLBCdec_inst->nasub = NASUB_20MS;
+           iLBCdec_inst->lpc_n = LPC_N_20MS;
+           iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
+           iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
+           iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
+           /* ULP init */
+           iLBCdec_inst->ULP_inst=&ULP_20msTbl;
+       }
+       else {
+           exit(2);
+       }
+
+       memset(iLBCdec_inst->syntMem, 0,
+           LPC_FILTERORDER*sizeof(float));
+       memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl,
+           LPC_FILTERORDER*sizeof(float));
+
+       memset(iLBCdec_inst->old_syntdenum, 0,
+           ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
+       for (i=0; i<NSUB_MAX; i++)
+           iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
+
+       iLBCdec_inst->last_lag = 20;
+
+       iLBCdec_inst->prevLag = 120;
+       iLBCdec_inst->per = 0.0;
+       iLBCdec_inst->consPLICount = 0;
+       iLBCdec_inst->prevPLI = 0;
+       iLBCdec_inst->prevLpc[0] = 1.0;
+       memset(iLBCdec_inst->prevLpc+1,0,
+           LPC_FILTERORDER*sizeof(float));
+       memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
+       iLBCdec_inst->seed=777;
+
+
+
+
+Andersen, et al.              Experimental                     [Page 65]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
+
+       iLBCdec_inst->use_enhancer = use_enhancer;
+       memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
+       for (i=0;i<ENH_NBLOCKS_TOT;i++)
+           iLBCdec_inst->enh_period[i]=(float)40.0;
+
+       iLBCdec_inst->prev_enh_pl = 0;
+
+       return (iLBCdec_inst->blockl);
+   }
+
+   /*----------------------------------------------------------------*
+    *  frame residual decoder function (subrutine to iLBC_decode)
+    *---------------------------------------------------------------*/
+
+   void Decode(
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       float *decresidual,             /* (o) decoded residual frame */
+       int start,                      /* (i) location of start
+                                              state */
+       int idxForMax,                  /* (i) codebook index for the
+                                              maximum value */
+       int *idxVec,                /* (i) codebook indexes for the
+                                              samples  in the start
+                                              state */
+       float *syntdenum,               /* (i) the decoded synthesis
+                                              filter coefficients */
+       int *cb_index,                  /* (i) the indexes for the
+                                              adaptive codebook */
+       int *gain_index,            /* (i) the indexes for the
+                                              corresponding gains */
+       int *extra_cb_index,        /* (i) the indexes for the
+                                              adaptive codebook part
+                                              of start state */
+       int *extra_gain_index,          /* (i) the indexes for the
+                                              corresponding gains */
+       int state_first                 /* (i) 1 if non adaptive part
+                                              of start state comes
+                                              first 0 if that part
+                                              comes last */
+   ){
+       float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
+       int k, meml_gotten, Nfor, Nback, i;
+       int diff, start_pos;
+       int subcount, subframe;
+
+
+
+
+Andersen, et al.              Experimental                     [Page 66]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       diff = STATE_LEN - iLBCdec_inst->state_short_len;
+
+       if (state_first == 1) {
+           start_pos = (start-1)*SUBL;
+       } else {
+           start_pos = (start-1)*SUBL + diff;
+       }
+
+       /* decode scalar part of start state */
+
+       StateConstructW(idxForMax, idxVec,
+           &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
+           &decresidual[start_pos], iLBCdec_inst->state_short_len);
+
+
+       if (state_first) { /* put adaptive part in the end */
+
+           /* setup memory */
+
+           memset(mem, 0,
+               (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
+           memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len,
+               decresidual+start_pos,
+               iLBCdec_inst->state_short_len*sizeof(float));
+
+           /* construct decoded vector */
+
+           iCBConstruct(
+               &decresidual[start_pos+iLBCdec_inst->state_short_len],
+               extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
+               stMemLTbl, diff, CB_NSTAGES);
+
+       }
+       else {/* put adaptive part in the beginning */
+
+           /* create reversed vectors for prediction */
+
+           for (k=0; k<diff; k++) {
+               reverseDecresidual[k] =
+                   decresidual[(start+1)*SUBL-1-
+                           (k+iLBCdec_inst->state_short_len)];
+           }
+
+           /* setup memory */
+
+           meml_gotten = iLBCdec_inst->state_short_len;
+           for (k=0; k<meml_gotten; k++){
+               mem[CB_MEML-1-k] = decresidual[start_pos + k];
+
+
+
+Andersen, et al.              Experimental                     [Page 67]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+
+           /* construct decoded vector */
+
+           iCBConstruct(reverseDecresidual, extra_cb_index,
+               extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
+               diff, CB_NSTAGES);
+
+           /* get decoded residual from reversed vector */
+
+           for (k=0; k<diff; k++) {
+               decresidual[start_pos-1-k] = reverseDecresidual[k];
+           }
+       }
+
+       /* counter for predicted sub-frames */
+
+       subcount=0;
+
+       /* forward prediction of sub-frames */
+
+       Nfor = iLBCdec_inst->nsub-start-1;
+
+       if ( Nfor > 0 ){
+
+           /* setup memory */
+
+           memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
+           memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
+               STATE_LEN*sizeof(float));
+
+           /* loop over sub-frames to encode */
+
+           for (subframe=0; subframe<Nfor; subframe++) {
+
+               /* construct decoded vector */
+
+               iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount],
+                   memLfTbl[subcount], SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+
+
+
+Andersen, et al.              Experimental                     [Page 68]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   &decresidual[(start+1+subframe)*SUBL],
+                   SUBL*sizeof(float));
+
+               subcount++;
+
+           }
+
+       }
+
+       /* backward prediction of sub-frames */
+
+       Nback = start-1;
+
+       if ( Nback > 0 ) {
+
+           /* setup memory */
+
+           meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
+
+           if ( meml_gotten > CB_MEML ) {
+               meml_gotten=CB_MEML;
+           }
+           for (k=0; k<meml_gotten; k++) {
+               mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
+           }
+           memset(mem, 0, (CB_MEML-k)*sizeof(float));
+
+           /* loop over subframes to decode */
+
+           for (subframe=0; subframe<Nback; subframe++) {
+
+               /* construct decoded vector */
+
+               iCBConstruct(&reverseDecresidual[subframe*SUBL],
+                   cb_index+subcount*CB_NSTAGES,
+                   gain_index+subcount*CB_NSTAGES,
+                   mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount],
+                   SUBL, CB_NSTAGES);
+
+               /* update memory */
+
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem+CB_MEML-SUBL,
+                   &reverseDecresidual[subframe*SUBL],
+                   SUBL*sizeof(float));
+
+               subcount++;
+           }
+
+
+
+Andersen, et al.              Experimental                     [Page 69]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           /* get decoded residual from reversed vector */
+
+           for (i=0; i<SUBL*Nback; i++)
+               decresidual[SUBL*Nback - i - 1] =
+               reverseDecresidual[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  main decoder function
+    *---------------------------------------------------------------*/
+
+   void iLBC_decode(
+       float *decblock,            /* (o) decoded signal block */
+       unsigned char *bytes,           /* (i) encoded signal bits */
+       iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state
+                                                structure */
+       int mode                    /* (i) 0: bad packet, PLC,
+                                              1: normal */
+   ){
+       float data[BLOCKL_MAX];
+       float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
+       float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
+       float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
+       int k, i, start, idxForMax, pos, lastpart, ulp;
+       int lag, ilag;
+       float cc, maxcc;
+       int idxVec[STATE_LEN];
+       int check;
+       int gain_index[NASUB_MAX*CB_NSTAGES],
+           extra_gain_index[CB_NSTAGES];
+       int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
+       int lsf_i[LSF_NSPLIT*LPC_N_MAX];
+       int state_first;
+       int last_bit;
+       unsigned char *pbytes;
+       float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
+       int order_plus_one;
+       float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
+       float decresidual[BLOCKL_MAX];
+
+       if (mode>0) { /* the data are good */
+
+           /* decode data */
+
+           pbytes=bytes;
+           pos=0;
+
+
+
+
+Andersen, et al.              Experimental                     [Page 70]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           /* Set everything to zero before decoding */
+
+           for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
+               lsf_i[k]=0;
+           }
+           start=0;
+           state_first=0;
+           idxForMax=0;
+           for (k=0; k<iLBCdec_inst->state_short_len; k++) {
+               idxVec[k]=0;
+           }
+           for (k=0; k<CB_NSTAGES; k++) {
+               extra_cb_index[k]=0;
+           }
+           for (k=0; k<CB_NSTAGES; k++) {
+               extra_gain_index[k]=0;
+           }
+           for (i=0; i<iLBCdec_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   cb_index[i*CB_NSTAGES+k]=0;
+               }
+           }
+           for (i=0; i<iLBCdec_inst->nasub; i++) {
+               for (k=0; k<CB_NSTAGES; k++) {
+                   gain_index[i*CB_NSTAGES+k]=0;
+               }
+           }
+
+           /* loop over ULP classes */
+
+           for (ulp=0; ulp<3; ulp++) {
+
+               /* LSF */
+               for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
+                   packcombine(&lsf_i[k], lastpart,
+                       iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
+               }
+
+               /* Start block info */
+
+               unpack( &pbytes, &lastpart,
+                   iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
+               packcombine(&start, lastpart,
+                   iLBCdec_inst->ULP_inst->start_bits[ulp]);
+
+               unpack( &pbytes, &lastpart,
+
+
+
+Andersen, et al.              Experimental                     [Page 71]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
+               packcombine(&state_first, lastpart,
+                   iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
+
+               unpack( &pbytes, &lastpart,
+                   iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
+               packcombine(&idxForMax, lastpart,
+                   iLBCdec_inst->ULP_inst->scale_bits[ulp]);
+
+               for (k=0; k<iLBCdec_inst->state_short_len; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
+                   packcombine(idxVec+k, lastpart,
+                       iLBCdec_inst->ULP_inst->state_bits[ulp]);
+               }
+
+               /* 23/22 (20ms/30ms) sample block */
+
+               for (k=0; k<CB_NSTAGES; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp],
+                       &pos);
+                   packcombine(extra_cb_index+k, lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
+               }
+               for (k=0; k<CB_NSTAGES; k++) {
+                   unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp],
+                       &pos);
+                   packcombine(extra_gain_index+k, lastpart,
+                       iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
+               }
+
+               /* The two/four (20ms/30ms) 40 sample sub-blocks */
+
+               for (i=0; i<iLBCdec_inst->nasub; i++) {
+                   for (k=0; k<CB_NSTAGES; k++) {
+                       unpack( &pbytes, &lastpart,
+                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp],
+                           &pos);
+                       packcombine(cb_index+i*CB_NSTAGES+k, lastpart,
+                       iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
+                   }
+               }
+
+               for (i=0; i<iLBCdec_inst->nasub; i++) {
+                   for (k=0; k<CB_NSTAGES; k++) {
+                       unpack( &pbytes, &lastpart,
+
+
+
+Andersen, et al.              Experimental                     [Page 72]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                       iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp],
+                           &pos);
+                       packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
+                           iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
+                   }
+               }
+           }
+           /* Extract last bit. If it is 1 this indicates an
+              empty/lost frame */
+           unpack( &pbytes, &last_bit, 1, &pos);
+
+           /* Check for bit errors or empty/lost frames */
+           if (start<1)
+               mode = 0;
+           if (iLBCdec_inst->mode==20 && start>3)
+               mode = 0;
+           if (iLBCdec_inst->mode==30 && start>5)
+               mode = 0;
+           if (last_bit==1)
+               mode = 0;
+
+           if (mode==1) { /* No bit errors was detected,
+                             continue decoding */
+
+               /* adjust index */
+               index_conv_dec(cb_index);
+
+               /* decode the lsf */
+
+               SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
+               check=LSF_check(lsfdeq, LPC_FILTERORDER,
+                   iLBCdec_inst->lpc_n);
+               DecoderInterpolateLSF(syntdenum, weightdenum,
+                   lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
+
+               Decode(iLBCdec_inst, decresidual, start, idxForMax,
+                   idxVec, syntdenum, cb_index, gain_index,
+                   extra_cb_index, extra_gain_index,
+                   state_first);
+
+               /* preparing the plc for a future loss! */
+
+               doThePLC(PLCresidual, PLClpc, 0, decresidual,
+                   syntdenum +
+                   (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
+                   (*iLBCdec_inst).last_lag, iLBCdec_inst);
+
+
+
+
+
+Andersen, et al.              Experimental                     [Page 73]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               memcpy(decresidual, PLCresidual,
+                   iLBCdec_inst->blockl*sizeof(float));
+           }
+
+       }
+
+       if (mode == 0) {
+           /* the data is bad (either a PLC call
+            * was made or a severe bit error was detected)
+            */
+
+           /* packet loss conceal */
+
+           memset(zeros, 0, BLOCKL_MAX*sizeof(float));
+
+           one[0] = 1;
+           memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
+
+           start=0;
+
+           doThePLC(PLCresidual, PLClpc, 1, zeros, one,
+               (*iLBCdec_inst).last_lag, iLBCdec_inst);
+           memcpy(decresidual, PLCresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+
+           order_plus_one = LPC_FILTERORDER + 1;
+           for (i = 0; i < iLBCdec_inst->nsub; i++) {
+               memcpy(syntdenum+(i*order_plus_one), PLClpc,
+                   order_plus_one*sizeof(float));
+           }
+       }
+
+       if (iLBCdec_inst->use_enhancer == 1) {
+
+           /* post filtering */
+
+           iLBCdec_inst->last_lag =
+               enhancerInterface(data, decresidual, iLBCdec_inst);
+
+           /* synthesis filtering */
+
+           if (iLBCdec_inst->mode==20) {
+               /* Enhancer has 40 samples delay */
+               i=0;
+               syntFilter(data + i*SUBL,
+                   iLBCdec_inst->old_syntdenum +
+                   (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1),
+                   SUBL, iLBCdec_inst->syntMem);
+
+
+
+Andersen, et al.              Experimental                     [Page 74]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               for (i=1; i < iLBCdec_inst->nsub; i++) {
+                   syntFilter(data + i*SUBL,
+                       syntdenum + (i-1)*(LPC_FILTERORDER+1),
+                       SUBL, iLBCdec_inst->syntMem);
+               }
+           } else if (iLBCdec_inst->mode==30) {
+               /* Enhancer has 80 samples delay */
+               for (i=0; i < 2; i++) {
+                   syntFilter(data + i*SUBL,
+                       iLBCdec_inst->old_syntdenum +
+                       (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
+                       SUBL, iLBCdec_inst->syntMem);
+               }
+               for (i=2; i < iLBCdec_inst->nsub; i++) {
+                   syntFilter(data + i*SUBL,
+                       syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
+                       iLBCdec_inst->syntMem);
+               }
+           }
+
+       } else {
+
+           /* Find last lag */
+           lag = 20;
+           maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
+               &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
+
+           for (ilag=21; ilag<120; ilag++) {
+               cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
+                   &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag],
+                   ENH_BLOCKL);
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+           iLBCdec_inst->last_lag = lag;
+
+           /* copy data and run synthesis filter */
+
+           memcpy(data, decresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+           for (i=0; i < iLBCdec_inst->nsub; i++) {
+               syntFilter(data + i*SUBL,
+                   syntdenum + i*(LPC_FILTERORDER+1), SUBL,
+                   iLBCdec_inst->syntMem);
+           }
+
+
+
+Andersen, et al.              Experimental                     [Page 75]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       }
+
+       /* high pass filtering on output if desired, otherwise
+          copy to out */
+
+       hpOutput(data, iLBCdec_inst->blockl,
+                   decblock,iLBCdec_inst->hpomem);
+
+       /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
+
+       memcpy(iLBCdec_inst->old_syntdenum, syntdenum,
+
+           iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
+
+       iLBCdec_inst->prev_enh_pl=0;
+
+       if (mode==0) { /* PLC was used */
+           iLBCdec_inst->prev_enh_pl=1;
+       }
+   }
+
+A.6.  iLBC_define.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iLBC_define.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+   #include <string.h>
+
+   #ifndef __iLBC_ILBCDEFINE_H
+   #define __iLBC_ILBCDEFINE_H
+
+   /* general codec settings */
+
+   #define FS                      (float)8000.0
+   #define BLOCKL_20MS             160
+   #define BLOCKL_30MS             240
+   #define BLOCKL_MAX              240
+   #define NSUB_20MS               4
+   #define NSUB_30MS               6
+   #define NSUB_MAX            6
+   #define NASUB_20MS              2
+
+
+
+Andersen, et al.              Experimental                     [Page 76]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #define NASUB_30MS              4
+   #define NASUB_MAX               4
+   #define SUBL                40
+   #define STATE_LEN               80
+   #define STATE_SHORT_LEN_30MS    58
+   #define STATE_SHORT_LEN_20MS    57
+
+   /* LPC settings */
+
+   #define LPC_FILTERORDER         10
+   #define LPC_CHIRP_SYNTDENUM     (float)0.9025
+   #define LPC_CHIRP_WEIGHTDENUM   (float)0.4222
+   #define LPC_LOOKBACK        60
+   #define LPC_N_20MS              1
+   #define LPC_N_30MS              2
+   #define LPC_N_MAX               2
+   #define LPC_ASYMDIFF        20
+   #define LPC_BW                  (float)60.0
+   #define LPC_WN                  (float)1.0001
+   #define LSF_NSPLIT              3
+   #define LSF_NUMBER_OF_STEPS     4
+   #define LPC_HALFORDER           (LPC_FILTERORDER/2)
+
+   /* cb settings */
+
+   #define CB_NSTAGES              3
+   #define CB_EXPAND               2
+   #define CB_MEML                 147
+   #define CB_FILTERLEN        2*4
+   #define CB_HALFFILTERLEN    4
+   #define CB_RESRANGE             34
+   #define CB_MAXGAIN              (float)1.3
+
+   /* enhancer */
+
+   #define ENH_BLOCKL              80  /* block length */
+   #define ENH_BLOCKL_HALF         (ENH_BLOCKL/2)
+   #define ENH_HL                  3   /* 2*ENH_HL+1 is number blocks
+                                          in said second sequence */
+   #define ENH_SLOP            2   /* max difference estimated and
+                                          correct pitch period */
+   #define ENH_PLOCSL              20  /* pitch-estimates and pitch-
+                                          locations buffer length */
+   #define ENH_OVERHANG        2
+   #define ENH_UPS0            4   /* upsampling rate */
+   #define ENH_FL0                 3   /* 2*FLO+1 is the length of
+                                          each filter */
+   #define ENH_VECTL               (ENH_BLOCKL+2*ENH_FL0)
+
+
+
+Andersen, et al.              Experimental                     [Page 77]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #define ENH_CORRDIM             (2*ENH_SLOP+1)
+   #define ENH_NBLOCKS             (BLOCKL_MAX/ENH_BLOCKL)
+   #define ENH_NBLOCKS_EXTRA       5
+   #define ENH_NBLOCKS_TOT         8   /* ENH_NBLOCKS +
+                                          ENH_NBLOCKS_EXTRA */
+   #define ENH_BUFL            (ENH_NBLOCKS_TOT)*ENH_BLOCKL
+   #define ENH_ALPHA0              (float)0.05
+
+   /* Down sampling */
+
+   #define FILTERORDER_DS          7
+   #define DELAY_DS            3
+   #define FACTOR_DS               2
+
+   /* bit stream defs */
+
+   #define NO_OF_BYTES_20MS    38
+   #define NO_OF_BYTES_30MS    50
+   #define NO_OF_WORDS_20MS    19
+   #define NO_OF_WORDS_30MS    25
+   #define STATE_BITS              3
+   #define BYTE_LEN            8
+   #define ULP_CLASSES             3
+
+   /* help parameters */
+
+   #define FLOAT_MAX               (float)1.0e37
+   #define EPS                     (float)2.220446049250313e-016
+   #define PI                      (float)3.14159265358979323846
+   #define MIN_SAMPLE              -32768
+   #define MAX_SAMPLE              32767
+   #define TWO_PI                  (float)6.283185307
+   #define PI2                     (float)0.159154943
+
+   /* type definition encoder instance */
+   typedef struct iLBC_ULP_Inst_t_ {
+       int lsf_bits[6][ULP_CLASSES+2];
+       int start_bits[ULP_CLASSES+2];
+       int startfirst_bits[ULP_CLASSES+2];
+       int scale_bits[ULP_CLASSES+2];
+       int state_bits[ULP_CLASSES+2];
+       int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
+       int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
+       int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
+       int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
+   } iLBC_ULP_Inst_t;
+
+   /* type definition encoder instance */
+
+
+
+Andersen, et al.              Experimental                     [Page 78]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   typedef struct iLBC_Enc_Inst_t_ {
+
+       /* flag for frame size mode */
+       int mode;
+
+       /* basic parameters for different frame sizes */
+       int blockl;
+       int nsub;
+       int nasub;
+       int no_of_bytes, no_of_words;
+       int lpc_n;
+       int state_short_len;
+       const iLBC_ULP_Inst_t *ULP_inst;
+
+       /* analysis filter state */
+       float anaMem[LPC_FILTERORDER];
+
+       /* old lsf parameters for interpolation */
+       float lsfold[LPC_FILTERORDER];
+       float lsfdeqold[LPC_FILTERORDER];
+
+       /* signal buffer for LP analysis */
+       float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
+
+       /* state of input HP filter */
+       float hpimem[4];
+
+   } iLBC_Enc_Inst_t;
+
+   /* type definition decoder instance */
+   typedef struct iLBC_Dec_Inst_t_ {
+
+       /* flag for frame size mode */
+       int mode;
+
+       /* basic parameters for different frame sizes */
+       int blockl;
+       int nsub;
+       int nasub;
+       int no_of_bytes, no_of_words;
+       int lpc_n;
+       int state_short_len;
+       const iLBC_ULP_Inst_t *ULP_inst;
+
+       /* synthesis filter state */
+       float syntMem[LPC_FILTERORDER];
+
+       /* old LSF for interpolation */
+
+
+
+Andersen, et al.              Experimental                     [Page 79]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float lsfdeqold[LPC_FILTERORDER];
+
+       /* pitch lag estimated in enhancer and used in PLC */
+       int last_lag;
+
+       /* PLC state information */
+       int prevLag, consPLICount, prevPLI, prev_enh_pl;
+       float prevLpc[LPC_FILTERORDER+1];
+       float prevResidual[NSUB_MAX*SUBL];
+       float per;
+       unsigned long seed;
+
+       /* previous synthesis filter parameters */
+       float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
+
+       /* state of output HP filter */
+       float hpomem[4];
+
+       /* enhancer state information */
+       int use_enhancer;
+       float enh_buf[ENH_BUFL];
+       float enh_period[ENH_NBLOCKS_TOT];
+
+   } iLBC_Dec_Inst_t;
+
+   #endif
+
+A.7.  constants.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       constants.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_CONSTANTS_H
+   #define __iLBC_CONSTANTS_H
+
+   #include "iLBC_define.h"
+
+
+   /* ULP bit allocation */
+
+
+
+
+Andersen, et al.              Experimental                     [Page 80]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   extern const iLBC_ULP_Inst_t ULP_20msTbl;
+   extern const iLBC_ULP_Inst_t ULP_30msTbl;
+
+   /* high pass filters */
+
+   extern float hpi_zero_coefsTbl[];
+   extern float hpi_pole_coefsTbl[];
+   extern float hpo_zero_coefsTbl[];
+   extern float hpo_pole_coefsTbl[];
+
+   /* low pass filters */
+   extern float lpFilt_coefsTbl[];
+
+   /* LPC analysis and quantization */
+
+   extern float lpc_winTbl[];
+   extern float lpc_asymwinTbl[];
+   extern float lpc_lagwinTbl[];
+   extern float lsfCbTbl[];
+   extern float lsfmeanTbl[];
+   extern int   dim_lsfCbTbl[];
+   extern int   size_lsfCbTbl[];
+   extern float lsf_weightTbl_30ms[];
+   extern float lsf_weightTbl_20ms[];
+
+   /* state quantization tables */
+
+   extern float state_sq3Tbl[];
+   extern float state_frgqTbl[];
+
+   /* gain quantization tables */
+
+   extern float gain_sq3Tbl[];
+   extern float gain_sq4Tbl[];
+   extern float gain_sq5Tbl[];
+
+   /* adaptive codebook definitions */
+
+   extern int search_rangeTbl[5][CB_NSTAGES];
+   extern int memLfTbl[];
+   extern int stMemLTbl;
+   extern float cbfiltersTbl[CB_FILTERLEN];
+
+   /* enhancer definitions */
+
+   extern float polyphaserTbl[];
+   extern float enh_plocsTbl[];
+
+
+
+
+Andersen, et al.              Experimental                     [Page 81]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #endif
+
+A.8.  constants.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       constants.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /* ULP bit allocation */
+
+       /* 20 ms frame */
+
+   const iLBC_ULP_Inst_t ULP_20msTbl = {
+       /* LSF */
+       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
+           {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+       /* Start state location, gain and samples */
+       {2,0,0,0,0},
+       {1,0,0,0,0},
+       {6,0,0,0,0},
+       {0,1,2,0,0},
+       /* extra CB index and extra CB gain */
+       {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+       {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+       /* CB index and CB gain */
+       {   {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+           {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
+       {   {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+           {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
+           {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
+   };
+
+       /* 30 ms frame */
+
+   const iLBC_ULP_Inst_t ULP_30msTbl = {
+       /* LSF */
+
+
+
+Andersen, et al.              Experimental                     [Page 82]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
+           {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
+       /* Start state location, gain and samples */
+       {3,0,0,0,0},
+       {1,0,0,0,0},
+       {6,0,0,0,0},
+       {0,1,2,0,0},
+       /* extra CB index and extra CB gain */
+       {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+       {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
+       /* CB index and CB gain */
+       {   {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
+           {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
+       {   {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
+           {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
+           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
+           {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
+   };
+
+   /* HP Filters */
+
+   float hpi_zero_coefsTbl[3] = {
+       (float)0.92727436, (float)-1.8544941, (float)0.92727436
+   };
+   float hpi_pole_coefsTbl[3] = {
+       (float)1.0, (float)-1.9059465, (float)0.9114024
+   };
+   float hpo_zero_coefsTbl[3] = {
+       (float)0.93980581, (float)-1.8795834, (float)0.93980581
+   };
+   float hpo_pole_coefsTbl[3] = {
+       (float)1.0, (float)-1.9330735, (float)0.93589199
+   };
+
+   /* LP Filter */
+
+   float lpFilt_coefsTbl[FILTERORDER_DS]={
+       (float)-0.066650, (float)0.125000, (float)0.316650,
+       (float)0.414063, (float)0.316650,
+       (float)0.125000, (float)-0.066650
+   };
+
+   /* State quantization tables */
+
+   float state_sq3Tbl[8] = {
+       (float)-3.719849, (float)-2.177490, (float)-1.130005,
+
+
+
+Andersen, et al.              Experimental                     [Page 83]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       (float)-0.309692, (float)0.444214, (float)1.329712,
+       (float)2.436279, (float)3.983887
+   };
+
+   float state_frgqTbl[64] = {
+       (float)1.000085, (float)1.071695, (float)1.140395,
+       (float)1.206868, (float)1.277188, (float)1.351503,
+       (float)1.429380, (float)1.500727, (float)1.569049,
+       (float)1.639599, (float)1.707071, (float)1.781531,
+       (float)1.840799, (float)1.901550, (float)1.956695,
+       (float)2.006750, (float)2.055474, (float)2.102787,
+       (float)2.142819, (float)2.183592, (float)2.217962,
+       (float)2.257177, (float)2.295739, (float)2.332967,
+       (float)2.369248, (float)2.402792, (float)2.435080,
+       (float)2.468598, (float)2.503394, (float)2.539284,
+       (float)2.572944, (float)2.605036, (float)2.636331,
+       (float)2.668939, (float)2.698780, (float)2.729101,
+       (float)2.759786, (float)2.789834, (float)2.818679,
+       (float)2.848074, (float)2.877470, (float)2.906899,
+       (float)2.936655, (float)2.967804, (float)3.000115,
+       (float)3.033367, (float)3.066355, (float)3.104231,
+       (float)3.141499, (float)3.183012, (float)3.222952,
+       (float)3.265433, (float)3.308441, (float)3.350823,
+       (float)3.395275, (float)3.442793, (float)3.490801,
+       (float)3.542514, (float)3.604064, (float)3.666050,
+       (float)3.740994, (float)3.830749, (float)3.938770,
+       (float)4.101764
+   };
+
+   /* CB tables */
+
+   int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44},
+               {108,108,108}, {108,108,108}, {108,108,108}};
+   int stMemLTbl=85;
+   int memLfTbl[NASUB_MAX]={147,147,147,147};
+
+   /* expansion filter(s) */
+
+   float cbfiltersTbl[CB_FILTERLEN]={
+       (float)-0.034180, (float)0.108887, (float)-0.184326,
+       (float)0.806152,  (float)0.713379, (float)-0.144043,
+       (float)0.083740,  (float)-0.033691
+   };
+
+   /* Gain Quantization */
+
+   float gain_sq3Tbl[8]={
+       (float)-1.000000,  (float)-0.659973,  (float)-0.330017,
+
+
+
+Andersen, et al.              Experimental                     [Page 84]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       (float)0.000000, (float)0.250000, (float)0.500000,
+       (float)0.750000, (float)1.00000};
+
+   float gain_sq4Tbl[16]={
+       (float)-1.049988, (float)-0.900024, (float)-0.750000,
+       (float)-0.599976, (float)-0.450012, (float)-0.299988,
+       (float)-0.150024, (float)0.000000, (float)0.150024,
+       (float)0.299988, (float)0.450012, (float)0.599976,
+       (float)0.750000, (float)0.900024, (float)1.049988,
+       (float)1.200012};
+
+   float gain_sq5Tbl[32]={
+       (float)0.037476, (float)0.075012, (float)0.112488,
+       (float)0.150024, (float)0.187500, (float)0.224976,
+       (float)0.262512, (float)0.299988, (float)0.337524,
+       (float)0.375000, (float)0.412476, (float)0.450012,
+       (float)0.487488, (float)0.525024, (float)0.562500,
+       (float)0.599976, (float)0.637512, (float)0.674988,
+       (float)0.712524, (float)0.750000, (float)0.787476,
+       (float)0.825012, (float)0.862488, (float)0.900024,
+       (float)0.937500, (float)0.974976, (float)1.012512,
+       (float)1.049988, (float)1.087524, (float)1.125000,
+       (float)1.162476, (float)1.200012};
+
+   /* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
+   float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={
+       (float)0.000000, (float)0.000000, (float)0.000000,
+   (float)1.000000,
+           (float)0.000000, (float)0.000000, (float)0.000000,
+       (float)0.015625, (float)-0.076904, (float)0.288330,
+   (float)0.862061,
+           (float)-0.106445, (float)0.018799, (float)-0.015625,
+       (float)0.023682, (float)-0.124268, (float)0.601563,
+   (float)0.601563,
+           (float)-0.124268, (float)0.023682, (float)-0.023682,
+       (float)0.018799, (float)-0.106445, (float)0.862061,
+   (float)0.288330,
+           (float)-0.076904, (float)0.015625, (float)-0.018799};
+
+   float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0,
+               (float)200.0, (float)280.0, (float)360.0,
+               (float)440.0, (float)520.0, (float)600.0};
+
+   /* LPC analysis and quantization */
+
+   int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
+   int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
+
+
+
+
+Andersen, et al.              Experimental                     [Page 85]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   float lsfmeanTbl[LPC_FILTERORDER] = {
+       (float)0.281738, (float)0.445801, (float)0.663330,
+       (float)0.962524, (float)1.251831, (float)1.533081,
+       (float)1.850586, (float)2.137817, (float)2.481445,
+       (float)2.777344};
+
+   float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
+   (float)(2.0/3.0),
+       (float)(1.0/3.0), (float)0.0, (float)0.0};
+
+   float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0),
+       (float)(1.0/4.0), (float)(0.0)};
+
+   /* Hanning LPC window */
+   float lpc_winTbl[BLOCKL_MAX]={
+       (float)0.000183, (float)0.000671, (float)0.001526,
+       (float)0.002716, (float)0.004242, (float)0.006104,
+       (float)0.008301, (float)0.010834, (float)0.013702,
+       (float)0.016907, (float)0.020416, (float)0.024261,
+       (float)0.028442, (float)0.032928, (float)0.037750,
+       (float)0.042877, (float)0.048309, (float)0.054047,
+       (float)0.060089, (float)0.066437, (float)0.073090,
+       (float)0.080017, (float)0.087219, (float)0.094727,
+       (float)0.102509, (float)0.110535, (float)0.118835,
+       (float)0.127411, (float)0.136230, (float)0.145294,
+       (float)0.154602, (float)0.164154, (float)0.173920,
+       (float)0.183899, (float)0.194122, (float)0.204529,
+       (float)0.215149, (float)0.225952, (float)0.236938,
+       (float)0.248108, (float)0.259460, (float)0.270966,
+       (float)0.282654, (float)0.294464, (float)0.306396,
+       (float)0.318481, (float)0.330688, (float)0.343018,
+       (float)0.355438, (float)0.367981, (float)0.380585,
+       (float)0.393280, (float)0.406067, (float)0.418884,
+       (float)0.431763, (float)0.444702, (float)0.457672,
+       (float)0.470673, (float)0.483704, (float)0.496735,
+       (float)0.509766, (float)0.522797, (float)0.535828,
+       (float)0.548798, (float)0.561768, (float)0.574677,
+       (float)0.587524, (float)0.600342, (float)0.613068,
+       (float)0.625732, (float)0.638306, (float)0.650787,
+       (float)0.663147, (float)0.675415, (float)0.687561,
+       (float)0.699585, (float)0.711487, (float)0.723206,
+       (float)0.734802, (float)0.746216, (float)0.757477,
+       (float)0.768585, (float)0.779480, (float)0.790192,
+       (float)0.800720, (float)0.811005, (float)0.821106,
+       (float)0.830994, (float)0.840668, (float)0.850067,
+       (float)0.859253, (float)0.868225, (float)0.876892,
+       (float)0.885345, (float)0.893524, (float)0.901428,
+       (float)0.909058, (float)0.916412, (float)0.923492,
+
+
+
+Andersen, et al.              Experimental                     [Page 86]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       (float)0.930267, (float)0.936768, (float)0.942963,
+       (float)0.948853, (float)0.954437, (float)0.959717,
+       (float)0.964691, (float)0.969360, (float)0.973694,
+       (float)0.977692, (float)0.981384, (float)0.984741,
+       (float)0.987762, (float)0.990479, (float)0.992828,
+       (float)0.994873, (float)0.996552, (float)0.997925,
+       (float)0.998932, (float)0.999603, (float)0.999969,
+       (float)0.999969, (float)0.999603, (float)0.998932,
+       (float)0.997925, (float)0.996552, (float)0.994873,
+       (float)0.992828, (float)0.990479, (float)0.987762,
+       (float)0.984741, (float)0.981384, (float)0.977692,
+       (float)0.973694, (float)0.969360, (float)0.964691,
+       (float)0.959717, (float)0.954437, (float)0.948853,
+       (float)0.942963, (float)0.936768, (float)0.930267,
+       (float)0.923492, (float)0.916412, (float)0.909058,
+       (float)0.901428, (float)0.893524, (float)0.885345,
+       (float)0.876892, (float)0.868225, (float)0.859253,
+       (float)0.850067, (float)0.840668, (float)0.830994,
+       (float)0.821106, (float)0.811005, (float)0.800720,
+       (float)0.790192, (float)0.779480, (float)0.768585,
+       (float)0.757477, (float)0.746216, (float)0.734802,
+       (float)0.723206, (float)0.711487, (float)0.699585,
+       (float)0.687561, (float)0.675415, (float)0.663147,
+       (float)0.650787, (float)0.638306, (float)0.625732,
+       (float)0.613068, (float)0.600342, (float)0.587524,
+       (float)0.574677, (float)0.561768, (float)0.548798,
+       (float)0.535828, (float)0.522797, (float)0.509766,
+       (float)0.496735, (float)0.483704, (float)0.470673,
+       (float)0.457672, (float)0.444702, (float)0.431763,
+       (float)0.418884, (float)0.406067, (float)0.393280,
+       (float)0.380585, (float)0.367981, (float)0.355438,
+       (float)0.343018, (float)0.330688, (float)0.318481,
+       (float)0.306396, (float)0.294464, (float)0.282654,
+       (float)0.270966, (float)0.259460, (float)0.248108,
+       (float)0.236938, (float)0.225952, (float)0.215149,
+       (float)0.204529, (float)0.194122, (float)0.183899,
+       (float)0.173920, (float)0.164154, (float)0.154602,
+       (float)0.145294, (float)0.136230, (float)0.127411,
+       (float)0.118835, (float)0.110535, (float)0.102509,
+       (float)0.094727, (float)0.087219, (float)0.080017,
+       (float)0.073090, (float)0.066437, (float)0.060089,
+       (float)0.054047, (float)0.048309, (float)0.042877,
+       (float)0.037750, (float)0.032928, (float)0.028442,
+       (float)0.024261, (float)0.020416, (float)0.016907,
+       (float)0.013702, (float)0.010834, (float)0.008301,
+       (float)0.006104, (float)0.004242, (float)0.002716,
+       (float)0.001526, (float)0.000671, (float)0.000183
+   };
+
+
+
+Andersen, et al.              Experimental                     [Page 87]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   /* Asymmetric LPC window */
+   float lpc_asymwinTbl[BLOCKL_MAX]={
+       (float)0.000061, (float)0.000214, (float)0.000458,
+       (float)0.000824, (float)0.001282, (float)0.001831,
+       (float)0.002472, (float)0.003235, (float)0.004120,
+       (float)0.005066, (float)0.006134, (float)0.007294,
+       (float)0.008545, (float)0.009918, (float)0.011383,
+       (float)0.012939, (float)0.014587, (float)0.016357,
+       (float)0.018219, (float)0.020172, (float)0.022217,
+       (float)0.024353, (float)0.026611, (float)0.028961,
+       (float)0.031372, (float)0.033905, (float)0.036530,
+       (float)0.039276, (float)0.042084, (float)0.044983,
+       (float)0.047974, (float)0.051086, (float)0.054260,
+       (float)0.057526, (float)0.060883, (float)0.064331,
+       (float)0.067871, (float)0.071503, (float)0.075226,
+       (float)0.079010, (float)0.082916, (float)0.086884,
+       (float)0.090942, (float)0.095062, (float)0.099304,
+       (float)0.103607, (float)0.107971, (float)0.112427,
+       (float)0.116974, (float)0.121582, (float)0.126282,
+       (float)0.131073, (float)0.135895, (float)0.140839,
+       (float)0.145813, (float)0.150879, (float)0.156006,
+       (float)0.161224, (float)0.166504, (float)0.171844,
+       (float)0.177246, (float)0.182709, (float)0.188263,
+       (float)0.193848, (float)0.199524, (float)0.205231,
+       (float)0.211029, (float)0.216858, (float)0.222778,
+       (float)0.228729, (float)0.234741, (float)0.240814,
+       (float)0.246918, (float)0.253082, (float)0.259308,
+       (float)0.265564, (float)0.271881, (float)0.278259,
+       (float)0.284668, (float)0.291107, (float)0.297607,
+       (float)0.304138, (float)0.310730, (float)0.317322,
+       (float)0.323975, (float)0.330658, (float)0.337372,
+       (float)0.344147, (float)0.350922, (float)0.357727,
+       (float)0.364594, (float)0.371460, (float)0.378357,
+       (float)0.385284, (float)0.392212, (float)0.399170,
+       (float)0.406158, (float)0.413177, (float)0.420197,
+       (float)0.427246, (float)0.434296, (float)0.441376,
+       (float)0.448456, (float)0.455536, (float)0.462646,
+       (float)0.469757, (float)0.476868, (float)0.483978,
+       (float)0.491089, (float)0.498230, (float)0.505341,
+       (float)0.512451, (float)0.519592, (float)0.526703,
+       (float)0.533813, (float)0.540924, (float)0.548004,
+       (float)0.555084, (float)0.562164, (float)0.569244,
+       (float)0.576294, (float)0.583313, (float)0.590332,
+       (float)0.597321, (float)0.604309, (float)0.611267,
+       (float)0.618195, (float)0.625092, (float)0.631989,
+       (float)0.638855, (float)0.645660, (float)0.652466,
+       (float)0.659241, (float)0.665985, (float)0.672668,
+       (float)0.679352, (float)0.685974, (float)0.692566,
+
+
+
+Andersen, et al.              Experimental                     [Page 88]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       (float)0.699127, (float)0.705658, (float)0.712128,
+       (float)0.718536, (float)0.724945, (float)0.731262,
+       (float)0.737549, (float)0.743805, (float)0.750000,
+       (float)0.756134, (float)0.762238, (float)0.768280,
+       (float)0.774261, (float)0.780182, (float)0.786072,
+       (float)0.791870, (float)0.797638, (float)0.803314,
+       (float)0.808960, (float)0.814514, (float)0.820038,
+       (float)0.825470, (float)0.830841, (float)0.836151,
+       (float)0.841400, (float)0.846558, (float)0.851654,
+       (float)0.856689, (float)0.861633, (float)0.866516,
+       (float)0.871338, (float)0.876068, (float)0.880737,
+       (float)0.885315, (float)0.889801, (float)0.894226,
+       (float)0.898560, (float)0.902832, (float)0.907013,
+       (float)0.911102, (float)0.915100, (float)0.919037,
+       (float)0.922882, (float)0.926636, (float)0.930328,
+       (float)0.933899, (float)0.937408, (float)0.940796,
+       (float)0.944122, (float)0.947357, (float)0.950470,
+       (float)0.953522, (float)0.956482, (float)0.959351,
+       (float)0.962097, (float)0.964783, (float)0.967377,
+       (float)0.969849, (float)0.972229, (float)0.974518,
+       (float)0.976715, (float)0.978821, (float)0.980835,
+       (float)0.982727, (float)0.984528, (float)0.986237,
+       (float)0.987854, (float)0.989380, (float)0.990784,
+       (float)0.992096, (float)0.993317, (float)0.994415,
+       (float)0.995422, (float)0.996338, (float)0.997162,
+       (float)0.997864, (float)0.998474, (float)0.998962,
+       (float)0.999390, (float)0.999695, (float)0.999878,
+       (float)0.999969, (float)0.999969, (float)0.996918,
+       (float)0.987701, (float)0.972382, (float)0.951050,
+       (float)0.923889, (float)0.891022, (float)0.852631,
+       (float)0.809021, (float)0.760406, (float)0.707092,
+       (float)0.649445, (float)0.587799, (float)0.522491,
+       (float)0.453979, (float)0.382690, (float)0.309021,
+       (float)0.233459, (float)0.156433, (float)0.078461
+   };
+
+   /* Lag window for LPC */
+   float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
+       (float)1.000100, (float)0.998890, (float)0.995569,
+           (float)0.990057, (float)0.982392,
+       (float)0.972623, (float)0.960816, (float)0.947047,
+           (float)0.931405, (float)0.913989, (float)0.894909};
+
+   /* LSF quantization*/
+   float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
+   (float)0.155396, (float)0.273193, (float)0.451172,
+   (float)0.390503, (float)0.648071, (float)1.002075,
+   (float)0.440186, (float)0.692261, (float)0.955688,
+
+
+
+Andersen, et al.              Experimental                     [Page 89]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)0.343628, (float)0.642334, (float)1.071533,
+   (float)0.318359, (float)0.491577, (float)0.670532,
+   (float)0.193115, (float)0.375488, (float)0.725708,
+   (float)0.364136, (float)0.510376, (float)0.658691,
+   (float)0.297485, (float)0.527588, (float)0.842529,
+   (float)0.227173, (float)0.365967, (float)0.563110,
+   (float)0.244995, (float)0.396729, (float)0.636475,
+   (float)0.169434, (float)0.300171, (float)0.520264,
+   (float)0.312866, (float)0.464478, (float)0.643188,
+   (float)0.248535, (float)0.429932, (float)0.626099,
+   (float)0.236206, (float)0.491333, (float)0.817139,
+   (float)0.334961, (float)0.625122, (float)0.895752,
+   (float)0.343018, (float)0.518555, (float)0.698608,
+   (float)0.372803, (float)0.659790, (float)0.945435,
+   (float)0.176880, (float)0.316528, (float)0.581421,
+   (float)0.416382, (float)0.625977, (float)0.805176,
+   (float)0.303223, (float)0.568726, (float)0.915039,
+   (float)0.203613, (float)0.351440, (float)0.588135,
+   (float)0.221191, (float)0.375000, (float)0.614746,
+   (float)0.199951, (float)0.323364, (float)0.476074,
+   (float)0.300781, (float)0.433350, (float)0.566895,
+   (float)0.226196, (float)0.354004, (float)0.507568,
+   (float)0.300049, (float)0.508179, (float)0.711670,
+   (float)0.312012, (float)0.492676, (float)0.763428,
+   (float)0.329956, (float)0.541016, (float)0.795776,
+   (float)0.373779, (float)0.604614, (float)0.928833,
+   (float)0.210571, (float)0.452026, (float)0.755249,
+   (float)0.271118, (float)0.473267, (float)0.662476,
+   (float)0.285522, (float)0.436890, (float)0.634399,
+   (float)0.246704, (float)0.565552, (float)0.859009,
+   (float)0.270508, (float)0.406250, (float)0.553589,
+   (float)0.361450, (float)0.578491, (float)0.813843,
+   (float)0.342651, (float)0.482788, (float)0.622437,
+   (float)0.340332, (float)0.549438, (float)0.743164,
+   (float)0.200439, (float)0.336304, (float)0.540894,
+   (float)0.407837, (float)0.644775, (float)0.895142,
+   (float)0.294678, (float)0.454834, (float)0.699097,
+   (float)0.193115, (float)0.344482, (float)0.643188,
+   (float)0.275757, (float)0.420776, (float)0.598755,
+   (float)0.380493, (float)0.608643, (float)0.861084,
+   (float)0.222778, (float)0.426147, (float)0.676514,
+   (float)0.407471, (float)0.700195, (float)1.053101,
+   (float)0.218384, (float)0.377197, (float)0.669922,
+   (float)0.313232, (float)0.454102, (float)0.600952,
+   (float)0.347412, (float)0.571533, (float)0.874146,
+   (float)0.238037, (float)0.405396, (float)0.729492,
+   (float)0.223877, (float)0.412964, (float)0.822021,
+   (float)0.395264, (float)0.582153, (float)0.743896,
+
+
+
+Andersen, et al.              Experimental                     [Page 90]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)0.247925, (float)0.485596, (float)0.720581,
+   (float)0.229126, (float)0.496582, (float)0.907715,
+   (float)0.260132, (float)0.566895, (float)1.012695,
+   (float)0.337402, (float)0.611572, (float)0.978149,
+   (float)0.267822, (float)0.447632, (float)0.769287,
+   (float)0.250610, (float)0.381714, (float)0.530029,
+   (float)0.430054, (float)0.805054, (float)1.221924,
+   (float)0.382568, (float)0.544067, (float)0.701660,
+   (float)0.383545, (float)0.710327, (float)1.149170,
+   (float)0.271362, (float)0.529053, (float)0.775513,
+   (float)0.246826, (float)0.393555, (float)0.588623,
+   (float)0.266846, (float)0.422119, (float)0.676758,
+   (float)0.311523, (float)0.580688, (float)0.838623,
+   (float)1.331177, (float)1.576782, (float)1.779541,
+   (float)1.160034, (float)1.401978, (float)1.768188,
+   (float)1.161865, (float)1.525146, (float)1.715332,
+   (float)0.759521, (float)0.913940, (float)1.119873,
+   (float)0.947144, (float)1.121338, (float)1.282471,
+   (float)1.015015, (float)1.557007, (float)1.804932,
+   (float)1.172974, (float)1.402100, (float)1.692627,
+   (float)1.087524, (float)1.474243, (float)1.665405,
+   (float)0.899536, (float)1.105225, (float)1.406250,
+   (float)1.148438, (float)1.484741, (float)1.796265,
+   (float)0.785645, (float)1.209839, (float)1.567749,
+   (float)0.867798, (float)1.166504, (float)1.450684,
+   (float)0.922485, (float)1.229858, (float)1.420898,
+   (float)0.791260, (float)1.123291, (float)1.409546,
+   (float)0.788940, (float)0.966064, (float)1.340332,
+   (float)1.051147, (float)1.272827, (float)1.556641,
+   (float)0.866821, (float)1.181152, (float)1.538818,
+   (float)0.906738, (float)1.373535, (float)1.607910,
+   (float)1.244751, (float)1.581421, (float)1.933838,
+   (float)0.913940, (float)1.337280, (float)1.539673,
+   (float)0.680542, (float)0.959229, (float)1.662720,
+   (float)0.887207, (float)1.430542, (float)1.800781,
+   (float)0.912598, (float)1.433594, (float)1.683960,
+   (float)0.860474, (float)1.060303, (float)1.455322,
+   (float)1.005127, (float)1.381104, (float)1.706909,
+   (float)0.800781, (float)1.363892, (float)1.829102,
+   (float)0.781860, (float)1.124390, (float)1.505981,
+   (float)1.003662, (float)1.471436, (float)1.684692,
+   (float)0.981323, (float)1.309570, (float)1.618042,
+   (float)1.228760, (float)1.554321, (float)1.756470,
+   (float)0.734375, (float)0.895752, (float)1.225586,
+   (float)0.841797, (float)1.055664, (float)1.249268,
+   (float)0.920166, (float)1.119385, (float)1.486206,
+   (float)0.894409, (float)1.539063, (float)1.828979,
+   (float)1.283691, (float)1.543335, (float)1.858276,
+
+
+
+Andersen, et al.              Experimental                     [Page 91]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)0.676025, (float)0.933105, (float)1.490845,
+   (float)0.821289, (float)1.491821, (float)1.739868,
+   (float)0.923218, (float)1.144653, (float)1.580566,
+   (float)1.057251, (float)1.345581, (float)1.635864,
+   (float)0.888672, (float)1.074951, (float)1.353149,
+   (float)0.942749, (float)1.195435, (float)1.505493,
+   (float)1.492310, (float)1.788086, (float)2.039673,
+   (float)1.070313, (float)1.634399, (float)1.860962,
+   (float)1.253296, (float)1.488892, (float)1.686035,
+   (float)0.647095, (float)0.864014, (float)1.401855,
+   (float)0.866699, (float)1.254883, (float)1.453369,
+   (float)1.063965, (float)1.532593, (float)1.731323,
+   (float)1.167847, (float)1.521484, (float)1.884033,
+   (float)0.956055, (float)1.502075, (float)1.745605,
+   (float)0.928711, (float)1.288574, (float)1.479614,
+   (float)1.088013, (float)1.380737, (float)1.570801,
+   (float)0.905029, (float)1.186768, (float)1.371948,
+   (float)1.057861, (float)1.421021, (float)1.617432,
+   (float)1.108276, (float)1.312500, (float)1.501465,
+   (float)0.979492, (float)1.416992, (float)1.624268,
+   (float)1.276001, (float)1.661011, (float)2.007935,
+   (float)0.993042, (float)1.168579, (float)1.331665,
+   (float)0.778198, (float)0.944946, (float)1.235962,
+   (float)1.223755, (float)1.491333, (float)1.815674,
+   (float)0.852661, (float)1.350464, (float)1.722290,
+   (float)1.134766, (float)1.593140, (float)1.787354,
+   (float)1.051392, (float)1.339722, (float)1.531006,
+   (float)0.803589, (float)1.271240, (float)1.652100,
+   (float)0.755737, (float)1.143555, (float)1.639404,
+   (float)0.700928, (float)0.837280, (float)1.130371,
+   (float)0.942749, (float)1.197876, (float)1.669800,
+   (float)0.993286, (float)1.378296, (float)1.566528,
+   (float)0.801025, (float)1.095337, (float)1.298950,
+   (float)0.739990, (float)1.032959, (float)1.383667,
+   (float)0.845703, (float)1.072266, (float)1.543823,
+   (float)0.915649, (float)1.072266, (float)1.224487,
+   (float)1.021973, (float)1.226196, (float)1.481323,
+   (float)0.999878, (float)1.204102, (float)1.555908,
+   (float)0.722290, (float)0.913940, (float)1.340210,
+   (float)0.673340, (float)0.835938, (float)1.259521,
+   (float)0.832397, (float)1.208374, (float)1.394165,
+   (float)0.962158, (float)1.576172, (float)1.912842,
+   (float)1.166748, (float)1.370850, (float)1.556763,
+   (float)0.946289, (float)1.138550, (float)1.400391,
+   (float)1.035034, (float)1.218262, (float)1.386475,
+   (float)1.393799, (float)1.717773, (float)2.000244,
+   (float)0.972656, (float)1.260986, (float)1.760620,
+   (float)1.028198, (float)1.288452, (float)1.484619,
+
+
+
+Andersen, et al.              Experimental                     [Page 92]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)0.773560, (float)1.258057, (float)1.756714,
+   (float)1.080322, (float)1.328003, (float)1.742676,
+   (float)0.823975, (float)1.450806, (float)1.917725,
+   (float)0.859009, (float)1.016602, (float)1.191895,
+   (float)0.843994, (float)1.131104, (float)1.645020,
+   (float)1.189697, (float)1.702759, (float)1.894409,
+   (float)1.346680, (float)1.763184, (float)2.066040,
+   (float)0.980469, (float)1.253784, (float)1.441650,
+   (float)1.338135, (float)1.641968, (float)1.932739,
+   (float)1.223267, (float)1.424194, (float)1.626465,
+   (float)0.765747, (float)1.004150, (float)1.579102,
+   (float)1.042847, (float)1.269165, (float)1.647461,
+   (float)0.968750, (float)1.257568, (float)1.555786,
+   (float)0.826294, (float)0.993408, (float)1.275146,
+   (float)0.742310, (float)0.950439, (float)1.430542,
+   (float)1.054321, (float)1.439819, (float)1.828003,
+   (float)1.072998, (float)1.261719, (float)1.441895,
+   (float)0.859375, (float)1.036377, (float)1.314819,
+   (float)0.895752, (float)1.267212, (float)1.605591,
+   (float)0.805420, (float)0.962891, (float)1.142334,
+   (float)0.795654, (float)1.005493, (float)1.468506,
+   (float)1.105347, (float)1.313843, (float)1.584839,
+   (float)0.792236, (float)1.221802, (float)1.465698,
+   (float)1.170532, (float)1.467651, (float)1.664063,
+   (float)0.838257, (float)1.153198, (float)1.342163,
+   (float)0.968018, (float)1.198242, (float)1.391235,
+   (float)1.250122, (float)1.623535, (float)1.823608,
+   (float)0.711670, (float)1.058350, (float)1.512085,
+   (float)1.204834, (float)1.454468, (float)1.739136,
+   (float)1.137451, (float)1.421753, (float)1.620117,
+   (float)0.820435, (float)1.322754, (float)1.578247,
+   (float)0.798706, (float)1.005005, (float)1.213867,
+   (float)0.980713, (float)1.324951, (float)1.512939,
+   (float)1.112305, (float)1.438843, (float)1.735596,
+   (float)1.135498, (float)1.356689, (float)1.635742,
+   (float)1.101318, (float)1.387451, (float)1.686523,
+   (float)0.849854, (float)1.276978, (float)1.523438,
+   (float)1.377930, (float)1.627563, (float)1.858154,
+   (float)0.884888, (float)1.095459, (float)1.287476,
+   (float)1.289795, (float)1.505859, (float)1.756592,
+   (float)0.817505, (float)1.384155, (float)1.650513,
+   (float)1.446655, (float)1.702148, (float)1.931885,
+   (float)0.835815, (float)1.023071, (float)1.385376,
+   (float)0.916626, (float)1.139038, (float)1.335327,
+   (float)0.980103, (float)1.174072, (float)1.453735,
+   (float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
+   (float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
+   (float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
+
+
+
+Andersen, et al.              Experimental                     [Page 93]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
+   (float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
+   (float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
+   (float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
+   (float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
+   (float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
+   (float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
+   (float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
+   (float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
+   (float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
+   (float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
+   (float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
+   (float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
+   (float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
+   (float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
+   (float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
+   (float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
+   (float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
+   (float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
+   (float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
+   (float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
+   (float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
+   (float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
+   (float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
+   (float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
+   (float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
+   (float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
+   (float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
+   (float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
+   (float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
+   (float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
+   (float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
+   (float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
+   (float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
+   (float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
+   (float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
+   (float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
+   (float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
+   (float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
+   (float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
+   (float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
+   (float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
+   (float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
+   (float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
+   (float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
+   (float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
+   (float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
+   (float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
+
+
+
+Andersen, et al.              Experimental                     [Page 94]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
+   (float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
+   (float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
+   (float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
+   (float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
+   (float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
+   (float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
+   (float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
+   (float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
+   (float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
+   (float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
+   (float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
+   (float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
+   (float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
+   (float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
+   (float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
+   (float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
+   (float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
+   (float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
+   (float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
+   (float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
+   (float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
+   (float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
+   (float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
+   (float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
+   (float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
+   (float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
+   (float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
+   (float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
+   (float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
+   (float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
+   (float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
+   (float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
+   (float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
+   (float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
+   (float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
+   (float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
+   (float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
+   (float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
+   (float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
+   (float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
+   (float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
+   (float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
+   (float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
+   (float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
+   (float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
+   (float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
+   (float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
+
+
+
+Andersen, et al.              Experimental                     [Page 95]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   (float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
+   (float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
+   (float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
+   (float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
+   (float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
+   (float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
+   (float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
+   (float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
+   (float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
+   (float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
+   (float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
+   (float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
+   (float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
+   (float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
+   (float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
+   (float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
+   (float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
+   (float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
+   (float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
+   (float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
+   (float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
+   (float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
+   (float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
+   (float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
+   (float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
+   (float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
+   (float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
+   (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
+   (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
+   };
+
+A.9.  anaFilter.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       anaFilter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ANAFILTER_H
+   #define __iLBC_ANAFILTER_H
+
+   void anaFilter(
+
+
+
+Andersen, et al.              Experimental                     [Page 96]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *In,  /* (i) Signal to be filtered */
+       float *a,   /* (i) LP parameters */
+       int len,/* (i) Length of signal */
+       float *Out, /* (o) Filtered signal */
+       float *mem  /* (i/o) Filter state */
+   );
+
+   #endif
+
+A.10.  anaFilter.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       anaFilter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  LP analysis filter.
+    *---------------------------------------------------------------*/
+
+   void anaFilter(
+       float *In,  /* (i) Signal to be filtered */
+       float *a,   /* (i) LP parameters */
+       int len,/* (i) Length of signal */
+       float *Out, /* (o) Filtered signal */
+       float *mem  /* (i/o) Filter state */
+   ){
+       int i, j;
+       float *po, *pi, *pm, *pa;
+
+       po = Out;
+
+       /* Filter first part using memory from past */
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           pi = &In[i];
+           pm = &mem[LPC_FILTERORDER-1];
+           pa = a;
+           *po=0.0;
+
+
+
+Andersen, et al.              Experimental                     [Page 97]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           for (j=0; j<=i; j++) {
+               *po+=(*pa++)*(*pi--);
+           }
+           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
+
+               *po+=(*pa++)*(*pm--);
+           }
+           po++;
+       }
+
+       /* Filter last part where the state is entirely
+          in the input vector */
+
+       for (i=LPC_FILTERORDER; i<len; i++) {
+           pi = &In[i];
+           pa = a;
+           *po=0.0;
+           for (j=0; j<LPC_FILTERORDER+1; j++) {
+               *po+=(*pa++)*(*pi--);
+           }
+           po++;
+       }
+
+       /* Update state vector */
+
+       memcpy(mem, &In[len-LPC_FILTERORDER],
+           LPC_FILTERORDER*sizeof(float));
+   }
+
+A.11.  createCB.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       createCB.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_CREATECB_H
+   #define __iLBC_CREATECB_H
+
+   void filteredCBvecs(
+       float *cbvectors,   /* (o) Codebook vector for the
+                                  higher section */
+
+
+
+Andersen, et al.              Experimental                     [Page 98]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *mem,         /* (i) Buffer to create codebook
+                                  vectors from */
+       int lMem        /* (i) Length of buffer */
+   );
+
+   void searchAugmentedCB(
+       int low,        /* (i) Start index for the search */
+       int high,           /* (i) End index for the search */
+       int stage,          /* (i) Current stage */
+       int startIndex,     /* (i) CB index for the first
+                                  augmented vector */
+       float *target,      /* (i) Target vector for encoding */
+       float *buffer,      /* (i) Pointer to the end of the
+                                  buffer for augmented codebook
+                                  construction */
+       float *max_measure, /* (i/o) Currently maximum measure */
+       int *best_index,/* (o) Currently the best index */
+       float *gain,    /* (o) Currently the best gain */
+       float *energy,      /* (o) Energy of augmented
+                                  codebook vectors */
+       float *invenergy/* (o) Inv energy of aug codebook
+                                  vectors */
+   );
+
+   void createAugmentedVec(
+       int index,          /* (i) Index for the aug vector
+                                  to be created */
+       float *buffer,      /* (i) Pointer to the end of the
+                                  buffer for augmented codebook
+                                  construction */
+       float *cbVec    /* (o) The construced codebook vector */
+   );
+
+   #endif
+
+A.12.  createCB.c
+
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       createCB.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+
+
+Andersen, et al.              Experimental                     [Page 99]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include <string.h>
+   #include <math.h>
+
+   /*----------------------------------------------------------------*
+    *  Construct an additional codebook vector by filtering the
+    *  initial codebook buffer. This vector is then used to expand
+    *  the codebook with an additional section.
+    *---------------------------------------------------------------*/
+
+   void filteredCBvecs(
+       float *cbvectors,   /* (o) Codebook vectors for the
+                                  higher section */
+       float *mem,         /* (i) Buffer to create codebook
+                                  vector from */
+       int lMem        /* (i) Length of buffer */
+   ){
+       int j, k;
+       float *pp, *pp1;
+       float tempbuff2[CB_MEML+CB_FILTERLEN];
+       float *pos;
+
+       memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
+       memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
+       memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0,
+           (CB_HALFFILTERLEN+1)*sizeof(float));
+
+       /* Create codebook vector for higher section by filtering */
+
+       /* do filtering */
+       pos=cbvectors;
+       memset(pos, 0, lMem*sizeof(float));
+       for (k=0; k<lMem; k++) {
+           pp=&tempbuff2[k];
+           pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+           for (j=0;j<CB_FILTERLEN;j++) {
+               (*pos)+=(*pp++)*(*pp1--);
+           }
+           pos++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  Search the augmented part of the codebook to find the best
+    *  measure.
+    *----------------------------------------------------------------*/
+
+
+
+
+Andersen, et al.              Experimental                    [Page 100]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void searchAugmentedCB(
+       int low,        /* (i) Start index for the search */
+       int high,           /* (i) End index for the search */
+       int stage,          /* (i) Current stage */
+       int startIndex,     /* (i) Codebook index for the first
+                                  aug vector */
+       float *target,      /* (i) Target vector for encoding */
+       float *buffer,      /* (i) Pointer to the end of the buffer for
+                                  augmented codebook construction */
+       float *max_measure, /* (i/o) Currently maximum measure */
+       int *best_index,/* (o) Currently the best index */
+       float *gain,    /* (o) Currently the best gain */
+       float *energy,      /* (o) Energy of augmented codebook
+                                  vectors */
+       float *invenergy/* (o) Inv energy of augmented codebook
+                                  vectors */
+   ) {
+       int icount, ilow, j, tmpIndex;
+       float *pp, *ppo, *ppi, *ppe, crossDot, alfa;
+       float weighted, measure, nrjRecursive;
+       float ftmp;
+
+       /* Compute the energy for the first (low-5)
+          noninterpolated samples */
+       nrjRecursive = (float) 0.0;
+       pp = buffer - low + 1;
+       for (j=0; j<(low-5); j++) {
+           nrjRecursive += ( (*pp)*(*pp) );
+           pp++;
+       }
+       ppe = buffer - low;
+
+
+       for (icount=low; icount<=high; icount++) {
+
+           /* Index of the codebook vector used for retrieving
+              energy values */
+           tmpIndex = startIndex+icount-20;
+
+           ilow = icount-4;
+
+           /* Update the energy recursively to save complexity */
+           nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
+           ppe--;
+           energy[tmpIndex] = nrjRecursive;
+
+           /* Compute cross dot product for the first (low-5)
+              samples */
+
+
+
+Andersen, et al.              Experimental                    [Page 101]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           crossDot = (float) 0.0;
+           pp = buffer-icount;
+           for (j=0; j<ilow; j++) {
+               crossDot += target[j]*(*pp++);
+           }
+
+           /* interpolation */
+           alfa = (float) 0.2;
+           ppo = buffer-4;
+           ppi = buffer-icount-4;
+           for (j=ilow; j<icount; j++) {
+               weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
+               ppo++;
+               ppi++;
+               energy[tmpIndex] += weighted*weighted;
+               crossDot += target[j]*weighted;
+               alfa += (float)0.2;
+           }
+
+           /* Compute energy and cross dot product for the
+              remaining samples */
+           pp = buffer - icount;
+           for (j=icount; j<SUBL; j++) {
+               energy[tmpIndex] += (*pp)*(*pp);
+               crossDot += target[j]*(*pp++);
+           }
+
+           if (energy[tmpIndex]>0.0) {
+               invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
+           } else {
+               invenergy[tmpIndex] = (float) 0.0;
+           }
+
+           if (stage==0) {
+               measure = (float)-10000000.0;
+
+               if (crossDot > 0.0) {
+                   measure = crossDot*crossDot*invenergy[tmpIndex];
+               }
+           }
+           else {
+               measure = crossDot*crossDot*invenergy[tmpIndex];
+           }
+
+           /* check if measure is better */
+           ftmp = crossDot*invenergy[tmpIndex];
+
+           if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+
+
+
+Andersen, et al.              Experimental                    [Page 102]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               *best_index = tmpIndex;
+               *max_measure = measure;
+               *gain = ftmp;
+           }
+       }
+   }
+
+
+   /*----------------------------------------------------------------*
+    *  Recreate a specific codebook vector from the augmented part.
+    *
+    *----------------------------------------------------------------*/
+
+   void createAugmentedVec(
+       int index,      /* (i) Index for the augmented vector
+                              to be created */
+       float *buffer,  /* (i) Pointer to the end of the buffer for
+                              augmented codebook construction */
+       float *cbVec/* (o) The construced codebook vector */
+   ) {
+       int ilow, j;
+       float *pp, *ppo, *ppi, alfa, alfa1, weighted;
+
+       ilow = index-5;
+
+       /* copy the first noninterpolated part */
+
+       pp = buffer-index;
+       memcpy(cbVec,pp,sizeof(float)*index);
+
+       /* interpolation */
+
+       alfa1 = (float)0.2;
+       alfa = 0.0;
+       ppo = buffer-5;
+       ppi = buffer-index-5;
+       for (j=ilow; j<index; j++) {
+           weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
+           ppo++;
+           ppi++;
+           cbVec[j] = weighted;
+           alfa += alfa1;
+       }
+
+       /* copy the second noninterpolated part */
+
+       pp = buffer - index;
+       memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
+
+
+
+Andersen, et al.              Experimental                    [Page 103]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   }
+
+A.13.  doCPLC.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       doCPLC.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_DOLPC_H
+   #define __iLBC_DOLPC_H
+
+   void doThePLC(
+       float *PLCresidual, /* (o) concealed residual */
+       float *PLClpc,      /* (o) concealed LP parameters */
+       int PLI,        /* (i) packet loss indicator
+                                  0 - no PL, 1 = PL */
+       float *decresidual, /* (i) decoded residual */
+       float *lpc,         /* (i) decoded LPC (only used for no PL) */
+       int inlag,          /* (i) pitch lag */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) decoder instance */
+   );
+
+   #endif
+
+A.14.  doCPLC.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       doCPLC.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+   #include <stdio.h>
+
+
+
+Andersen, et al.              Experimental                    [Page 104]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  Compute cross correlation and pitch gain for pitch prediction
+    *  of last subframe at given lag.
+    *---------------------------------------------------------------*/
+
+   void compCorr(
+       float *cc,      /* (o) cross correlation coefficient */
+       float *gc,      /* (o) gain */
+       float *pm,
+       float *buffer,  /* (i) signal buffer */
+       int lag,    /* (i) pitch lag */
+       int bLen,       /* (i) length of buffer */
+       int sRange      /* (i) correlation search length */
+   ){
+       int i;
+       float ftmp1, ftmp2, ftmp3;
+
+       /* Guard against getting outside buffer */
+       if ((bLen-sRange-lag)<0) {
+           sRange=bLen-lag;
+       }
+
+       ftmp1 = 0.0;
+       ftmp2 = 0.0;
+       ftmp3 = 0.0;
+       for (i=0; i<sRange; i++) {
+           ftmp1 += buffer[bLen-sRange+i] *
+               buffer[bLen-sRange+i-lag];
+           ftmp2 += buffer[bLen-sRange+i-lag] *
+                   buffer[bLen-sRange+i-lag];
+           ftmp3 += buffer[bLen-sRange+i] *
+                   buffer[bLen-sRange+i];
+       }
+
+       if (ftmp2 > 0.0) {
+           *cc = ftmp1*ftmp1/ftmp2;
+           *gc = (float)fabs(ftmp1/ftmp2);
+           *pm=(float)fabs(ftmp1)/
+               ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
+       }
+       else {
+           *cc = 0.0;
+           *gc = 0.0;
+           *pm=0.0;
+       }
+   }
+
+
+
+Andersen, et al.              Experimental                    [Page 105]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   /*----------------------------------------------------------------*
+    *  Packet loss concealment routine. Conceals a residual signal
+    *  and LP parameters. If no packet loss, update state.
+    *---------------------------------------------------------------*/
+
+   void doThePLC(
+       float *PLCresidual, /* (o) concealed residual */
+       float *PLClpc,      /* (o) concealed LP parameters */
+       int PLI,        /* (i) packet loss indicator
+                                  0 - no PL, 1 = PL */
+       float *decresidual, /* (i) decoded residual */
+       float *lpc,         /* (i) decoded LPC (only used for no PL) */
+       int inlag,          /* (i) pitch lag */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) decoder instance */
+   ){
+       int lag=20, randlag;
+       float gain, maxcc;
+       float use_gain;
+       float gain_comp, maxcc_comp, per, max_per;
+       int i, pick, use_lag;
+       float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
+
+       /* Packet Loss */
+
+       if (PLI == 1) {
+
+           iLBCdec_inst->consPLICount += 1;
+
+           /* if previous frame not lost,
+              determine pitch pred. gain */
+
+           if (iLBCdec_inst->prevPLI != 1) {
+
+               /* Search around the previous lag to find the
+                  best pitch period */
+
+               lag=inlag-3;
+               compCorr(&maxcc, &gain, &max_per,
+                   iLBCdec_inst->prevResidual,
+                   lag, iLBCdec_inst->blockl, 60);
+               for (i=inlag-2;i<=inlag+3;i++) {
+                   compCorr(&maxcc_comp, &gain_comp, &per,
+                       iLBCdec_inst->prevResidual,
+                       i, iLBCdec_inst->blockl, 60);
+
+                   if (maxcc_comp>maxcc) {
+                       maxcc=maxcc_comp;
+
+
+
+Andersen, et al.              Experimental                    [Page 106]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                       gain=gain_comp;
+                       lag=i;
+                       max_per=per;
+                   }
+               }
+
+           }
+
+           /* previous frame lost, use recorded lag and periodicity */
+
+           else {
+               lag=iLBCdec_inst->prevLag;
+               max_per=iLBCdec_inst->per;
+           }
+
+           /* downscaling */
+
+           use_gain=1.0;
+           if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
+               use_gain=(float)0.9;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>2*320)
+               use_gain=(float)0.7;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>3*320)
+               use_gain=(float)0.5;
+           else if (iLBCdec_inst->consPLICount*
+                           iLBCdec_inst->blockl>4*320)
+               use_gain=(float)0.0;
+
+           /* mix noise and pitch repeatition */
+           ftmp=(float)sqrt(max_per);
+           if (ftmp>(float)0.7)
+               pitchfact=(float)1.0;
+           else if (ftmp>(float)0.4)
+               pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
+           else
+               pitchfact=0.0;
+
+
+           /* avoid repetition of same pitch cycle */
+           use_lag=lag;
+           if (lag<80) {
+               use_lag=2*lag;
+           }
+
+           /* compute concealed residual */
+
+
+
+
+Andersen, et al.              Experimental                    [Page 107]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           energy = 0.0;
+           for (i=0; i<iLBCdec_inst->blockl; i++) {
+
+               /* noise component */
+
+               iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) &
+                   (0x80000000L-1);
+               randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
+               pick = i - randlag;
+
+               if (pick < 0) {
+                   randvec[i] =
+                       iLBCdec_inst->prevResidual[
+                                   iLBCdec_inst->blockl+pick];
+               } else {
+                   randvec[i] =  randvec[pick];
+               }
+
+               /* pitch repeatition component */
+               pick = i - use_lag;
+
+               if (pick < 0) {
+                   PLCresidual[i] =
+                       iLBCdec_inst->prevResidual[
+                                   iLBCdec_inst->blockl+pick];
+               } else {
+                   PLCresidual[i] = PLCresidual[pick];
+               }
+
+               /* mix random and periodicity component */
+
+               if (i<80)
+                   PLCresidual[i] = use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+               else if (i<160)
+                   PLCresidual[i] = (float)0.95*use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+               else
+                   PLCresidual[i] = (float)0.9*use_gain*(pitchfact *
+                               PLCresidual[i] +
+                               ((float)1.0 - pitchfact) * randvec[i]);
+
+               energy += PLCresidual[i] * PLCresidual[i];
+           }
+
+           /* less than 30 dB, use only noise */
+
+
+
+Andersen, et al.              Experimental                    [Page 108]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+
+           if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) {
+               gain=0.0;
+               for (i=0; i<iLBCdec_inst->blockl; i++) {
+                   PLCresidual[i] = randvec[i];
+               }
+           }
+
+           /* use old LPC */
+
+           memcpy(PLClpc,iLBCdec_inst->prevLpc,
+               (LPC_FILTERORDER+1)*sizeof(float));
+
+       }
+
+       /* no packet loss, copy input */
+
+       else {
+           memcpy(PLCresidual, decresidual,
+               iLBCdec_inst->blockl*sizeof(float));
+           memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
+           iLBCdec_inst->consPLICount = 0;
+       }
+
+       /* update state */
+
+       if (PLI) {
+           iLBCdec_inst->prevLag = lag;
+           iLBCdec_inst->per=max_per;
+       }
+
+       iLBCdec_inst->prevPLI = PLI;
+       memcpy(iLBCdec_inst->prevLpc, PLClpc,
+           (LPC_FILTERORDER+1)*sizeof(float));
+       memcpy(iLBCdec_inst->prevResidual, PLCresidual,
+           iLBCdec_inst->blockl*sizeof(float));
+   }
+
+A.15.  enhancer.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       enhancer.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+
+
+Andersen, et al.              Experimental                    [Page 109]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   ******************************************************************/
+
+   #ifndef __ENHANCER_H
+   #define __ENHANCER_H
+
+   #include "iLBC_define.h"
+
+   float xCorrCoef(
+       float *target,      /* (i) first array */
+       float *regressor,   /* (i) second array */
+       int subl        /* (i) dimension arrays */
+   );
+
+   int enhancerInterface(
+       float *out,         /* (o) the enhanced recidual signal */
+       float *in,          /* (i) the recidual signal to enhance */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i/o) the decoder state structure */
+   );
+
+   #endif
+
+A.16.  enhancer.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       enhancer.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    * Find index in array such that the array element with said
+    * index is the element of said array closest to "value"
+    * according to the squared-error criterion
+    *---------------------------------------------------------------*/
+
+   void NearestNeighbor(
+
+
+
+Andersen, et al.              Experimental                    [Page 110]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       int   *index,   /* (o) index of array element closest
+                              to value */
+       float *array,   /* (i) data array */
+       float value,/* (i) value */
+       int arlength/* (i) dimension of data array */
+   ){
+       int i;
+       float bestcrit,crit;
+
+       crit=array[0]-value;
+       bestcrit=crit*crit;
+       *index=0;
+       for (i=1; i<arlength; i++) {
+           crit=array[i]-value;
+           crit=crit*crit;
+
+           if (crit<bestcrit) {
+               bestcrit=crit;
+               *index=i;
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * compute cross correlation between sequences
+    *---------------------------------------------------------------*/
+
+   void mycorr1(
+       float* corr,    /* (o) correlation of seq1 and seq2 */
+       float* seq1,    /* (i) first sequence */
+       int dim1,           /* (i) dimension first seq1 */
+       const float *seq2,  /* (i) second sequence */
+       int dim2        /* (i) dimension seq2 */
+   ){
+       int i,j;
+
+       for (i=0; i<=dim1-dim2; i++) {
+           corr[i]=0.0;
+           for (j=0; j<dim2; j++) {
+               corr[i] += seq1[i+j] * seq2[j];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * upsample finite array assuming zeros outside bounds
+    *---------------------------------------------------------------*/
+
+
+
+
+Andersen, et al.              Experimental                    [Page 111]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void enh_upsample(
+       float* useq1,   /* (o) upsampled output sequence */
+       float* seq1,/* (i) unupsampled sequence */
+       int dim1,       /* (i) dimension seq1 */
+       int hfl         /* (i) polyphase filter length=2*hfl+1 */
+   ){
+       float *pu,*ps;
+       int i,j,k,q,filterlength,hfl2;
+       const float *polyp[ENH_UPS0]; /* pointers to
+                                        polyphase columns */
+       const float *pp;
+
+       /* define pointers for filter */
+
+       filterlength=2*hfl+1;
+
+       if ( filterlength > dim1 ) {
+           hfl2=(int) (dim1/2);
+           for (j=0; j<ENH_UPS0; j++) {
+               polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
+           }
+           hfl=hfl2;
+           filterlength=2*hfl+1;
+       }
+       else {
+           for (j=0; j<ENH_UPS0; j++) {
+               polyp[j]=polyphaserTbl+j*filterlength;
+           }
+       }
+
+       /* filtering: filter overhangs left side of sequence */
+
+       pu=useq1;
+       for (i=hfl; i<filterlength; i++) {
+           for (j=0; j<ENH_UPS0; j++) {
+               *pu=0.0;
+               pp = polyp[j];
+               ps = seq1+i;
+               for (k=0; k<=i; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+
+       /* filtering: simple convolution=inner products */
+
+       for (i=filterlength; i<dim1; i++) {
+
+
+
+Andersen, et al.              Experimental                    [Page 112]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           for (j=0;j<ENH_UPS0; j++){
+               *pu=0.0;
+               pp = polyp[j];
+               ps = seq1+i;
+               for (k=0; k<filterlength; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+
+       /* filtering: filter overhangs right side of sequence */
+
+       for (q=1; q<=hfl; q++) {
+           for (j=0; j<ENH_UPS0; j++) {
+               *pu=0.0;
+               pp = polyp[j]+q;
+               ps = seq1+dim1-1;
+               for (k=0; k<filterlength-q; k++) {
+                   *pu += *ps-- * *pp++;
+               }
+               pu++;
+           }
+       }
+   }
+
+
+   /*----------------------------------------------------------------*
+    * find segment starting near idata+estSegPos that has highest
+    * correlation with idata+centerStartPos through
+    * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a
+    * resolution of ENH_UPSO times the original of the original
+    * sampling rate
+    *---------------------------------------------------------------*/
+
+   void refiner(
+       float *seg,         /* (o) segment array */
+       float *updStartPos, /* (o) updated start point */
+       float* idata,       /* (i) original data buffer */
+       int idatal,         /* (i) dimension of idata */
+       int centerStartPos, /* (i) beginning center segment */
+       float estSegPos,/* (i) estimated beginning other segment */
+       float period    /* (i) estimated pitch period */
+   ){
+       int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
+       int tloc,tloc2,i,st,en,fraction;
+       float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
+       float corrVecUps[ENH_CORRDIM*ENH_UPS0];
+
+
+
+Andersen, et al.              Experimental                    [Page 113]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* defining array bounds */
+
+       estSegPosRounded=(int)(estSegPos - 0.5);
+
+       searchSegStartPos=estSegPosRounded-ENH_SLOP;
+
+       if (searchSegStartPos<0) {
+           searchSegStartPos=0;
+       }
+       searchSegEndPos=estSegPosRounded+ENH_SLOP;
+
+       if (searchSegEndPos+ENH_BLOCKL >= idatal) {
+           searchSegEndPos=idatal-ENH_BLOCKL-1;
+       }
+       corrdim=searchSegEndPos-searchSegStartPos+1;
+
+       /* compute upsampled correlation (corr33) and find
+          location of max */
+
+       mycorr1(corrVec,idata+searchSegStartPos,
+           corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
+       enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
+       tloc=0; maxv=corrVecUps[0];
+       for (i=1; i<ENH_UPS0*corrdim; i++) {
+
+           if (corrVecUps[i]>maxv) {
+               tloc=i;
+               maxv=corrVecUps[i];
+           }
+       }
+
+       /* make vector can be upsampled without ever running outside
+          bounds */
+
+       *updStartPos= (float)searchSegStartPos +
+           (float)tloc/(float)ENH_UPS0+(float)1.0;
+       tloc2=(int)(tloc/ENH_UPS0);
+
+       if (tloc>tloc2*ENH_UPS0) {
+           tloc2++;
+       }
+       st=searchSegStartPos+tloc2-ENH_FL0;
+
+       if (st<0) {
+           memset(vect,0,-st*sizeof(float));
+           memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
+       }
+       else {
+
+
+
+Andersen, et al.              Experimental                    [Page 114]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           en=st+ENH_VECTL;
+
+           if (en>idatal) {
+               memcpy(vect, &idata[st],
+                   (ENH_VECTL-(en-idatal))*sizeof(float));
+               memset(&vect[ENH_VECTL-(en-idatal)], 0,
+                   (en-idatal)*sizeof(float));
+           }
+           else {
+               memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
+           }
+       }
+       fraction=tloc2*ENH_UPS0-tloc;
+
+       /* compute the segment (this is actually a convolution) */
+
+       mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
+           2*ENH_FL0+1);
+   }
+
+   /*----------------------------------------------------------------*
+    * find the smoothed output data
+    *---------------------------------------------------------------*/
+
+   void smath(
+       float *odata,   /* (o) smoothed output */
+       float *sseq,/* (i) said second sequence of waveforms */
+       int hl,         /* (i) 2*hl+1 is sseq dimension */
+       float alpha0/* (i) max smoothing energy fraction */
+   ){
+       int i,k;
+       float w00,w10,w11,A,B,C,*psseq,err,errs;
+       float surround[BLOCKL_MAX]; /* shape contributed by other than
+                                      current */
+       float wt[2*ENH_HL+1];       /* waveform weighting to get
+                                      surround shape */
+       float denom;
+
+       /* create shape of contribution from all waveforms except the
+          current one */
+
+       for (i=1; i<=2*hl+1; i++) {
+           wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2)));
+       }
+       wt[hl]=0.0; /* for clarity, not used */
+       for (i=0; i<ENH_BLOCKL; i++) {
+           surround[i]=sseq[i]*wt[0];
+       }
+
+
+
+Andersen, et al.              Experimental                    [Page 115]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       for (k=1; k<hl; k++) {
+           psseq=sseq+k*ENH_BLOCKL;
+           for(i=0;i<ENH_BLOCKL; i++) {
+               surround[i]+=psseq[i]*wt[k];
+           }
+       }
+       for (k=hl+1; k<=2*hl; k++) {
+           psseq=sseq+k*ENH_BLOCKL;
+           for(i=0;i<ENH_BLOCKL; i++) {
+               surround[i]+=psseq[i]*wt[k];
+           }
+       }
+
+       /* compute some inner products */
+
+       w00 = w10 = w11 = 0.0;
+       psseq=sseq+hl*ENH_BLOCKL; /* current block  */
+       for (i=0; i<ENH_BLOCKL;i++) {
+           w00+=psseq[i]*psseq[i];
+           w11+=surround[i]*surround[i];
+           w10+=surround[i]*psseq[i];
+       }
+
+       if (fabs(w11) < 1.0) {
+           w11=1.0;
+       }
+       C = (float)sqrt( w00/w11);
+
+       /* first try enhancement without power-constraint */
+
+       errs=0.0;
+       psseq=sseq+hl*ENH_BLOCKL;
+       for (i=0; i<ENH_BLOCKL; i++) {
+           odata[i]=C*surround[i];
+           err=psseq[i]-odata[i];
+           errs+=err*err;
+       }
+
+       /* if constraint violated by first try, add constraint */
+
+       if (errs > alpha0 * w00) {
+           if ( w00 < 1) {
+               w00=1;
+           }
+           denom = (w11*w00-w10*w10)/(w00*w00);
+
+           if (denom > 0.0001) { /* eliminates numerical problems
+                                    for if smooth */
+
+
+
+Andersen, et al.              Experimental                    [Page 116]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
+               B = -alpha0/2 - A * w10/w00;
+               B = B+1;
+           }
+           else { /* essentially no difference between cycles;
+                     smoothing not needed */
+               A= 0.0;
+               B= 1.0;
+           }
+
+           /* create smoothed sequence */
+
+           psseq=sseq+hl*ENH_BLOCKL;
+           for (i=0; i<ENH_BLOCKL; i++) {
+               odata[i]=A*surround[i]+B*psseq[i];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * get the pitch-synchronous sample sequence
+    *---------------------------------------------------------------*/
+
+   void getsseq(
+       float *sseq,    /* (o) the pitch-synchronous sequence */
+       float *idata,       /* (i) original data */
+       int idatal,         /* (i) dimension of data */
+       int centerStartPos, /* (i) where current block starts */
+       float *period,      /* (i) rough-pitch-period array */
+       float *plocs,       /* (i) where periods of period array
+                                  are taken */
+       int periodl,    /* (i) dimension period array */
+       int hl              /* (i) 2*hl+1 is the number of sequences */
+   ){
+       int i,centerEndPos,q;
+       float blockStartPos[2*ENH_HL+1];
+       int lagBlock[2*ENH_HL+1];
+       float plocs2[ENH_PLOCSL];
+       float *psseq;
+
+       centerEndPos=centerStartPos+ENH_BLOCKL-1;
+
+       /* present */
+
+       NearestNeighbor(lagBlock+hl,plocs,
+           (float)0.5*(centerStartPos+centerEndPos),periodl);
+
+       blockStartPos[hl]=(float)centerStartPos;
+
+
+
+Andersen, et al.              Experimental                    [Page 117]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       psseq=sseq+ENH_BLOCKL*hl;
+       memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
+
+       /* past */
+
+       for (q=hl-1; q>=0; q--) {
+           blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
+           NearestNeighbor(lagBlock+q,plocs,
+               blockStartPos[q]+
+               ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
+
+
+           if (blockStartPos[q]-ENH_OVERHANG>=0) {
+               refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
+                   idatal, centerStartPos, blockStartPos[q],
+                   period[lagBlock[q+1]]);
+           } else {
+               psseq=sseq+q*ENH_BLOCKL;
+               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
+           }
+       }
+
+       /* future */
+
+       for (i=0; i<periodl; i++) {
+           plocs2[i]=plocs[i]-period[i];
+       }
+       for (q=hl+1; q<=2*hl; q++) {
+           NearestNeighbor(lagBlock+q,plocs2,
+               blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
+
+           blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
+           if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
+               refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
+                   idatal, centerStartPos, blockStartPos[q],
+                   period[lagBlock[q]]);
+           }
+           else {
+               psseq=sseq+q*ENH_BLOCKL;
+               memset(psseq, 0, ENH_BLOCKL*sizeof(float));
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * perform enhancement on idata+centerStartPos through
+    * idata+centerStartPos+ENH_BLOCKL-1
+    *---------------------------------------------------------------*/
+
+
+
+Andersen, et al.              Experimental                    [Page 118]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void enhancer(
+       float *odata,       /* (o) smoothed block, dimension blockl */
+       float *idata,       /* (i) data buffer used for enhancing */
+       int idatal,         /* (i) dimension idata */
+       int centerStartPos, /* (i) first sample current block
+                                  within idata */
+       float alpha0,       /* (i) max correction-energy-fraction
+                                 (in [0,1]) */
+       float *period,      /* (i) pitch period array */
+       float *plocs,       /* (i) locations where period array
+                                  values valid */
+       int periodl         /* (i) dimension of period and plocs */
+   ){
+       float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
+
+       /* get said second sequence of segments */
+
+       getsseq(sseq,idata,idatal,centerStartPos,period,
+           plocs,periodl,ENH_HL);
+
+       /* compute the smoothed output from said second sequence */
+
+       smath(odata,sseq,ENH_HL,alpha0);
+
+   }
+
+   /*----------------------------------------------------------------*
+    * cross correlation
+    *---------------------------------------------------------------*/
+
+   float xCorrCoef(
+       float *target,      /* (i) first array */
+       float *regressor,   /* (i) second array */
+       int subl        /* (i) dimension arrays */
+   ){
+       int i;
+       float ftmp1, ftmp2;
+
+       ftmp1 = 0.0;
+       ftmp2 = 0.0;
+       for (i=0; i<subl; i++) {
+           ftmp1 += target[i]*regressor[i];
+           ftmp2 += regressor[i]*regressor[i];
+       }
+
+       if (ftmp1 > 0.0) {
+           return (float)(ftmp1*ftmp1/ftmp2);
+       }
+
+
+
+Andersen, et al.              Experimental                    [Page 119]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       else {
+           return (float)0.0;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    * interface for enhancer
+    *---------------------------------------------------------------*/
+
+   int enhancerInterface(
+       float *out,                     /* (o) enhanced signal */
+       float *in,                      /* (i) unenhanced signal */
+       iLBC_Dec_Inst_t *iLBCdec_inst   /* (i) buffers etc */
+   ){
+       float *enh_buf, *enh_period;
+       int iblock, isample;
+       int lag=0, ilag, i, ioffset;
+       float cc, maxcc;
+       float ftmp1, ftmp2;
+       float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
+       float plc_pred[ENH_BLOCKL];
+
+       float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
+       int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
+       int start, plc_blockl, inlag;
+
+       enh_buf=iLBCdec_inst->enh_buf;
+       enh_period=iLBCdec_inst->enh_period;
+
+       memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
+           (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
+
+       memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
+           iLBCdec_inst->blockl*sizeof(float));
+
+       if (iLBCdec_inst->mode==30)
+           plc_blockl=ENH_BLOCKL;
+       else
+           plc_blockl=40;
+
+       /* when 20 ms frame, move processing one block */
+       ioffset=0;
+       if (iLBCdec_inst->mode==20) ioffset=1;
+
+       i=3-ioffset;
+       memmove(enh_period, &enh_period[i],
+           (ENH_NBLOCKS_TOT-i)*sizeof(float));
+
+
+
+
+Andersen, et al.              Experimental                    [Page 120]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* Set state information to the 6 samples right before
+          the samples to be downsampled. */
+
+       memcpy(lpState,
+           enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126,
+           6*sizeof(float));
+
+       /* Down sample a factor 2 to save computations */
+
+       DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
+                   lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
+                   lpState, downsampled);
+
+       /* Estimate the pitch in the down sampled domain. */
+       for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
+
+           lag = 10;
+           maxcc = xCorrCoef(downsampled+60+iblock*
+               ENH_BLOCKL_HALF, downsampled+60+iblock*
+               ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
+           for (ilag=11; ilag<60; ilag++) {
+               cc = xCorrCoef(downsampled+60+iblock*
+                   ENH_BLOCKL_HALF, downsampled+60+iblock*
+                   ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+
+           /* Store the estimated lag in the non-downsampled domain */
+           enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
+
+
+       }
+
+
+       /* PLC was performed on the previous packet */
+       if (iLBCdec_inst->prev_enh_pl==1) {
+
+           inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
+
+           lag = inlag-1;
+           maxcc = xCorrCoef(in, in+lag, plc_blockl);
+           for (ilag=inlag; ilag<=inlag+1; ilag++) {
+               cc = xCorrCoef(in, in+ilag, plc_blockl);
+
+
+
+
+Andersen, et al.              Experimental                    [Page 121]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               if (cc > maxcc) {
+                   maxcc = cc;
+                   lag = ilag;
+               }
+           }
+
+           enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
+
+           /* compute new concealed residual for the old lookahead,
+              mix the forward PLC with a backward PLC from
+              the new frame */
+
+           inPtr=&in[lag-1];
+
+           enh_bufPtr1=&plc_pred[plc_blockl-1];
+
+           if (lag>plc_blockl) {
+               start=plc_blockl;
+           } else {
+               start=lag;
+           }
+
+           for (isample = start; isample>0; isample--) {
+               *enh_bufPtr1-- = *inPtr--;
+           }
+
+           enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
+           for (isample = (plc_blockl-1-lag); isample>=0; isample--) {
+               *enh_bufPtr1-- = *enh_bufPtr2--;
+           }
+
+           /* limit energy change */
+           ftmp2=0.0;
+           ftmp1=0.0;
+           for (i=0;i<plc_blockl;i++) {
+               ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
+                   enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
+               ftmp1+=plc_pred[i]*plc_pred[i];
+           }
+           ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
+           ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
+           if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
+               for (i=0;i<plc_blockl-10;i++) {
+                   plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
+               }
+               for (i=plc_blockl-10;i<plc_blockl;i++) {
+                   plc_pred[i]*=(float)(i-plc_blockl+10)*
+                       ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
+
+
+
+Andersen, et al.              Experimental                    [Page 122]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                       (float)2.0*ftmp2/ftmp1;
+               }
+           }
+
+           enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
+           for (i=0; i<plc_blockl; i++) {
+               ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
+               *enh_bufPtr1 *= ftmp1;
+               *enh_bufPtr1 += ((float)1.0-ftmp1)*
+                                   plc_pred[plc_blockl-1-i];
+               enh_bufPtr1--;
+           }
+       }
+
+       if (iLBCdec_inst->mode==20) {
+           /* Enhancer with 40 samples delay */
+           for (iblock = 0; iblock<2; iblock++) {
+               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
+                   ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
+                   ENH_ALPHA0, enh_period, enh_plocsTbl,
+                       ENH_NBLOCKS_TOT);
+           }
+       } else if (iLBCdec_inst->mode==30) {
+           /* Enhancer with 80 samples delay */
+           for (iblock = 0; iblock<3; iblock++) {
+               enhancer(out+iblock*ENH_BLOCKL, enh_buf,
+                   ENH_BUFL, (4+iblock)*ENH_BLOCKL,
+                   ENH_ALPHA0, enh_period, enh_plocsTbl,
+                       ENH_NBLOCKS_TOT);
+           }
+       }
+
+       return (lag*2);
+   }
+
+A.17.  filter.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       filter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+
+
+
+Andersen, et al.              Experimental                    [Page 123]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #ifndef __iLBC_FILTER_H
+   #define __iLBC_FILTER_H
+
+   void AllPoleFilter(
+       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
+                              InOut[-1] contain the state of the
+                              filter (delayed samples). InOut[0] to
+                              InOut[lengthInOut-1] contain the filter
+                              input, on en exit InOut[-orderCoef] to
+                              InOut[-1] is unchanged and InOut[0] to
+                              InOut[lengthInOut-1] contain filtered
+                              samples */
+       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
+                              to be 1.0 */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef   /* (i) number of filter coefficients */
+   );
+
+   void AllZeroFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples */
+       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
+                              to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain the filter state, on exit Out[0]
+                              to Out[lengthInOut-1] contain filtered
+                              samples */
+   );
+
+   void ZeroPoleFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain filter
+                              input samples In[-orderCoef] to In[-1]
+                              contain state of all-zero section */
+       float *ZeroCoef,/* (i) filter coefficients for all-zero
+                              section (ZeroCoef[0] is assumed to
+                              be 1.0) */
+       float *PoleCoef,/* (i) filter coefficients for all-pole section
+                              (ZeroCoef[0] is assumed to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain state of all-pole section. On
+                              exit Out[0] to Out[lengthInOut-1]
+                              contain filtered samples */
+   );
+
+
+
+
+Andersen, et al.              Experimental                    [Page 124]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void DownSample (
+       float  *In,     /* (i) input samples */
+       float  *Coef,   /* (i) filter coefficients */
+       int lengthIn,   /* (i) number of input samples */
+       float  *state,  /* (i) filter state */
+       float  *Out     /* (o) downsampled output */
+   );
+
+   #endif
+
+A.18.  filter.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       filter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  all-pole filter
+    *---------------------------------------------------------------*/
+
+   void AllPoleFilter(
+       float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to
+                              InOut[-1] contain the state of the
+                              filter (delayed samples). InOut[0] to
+                              InOut[lengthInOut-1] contain the filter
+                              input, on en exit InOut[-orderCoef] to
+                              InOut[-1] is unchanged and InOut[0] to
+                              InOut[lengthInOut-1] contain filtered
+                              samples */
+       float *Coef,/* (i) filter coefficients, Coef[0] is assumed
+                              to be 1.0 */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef   /* (i) number of filter coefficients */
+   ){
+       int n,k;
+
+       for(n=0;n<lengthInOut;n++){
+           for(k=1;k<=orderCoef;k++){
+               *InOut -= Coef[k]*InOut[-k];
+
+
+
+Andersen, et al.              Experimental                    [Page 125]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           }
+           InOut++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  all-zero filter
+    *---------------------------------------------------------------*/
+
+   void AllZeroFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples */
+       float *Coef,/* (i) filter coefficients (Coef[0] is assumed
+                              to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain the filter state, on exit Out[0]
+                              to Out[lengthInOut-1] contain filtered
+                              samples */
+   ){
+       int n,k;
+
+       for(n=0;n<lengthInOut;n++){
+           *Out = Coef[0]*In[0];
+           for(k=1;k<=orderCoef;k++){
+               *Out += Coef[k]*In[-k];
+           }
+           Out++;
+           In++;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  pole-zero filter
+    *---------------------------------------------------------------*/
+
+   void ZeroPoleFilter(
+       float *In,      /* (i) In[0] to In[lengthInOut-1] contain
+                              filter input samples In[-orderCoef] to
+                              In[-1] contain state of all-zero
+                              section */
+       float *ZeroCoef,/* (i) filter coefficients for all-zero
+                              section (ZeroCoef[0] is assumed to
+                              be 1.0) */
+       float *PoleCoef,/* (i) filter coefficients for all-pole section
+                              (ZeroCoef[0] is assumed to be 1.0) */
+       int lengthInOut,/* (i) number of input/output samples */
+
+
+
+Andersen, et al.              Experimental                    [Page 126]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       int orderCoef,  /* (i) number of filter coefficients */
+       float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
+                              contain state of all-pole section. On
+                              exit Out[0] to Out[lengthInOut-1]
+                              contain filtered samples */
+   ){
+       AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
+       AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
+   }
+
+   /*----------------------------------------------------------------*
+    * downsample (LP filter and decimation)
+    *---------------------------------------------------------------*/
+
+   void DownSample (
+       float  *In,     /* (i) input samples */
+       float  *Coef,   /* (i) filter coefficients */
+       int lengthIn,   /* (i) number of input samples */
+       float  *state,  /* (i) filter state */
+       float  *Out     /* (o) downsampled output */
+   ){
+       float   o;
+       float *Out_ptr = Out;
+       float *Coef_ptr, *In_ptr;
+       float *state_ptr;
+       int i, j, stop;
+
+       /* LP filter and decimate at the same time */
+
+       for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
+       {
+           Coef_ptr = &Coef[0];
+           In_ptr = &In[i];
+           state_ptr = &state[FILTERORDER_DS-2];
+
+           o = (float)0.0;
+
+           stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
+
+           for (j = 0; j < stop; j++)
+           {
+               o += *Coef_ptr++ * (*In_ptr--);
+           }
+           for (j = i + 1; j < FILTERORDER_DS; j++)
+           {
+               o += *Coef_ptr++ * (*state_ptr--);
+           }
+
+
+
+
+Andersen, et al.              Experimental                    [Page 127]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           *Out_ptr++ = o;
+       }
+
+       /* Get the last part (use zeros as input for the future) */
+
+       for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS);
+               i+=FACTOR_DS) {
+
+           o=(float)0.0;
+
+           if (i<lengthIn) {
+               Coef_ptr = &Coef[0];
+               In_ptr = &In[i];
+               for (j=0; j<FILTERORDER_DS; j++) {
+                       o += *Coef_ptr++ * (*Out_ptr--);
+               }
+           } else {
+               Coef_ptr = &Coef[i-lengthIn];
+               In_ptr = &In[lengthIn-1];
+               for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
+                       o += *Coef_ptr++ * (*In_ptr--);
+               }
+           }
+           *Out_ptr++ = o;
+       }
+   }
+
+A.19.  FrameClassify.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       FrameClassify.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_FRAMECLASSIFY_H
+   #define __iLBC_FRAMECLASSIFY_H
+
+   int FrameClassify(      /* index to the max-energy sub-frame */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i/o) the encoder state structure */
+       float *residual     /* (i) lpc residual signal */
+   );
+
+
+
+Andersen, et al.              Experimental                    [Page 128]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #endif
+
+A.20.  FrameClassify.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       FrameClassify.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*---------------------------------------------------------------*
+    *  Classification of subframes to localize start state
+    *--------------------------------------------------------------*/
+
+   int FrameClassify(      /* index to the max-energy sub-frame */
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i/o) the encoder state structure */
+       float *residual     /* (i) lpc residual signal */
+   ) {
+       float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
+       int n, l, max_ssqEn_n;
+       const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
+           (float)1.0,(float)0.9,(float)0.8};
+       const float sampEn_win[5]={(float)1.0/(float)6.0,
+           (float)2.0/(float)6.0, (float)3.0/(float)6.0,
+           (float)4.0/(float)6.0, (float)5.0/(float)6.0};
+
+       /* init the front and back energies to zero */
+
+       memset(fssqEn, 0, NSUB_MAX*sizeof(float));
+       memset(bssqEn, 0, NSUB_MAX*sizeof(float));
+
+       /* Calculate front of first seqence */
+
+       n=0;
+       pp=residual;
+       for (l=0; l<5; l++) {
+           fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
+           pp++;
+       }
+       for (l=5; l<SUBL; l++) {
+
+
+
+Andersen, et al.              Experimental                    [Page 129]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           fssqEn[n] += (*pp) * (*pp);
+           pp++;
+       }
+
+       /* Calculate front and back of all middle sequences */
+
+       for (n=1; n<iLBCenc_inst->nsub-1; n++) {
+           pp=residual+n*SUBL;
+           for (l=0; l<5; l++) {
+               fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
+               bssqEn[n] += (*pp) * (*pp);
+               pp++;
+           }
+           for (l=5; l<SUBL-5; l++) {
+               fssqEn[n] += (*pp) * (*pp);
+               bssqEn[n] += (*pp) * (*pp);
+               pp++;
+           }
+           for (l=SUBL-5; l<SUBL; l++) {
+               fssqEn[n] += (*pp) * (*pp);
+               bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
+               pp++;
+           }
+       }
+
+       /* Calculate back of last seqence */
+
+       n=iLBCenc_inst->nsub-1;
+       pp=residual+n*SUBL;
+       for (l=0; l<SUBL-5; l++) {
+           bssqEn[n] += (*pp) * (*pp);
+           pp++;
+       }
+       for (l=SUBL-5; l<SUBL; l++) {
+           bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
+           pp++;
+       }
+
+       /* find the index to the weighted 80 sample with
+          most energy */
+
+       if (iLBCenc_inst->mode==20) l=1;
+       else                        l=0;
+
+       max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
+       max_ssqEn_n=1;
+       for (n=2; n<iLBCenc_inst->nsub; n++) {
+
+
+
+
+Andersen, et al.              Experimental                    [Page 130]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           l++;
+           if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
+               max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
+                               ssqEn_win[l];
+               max_ssqEn_n=n;
+           }
+       }
+
+       return max_ssqEn_n;
+   }
+
+A.21.  gainquant.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       gainquant.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_GAINQUANT_H
+   #define __iLBC_GAINQUANT_H
+
+   float gainquant(/* (o) quantized gain value */
+       float in,       /* (i) gain value */
+       float maxIn,/* (i) maximum of gain value */
+       int cblen,      /* (i) number of quantization indices */
+       int *index      /* (o) quantization index */
+   );
+
+   float gaindequant(  /* (o) quantized gain value */
+       int index,      /* (i) quantization index */
+       float maxIn,/* (i) maximum of unquantized gain */
+       int cblen       /* (i) number of quantization indices */
+   );
+
+   #endif
+
+A.22.  gainquant.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+
+
+
+Andersen, et al.              Experimental                    [Page 131]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       gainquant.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+   #include <math.h>
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    *  quantizer for the gain in the gain-shape coding of residual
+    *---------------------------------------------------------------*/
+
+   float gainquant(/* (o) quantized gain value */
+       float in,       /* (i) gain value */
+       float maxIn,/* (i) maximum of gain value */
+       int cblen,      /* (i) number of quantization indices */
+       int *index      /* (o) quantization index */
+   ){
+       int i, tindex;
+       float minmeasure,measure, *cb, scale;
+
+       /* ensure a lower bound on the scaling factor */
+
+       scale=maxIn;
+
+       if (scale<0.1) {
+           scale=(float)0.1;
+       }
+
+       /* select the quantization table */
+
+       if (cblen == 8) {
+           cb = gain_sq3Tbl;
+       } else if (cblen == 16) {
+           cb = gain_sq4Tbl;
+       } else  {
+           cb = gain_sq5Tbl;
+       }
+
+       /* select the best index in the quantization table */
+
+       minmeasure=10000000.0;
+       tindex=0;
+       for (i=0; i<cblen; i++) {
+
+
+
+Andersen, et al.              Experimental                    [Page 132]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           measure=(in-scale*cb[i])*(in-scale*cb[i]);
+
+           if (measure<minmeasure) {
+               tindex=i;
+               minmeasure=measure;
+           }
+       }
+       *index=tindex;
+
+       /* return the quantized value */
+
+       return scale*cb[tindex];
+   }
+
+   /*----------------------------------------------------------------*
+    *  decoder for quantized gains in the gain-shape coding of
+    *  residual
+    *---------------------------------------------------------------*/
+
+   float gaindequant(  /* (o) quantized gain value */
+       int index,      /* (i) quantization index */
+       float maxIn,/* (i) maximum of unquantized gain */
+       int cblen       /* (i) number of quantization indices */
+   ){
+       float scale;
+
+       /* obtain correct scale factor */
+
+       scale=(float)fabs(maxIn);
+
+       if (scale<0.1) {
+           scale=(float)0.1;
+       }
+
+       /* select the quantization table and return the decoded value */
+
+       if (cblen==8) {
+           return scale*gain_sq3Tbl[index];
+       } else if (cblen==16) {
+           return scale*gain_sq4Tbl[index];
+       }
+       else if (cblen==32) {
+           return scale*gain_sq5Tbl[index];
+       }
+
+       return 0.0;
+   }
+
+
+
+
+Andersen, et al.              Experimental                    [Page 133]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.23.  getCBvec.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       getCBvec.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_GETCBVEC_H
+   #define __iLBC_GETCBVEC_H
+
+   void getCBvec(
+       float *cbvec,   /* (o) Constructed codebook vector */
+       float *mem,     /* (i) Codebook buffer */
+       int index,      /* (i) Codebook index */
+       int lMem,       /* (i) Length of codebook buffer */
+       int cbveclen/* (i) Codebook vector length */
+   );
+
+   #endif
+
+A.24.  getCBvec.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       getCBvec.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include <string.h>
+
+   /*----------------------------------------------------------------*
+    *  Construct codebook vector for given index.
+    *---------------------------------------------------------------*/
+
+   void getCBvec(
+
+
+
+Andersen, et al.              Experimental                    [Page 134]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *cbvec,   /* (o) Constructed codebook vector */
+       float *mem,     /* (i) Codebook buffer */
+       int index,      /* (i) Codebook index */
+       int lMem,       /* (i) Length of codebook buffer */
+       int cbveclen/* (i) Codebook vector length */
+   ){
+       int j, k, n, memInd, sFilt;
+       float tmpbuf[CB_MEML];
+       int base_size;
+       int ilow, ihigh;
+       float alfa, alfa1;
+
+       /* Determine size of codebook sections */
+
+       base_size=lMem-cbveclen+1;
+
+       if (cbveclen==SUBL) {
+           base_size+=cbveclen/2;
+       }
+
+       /* No filter -> First codebook section */
+
+       if (index<lMem-cbveclen+1) {
+
+           /* first non-interpolated vectors */
+
+           k=index+cbveclen;
+           /* get vector */
+           memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
+
+       } else if (index < base_size) {
+
+           k=2*(index-(lMem-cbveclen+1))+cbveclen;
+
+           ihigh=k/2;
+           ilow=ihigh-5;
+
+           /* Copy first noninterpolated part */
+
+           memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
+
+           /* interpolation */
+
+           alfa1=(float)0.2;
+           alfa=0.0;
+           for (j=ilow; j<ihigh; j++) {
+               cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
+                   alfa*mem[lMem-k+j];
+
+
+
+Andersen, et al.              Experimental                    [Page 135]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               alfa+=alfa1;
+           }
+
+           /* Copy second noninterpolated part */
+
+           memcpy(cbvec+ihigh, mem+lMem-k+ihigh,
+               (cbveclen-ihigh)*sizeof(float));
+
+       }
+
+       /* Higher codebook section based on filtering */
+
+       else {
+
+           /* first non-interpolated vectors */
+
+           if (index-base_size<lMem-cbveclen+1) {
+               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
+               float *pos;
+               float *pp, *pp1;
+
+               memset(tempbuff2, 0,
+                   CB_HALFFILTERLEN*sizeof(float));
+               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
+                   lMem*sizeof(float));
+               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
+                   (CB_HALFFILTERLEN+1)*sizeof(float));
+
+               k=index-base_size+cbveclen;
+               sFilt=lMem-k;
+               memInd=sFilt+1-CB_HALFFILTERLEN;
+
+               /* do filtering */
+               pos=cbvec;
+               memset(pos, 0, cbveclen*sizeof(float));
+               for (n=0; n<cbveclen; n++) {
+                   pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
+                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+                   for (j=0; j<CB_FILTERLEN; j++) {
+                       (*pos)+=(*pp++)*(*pp1--);
+                   }
+                   pos++;
+               }
+           }
+
+           /* interpolated vectors */
+
+           else {
+
+
+
+Andersen, et al.              Experimental                    [Page 136]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               float tempbuff2[CB_MEML+CB_FILTERLEN+1];
+
+               float *pos;
+               float *pp, *pp1;
+               int i;
+
+               memset(tempbuff2, 0,
+                   CB_HALFFILTERLEN*sizeof(float));
+               memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
+                   lMem*sizeof(float));
+               memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
+                   (CB_HALFFILTERLEN+1)*sizeof(float));
+
+               k=2*(index-base_size-
+                   (lMem-cbveclen+1))+cbveclen;
+               sFilt=lMem-k;
+               memInd=sFilt+1-CB_HALFFILTERLEN;
+
+               /* do filtering */
+               pos=&tmpbuf[sFilt];
+               memset(pos, 0, k*sizeof(float));
+               for (i=0; i<k; i++) {
+                   pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
+                   pp1=&cbfiltersTbl[CB_FILTERLEN-1];
+                   for (j=0; j<CB_FILTERLEN; j++) {
+                       (*pos)+=(*pp++)*(*pp1--);
+                   }
+                   pos++;
+               }
+
+               ihigh=k/2;
+               ilow=ihigh-5;
+
+               /* Copy first noninterpolated part */
+
+               memcpy(cbvec, tmpbuf+lMem-k/2,
+                   ilow*sizeof(float));
+
+               /* interpolation */
+
+               alfa1=(float)0.2;
+               alfa=0.0;
+               for (j=ilow; j<ihigh; j++) {
+                   cbvec[j]=((float)1.0-alfa)*
+                       tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
+                   alfa+=alfa1;
+               }
+
+
+
+
+Andersen, et al.              Experimental                    [Page 137]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               /* Copy second noninterpolated part */
+
+               memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh,
+                   (cbveclen-ihigh)*sizeof(float));
+           }
+       }
+   }
+
+A.25.  helpfun.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       helpfun.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HELPFUN_H
+   #define __iLBC_HELPFUN_H
+
+   void autocorr(
+       float *r,       /* (o) autocorrelation vector */
+       const float *x, /* (i) data vector */
+       int N,          /* (i) length of data vector */
+       int order       /* largest lag for calculated
+                          autocorrelations */
+   );
+
+   void window(
+       float *z,       /* (o) the windowed data */
+       const float *x, /* (i) the original data vector */
+       const float *y, /* (i) the window */
+       int N           /* (i) length of all vectors */
+   );
+
+   void levdurb(
+       float *a,       /* (o) lpc coefficient vector starting
+                              with 1.0 */
+       float *k,       /* (o) reflection coefficients */
+       float *r,       /* (i) autocorrelation vector */
+       int order       /* (i) order of lpc filter */
+   );
+
+   void interpolate(
+
+
+
+Andersen, et al.              Experimental                    [Page 138]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *out,     /* (o) the interpolated vector */
+       float *in1,     /* (i) the first vector for the
+                              interpolation */
+       float *in2,     /* (i) the second vector for the
+                              interpolation */
+       float coef,     /* (i) interpolation weights */
+       int length      /* (i) length of all vectors */
+   );
+
+   void bwexpand(
+       float *out,     /* (o) the bandwidth expanded lpc
+                              coefficients */
+       float *in,      /* (i) the lpc coefficients before bandwidth
+                              expansion */
+       float coef,     /* (i) the bandwidth expansion factor */
+       int length      /* (i) the length of lpc coefficient vectors */
+   );
+
+   void vq(
+       float *Xq,      /* (o) the quantized vector */
+       int *index,     /* (o) the quantization index */
+       const float *CB,/* (i) the vector quantization codebook */
+       float *X,       /* (i) the vector to quantize */
+       int n_cb,       /* (i) the number of vectors in the codebook */
+       int dim         /* (i) the dimension of all vectors */
+   );
+
+   void SplitVQ(
+       float *qX,      /* (o) the quantized vector */
+       int *index,     /* (o) a vector of indexes for all vector
+                              codebooks in the split */
+       float *X,       /* (i) the vector to quantize */
+       const float *CB,/* (i) the quantizer codebook */
+       int nsplit,     /* the number of vector splits */
+       const int *dim, /* the dimension of X and qX */
+       const int *cbsize /* the number of vectors in the codebook */
+   );
+
+
+   void sort_sq(
+       float *xq,      /* (o) the quantized value */
+       int *index,     /* (o) the quantization index */
+       float x,    /* (i) the value to quantize */
+       const float *cb,/* (i) the quantization codebook */
+       int cb_size     /* (i) the size of the quantization codebook */
+   );
+
+   int LSF_check(      /* (o) 1 for stable lsf vectors and 0 for
+
+
+
+Andersen, et al.              Experimental                    [Page 139]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                              nonstable ones */
+       float *lsf,     /* (i) a table of lsf vectors */
+       int dim,    /* (i) the dimension of each lsf vector */
+       int NoAn    /* (i) the number of lsf vectors in the
+                              table */
+   );
+
+   #endif
+
+A.26.  helpfun.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       helpfun.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  calculation of auto correlation
+    *---------------------------------------------------------------*/
+
+   void autocorr(
+       float *r,       /* (o) autocorrelation vector */
+       const float *x, /* (i) data vector */
+       int N,          /* (i) length of data vector */
+       int order       /* largest lag for calculated
+                          autocorrelations */
+   ){
+       int     lag, n;
+       float   sum;
+
+       for (lag = 0; lag <= order; lag++) {
+           sum = 0;
+           for (n = 0; n < N - lag; n++) {
+               sum += x[n] * x[n+lag];
+           }
+           r[lag] = sum;
+       }
+
+
+
+Andersen, et al.              Experimental                    [Page 140]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   }
+
+   /*----------------------------------------------------------------*
+    *  window multiplication
+    *---------------------------------------------------------------*/
+
+   void window(
+       float *z,       /* (o) the windowed data */
+       const float *x, /* (i) the original data vector */
+       const float *y, /* (i) the window */
+       int N           /* (i) length of all vectors */
+   ){
+       int     i;
+
+       for (i = 0; i < N; i++) {
+           z[i] = x[i] * y[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  levinson-durbin solution for lpc coefficients
+    *---------------------------------------------------------------*/
+
+   void levdurb(
+       float *a,       /* (o) lpc coefficient vector starting
+                              with 1.0 */
+       float *k,       /* (o) reflection coefficients */
+       float *r,       /* (i) autocorrelation vector */
+       int order       /* (i) order of lpc filter */
+   ){
+       float  sum, alpha;
+       int     m, m_h, i;
+
+       a[0] = 1.0;
+
+       if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
+           for (i = 0; i < order; i++) {
+               k[i] = 0;
+               a[i+1] = 0;
+           }
+       } else {
+           a[1] = k[0] = -r[1]/r[0];
+           alpha = r[0] + r[1] * k[0];
+           for (m = 1; m < order; m++){
+               sum = r[m + 1];
+               for (i = 0; i < m; i++){
+                   sum += a[i+1] * r[m - i];
+               }
+
+
+
+Andersen, et al.              Experimental                    [Page 141]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               k[m] = -sum / alpha;
+               alpha += k[m] * sum;
+               m_h = (m + 1) >> 1;
+               for (i = 0; i < m_h; i++){
+                   sum = a[i+1] + k[m] * a[m - i];
+                   a[m - i] += k[m] * a[i+1];
+                   a[i+1] = sum;
+               }
+               a[m+1] = k[m];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  interpolation between vectors
+    *---------------------------------------------------------------*/
+
+   void interpolate(
+       float *out,      /* (o) the interpolated vector */
+       float *in1,     /* (i) the first vector for the
+                              interpolation */
+       float *in2,     /* (i) the second vector for the
+                              interpolation */
+       float coef,      /* (i) interpolation weights */
+       int length      /* (i) length of all vectors */
+   ){
+       int i;
+       float invcoef;
+
+       invcoef = (float)1.0 - coef;
+       for (i = 0; i < length; i++) {
+           out[i] = coef * in1[i] + invcoef * in2[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lpc bandwidth expansion
+    *---------------------------------------------------------------*/
+
+   void bwexpand(
+       float *out,      /* (o) the bandwidth expanded lpc
+                              coefficients */
+       float *in,      /* (i) the lpc coefficients before bandwidth
+                              expansion */
+       float coef,     /* (i) the bandwidth expansion factor */
+       int length      /* (i) the length of lpc coefficient vectors */
+   ){
+       int i;
+
+
+
+Andersen, et al.              Experimental                    [Page 142]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float  chirp;
+
+       chirp = coef;
+
+       out[0] = in[0];
+       for (i = 1; i < length; i++) {
+           out[i] = chirp * in[i];
+           chirp *= coef;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  vector quantization
+    *---------------------------------------------------------------*/
+
+   void vq(
+       float *Xq,      /* (o) the quantized vector */
+       int *index,     /* (o) the quantization index */
+       const float *CB,/* (i) the vector quantization codebook */
+       float *X,       /* (i) the vector to quantize */
+       int n_cb,       /* (i) the number of vectors in the codebook */
+       int dim         /* (i) the dimension of all vectors */
+   ){
+       int     i, j;
+       int     pos, minindex;
+       float   dist, tmp, mindist;
+
+       pos = 0;
+       mindist = FLOAT_MAX;
+       minindex = 0;
+       for (j = 0; j < n_cb; j++) {
+           dist = X[0] - CB[pos];
+           dist *= dist;
+           for (i = 1; i < dim; i++) {
+               tmp = X[i] - CB[pos + i];
+               dist += tmp*tmp;
+           }
+
+           if (dist < mindist) {
+               mindist = dist;
+               minindex = j;
+           }
+           pos += dim;
+       }
+       for (i = 0; i < dim; i++) {
+           Xq[i] = CB[minindex*dim + i];
+       }
+       *index = minindex;
+
+
+
+Andersen, et al.              Experimental                    [Page 143]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   }
+
+   /*----------------------------------------------------------------*
+    *  split vector quantization
+    *---------------------------------------------------------------*/
+
+   void SplitVQ(
+       float *qX,      /* (o) the quantized vector */
+       int *index,     /* (o) a vector of indexes for all vector
+                              codebooks in the split */
+       float *X,       /* (i) the vector to quantize */
+       const float *CB,/* (i) the quantizer codebook */
+       int nsplit,     /* the number of vector splits */
+       const int *dim, /* the dimension of X and qX */
+       const int *cbsize /* the number of vectors in the codebook */
+   ){
+       int    cb_pos, X_pos, i;
+
+       cb_pos = 0;
+       X_pos= 0;
+       for (i = 0; i < nsplit; i++) {
+           vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos,
+               cbsize[i], dim[i]);
+           X_pos += dim[i];
+           cb_pos += dim[i] * cbsize[i];
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  scalar quantization
+    *---------------------------------------------------------------*/
+
+   void sort_sq(
+       float *xq,      /* (o) the quantized value */
+       int *index,     /* (o) the quantization index */
+       float x,    /* (i) the value to quantize */
+       const float *cb,/* (i) the quantization codebook */
+       int cb_size      /* (i) the size of the quantization codebook */
+   ){
+       int i;
+
+       if (x <= cb[0]) {
+           *index = 0;
+           *xq = cb[0];
+       } else {
+           i = 0;
+           while ((x > cb[i]) && i < cb_size - 1) {
+               i++;
+
+
+
+Andersen, et al.              Experimental                    [Page 144]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           }
+
+           if (x > ((cb[i] + cb[i - 1])/2)) {
+               *index = i;
+               *xq = cb[i];
+           } else {
+               *index = i - 1;
+               *xq = cb[i - 1];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  check for stability of lsf coefficients
+    *---------------------------------------------------------------*/
+
+   int LSF_check(    /* (o) 1 for stable lsf vectors and 0 for
+                              nonstable ones */
+       float *lsf,     /* (i) a table of lsf vectors */
+       int dim,    /* (i) the dimension of each lsf vector */
+       int NoAn    /* (i) the number of lsf vectors in the
+                              table */
+   ){
+       int k,n,m, Nit=2, change=0,pos;
+       float tmp;
+       static float eps=(float)0.039; /* 50 Hz */
+       static float eps2=(float)0.0195;
+       static float maxlsf=(float)3.14; /* 4000 Hz */
+       static float minlsf=(float)0.01; /* 0 Hz */
+
+       /* LSF separation check*/
+
+       for (n=0; n<Nit; n++) { /* Run through a couple of times */
+           for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
+               for (k=0; k<(dim-1); k++) {
+                   pos=m*dim+k;
+
+                   if ((lsf[pos+1]-lsf[pos])<eps) {
+
+                       if (lsf[pos+1]<lsf[pos]) {
+                           tmp=lsf[pos+1];
+                           lsf[pos+1]= lsf[pos]+eps2;
+                           lsf[pos]= lsf[pos+1]-eps2;
+                       } else {
+                           lsf[pos]-=eps2;
+                           lsf[pos+1]+=eps2;
+                       }
+                       change=1;
+
+
+
+Andersen, et al.              Experimental                    [Page 145]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   }
+
+                   if (lsf[pos]<minlsf) {
+                       lsf[pos]=minlsf;
+                       change=1;
+                   }
+
+                   if (lsf[pos]>maxlsf) {
+                       lsf[pos]=maxlsf;
+                       change=1;
+                   }
+               }
+           }
+       }
+
+       return change;
+   }
+
+A.27.  hpInput.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpInput.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HPINPUT_H
+   #define __iLBC_HPINPUT_H
+
+   void hpInput(
+       float *In,  /* (i) vector to filter */
+       int len,    /* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   );
+
+   #endif
+
+A.28.  hpInput.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+
+
+Andersen, et al.              Experimental                    [Page 146]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       hpInput.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Input high-pass filter
+    *---------------------------------------------------------------*/
+
+   void hpInput(
+       float *In,  /* (i) vector to filter */
+       int len,    /* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   ){
+       int i;
+       float *pi, *po;
+
+       /* all-zero section*/
+
+       pi = &In[0];
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po = hpi_zero_coefsTbl[0] * (*pi);
+           *po += hpi_zero_coefsTbl[1] * mem[0];
+           *po += hpi_zero_coefsTbl[2] * mem[1];
+
+           mem[1] = mem[0];
+           mem[0] = *pi;
+           po++;
+           pi++;
+
+       }
+
+       /* all-pole section*/
+
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po -= hpi_pole_coefsTbl[1] * mem[2];
+           *po -= hpi_pole_coefsTbl[2] * mem[3];
+
+           mem[3] = mem[2];
+           mem[2] = *po;
+           po++;
+
+
+
+Andersen, et al.              Experimental                    [Page 147]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       }
+   }
+
+A.29.  hpOutput.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpOutput.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_HPOUTPUT_H
+   #define __iLBC_HPOUTPUT_H
+
+   void hpOutput(
+       float *In,  /* (i) vector to filter */
+       int len,/* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   );
+
+   #endif
+
+A.30.  hpOutput.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       hpOutput.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Output high-pass filter
+    *---------------------------------------------------------------*/
+
+   void hpOutput(
+
+
+
+Andersen, et al.              Experimental                    [Page 148]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *In,  /* (i) vector to filter */
+       int len,/* (i) length of vector to filter */
+       float *Out, /* (o) the resulting filtered vector */
+       float *mem  /* (i/o) the filter state */
+   ){
+       int i;
+       float *pi, *po;
+
+       /* all-zero section*/
+
+       pi = &In[0];
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po = hpo_zero_coefsTbl[0] * (*pi);
+           *po += hpo_zero_coefsTbl[1] * mem[0];
+           *po += hpo_zero_coefsTbl[2] * mem[1];
+
+           mem[1] = mem[0];
+           mem[0] = *pi;
+           po++;
+           pi++;
+
+       }
+
+       /* all-pole section*/
+
+       po = &Out[0];
+       for (i=0; i<len; i++) {
+           *po -= hpo_pole_coefsTbl[1] * mem[2];
+           *po -= hpo_pole_coefsTbl[2] * mem[3];
+
+           mem[3] = mem[2];
+           mem[2] = *po;
+           po++;
+       }
+   }
+
+A.31.  iCBConstruct.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBConstruct.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+
+
+
+Andersen, et al.              Experimental                    [Page 149]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ICBCONSTRUCT_H
+   #define __iLBC_ICBCONSTRUCT_H
+
+   void index_conv_enc(
+       int *index          /* (i/o) Codebook indexes */
+   );
+
+   void index_conv_dec(
+       int *index          /* (i/o) Codebook indexes */
+   );
+
+   void iCBConstruct(
+       float *decvector,   /* (o) Decoded vector */
+       int *index,         /* (i) Codebook indices */
+       int *gain_index,/* (i) Gain quantization indices */
+       float *mem,         /* (i) Buffer for codevector construction */
+       int lMem,           /* (i) Length of buffer */
+       int veclen,         /* (i) Length of vector */
+       int nStages         /* (i) Number of codebook stages */
+   );
+
+   #endif
+
+A.32.  iCBConstruct.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBConstruct.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+   #include "gainquant.h"
+   #include "getCBvec.h"
+
+   /*----------------------------------------------------------------*
+    *  Convert the codebook indexes to make the search easier
+    *---------------------------------------------------------------*/
+
+
+
+
+Andersen, et al.              Experimental                    [Page 150]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void index_conv_enc(
+       int *index          /* (i/o) Codebook indexes */
+   ){
+       int k;
+
+       for (k=1; k<CB_NSTAGES; k++) {
+
+           if ((index[k]>=108)&&(index[k]<172)) {
+               index[k]-=64;
+           } else if (index[k]>=236) {
+               index[k]-=128;
+           } else {
+               /* ERROR */
+           }
+       }
+   }
+
+   void index_conv_dec(
+       int *index          /* (i/o) Codebook indexes */
+   ){
+       int k;
+
+       for (k=1; k<CB_NSTAGES; k++) {
+
+           if ((index[k]>=44)&&(index[k]<108)) {
+               index[k]+=64;
+           } else if ((index[k]>=108)&&(index[k]<128)) {
+               index[k]+=128;
+           } else {
+               /* ERROR */
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  Construct decoded vector from codebook and gains.
+    *---------------------------------------------------------------*/
+
+   void iCBConstruct(
+       float *decvector,   /* (o) Decoded vector */
+       int *index,         /* (i) Codebook indices */
+       int *gain_index,/* (i) Gain quantization indices */
+       float *mem,         /* (i) Buffer for codevector construction */
+       int lMem,           /* (i) Length of buffer */
+       int veclen,         /* (i) Length of vector */
+       int nStages         /* (i) Number of codebook stages */
+   ){
+       int j,k;
+
+
+
+Andersen, et al.              Experimental                    [Page 151]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float gain[CB_NSTAGES];
+       float cbvec[SUBL];
+
+       /* gain de-quantization */
+
+       gain[0] = gaindequant(gain_index[0], 1.0, 32);
+       if (nStages > 1) {
+           gain[1] = gaindequant(gain_index[1],
+               (float)fabs(gain[0]), 16);
+       }
+       if (nStages > 2) {
+           gain[2] = gaindequant(gain_index[2],
+               (float)fabs(gain[1]), 8);
+       }
+
+       /* codebook vector construction and construction of
+       total vector */
+
+       getCBvec(cbvec, mem, index[0], lMem, veclen);
+       for (j=0;j<veclen;j++){
+           decvector[j] = gain[0]*cbvec[j];
+       }
+       if (nStages > 1) {
+           for (k=1; k<nStages; k++) {
+               getCBvec(cbvec, mem, index[k], lMem, veclen);
+               for (j=0;j<veclen;j++) {
+                   decvector[j] += gain[k]*cbvec[j];
+               }
+           }
+       }
+   }
+
+A.33.  iCBSearch.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBSearch.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_ICBSEARCH_H
+   #define __iLBC_ICBSEARCH_H
+
+
+
+
+Andersen, et al.              Experimental                    [Page 152]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void iCBSearch(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) the encoder state structure */
+       int *index,         /* (o) Codebook indices */
+       int *gain_index,/* (o) Gain quantization indices */
+       float *intarget,/* (i) Target vector for encoding */
+       float *mem,         /* (i) Buffer for codebook construction */
+       int lMem,           /* (i) Length of buffer */
+       int lTarget,    /* (i) Length of vector */
+       int nStages,    /* (i) Number of codebook stages */
+       float *weightDenum, /* (i) weighting filter coefficients */
+       float *weightState, /* (i) weighting filter state */
+       int block           /* (i) the sub-block number */
+   );
+
+   #endif
+
+A.34.  iCBSearch.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       iCBSearch.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "gainquant.h"
+   #include "createCB.h"
+   #include "filter.h"
+   #include "constants.h"
+
+   /*----------------------------------------------------------------*
+    *  Search routine for codebook encoding and gain quantization.
+    *---------------------------------------------------------------*/
+
+   void iCBSearch(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) the encoder state structure */
+       int *index,         /* (o) Codebook indices */
+       int *gain_index,/* (o) Gain quantization indices */
+
+
+
+Andersen, et al.              Experimental                    [Page 153]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *intarget,/* (i) Target vector for encoding */
+       float *mem,         /* (i) Buffer for codebook construction */
+       int lMem,           /* (i) Length of buffer */
+       int lTarget,    /* (i) Length of vector */
+       int nStages,    /* (i) Number of codebook stages */
+       float *weightDenum, /* (i) weighting filter coefficients */
+       float *weightState, /* (i) weighting filter state */
+       int block           /* (i) the sub-block number */
+   ){
+       int i, j, icount, stage, best_index, range, counter;
+       float max_measure, gain, measure, crossDot, ftmp;
+       float gains[CB_NSTAGES];
+       float target[SUBL];
+       int base_index, sInd, eInd, base_size;
+       int sIndAug=0, eIndAug=0;
+       float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
+       float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
+       float *pp, *ppi=0, *ppo=0, *ppe=0;
+       float cbvectors[CB_MEML];
+       float tene, cene, cvec[SUBL];
+       float aug_vec[SUBL];
+
+       memset(cvec,0,SUBL*sizeof(float));
+
+       /* Determine size of codebook sections */
+
+       base_size=lMem-lTarget+1;
+
+       if (lTarget==SUBL) {
+           base_size=lMem-lTarget+1+lTarget/2;
+       }
+
+       /* setup buffer for weighting */
+
+       memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
+       memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
+       memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
+
+       /* weighting */
+
+       AllPoleFilter(buf+LPC_FILTERORDER, weightDenum,
+           lMem+lTarget, LPC_FILTERORDER);
+
+       /* Construct the codebook and target needed */
+
+       memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
+
+       tene=0.0;
+
+
+
+Andersen, et al.              Experimental                    [Page 154]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       for (i=0; i<lTarget; i++) {
+           tene+=target[i]*target[i];
+       }
+
+       /* Prepare search over one more codebook section. This section
+          is created by filtering the original buffer with a filter. */
+
+       filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
+
+       /* The Main Loop over stages */
+
+       for (stage=0; stage<nStages; stage++) {
+
+           range = search_rangeTbl[block][stage];
+
+           /* initialize search measure */
+
+           max_measure = (float)-10000000.0;
+           gain = (float)0.0;
+           best_index = 0;
+
+           /* Compute cross dot product between the target
+              and the CB memory */
+
+           crossDot=0.0;
+           pp=buf+LPC_FILTERORDER+lMem-lTarget;
+           for (j=0; j<lTarget; j++) {
+               crossDot += target[j]*(*pp++);
+           }
+
+           if (stage==0) {
+
+               /* Calculate energy in the first block of
+                 'lTarget' samples. */
+               ppe = energy;
+               ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
+               ppo = buf+LPC_FILTERORDER+lMem-1;
+
+               *ppe=0.0;
+               pp=buf+LPC_FILTERORDER+lMem-lTarget;
+               for (j=0; j<lTarget; j++) {
+                   *ppe+=(*pp)*(*pp++);
+               }
+
+               if (*ppe>0.0) {
+                   invenergy[0] = (float) 1.0 / (*ppe + EPS);
+               } else {
+                   invenergy[0] = (float) 0.0;
+
+
+
+Andersen, et al.              Experimental                    [Page 155]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+               }
+               ppe++;
+
+               measure=(float)-10000000.0;
+
+               if (crossDot > 0.0) {
+                      measure = crossDot*crossDot*invenergy[0];
+               }
+           }
+           else {
+               measure = crossDot*crossDot*invenergy[0];
+           }
+
+           /* check if measure is better */
+           ftmp = crossDot*invenergy[0];
+
+           if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+               best_index = 0;
+               max_measure = measure;
+               gain = ftmp;
+           }
+
+           /* loop over the main first codebook section,
+              full search */
+
+           for (icount=1; icount<range; icount++) {
+
+               /* calculate measure */
+
+               crossDot=0.0;
+               pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
+
+               for (j=0; j<lTarget; j++) {
+                   crossDot += target[j]*(*pp++);
+               }
+
+               if (stage==0) {
+                   *ppe++ = energy[icount-1] + (*ppi)*(*ppi) -
+                       (*ppo)*(*ppo);
+                   ppo--;
+                   ppi--;
+
+                   if (energy[icount]>0.0) {
+                       invenergy[icount] =
+                           (float)1.0/(energy[icount]+EPS);
+                   } else {
+                       invenergy[icount] = (float) 0.0;
+                   }
+
+
+
+Andersen, et al.              Experimental                    [Page 156]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   measure=(float)-10000000.0;
+
+                   if (crossDot > 0.0) {
+                       measure = crossDot*crossDot*invenergy[icount];
+                   }
+               }
+               else {
+                   measure = crossDot*crossDot*invenergy[icount];
+               }
+
+               /* check if measure is better */
+               ftmp = crossDot*invenergy[icount];
+
+               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+                   best_index = icount;
+                   max_measure = measure;
+                   gain = ftmp;
+               }
+           }
+
+           /* Loop over augmented part in the first codebook
+            * section, full search.
+            * The vectors are interpolated.
+            */
+
+           if (lTarget==SUBL) {
+
+               /* Search for best possible cb vector and
+                  compute the CB-vectors' energy. */
+               searchAugmentedCB(20, 39, stage, base_size-lTarget/2,
+                   target, buf+LPC_FILTERORDER+lMem,
+                   &max_measure, &best_index, &gain, energy,
+                   invenergy);
+           }
+
+           /* set search range for following codebook sections */
+
+           base_index=best_index;
+
+           /* unrestricted search */
+
+           if (CB_RESRANGE == -1) {
+               sInd=0;
+               eInd=range-1;
+               sIndAug=20;
+               eIndAug=39;
+           }
+
+
+
+
+Andersen, et al.              Experimental                    [Page 157]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           /* restricted search around best index from first
+           codebook section */
+
+           else {
+               /* Initialize search indices */
+               sIndAug=0;
+               eIndAug=0;
+               sInd=base_index-CB_RESRANGE/2;
+               eInd=sInd+CB_RESRANGE;
+
+               if (lTarget==SUBL) {
+
+                   if (sInd<0) {
+
+                       sIndAug = 40 + sInd;
+                       eIndAug = 39;
+                       sInd=0;
+
+                   } else if ( base_index < (base_size-20) ) {
+
+                       if (eInd > range) {
+                           sInd -= (eInd-range);
+                           eInd = range;
+                       }
+                   } else { /* base_index >= (base_size-20) */
+
+                       if (sInd < (base_size-20)) {
+                           sIndAug = 20;
+                           sInd = 0;
+                           eInd = 0;
+                           eIndAug = 19 + CB_RESRANGE;
+
+                           if(eIndAug > 39) {
+                               eInd = eIndAug-39;
+                               eIndAug = 39;
+                           }
+                       } else {
+                           sIndAug = 20 + sInd - (base_size-20);
+                           eIndAug = 39;
+                           sInd = 0;
+                           eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
+                       }
+                   }
+
+               } else { /* lTarget = 22 or 23 */
+
+                   if (sInd < 0) {
+                       eInd -= sInd;
+
+
+
+Andersen, et al.              Experimental                    [Page 158]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                       sInd = 0;
+                   }
+
+                   if(eInd > range) {
+                       sInd -= (eInd - range);
+                       eInd = range;
+                   }
+               }
+           }
+
+           /* search of higher codebook section */
+
+           /* index search range */
+           counter = sInd;
+           sInd += base_size;
+           eInd += base_size;
+
+
+           if (stage==0) {
+               ppe = energy+base_size;
+               *ppe=0.0;
+
+               pp=cbvectors+lMem-lTarget;
+               for (j=0; j<lTarget; j++) {
+                   *ppe+=(*pp)*(*pp++);
+               }
+
+               ppi = cbvectors + lMem - 1 - lTarget;
+               ppo = cbvectors + lMem - 1;
+
+               for (j=0; j<(range-1); j++) {
+                   *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
+                   ppo--;
+                   ppi--;
+                   ppe++;
+               }
+           }
+
+           /* loop over search range */
+
+           for (icount=sInd; icount<eInd; icount++) {
+
+               /* calculate measure */
+
+               crossDot=0.0;
+               pp=cbvectors + lMem - (counter++) - lTarget;
+
+               for (j=0;j<lTarget;j++) {
+
+
+
+Andersen, et al.              Experimental                    [Page 159]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+                   crossDot += target[j]*(*pp++);
+               }
+
+               if (energy[icount]>0.0) {
+                   invenergy[icount] =(float)1.0/(energy[icount]+EPS);
+               } else {
+                   invenergy[icount] =(float)0.0;
+               }
+
+               if (stage==0) {
+
+                   measure=(float)-10000000.0;
+
+                   if (crossDot > 0.0) {
+                       measure = crossDot*crossDot*
+                           invenergy[icount];
+                   }
+               }
+               else {
+                   measure = crossDot*crossDot*invenergy[icount];
+               }
+
+               /* check if measure is better */
+               ftmp = crossDot*invenergy[icount];
+
+               if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
+                   best_index = icount;
+                   max_measure = measure;
+                   gain = ftmp;
+               }
+           }
+
+           /* Search the augmented CB inside the limited range. */
+
+           if ((lTarget==SUBL)&&(sIndAug!=0)) {
+               searchAugmentedCB(sIndAug, eIndAug, stage,
+                   2*base_size-20, target, cbvectors+lMem,
+                   &max_measure, &best_index, &gain, energy,
+                   invenergy);
+           }
+
+           /* record best index */
+
+           index[stage] = best_index;
+
+           /* gain quantization */
+
+           if (stage==0){
+
+
+
+Andersen, et al.              Experimental                    [Page 160]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+
+               if (gain<0.0){
+                   gain = 0.0;
+               }
+
+               if (gain>CB_MAXGAIN) {
+                   gain = (float)CB_MAXGAIN;
+               }
+               gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
+           }
+           else {
+               if (stage==1) {
+                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
+                       16, &gain_index[stage]);
+               } else {
+                   gain = gainquant(gain, (float)fabs(gains[stage-1]),
+                       8, &gain_index[stage]);
+               }
+           }
+
+           /* Extract the best (according to measure)
+              codebook vector */
+
+           if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
+
+               if (index[stage]<base_size) {
+                   pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
+               } else {
+                   pp=cbvectors+lMem-lTarget-
+                       index[stage]+base_size;
+               }
+           } else {
+
+               if (index[stage]<base_size) {
+                   if (index[stage]<(base_size-20)) {
+                       pp=buf+LPC_FILTERORDER+lMem-
+                           lTarget-index[stage];
+                   } else {
+                       createAugmentedVec(index[stage]-base_size+40,
+                               buf+LPC_FILTERORDER+lMem,aug_vec);
+                       pp=aug_vec;
+                   }
+               } else {
+                   int filterno, position;
+
+                   filterno=index[stage]/base_size;
+                   position=index[stage]-filterno*base_size;
+
+
+
+
+Andersen, et al.              Experimental                    [Page 161]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+
+                   if (position<(base_size-20)) {
+                       pp=cbvectors+filterno*lMem-lTarget-
+                           index[stage]+filterno*base_size;
+                   } else {
+                       createAugmentedVec(
+                           index[stage]-(filterno+1)*base_size+40,
+                           cbvectors+filterno*lMem,aug_vec);
+                       pp=aug_vec;
+                   }
+               }
+           }
+
+           /* Subtract the best codebook vector, according
+              to measure, from the target vector */
+
+           for (j=0;j<lTarget;j++) {
+               cvec[j] += gain*(*pp);
+               target[j] -= gain*(*pp++);
+           }
+
+           /* record quantized gain */
+
+           gains[stage]=gain;
+
+       }/* end of Main Loop. for (stage=0;... */
+
+       /* Gain adjustment for energy matching */
+       cene=0.0;
+       for (i=0; i<lTarget; i++) {
+           cene+=cvec[i]*cvec[i];
+       }
+       j=gain_index[0];
+
+       for (i=gain_index[0]; i<32; i++) {
+           ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
+
+           if ((ftmp<(tene*gains[0]*gains[0])) &&
+               (gain_sq5Tbl[j]<(2.0*gains[0]))) {
+               j=i;
+           }
+       }
+       gain_index[0]=j;
+   }
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 162]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.35.  LPCdecode.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPC_decode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LPC_DECODE_H
+   #define __iLBC_LPC_DECODE_H
+
+   void LSFinterpolate2a_dec(
+       float *a,           /* (o) lpc coefficients for a sub-frame */
+       float *lsf1,    /* (i) first lsf coefficient vector */
+       float *lsf2,    /* (i) second lsf coefficient vector */
+       float coef,         /* (i) interpolation weight */
+       int length          /* (i) length of lsf vectors */
+   );
+
+   void SimplelsfDEQ(
+       float *lsfdeq,      /* (o) dequantized lsf coefficients */
+       int *index,         /* (i) quantization index */
+       int lpc_n           /* (i) number of LPCs */
+   );
+
+   void DecoderInterpolateLSF(
+       float *syntdenum,   /* (o) synthesis filter coefficients */
+       float *weightdenum, /* (o) weighting denumerator
+                                  coefficients */
+       float *lsfdeq,      /* (i) dequantized lsf coefficients */
+       int length,         /* (i) length of lsf coefficient vector */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i) the decoder state structure */
+   );
+
+   #endif
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 163]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.36.  LPCdecode.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPC_decode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "helpfun.h"
+   #include "lsf.h"
+   #include "iLBC_define.h"
+   #include "constants.h"
+
+   /*---------------------------------------------------------------*
+    *  interpolation of lsf coefficients for the decoder
+    *--------------------------------------------------------------*/
+
+   void LSFinterpolate2a_dec(
+       float *a,           /* (o) lpc coefficients for a sub-frame */
+       float *lsf1,    /* (i) first lsf coefficient vector */
+       float *lsf2,    /* (i) second lsf coefficient vector */
+       float coef,         /* (i) interpolation weight */
+       int length          /* (i) length of lsf vectors */
+   ){
+       float  lsftmp[LPC_FILTERORDER];
+
+       interpolate(lsftmp, lsf1, lsf2, coef, length);
+       lsf2a(a, lsftmp);
+   }
+
+   /*---------------------------------------------------------------*
+    *  obtain dequantized lsf coefficients from quantization index
+    *--------------------------------------------------------------*/
+
+   void SimplelsfDEQ(
+       float *lsfdeq,    /* (o) dequantized lsf coefficients */
+       int *index,         /* (i) quantization index */
+       int lpc_n           /* (i) number of LPCs */
+   ){
+       int i, j, pos, cb_pos;
+
+
+
+Andersen, et al.              Experimental                    [Page 164]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* decode first LSF */
+
+       pos = 0;
+       cb_pos = 0;
+       for (i = 0; i < LSF_NSPLIT; i++) {
+           for (j = 0; j < dim_lsfCbTbl[i]; j++) {
+               lsfdeq[pos + j] = lsfCbTbl[cb_pos +
+                   (long)(index[i])*dim_lsfCbTbl[i] + j];
+           }
+           pos += dim_lsfCbTbl[i];
+           cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
+       }
+
+       if (lpc_n>1) {
+
+           /* decode last LSF */
+
+           pos = 0;
+           cb_pos = 0;
+           for (i = 0; i < LSF_NSPLIT; i++) {
+               for (j = 0; j < dim_lsfCbTbl[i]; j++) {
+                   lsfdeq[LPC_FILTERORDER + pos + j] =
+                       lsfCbTbl[cb_pos +
+                       (long)(index[LSF_NSPLIT + i])*
+                       dim_lsfCbTbl[i] + j];
+               }
+               pos += dim_lsfCbTbl[i];
+               cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  obtain synthesis and weighting filters form lsf coefficients
+    *---------------------------------------------------------------*/
+
+   void DecoderInterpolateLSF(
+       float *syntdenum, /* (o) synthesis filter coefficients */
+       float *weightdenum, /* (o) weighting denumerator
+                                  coefficients */
+       float *lsfdeq,       /* (i) dequantized lsf coefficients */
+       int length,         /* (i) length of lsf coefficient vector */
+       iLBC_Dec_Inst_t *iLBCdec_inst
+                           /* (i) the decoder state structure */
+   ){
+       int    i, pos, lp_length;
+       float  lp[LPC_FILTERORDER + 1], *lsfdeq2;
+
+
+
+
+Andersen, et al.              Experimental                    [Page 165]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       lsfdeq2 = lsfdeq + length;
+       lp_length = length + 1;
+
+       if (iLBCdec_inst->mode==30) {
+           /* sub-frame 1: Interpolation between old and first */
+
+           LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq,
+               lsf_weightTbl_30ms[0], length);
+           memcpy(syntdenum,lp,lp_length*sizeof(float));
+           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM,
+               lp_length);
+
+           /* sub-frames 2 to 6: interpolation between first
+              and last LSF */
+
+           pos = lp_length;
+           for (i = 1; i < 6; i++) {
+               LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2,
+                   lsf_weightTbl_30ms[i], length);
+               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
+               bwexpand(weightdenum + pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+       else {
+           pos = 0;
+           for (i = 0; i < iLBCdec_inst->nsub; i++) {
+               LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold,
+                   lsfdeq, lsf_weightTbl_20ms[i], length);
+               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
+               bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM,
+                   lp_length);
+               pos += lp_length;
+           }
+       }
+
+       /* update memory */
+
+       if (iLBCdec_inst->mode==30)
+           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2,
+                       length*sizeof(float));
+       else
+           memcpy(iLBCdec_inst->lsfdeqold, lsfdeq,
+                       length*sizeof(float));
+
+   }
+
+
+
+
+Andersen, et al.              Experimental                    [Page 166]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.37.  LPCencode.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPCencode.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LPCENCOD_H
+   #define __iLBC_LPCENCOD_H
+
+   void LPCencode(
+       float *syntdenum,   /* (i/o) synthesis filter coefficients
+                                  before/after encoding */
+       float *weightdenum, /* (i/o) weighting denumerator coefficients
+                                  before/after encoding */
+       int *lsf_index,     /* (o) lsf quantization index */
+       float *data,    /* (i) lsf coefficients to quantize */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   );
+
+   #endif
+
+A.38.  LPCencode.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       LPCencode.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "helpfun.h"
+   #include "lsf.h"
+   #include "constants.h"
+
+
+
+Andersen, et al.              Experimental                    [Page 167]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   /*----------------------------------------------------------------*
+    *  lpc analysis (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimpleAnalysis(
+       float *lsf,         /* (o) lsf coefficients */
+       float *data,    /* (i) new data vector */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       int k, is;
+       float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
+       float lp2[LPC_FILTERORDER + 1];
+       float r[LPC_FILTERORDER + 1];
+
+       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
+       memcpy(iLBCenc_inst->lpc_buffer+is,data,
+           iLBCenc_inst->blockl*sizeof(float));
+
+       /* No lookahead, last window is asymmetric */
+
+       for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
+
+           is = LPC_LOOKBACK;
+
+           if (k < (iLBCenc_inst->lpc_n - 1)) {
+               window(temp, lpc_winTbl,
+                   iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
+           } else {
+               window(temp, lpc_asymwinTbl,
+                   iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
+           }
+
+           autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
+           window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
+
+           levdurb(lp, temp, r, LPC_FILTERORDER);
+           bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
+
+           a2lsf(lsf + k*LPC_FILTERORDER, lp2);
+       }
+       is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
+       memmove(iLBCenc_inst->lpc_buffer,
+           iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is,
+           is*sizeof(float));
+   }
+
+   /*----------------------------------------------------------------*
+
+
+
+Andersen, et al.              Experimental                    [Page 168]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+    *  lsf interpolator and conversion from lsf to a coefficients
+    *  (subrutine to SimpleInterpolateLSF)
+    *---------------------------------------------------------------*/
+
+   void LSFinterpolate2a_enc(
+       float *a,       /* (o) lpc coefficients */
+       float *lsf1,/* (i) first set of lsf coefficients */
+       float *lsf2,/* (i) second set of lsf coefficients */
+       float coef,     /* (i) weighting coefficient to use between
+                              lsf1 and lsf2 */
+       long length      /* (i) length of coefficient vectors */
+   ){
+       float  lsftmp[LPC_FILTERORDER];
+
+       interpolate(lsftmp, lsf1, lsf2, coef, length);
+       lsf2a(a, lsftmp);
+   }
+
+   /*----------------------------------------------------------------*
+    *  lsf interpolator (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimpleInterpolateLSF(
+       float *syntdenum,   /* (o) the synthesis filter denominator
+                                  resulting from the quantized
+                                  interpolated lsf */
+       float *weightdenum, /* (o) the weighting filter denominator
+                                  resulting from the unquantized
+                                  interpolated lsf */
+       float *lsf,         /* (i) the unquantized lsf coefficients */
+       float *lsfdeq,      /* (i) the dequantized lsf coefficients */
+       float *lsfold,      /* (i) the unquantized lsf coefficients of
+                                  the previous signal frame */
+       float *lsfdeqold, /* (i) the dequantized lsf coefficients of
+                                  the previous signal frame */
+       int length,         /* (i) should equate LPC_FILTERORDER */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       int    i, pos, lp_length;
+       float  lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
+
+       lsf2 = lsf + length;
+       lsfdeq2 = lsfdeq + length;
+       lp_length = length + 1;
+
+       if (iLBCenc_inst->mode==30) {
+           /* sub-frame 1: Interpolation between old and first
+
+
+
+Andersen, et al.              Experimental                    [Page 169]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+              set of lsf coefficients */
+
+           LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
+               lsf_weightTbl_30ms[0], length);
+           memcpy(syntdenum,lp,lp_length*sizeof(float));
+           LSFinterpolate2a_enc(lp, lsfold, lsf,
+               lsf_weightTbl_30ms[0], length);
+           bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
+
+           /* sub-frame 2 to 6: Interpolation between first
+              and second set of lsf coefficients */
+
+           pos = lp_length;
+           for (i = 1; i < iLBCenc_inst->nsub; i++) {
+               LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2,
+                   lsf_weightTbl_30ms[i], length);
+               memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
+
+               LSFinterpolate2a_enc(lp, lsf, lsf2,
+                   lsf_weightTbl_30ms[i], length);
+               bwexpand(weightdenum + pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+       else {
+           pos = 0;
+           for (i = 0; i < iLBCenc_inst->nsub; i++) {
+               LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
+                   lsf_weightTbl_20ms[i], length);
+               memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
+               LSFinterpolate2a_enc(lp, lsfold, lsf,
+                   lsf_weightTbl_20ms[i], length);
+               bwexpand(weightdenum+pos, lp,
+                   LPC_CHIRP_WEIGHTDENUM, lp_length);
+               pos += lp_length;
+           }
+       }
+
+       /* update memory */
+
+       if (iLBCenc_inst->mode==30) {
+           memcpy(lsfold, lsf2, length*sizeof(float));
+           memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
+       }
+       else {
+           memcpy(lsfold, lsf, length*sizeof(float));
+           memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
+
+
+
+Andersen, et al.              Experimental                    [Page 170]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lsf quantizer (subrutine to LPCencode)
+    *---------------------------------------------------------------*/
+
+   void SimplelsfQ(
+       float *lsfdeq,    /* (o) dequantized lsf coefficients
+                              (dimension FILTERORDER) */
+       int *index,     /* (o) quantization index */
+       float *lsf,      /* (i) the lsf coefficient vector to be
+                              quantized (dimension FILTERORDER ) */
+       int lpc_n     /* (i) number of lsf sets to quantize */
+   ){
+       /* Quantize first LSF with memoryless split VQ */
+       SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT,
+           dim_lsfCbTbl, size_lsfCbTbl);
+
+       if (lpc_n==2) {
+           /* Quantize second LSF with memoryless split VQ */
+           SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT,
+               lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT,
+               dim_lsfCbTbl, size_lsfCbTbl);
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  lpc encoder
+    *---------------------------------------------------------------*/
+
+   void LPCencode(
+       float *syntdenum, /* (i/o) synthesis filter coefficients
+                                  before/after encoding */
+       float *weightdenum, /* (i/o) weighting denumerator
+                                  coefficients before/after
+                                  encoding */
+       int *lsf_index,     /* (o) lsf quantization index */
+       float *data,    /* (i) lsf coefficients to quantize */
+       iLBC_Enc_Inst_t *iLBCenc_inst
+                           /* (i/o) the encoder state structure */
+   ){
+       float lsf[LPC_FILTERORDER * LPC_N_MAX];
+       float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
+       int change=0;
+
+       SimpleAnalysis(lsf, data, iLBCenc_inst);
+       SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
+
+
+
+Andersen, et al.              Experimental                    [Page 171]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
+       SimpleInterpolateLSF(syntdenum, weightdenum,
+           lsf, lsfdeq, iLBCenc_inst->lsfold,
+           iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
+   }
+
+A.39.  lsf.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       lsf.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_LSF_H
+   #define __iLBC_LSF_H
+
+   void a2lsf(
+       float *freq,/* (o) lsf coefficients */
+       float *a    /* (i) lpc coefficients */
+   );
+
+   void lsf2a(
+       float *a_coef,  /* (o) lpc coefficients */
+       float *freq     /* (i) lsf coefficients */
+   );
+
+   #endif
+
+A.40.  lsf.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       lsf.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <string.h>
+
+
+
+Andersen, et al.              Experimental                    [Page 172]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   #include <math.h>
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  conversion from lpc coefficients to lsf coefficients
+    *---------------------------------------------------------------*/
+
+   void a2lsf(
+       float *freq,/* (o) lsf coefficients */
+       float *a    /* (i) lpc coefficients */
+   ){
+       float steps[LSF_NUMBER_OF_STEPS] =
+           {(float)0.00635, (float)0.003175, (float)0.0015875,
+           (float)0.00079375};
+       float step;
+       int step_idx;
+       int lsp_index;
+       float p[LPC_HALFORDER];
+       float q[LPC_HALFORDER];
+       float p_pre[LPC_HALFORDER];
+       float q_pre[LPC_HALFORDER];
+       float old_p, old_q, *old;
+       float *pq_coef;
+       float omega, old_omega;
+       int i;
+       float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
+
+       for (i=0; i<LPC_HALFORDER; i++) {
+           p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
+           q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
+       }
+
+       p_pre[0] = (float)-1.0 - p[0];
+       p_pre[1] = - p_pre[0] - p[1];
+       p_pre[2] = - p_pre[1] - p[2];
+       p_pre[3] = - p_pre[2] - p[3];
+       p_pre[4] = - p_pre[3] - p[4];
+       p_pre[4] = p_pre[4] / 2;
+
+       q_pre[0] = (float)1.0 - q[0];
+       q_pre[1] = q_pre[0] - q[1];
+       q_pre[2] = q_pre[1] - q[2];
+       q_pre[3] = q_pre[2] - q[3];
+       q_pre[4] = q_pre[3] - q[4];
+       q_pre[4] = q_pre[4] / 2;
+
+       omega = 0.0;
+
+
+
+Andersen, et al.              Experimental                    [Page 173]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       old_omega = 0.0;
+
+       old_p = FLOAT_MAX;
+       old_q = FLOAT_MAX;
+
+       /* Here we loop through lsp_index to find all the
+          LPC_FILTERORDER roots for omega. */
+
+       for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
+
+           /* Depending on lsp_index being even or odd, we
+           alternatively solve the roots for the two LSP equations. */
+
+
+           if ((lsp_index & 0x1) == 0) {
+               pq_coef = p_pre;
+               old = &old_p;
+           } else {
+               pq_coef = q_pre;
+               old = &old_q;
+           }
+
+           /* Start with low resolution grid */
+
+           for (step_idx = 0, step = steps[step_idx];
+               step_idx < LSF_NUMBER_OF_STEPS;){
+
+               /*  cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) +
+               pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
+
+               hlp = (float)cos(omega * TWO_PI);
+               hlp1 = (float)2.0 * hlp + pq_coef[0];
+               hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 +
+                   pq_coef[1];
+               hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
+               hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
+               hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
+
+
+               if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
+
+                   if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
+
+                       if (fabs(hlp5) >= fabs(*old)) {
+                           freq[lsp_index] = omega - step;
+                       } else {
+                           freq[lsp_index] = omega;
+                       }
+
+
+
+Andersen, et al.              Experimental                    [Page 174]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+
+
+                       if ((*old) >= 0.0){
+                           *old = (float)-1.0 * FLOAT_MAX;
+                       } else {
+                           *old = FLOAT_MAX;
+                       }
+
+                       omega = old_omega;
+                       step_idx = 0;
+
+                       step_idx = LSF_NUMBER_OF_STEPS;
+                   } else {
+
+                       if (step_idx == 0) {
+                           old_omega = omega;
+                       }
+
+                       step_idx++;
+                       omega -= steps[step_idx];
+
+                       /* Go back one grid step */
+
+                       step = steps[step_idx];
+                   }
+               } else {
+
+               /* increment omega until they are of different sign,
+               and we know there is at least one root between omega
+               and old_omega */
+                   *old = hlp5;
+                   omega += step;
+               }
+           }
+       }
+
+       for (i = 0; i<LPC_FILTERORDER; i++) {
+           freq[i] = freq[i] * TWO_PI;
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  conversion from lsf coefficients to lpc coefficients
+    *---------------------------------------------------------------*/
+
+   void lsf2a(
+       float *a_coef,  /* (o) lpc coefficients */
+       float *freq     /* (i) lsf coefficients */
+
+
+
+Andersen, et al.              Experimental                    [Page 175]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   ){
+       int i, j;
+       float hlp;
+       float p[LPC_HALFORDER], q[LPC_HALFORDER];
+       float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
+           a2[LPC_HALFORDER];
+       float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER],
+           b2[LPC_HALFORDER];
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           freq[i] = freq[i] * PI2;
+       }
+
+       /* Check input for ill-conditioned cases.  This part is not
+       found in the TIA standard.  It involves the following 2 IF
+       blocks.  If "freq" is judged ill-conditioned, then we first
+       modify freq[0] and freq[LPC_HALFORDER-1] (normally
+       LPC_HALFORDER = 10 for LPC applications), then we adjust
+       the other "freq" values slightly */
+
+
+       if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
+
+
+           if (freq[0] <= 0.0) {
+               freq[0] = (float)0.022;
+           }
+
+
+           if (freq[LPC_FILTERORDER - 1] >= 0.5) {
+               freq[LPC_FILTERORDER - 1] = (float)0.499;
+           }
+
+           hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) /
+               (float) (LPC_FILTERORDER - 1);
+
+           for (i=1; i<LPC_FILTERORDER; i++) {
+               freq[i] = freq[i - 1] + hlp;
+           }
+       }
+
+       memset(a1, 0, LPC_HALFORDER*sizeof(float));
+       memset(a2, 0, LPC_HALFORDER*sizeof(float));
+       memset(b1, 0, LPC_HALFORDER*sizeof(float));
+       memset(b2, 0, LPC_HALFORDER*sizeof(float));
+       memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
+       memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
+
+
+
+
+Andersen, et al.              Experimental                    [Page 176]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and
+       cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.
+       Note that for this code p[i] specifies the coefficients
+       used in .Q_A(z) while q[i] specifies the coefficients used
+       in .P_A(z) */
+
+       for (i=0; i<LPC_HALFORDER; i++) {
+           p[i] = (float)cos(TWO_PI * freq[2 * i]);
+           q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
+       }
+
+       a[0] = 0.25;
+       b[0] = 0.25;
+
+       for (i= 0; i<LPC_HALFORDER; i++) {
+           a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
+           b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
+           a2[i] = a1[i];
+           a1[i] = a[i];
+           b2[i] = b1[i];
+           b1[i] = b[i];
+       }
+
+       for (j=0; j<LPC_FILTERORDER; j++) {
+
+           if (j == 0) {
+               a[0] = 0.25;
+               b[0] = -0.25;
+           } else {
+               a[0] = b[0] = 0.0;
+           }
+
+           for (i=0; i<LPC_HALFORDER; i++) {
+               a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
+               b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
+               a2[i] = a1[i];
+               a1[i] = a[i];
+               b2[i] = b1[i];
+               b1[i] = b[i];
+           }
+
+           a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
+       }
+
+       a_coef[0] = 1.0;
+   }
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 177]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.41.  packing.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       packing.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __PACKING_H
+   #define __PACKING_H
+
+   void packsplit(
+       int *index,                 /* (i) the value to split */
+       int *firstpart,             /* (o) the value specified by most
+                                          significant bits */
+       int *rest,                  /* (o) the value specified by least
+                                          significant bits */
+       int bitno_firstpart,    /* (i) number of bits in most
+                                          significant part */
+       int bitno_total             /* (i) number of bits in full range
+                                          of value */
+   );
+
+   void packcombine(
+       int *index,                 /* (i/o) the msb value in the
+                                          combined value out */
+       int rest,                   /* (i) the lsb value */
+       int bitno_rest              /* (i) the number of bits in the
+                                          lsb part */
+   );
+
+   void dopack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to pack
+                                          new data, on exit pointer
+                                          to place in bitstream to
+                                          pack future data */
+       int index,                  /* (i) the value to pack */
+       int bitno,                  /* (i) the number of bits that the
+                                          value will fit within */
+       int *pos                /* (i/o) write position in the
+                                          current byte */
+   );
+
+
+
+Andersen, et al.              Experimental                    [Page 178]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   void unpack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to
+                                          unpack new data from, on
+                                          exit pointer to place in
+                                          bitstream to unpack future
+                                          data from */
+       int *index,                 /* (o) resulting value */
+       int bitno,                  /* (i) number of bits used to
+                                          represent the value */
+       int *pos                /* (i/o) read position in the
+                                          current byte */
+   );
+
+   #endif
+
+A.42.  packing.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       packing.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <stdlib.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "helpfun.h"
+   #include "string.h"
+
+   /*----------------------------------------------------------------*
+    *  splitting an integer into first most significant bits and
+    *  remaining least significant bits
+    *---------------------------------------------------------------*/
+
+   void packsplit(
+       int *index,                 /* (i) the value to split */
+       int *firstpart,             /* (o) the value specified by most
+                                          significant bits */
+       int *rest,                  /* (o) the value specified by least
+                                          significant bits */
+
+
+
+Andersen, et al.              Experimental                    [Page 179]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       int bitno_firstpart,    /* (i) number of bits in most
+                                          significant part */
+       int bitno_total             /* (i) number of bits in full range
+                                          of value */
+   ){
+       int bitno_rest = bitno_total-bitno_firstpart;
+
+       *firstpart = *index>>(bitno_rest);
+       *rest = *index-(*firstpart<<(bitno_rest));
+   }
+
+   /*----------------------------------------------------------------*
+    *  combining a value corresponding to msb's with a value
+    *  corresponding to lsb's
+    *---------------------------------------------------------------*/
+
+   void packcombine(
+       int *index,                 /* (i/o) the msb value in the
+                                          combined value out */
+       int rest,                   /* (i) the lsb value */
+       int bitno_rest              /* (i) the number of bits in the
+                                          lsb part */
+   ){
+       *index = *index<<bitno_rest;
+       *index += rest;
+   }
+
+   /*----------------------------------------------------------------*
+    *  packing of bits into bitstream, i.e., vector of bytes
+    *---------------------------------------------------------------*/
+
+   void dopack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to pack
+                                          new data, on exit pointer
+                                          to place in bitstream to
+                                          pack future data */
+       int index,                  /* (i) the value to pack */
+       int bitno,                  /* (i) the number of bits that the
+                                          value will fit within */
+       int *pos                /* (i/o) write position in the
+                                          current byte */
+   ){
+       int posLeft;
+
+       /* Clear the bits before starting in a new byte */
+
+       if ((*pos)==0) {
+
+
+
+Andersen, et al.              Experimental                    [Page 180]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           **bitstream=0;
+       }
+
+       while (bitno>0) {
+
+           /* Jump to the next byte if end of this byte is reached*/
+
+           if (*pos==8) {
+               *pos=0;
+               (*bitstream)++;
+               **bitstream=0;
+           }
+
+           posLeft=8-(*pos);
+
+           /* Insert index into the bitstream */
+
+           if (bitno <= posLeft) {
+               **bitstream |= (unsigned char)(index<<(posLeft-bitno));
+               *pos+=bitno;
+               bitno=0;
+           } else {
+               **bitstream |= (unsigned char)(index>>(bitno-posLeft));
+
+               *pos=8;
+               index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
+
+               bitno-=posLeft;
+           }
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  unpacking of bits from bitstream, i.e., vector of bytes
+    *---------------------------------------------------------------*/
+
+   void unpack(
+       unsigned char **bitstream,  /* (i/o) on entrance pointer to
+                                          place in bitstream to
+                                          unpack new data from, on
+                                          exit pointer to place in
+                                          bitstream to unpack future
+                                          data from */
+       int *index,                 /* (o) resulting value */
+       int bitno,                  /* (i) number of bits used to
+                                          represent the value */
+       int *pos                /* (i/o) read position in the
+                                          current byte */
+
+
+
+Andersen, et al.              Experimental                    [Page 181]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   ){
+       int BitsLeft;
+
+       *index=0;
+
+       while (bitno>0) {
+
+           /* move forward in bitstream when the end of the
+              byte is reached */
+
+           if (*pos==8) {
+               *pos=0;
+               (*bitstream)++;
+           }
+
+           BitsLeft=8-(*pos);
+
+           /* Extract bits to index */
+
+           if (BitsLeft>=bitno) {
+               *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
+
+               *pos+=bitno;
+               bitno=0;
+           } else {
+
+               if ((8-bitno)>0) {
+                   *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
+                       (8-bitno));
+                   *pos=8;
+               } else {
+                   *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
+                       (bitno-8));
+                   *pos=8;
+               }
+               bitno-=BitsLeft;
+           }
+       }
+   }
+
+A.43.  StateConstructW.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateConstructW.h
+
+
+
+
+Andersen, et al.              Experimental                    [Page 182]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_STATECONSTRUCTW_H
+   #define __iLBC_STATECONSTRUCTW_H
+
+   void StateConstructW(
+       int idxForMax,      /* (i) 6-bit index for the quantization of
+                                  max amplitude */
+       int *idxVec,    /* (i) vector of quantization indexes */
+       float *syntDenum,   /* (i) synthesis filter denumerator */
+       float *out,         /* (o) the decoded state vector */
+       int len             /* (i) length of a state vector */
+   );
+
+   #endif
+
+A.44.  StateConstructW.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateConstructW.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+
+   /*----------------------------------------------------------------*
+    *  decoding of the start state
+    *---------------------------------------------------------------*/
+
+   void StateConstructW(
+       int idxForMax,      /* (i) 6-bit index for the quantization of
+                                  max amplitude */
+       int *idxVec,    /* (i) vector of quantization indexes */
+       float *syntDenum,   /* (i) synthesis filter denumerator */
+
+
+
+Andersen, et al.              Experimental                    [Page 183]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *out,         /* (o) the decoded state vector */
+       int len             /* (i) length of a state vector */
+   ){
+       float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp,
+           numerator[LPC_FILTERORDER+1];
+       float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
+       int k,tmpi;
+
+       /* decoding of the maximum value */
+
+       maxVal = state_frgqTbl[idxForMax];
+       maxVal = (float)pow(10,maxVal)/(float)4.5;
+
+       /* initialization of buffers and coefficients */
+
+       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
+       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
+       for (k=0; k<LPC_FILTERORDER; k++) {
+           numerator[k]=syntDenum[LPC_FILTERORDER-k];
+       }
+       numerator[LPC_FILTERORDER]=syntDenum[0];
+       tmp = &tmpbuf[LPC_FILTERORDER];
+       fout = &foutbuf[LPC_FILTERORDER];
+
+       /* decoding of the sample values */
+
+       for (k=0; k<len; k++) {
+           tmpi = len-1-k;
+           /* maxVal = 1/scal */
+           tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
+       }
+
+       /* circular convolution with all-pass filter */
+
+       memset(tmp+len, 0, len*sizeof(float));
+       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
+           LPC_FILTERORDER, fout);
+       for (k=0;k<len;k++) {
+           out[k] = fout[len-1-k]+fout[2*len-1-k];
+       }
+   }
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 184]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.45.  StateSearchW.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateSearchW.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_STATESEARCHW_H
+   #define __iLBC_STATESEARCHW_H
+
+   void AbsQuantW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *in,          /* (i) vector to encode */
+       float *syntDenum,   /* (i) denominator of synthesis filter */
+       float *weightDenum, /* (i) denominator of weighting filter */
+       int *out,           /* (o) vector of quantizer indexes */
+       int len,        /* (i) length of vector to encode and
+                                  vector of quantizer indexes */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   );
+
+   void StateSearchW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *residual,/* (i) target residual vector */
+       float *syntDenum,   /* (i) lpc synthesis filter */
+       float *weightDenum, /* (i) weighting filter denuminator */
+       int *idxForMax,     /* (o) quantizer index for maximum
+                                  amplitude */
+       int *idxVec,    /* (o) vector of quantization indexes */
+       int len,        /* (i) length of all vectors */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   );
+
+
+   #endif
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 185]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.46.  StateSearchW.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       StateSearchW.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include <math.h>
+   #include <string.h>
+
+   #include "iLBC_define.h"
+   #include "constants.h"
+   #include "filter.h"
+   #include "helpfun.h"
+
+   /*----------------------------------------------------------------*
+    *  predictive noise shaping encoding of scaled start state
+    *  (subrutine for StateSearchW)
+    *---------------------------------------------------------------*/
+
+   void AbsQuantW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *in,          /* (i) vector to encode */
+       float *syntDenum,   /* (i) denominator of synthesis filter */
+       float *weightDenum, /* (i) denominator of weighting filter */
+       int *out,           /* (o) vector of quantizer indexes */
+       int len,        /* (i) length of vector to encode and
+                                  vector of quantizer indexes */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   ){
+       float *syntOut;
+       float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
+       float toQ, xq;
+       int n;
+       int index;
+
+       /* initialization of buffer for filtering */
+
+       memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
+
+
+
+
+Andersen, et al.              Experimental                    [Page 186]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       /* initialization of pointer for filtering */
+
+       syntOut = &syntOutBuf[LPC_FILTERORDER];
+
+       /* synthesis and weighting filters on input */
+
+       if (state_first) {
+           AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
+       } else {
+           AllPoleFilter (in, weightDenum,
+               iLBCenc_inst->state_short_len-SUBL,
+               LPC_FILTERORDER);
+       }
+
+       /* encoding loop */
+
+       for (n=0; n<len; n++) {
+
+           /* time update of filter coefficients */
+
+           if ((state_first)&&(n==SUBL)){
+               syntDenum += (LPC_FILTERORDER+1);
+               weightDenum += (LPC_FILTERORDER+1);
+
+               /* synthesis and weighting filters on input */
+               AllPoleFilter (&in[n], weightDenum, len-n,
+                   LPC_FILTERORDER);
+
+           } else if ((state_first==0)&&
+               (n==(iLBCenc_inst->state_short_len-SUBL))) {
+               syntDenum += (LPC_FILTERORDER+1);
+               weightDenum += (LPC_FILTERORDER+1);
+
+               /* synthesis and weighting filters on input */
+               AllPoleFilter (&in[n], weightDenum, len-n,
+                   LPC_FILTERORDER);
+
+           }
+
+           /* prediction of synthesized and weighted input */
+
+           syntOut[n] = 0.0;
+           AllPoleFilter (&syntOut[n], weightDenum, 1,
+               LPC_FILTERORDER);
+
+           /* quantization */
+
+           toQ = in[n]-syntOut[n];
+
+
+
+Andersen, et al.              Experimental                    [Page 187]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+           sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
+           out[n]=index;
+           syntOut[n] = state_sq3Tbl[out[n]];
+
+           /* update of the prediction filter */
+
+           AllPoleFilter(&syntOut[n], weightDenum, 1,
+               LPC_FILTERORDER);
+       }
+   }
+
+   /*----------------------------------------------------------------*
+    *  encoding of start state
+    *---------------------------------------------------------------*/
+
+   void StateSearchW(
+       iLBC_Enc_Inst_t *iLBCenc_inst,
+                           /* (i) Encoder instance */
+       float *residual,/* (i) target residual vector */
+       float *syntDenum,   /* (i) lpc synthesis filter */
+       float *weightDenum, /* (i) weighting filter denuminator */
+       int *idxForMax,     /* (o) quantizer index for maximum
+                                  amplitude */
+       int *idxVec,    /* (o) vector of quantization indexes */
+       int len,        /* (i) length of all vectors */
+       int state_first     /* (i) position of start state in the
+                                  80 vec */
+   ){
+       float dtmp, maxVal;
+       float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
+       float *tmp, numerator[1+LPC_FILTERORDER];
+       float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
+       int k;
+       float qmax, scal;
+
+       /* initialization of buffers and filter coefficients */
+
+       memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
+       memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
+       for (k=0; k<LPC_FILTERORDER; k++) {
+           numerator[k]=syntDenum[LPC_FILTERORDER-k];
+       }
+       numerator[LPC_FILTERORDER]=syntDenum[0];
+       tmp = &tmpbuf[LPC_FILTERORDER];
+       fout = &foutbuf[LPC_FILTERORDER];
+
+       /* circular convolution with the all-pass filter */
+
+
+
+
+Andersen, et al.              Experimental                    [Page 188]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       memcpy(tmp, residual, len*sizeof(float));
+       memset(tmp+len, 0, len*sizeof(float));
+       ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
+           LPC_FILTERORDER, fout);
+       for (k=0; k<len; k++) {
+           fout[k] += fout[k+len];
+       }
+
+       /* identification of the maximum amplitude value */
+
+       maxVal = fout[0];
+       for (k=1; k<len; k++) {
+
+           if (fout[k]*fout[k] > maxVal*maxVal){
+               maxVal = fout[k];
+           }
+       }
+       maxVal=(float)fabs(maxVal);
+
+       /* encoding of the maximum amplitude value */
+
+       if (maxVal < 10.0) {
+           maxVal = 10.0;
+       }
+       maxVal = (float)log10(maxVal);
+       sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
+
+       /* decoding of the maximum amplitude representation value,
+          and corresponding scaling of start state */
+
+       maxVal=state_frgqTbl[*idxForMax];
+       qmax = (float)pow(10,maxVal);
+       scal = (float)(4.5)/qmax;
+       for (k=0; k<len; k++){
+           fout[k] *= scal;
+       }
+
+       /* predictive noise shaping encoding of scaled start state */
+
+       AbsQuantW(iLBCenc_inst, fout,syntDenum,
+           weightDenum,idxVec, len, state_first);
+   }
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 189]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+A.47.  syntFilter.h
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       syntFilter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_SYNTFILTER_H
+   #define __iLBC_SYNTFILTER_H
+
+   void syntFilter(
+       float *Out,     /* (i/o) Signal to be filtered */
+       float *a,       /* (i) LP parameters */
+       int len,    /* (i) Length of signal */
+       float *mem      /* (i/o) Filter state */
+   );
+
+   #endif
+
+A.48.  syntFilter.c
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       syntFilter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  LP synthesis filter.
+    *---------------------------------------------------------------*/
+
+   void syntFilter(
+       float *Out,     /* (i/o) Signal to be filtered */
+       float *a,       /* (i) LP parameters */
+       int len,    /* (i) Length of signal */
+
+
+
+Andersen, et al.              Experimental                    [Page 190]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+       float *mem      /* (i/o) Filter state */
+   ){
+       int i, j;
+       float *po, *pi, *pa, *pm;
+
+       po=Out;
+
+       /* Filter first part using memory from past */
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           pi=&Out[i-1];
+           pa=&a[1];
+           pm=&mem[LPC_FILTERORDER-1];
+           for (j=1; j<=i; j++) {
+               *po-=(*pa++)*(*pi--);
+           }
+           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
+               *po-=(*pa++)*(*pm--);
+           }
+           po++;
+       }
+
+       /* Filter last part where the state is entirely in
+          the output vector */
+
+       for (i=LPC_FILTERORDER; i<len; i++) {
+           pi=&Out[i-1];
+           pa=&a[1];
+           for (j=1; j<LPC_FILTERORDER+1; j++) {
+               *po-=(*pa++)*(*pi--);
+           }
+           po++;
+       }
+
+       /* Update state vector */
+
+       memcpy(mem, &Out[len-LPC_FILTERORDER],
+           LPC_FILTERORDER*sizeof(float));
+   }
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 191]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+Authors' Addresses
+
+   Soren Vang Andersen
+   Department of Communication Technology
+   Aalborg University
+   Fredrik Bajers Vej 7A
+   9200 Aalborg
+   Denmark
+
+   Phone:  ++45 9 6358627
+   EMail:  sva@kom.auc.dk
+
+
+   Alan Duric
+   Telio AS
+   Stoperigt. 2
+   Oslo, N-0250
+   Norway
+
+   Phone:  +47 21673555
+   EMail:  alan.duric@telio.no
+
+
+   Henrik Astrom
+   Global IP Sound AB
+   Olandsgatan 42
+   Stockholm, S-11663
+   Sweden
+
+   Phone:  +46 8 54553040
+   EMail:  henrik.astrom@globalipsound.com
+
+
+   Roar Hagen
+   Global IP Sound AB
+   Olandsgatan 42
+   Stockholm, S-11663
+   Sweden
+
+   Phone:  +46 8 54553040
+   EMail:  roar.hagen@globalipsound.com
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 192]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+   W. Bastiaan Kleijn
+   Global IP Sound AB
+   Olandsgatan 42
+   Stockholm, S-11663
+   Sweden
+
+   Phone:  +46 8 54553040
+   EMail:  bastiaan.kleijn@globalipsound.com
+
+
+   Jan Linden
+   Global IP Sound Inc.
+   900 Kearny Street, suite 500
+   San Francisco, CA-94133
+   USA
+
+   Phone: +1 415 397 2555
+   EMail: jan.linden@globalipsound.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 193]
+
+RFC 3951              Internet Low Bit Rate Codec          December 2004
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2004).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+   ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+   INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+   INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the IETF's procedures with respect to rights in IETF Documents can
+   be found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at ietf-
+   ipr@ietf.org.
+
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+Andersen, et al.              Experimental                    [Page 194]
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
new file mode 100644
index 0000000..190eb00
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c
@@ -0,0 +1,80 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       syntFilter.c
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #include "iLBC_define.h"
+
+   /*----------------------------------------------------------------*
+    *  LP synthesis filter.
+    *---------------------------------------------------------------*/
+
+   void syntFilter(
+       float *Out,     /* (i/o) Signal to be filtered */
+       float *a,       /* (i) LP parameters */
+       int len,    /* (i) Length of signal */
+
+
+
+
+
+       float *mem      /* (i/o) Filter state */
+   ){
+       int i, j;
+       float *po, *pi, *pa, *pm;
+
+       po=Out;
+
+       /* Filter first part using memory from past */
+
+       for (i=0; i<LPC_FILTERORDER; i++) {
+           pi=&Out[i-1];
+           pa=&a[1];
+           pm=&mem[LPC_FILTERORDER-1];
+           for (j=1; j<=i; j++) {
+               *po-=(*pa++)*(*pi--);
+           }
+           for (j=i+1; j<LPC_FILTERORDER+1; j++) {
+               *po-=(*pa++)*(*pm--);
+           }
+           po++;
+       }
+
+       /* Filter last part where the state is entirely in
+          the output vector */
+
+       for (i=LPC_FILTERORDER; i<len; i++) {
+           pi=&Out[i-1];
+           pa=&a[1];
+           for (j=1; j<LPC_FILTERORDER+1; j++) {
+               *po-=(*pa++)*(*pi--);
+           }
+           po++;
+       }
+
+       /* Update state vector */
+
+       memcpy(mem, &Out[len-LPC_FILTERORDER],
+           LPC_FILTERORDER*sizeof(float));
+   }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
new file mode 100644
index 0000000..8865b89
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h
@@ -0,0 +1,24 @@
+
+   /******************************************************************
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       syntFilter.h
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+
+   ******************************************************************/
+
+   #ifndef __iLBC_SYNTFILTER_H
+   #define __iLBC_SYNTFILTER_H
+
+   void syntFilter(
+       float *Out,     /* (i/o) Signal to be filtered */
+       float *a,       /* (i) LP parameters */
+       int len,    /* (i) Length of signal */
+       float *mem      /* (i/o) Filter state */
+   );
+
+   #endif
+
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.confd b/net-misc/asterisk/files/1.4.39.1/asterisk.confd
new file mode 100644
index 0000000..fac8683
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/asterisk.confd
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.confd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=" -p -vvv -c"
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#
+#         ":asterisk" to run as user "root" and group "asterisk"
+#
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER=""
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+ASTERISK_MAX_FD="65535"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+ASTERISK_RESTART_DELAY=5
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.initd b/net-misc/asterisk/files/1.4.39.1/asterisk.initd
new file mode 100755
index 0000000..c564fcf
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/asterisk.initd
@@ -0,0 +1,295 @@
+#!/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/asterisk/files/1.8.0/asterisk.initd5,v 1.1 2013/01/24 13:10:46 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r /var/run/asterisk/asterisk.pid ] || return 1
+	local ast_pid="`pidof asterisk`"
+	if [ -z "${ast_pid}" ]; then
+		return 1
+	else
+		PID="`cat /var/run/asterisk/asterisk.pid`"
+		for x in ${ast_pid}; do
+			if [ "${x}" = "${PID}" ]; then
+				return 0
+			fi	
+		done
+	fi
+
+	return 1
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing asterisk wrapper"
+	OPTS="$*"
+
+	trap "rm -f /var/run/asterisk/wrapper_loop.running" EXIT
+	touch "/var/run/asterisk/wrapper_loop.running"
+
+	while [ -r "/var/run/asterisk/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F ${TTY} sane
+			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ $result -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ $result -gt 128 ]; then
+				signal=`expr $result - 128`
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 `pidof ${X}`;
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >${TTY} \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID NICE=""
+	local tmp x
+
+	local OPTS ARGS 
+		
+	ebegin "Starting asterisk PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
+
+	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
+		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
+		if [ -n "${USER}" ]; then
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
+		for element in `find /var/{log,run}/asterisk`; do
+			if [ `stat -c %U $element` != "${USER}" ]; then
+ 				ewarn "${USER} is not the owner of $element, fixing."
+				chown -R ${USER} /var/{log,run}/asterisk
+				chmod -R u+r /var/{log,run}/asterisk
+				chmod u+x /var/{log,run}/asterisk
+			fi;
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+	fi
+
+	eoutdent
+	eend $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
+		ebegin "Killing wrapper script"
+		kill `cat /var/run/asterisk/wrapper_loop.pid`
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r /var/run/asterisk/wrapper_loop.running ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm /var/run/asterisk/wrapper_loop.running
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -r -x "stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate b/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
new file mode 100644
index 0000000..f6e61db
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/asterisk.logrotate
@@ -0,0 +1,8 @@
+/var/log/asterisk/event_log /var/log/asterisk/full /var/log/asterisk/queue_log /var/log/asterisk/console{ 
+   missingok 
+   rotate 2
+   daily 
+   postrotate 
+       /usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null 
+   endscript 
+} 
diff --git a/net-misc/asterisk/files/1.4.39.1/dahdi.initd b/net-misc/asterisk/files/1.4.39.1/dahdi.initd
new file mode 100755
index 0000000..a2f2a5b
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/dahdi.initd
@@ -0,0 +1,229 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Ultimate Linux Solutions CC
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before dahdi
+	after wanrouter
+}
+
+dahdi_load_modules() {
+	local hwlist loc status mod mod_vname pciid desc
+
+	hwlist=$(/usr/sbin/dahdi_hardware)
+
+	if [ -z "${hwlist}" ]; then
+		einfo "No digium hardware found."
+		/sbin/modprobe dahdi max_pseudo_channels=8192
+		#ebegin "Loading module wanpipe_voicetime"
+		#/sbin/modprobe wanpipe_voicetime
+		ebegin "Loading module dahdi_dummy"
+		/sbin/modprobe dahdi_dummy
+		eend $?
+		return
+	fi
+
+	echo "${hwlist}" | while read loc mod pciid desc; do
+		status="${mod:${#mod}-1:1}"
+		mod="${mod%[+-]}"
+		mod_vname="mod_${mod}"
+
+		einfo "Found $desc at $loc (module: $mod)"
+
+		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
+			ebegin "Loading module $mod"
+			/sbin/modprobe $mod
+			eend
+
+			[ $? -eq 0 ] && eval "$mod_vname=loaded"
+		fi
+	done
+}
+
+dahdi_module_unload() {
+	local mod=$1 s
+	[ -d /sys/module/${mod} ] || return 0
+
+	for s in $(find /sys/module/${mod}/holders -type l); do
+		dahdi_module_unload $(basename $s)
+	done
+
+	ebegin "Removing dahdi module: $mod"
+	/sbin/rmmod $mod
+	eend $?
+}
+
+dahdi_gen_fxo_config() {
+	local port=$1
+
+	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_fxs_config() {
+	local port=$1
+
+	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_bri_te_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_bri_nt_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_e1_cpe_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_e1_net_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_conf_span() {
+	local span=$1
+	local type=$2
+	local desc=$3
+	local port=$4
+	local basechan=$5
+	local vname=""
+
+	# Analog we need to deal with on a port-by-port basis.
+	[ "${type}" = "analog" ] && return 0
+
+	echo -e "\n# ${desc}"
+	case "${type}" in
+		digital-TE)
+			dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}"
+		;;
+		digital-NT)
+			dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
+		;;
+		digital-E1)
+			# Use CPE by default.  Unfortunately there is no easy
+			# way to detect CPE vs NET as far as I know and specifying
+			# in a config that you want NET mode seems the sanest way.
+			vname="PRI_SPAN_${span}_NET"
+			if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
+				dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
+			else
+				dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
+			fi
+		;;
+		*)
+			echo "# Don't know how to configure this (type=${type})."
+			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
+		;;
+	esac
+}
+
+dahdi_gen_config() {
+	local type manufacturer devicetype basechan aport atype
+	local span=
+	local tfile="$(mktemp)"
+	local sfile="$(mktemp)"
+	local plocation=""
+	local isdnport=0
+
+	/usr/sbin/dahdi_scan > "${sfile}" 
+	exec 3<"${sfile}"
+
+	echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}"
+	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}"
+
+	while read LINE <&3; do
+		case "$LINE" in
+			[[]*[]])
+				[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
+				span="${LINE%?}"
+				span="${span#?}"
+			;;
+			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+			;;
+			location=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+				if [ "${location}" == "${plocation}" ]; then
+					(( ++isdnport ))
+				else
+					plocation="${location}"
+					isdnport=1
+				fi
+			;;
+			port=*)
+				# For analog cards only.
+				aport="${LINE#*=}"; aport="${aport%,*}"
+				atype="${LINE#*,}"
+				[ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}"
+				case "${atype}" in
+					FXO)
+						dahdi_gen_fxo_config $aport >> "${tfile}"
+					;;
+					FXS)
+						dahdi_gen_fxs_config $aport >> "${tfile}"
+					;;
+				esac
+			;;
+		esac
+	done
+	
+	[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
+
+	echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}"
+
+	exec 3<&-
+
+	rm -f "${sfile}"
+	mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
+	mv "${tfile}" /etc/dahdi/system.conf
+}
+
+start() {
+	dahdi_load_modules
+
+	if [ ! -r /dev/dahdi/ctl ]; then
+		eerror "No DAHDI compatible cards detected."
+		return 1
+	fi
+
+	ebegin "Generating DAHDI Configuration"
+	dahdi_gen_config
+	eend $?
+}
+
+stop() {
+	dahdi_module_unload dahdi
+}
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
new file mode 100644
index 0000000..7b0ae86
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/apps_.moduleinfo.patch
@@ -0,0 +1,281 @@
+--- asterisk-1.4.39.1/apps/.moduleinfo	2011-01-17 11:08:18.000000000 -0800
++++ asterisk-1.4.39.1-vici/apps/.moduleinfo	2013-05-13 21:48:22.000000000 -0700
+@@ -1,179 +1,179 @@
+ <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
+-<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
+-	<depend>res_adsi</depend>
+-</member>
+-<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
++<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
+ </member>
+-<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
++<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
++	<depend>dahdi</depend>
++	<depend>tonezone</depend>
++	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
++<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
+ </member>
+-<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
++<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
+ </member>
+-<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
++<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
+ </member>
+-<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
++<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
+ </member>
+-<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
++<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
+ </member>
+-<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
++<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
+ </member>
+-<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
+-	<depend>dahdi</depend>
++<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
++	<depend>res_indications</depend>
+ </member>
+-<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
+-	<depend>dahdi</depend>
+-	<depend>working_fork</depend>
++<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
+ </member>
+-<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
+-	<depend>dahdi</depend>
++<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
+ </member>
+-<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
++<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
+ </member>
+-<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
+-        <depend>chan_local</depend>
++<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
+ </member>
+ <member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
+ </member>
+-<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
++<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
++	<depend>dahdi</depend>
++	<depend>app_meetme</depend>
+ </member>
+-<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
++<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
+ </member>
+-<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
++<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
+ </member>
+-<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
++<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
+ </member>
+-<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
++<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
+ </member>
+-<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
++<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
+ </member>
+-<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
+-	<depend>working_fork</depend>
++<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
+ </member>
+-<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
+-	<depend>working_fork</depend>
++<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
+ </member>
+-<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
+-	<depend>dahdi</depend>
++<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
+ </member>
+-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
+-        <depend>chan_local</depend>
++<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
+ </member>
+-<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
++<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
+ </member>
+-<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
++<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
+ </member>
+-<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
++<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
++	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
+-	<depend>working_fork</depend>
++<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
++</member>
++<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
++</member>
++<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
++	<depend>res_adsi</depend>
++	<depend>res_smdi</depend>
+ </member>
+ <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
+ </member>
+-<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
+-	<defaultenabled>no</defaultenabled>
++<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
++        <depend>chan_local</depend>
+ </member>
+-<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
++<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
+ </member>
+-<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
++<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
+ </member>
+-<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
++<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
+ </member>
+-<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
++<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
+ 	<depend>dahdi</depend>
+ </member>
+-<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
+-	<depend>res_indications</depend>
++<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
+ </member>
+-<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
++<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
++        <depend>chan_local</depend>
+ </member>
+-<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
++<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
++</member>
++<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
++</member>
++<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
+ </member>
+ <member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
+ 	<depend>working_fork</depend>
+ </member>
+-<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
++<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
++</member>
++<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
+ 	<depend>working_fork</depend>
+ </member>
+-<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
+-	<depend>osptk</depend>
+-	<depend>ssl</depend>
++<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
+ </member>
+-<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
++<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
+ 	<depend>dahdi</depend>
+-	<depend>app_meetme</depend>
+-</member>
+-<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
+-</member>
+-<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
+-</member>
+-<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
+-</member>
+-<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
+-        <depend>res_monitor</depend>
+ </member>
+-<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
++<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
+ </member>
+-<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
++<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
+ </member>
+-<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
++<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
++	<depend>dahdi</depend>
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
++<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
++<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
++	<depend>osptk</depend>
++	<depend>ssl</depend>
+ </member>
+-<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
+-	<depend>dahdi</depend>
+-	<depend>tonezone</depend>
++<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
+ 	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
+-</member>
+-<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
++<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
++	<depend>dahdi</depend>
+ </member>
+-<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
++<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
+ </member>
+ <member name="app_setcallerid" displayname="Set CallerID Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
+ </member>
+-<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
++<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
++	<depend>res_adsi</depend>
+ </member>
+-<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
++<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
+ </member>
+-<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
+-	<defaultenabled>no</defaultenabled>
++<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
+ </member>
+-<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
++<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
+ </member>
+-<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
++<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
+ </member>
+-<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
++<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
+ </member>
+-<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
++<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
++<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
+ </member>
+-<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
++<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
++<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
+ </member>
+-<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
++<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
+ </member>
+-<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
++<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
++        <depend>res_monitor</depend>
+ </member>
+-<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
++<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
+ </member>
+-<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
++<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
+ </member>
+-<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
+-	<depend>res_adsi</depend>
+-	<depend>res_smdi</depend>
++<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
++	<depend>dahdi</depend>
+ </member>
+-<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
++<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
+ </member>
+-<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
++<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
+ </member>
+-<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
++<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
+ </member>
+-<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
++<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
++</member>
++<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
+ </member>
+ </category>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
new file mode 100644
index 0000000..1c702a4
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_meetme.c.patch
@@ -0,0 +1,13 @@
+--- asterisk-1.4.39.1/apps/app_meetme.c	2010-12-02 05:16:15.000000000 -0800
++++ asterisk-1.4.39.1-vici/apps/app_meetme.c	2013-05-13 21:48:19.000000000 -0700
+@@ -2117,10 +2117,6 @@ static int conf_run(struct ast_channel *
+ 				break;
+ 			}
+ 
+-			/* Perform an extra hangup check just in case */
+-			if (ast_check_hangup(chan))
+-				break;
+-
+ 			c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
+ 
+ 			if (c) {
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
new file mode 100644
index 0000000..4c33e05
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/apps_app_waitforsilence.c.patch
@@ -0,0 +1,32 @@
+--- asterisk-1.4.39.1/apps/app_waitforsilence.c	2010-01-13 09:16:12.000000000 -0800
++++ asterisk-1.4.39.1-vici/apps/app_waitforsilence.c	2011-02-08 18:15:06.000000000 -0800
+@@ -83,6 +83,7 @@ static int do_waiting(struct ast_channel
+ 	int res = 0;
+ 	struct ast_dsp *sildet;	 /* silence detector dsp */
+  	time_t now;
++	int loop_count = 1;
+ 
+ 	rfmt = chan->readformat; /* Set to linear mode */
+ 	res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
+@@ -128,8 +129,19 @@ static int do_waiting(struct ast_channel
+ 			}
+ 		}
+ 
+-		if (option_verbose > 6)
+-			ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence< %dms required\n", dspsilence, silencereqd);
++		loop_count++;
++
++		/* Lets not spam the logs */
++		if (loop_count >= 51) {
++			if ((option_verbose > 6) && (option_verbose <= 21))
++				ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence < %dms required\n", dspsilence, silencereqd);
++			loop_count = 1;
++		}
++
++		/* They must really want us to spam the logs */
++		if (option_verbose > 21)
++			ast_verbose(VERBOSE_PREFIX_3 "Got %dms silence < %dms required\n", dspsilence, silencereqd);
++
+ 
+ 		if (dspsilence >= silencereqd) {
+ 			if (option_verbose > 2)
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch b/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
new file mode 100644
index 0000000..5452d86
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/build_tools_menuselect-deps.in.patch
@@ -0,0 +1,10 @@
+--- asterisk-1.4.39.1/build_tools/menuselect-deps.in	2010-01-25 13:36:33.000000000 -0800
++++ asterisk-1.4.39.1-vici/build_tools/menuselect-deps.in	2011-02-08 18:15:16.000000000 -0800
+@@ -24,6 +24,7 @@ OSSAUDIO=@PBX_OSS@
+ PGSQL=@PBX_PGSQL@
+ POPT=@PBX_POPT@
+ PRI=@PBX_PRI@
++OPENR2=@PBX_OPENR2@
+ RADIUS=@PBX_RADIUS@
+ SPEEX=@PBX_SPEEX@
+ SPEEXDSP=@PBX_SPEEXDSP@
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
new file mode 100644
index 0000000..d63b7bd
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch
@@ -0,0 +1,8 @@
+--- asterisk-1.4.39.1/channels/.chan_dahdi.moduleinfo	2011-01-17 11:08:18.000000000 -0800
++++ asterisk-1.4.39.1-vici/channels/.chan_dahdi.moduleinfo	2012-05-16 19:02:35.000000000 -0700
+@@ -4,4 +4,5 @@
+ 	<depend>tonezone</depend>
+ 	<depend>res_features</depend>
+ 	<use>pri</use>
++	<use>openr2</use>
+ </member>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
new file mode 100644
index 0000000..46848e1
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/channels_.moduleinfo.patch
@@ -0,0 +1,10 @@
+--- asterisk-1.4.39.1/channels/.moduleinfo	2011-01-17 11:08:19.000000000 -0800
++++ asterisk-1.4.39.1-vici/channels/.moduleinfo	2012-05-16 19:02:36.000000000 -0700
+@@ -11,6 +11,7 @@
+ 	<depend>tonezone</depend>
+ 	<depend>res_features</depend>
+ 	<use>pri</use>
++	<use>openr2</use>
+ </member>
+ <member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
+         <defaultenabled>no</defaultenabled>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
new file mode 100644
index 0000000..7bbb077
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_dahdi.c.patch
@@ -0,0 +1,1909 @@
+--- asterisk-1.4.39.1/channels/chan_dahdi.c	2010-11-24 14:41:07.000000000 -0800
++++ asterisk-1.4.39.1-vici/channels/chan_dahdi.c	2011-02-08 18:15:16.000000000 -0800
+@@ -43,6 +43,7 @@
+ 	<depend>tonezone</depend>
+ 	<depend>res_features</depend>
+ 	<use>pri</use>
++	<use>openr2</use>
+  ***/
+ 
+ #include "asterisk.h"
+@@ -71,6 +72,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ #include <libpri.h>
+ #endif
+ 
++#ifdef HAVE_OPENR2
++#include <openr2.h>
++#endif
++
+ #include "asterisk/lock.h"
+ #include "asterisk/channel.h"
+ #include "asterisk/config.h"
+@@ -157,6 +162,9 @@ static const char tdesc[] = "DAHDI Telep
+ #ifdef HAVE_PRI
+                " w/PRI"
+ #endif
++#ifdef HAVE_OPENR2
++	       " w/OPENR2"
++#endif
+ ;
+ 
+ #define SIG_EM		DAHDI_SIG_EM
+@@ -175,6 +183,7 @@ static const char tdesc[] = "DAHDI Telep
+ #define SIG_FXOGS	DAHDI_SIG_FXOGS
+ #define SIG_FXOKS	DAHDI_SIG_FXOKS
+ #define SIG_PRI		DAHDI_SIG_CLEAR
++#define SIG_MFCR2	DAHDI_SIG_CAS
+ #define	SIG_SF		DAHDI_SIG_SF
+ #define SIG_SFWINK 	(0x0100000 | DAHDI_SIG_SF)
+ #define SIG_SF_FEATD	(0x0200000 | DAHDI_SIG_SF)
+@@ -300,6 +309,45 @@ struct dahdi_pvt;
+  */
+ static int ringt_base = DEFAULT_RINGT;
+ 
++#ifdef HAVE_OPENR2
++
++struct dahdi_mfcr2 {
++	pthread_t master;		       /*!< Thread of master */
++	openr2_context_t *protocol_context;    /*!< OpenR2 context handle */ 
++	struct dahdi_pvt *pvts[MAX_CHANNELS];     /*!< Member channel pvt structs */
++	int numchans;                          /*!< Number of channels in this R2 block */
++};
++
++static struct dahdi_mfcr2 r2links[NUM_SPANS];
++static openr2_variant_t mfcr2_cur_variant = OR2_VAR_UNKNOWN;
++static int mfcr2_cur_mfback_timeout = -1;
++static int mfcr2_cur_metering_pulse_timeout = -1;
++static int mfcr2_cur_max_ani = 10;
++static int mfcr2_cur_max_dnis = 4;
++static int mfcr2_cur_get_ani_first = -1;
++static int mfcr2_cur_skip_category = -1;
++static int mfcr2_cur_context_index = 0;
++static int mfcr2_cur_call_files = 0;
++static int mfcr2_cur_allow_collect_calls = 0;
++static int mfcr2_cur_accept_on_offer = 1;
++static int mfcr2_cur_charge_calls = 1;
++static int mfcr2_cur_forced_release = 0;
++static int mfcr2_cur_double_answer = 0;
++static int mfcr2_cur_immediate_accept = -1;
++/* starting with openr2 interface 3 we have DTMF support */
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
++static int mfcr2_cur_dtmf_dialing = -1;
++static int mfcr2_cur_dtmf_detection = -1;
++static int mfcr2_cur_dtmf_time_on = OR2_DEFAULT_DTMF_ON;
++static int mfcr2_cur_dtmf_time_off = OR2_DEFAULT_DTMF_OFF;
++#endif
++static char mfcr2_cur_logdir[OR2_MAX_PATH];
++static char mfcr2_cur_r2proto_file[OR2_MAX_PATH];
++static openr2_log_level_t mfcr2_cur_loglevel = OR2_LOG_ERROR | OR2_LOG_WARNING;
++static openr2_calling_party_category_t mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
++
++#endif /* HAVE_OPENR2 */
++
+ #ifdef HAVE_PRI
+ 
+ #define PVT_TO_CHANNEL(p) (((p)->prioffset) | ((p)->logicalspan << 8) | (p->pri->mastertrunkgroup ? 0x10000 : 0))
+@@ -891,6 +939,22 @@ static struct dahdi_pvt {
+ 	/*! \brief Logical span number within trunk group */
+ 	int logicalspan;
+ #endif	
++#ifdef HAVE_OPENR2
++	int mfcr2call;
++	int mfcr2block;
++	struct dahdi_mfcr2 *mfcr2;
++	openr2_chan_t *r2chan;
++	openr2_calling_party_category_t mfcr2_recvd_category;
++	openr2_calling_party_category_t mfcr2_category;
++	int mfcr2_accept_on_offer;
++	int mfcr2_charge_calls;
++	int mfcr2_allow_collect_calls;
++	int mfcr2_forced_release;
++	int mfcr2_dnis_index;
++	int mfcr2_ani_index;
++	int mfcr2_dnis_matched;
++	int mfcr2_call_accepted;
++#endif
+ 	/*! \brief Current line interface polarity. POLARITY_IDLE, POLARITY_REV */
+ 	int polarity;
+ 	/*! \brief DSP feature flags: DSP_FEATURE_xxx */
+@@ -1212,6 +1276,512 @@ static void dahdi_queue_frame(struct dah
+ #endif		
+ }
+ 
++static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpbx, int index, int law, int transfercapability);
++#ifdef HAVE_OPENR2
++static void init_mfcr2_globals(void)
++{
++	int r;
++	mfcr2_cur_context_index = 0;
++	mfcr2_cur_variant = OR2_VAR_UNKNOWN;
++	mfcr2_cur_mfback_timeout = -1;
++	mfcr2_cur_metering_pulse_timeout = -1;
++	mfcr2_cur_max_ani = 10;
++	mfcr2_cur_max_dnis = 4;
++	mfcr2_cur_get_ani_first = -1;
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
++	mfcr2_cur_dtmf_dialing = -1;
++	mfcr2_cur_dtmf_detection = -1;
++	mfcr2_cur_dtmf_time_on = OR2_DEFAULT_DTMF_ON;
++	mfcr2_cur_dtmf_time_off = OR2_DEFAULT_DTMF_OFF;
++#endif
++	mfcr2_cur_skip_category = -1;
++	mfcr2_cur_call_files = 0;
++	mfcr2_cur_allow_collect_calls = 0;
++	mfcr2_cur_forced_release = 0;
++	mfcr2_cur_double_answer = 0;
++	mfcr2_cur_immediate_accept = -1;
++	mfcr2_cur_loglevel = OR2_LOG_ERROR | OR2_LOG_WARNING;
++	mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
++	memset(mfcr2_cur_logdir, 0, sizeof(mfcr2_cur_logdir));
++	memset(mfcr2_cur_r2proto_file, 0, sizeof(mfcr2_cur_r2proto_file));
++	memset(r2links, 0, sizeof(r2links));
++	for (r = 0; r < NUM_SPANS; r++) {
++		r2links[r].master = AST_PTHREADT_NULL;
++	}
++}
++
++static int dahdi_r2_answer(struct dahdi_pvt *p)
++{
++	int res = 0;
++	/* openr2 1.1.0 and older does not even define OR2_LIB_INTERFACE
++	 * and does not has support for openr2_chan_answer_call_with_mode
++	 *  */
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
++	const char *double_answer = pbx_builtin_getvar_helper(p->owner, "MFCR2_DOUBLE_ANSWER");
++	int wants_double_answer = ast_true(double_answer) ? 1 : 0;
++	if (!double_answer) {
++		/* this still can result in double answer if the channel context 
++		 * was configured that way */
++		res = openr2_chan_answer_call(p->r2chan);
++	} else if (wants_double_answer) {
++		res = openr2_chan_answer_call_with_mode(p->r2chan, OR2_ANSWER_DOUBLE);
++	} else {
++		res = openr2_chan_answer_call_with_mode(p->r2chan, OR2_ANSWER_SIMPLE);
++	} 
++#else
++	res = openr2_chan_answer_call(p->r2chan);
++#endif
++	return res;
++}
++
++static openr2_calling_party_category_t dahdi_r2_get_channel_category(struct ast_channel *c)
++{
++	openr2_calling_party_category_t cat;
++	const char *catstr = pbx_builtin_getvar_helper(c, "MFCR2_CATEGORY");
++	struct dahdi_pvt *p = c->tech_pvt;
++	if (ast_strlen_zero(catstr)) {
++		ast_log(LOG_DEBUG, "no MFC/R2 category specified for chan %s, using default %s\n", 
++				c->name, openr2_proto_get_category_string(p->mfcr2_category));
++		return p->mfcr2_category;
++	}
++	if ((cat = openr2_proto_get_category(catstr)) == OR2_CALLING_PARTY_CATEGORY_UNKNOWN) {
++		ast_log(LOG_WARNING, "Invalid category specified '%s' for chan %s, using default %s\n",
++				catstr, c->name, openr2_proto_get_category_string(p->mfcr2_category));
++		return p->mfcr2_category;
++	}
++	ast_log(LOG_DEBUG, "Using category %s\n", catstr);
++	return cat;
++}
++
++static void dahdi_r2_on_call_init(openr2_chan_t *r2chan)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_mutex_lock(&p->lock);
++	if (p->mfcr2call) {
++		ast_mutex_unlock(&p->lock);
++		/* TODO: This can happen when some other thread just finished zt_request requesting this very same
++		interface but has not yet seized the line (zt_call), and the far end wins and seize the line,
++		can we avoid this somehow?, at this point when zt_call send the seize, it is likely that since
++		the other end will see our seize as a forced release and drop the call, we will see an invalid
++		pattern that will be seen and treated as protocol error. */
++		ast_log(LOG_ERROR, "Collision of calls on chan %d detected!.\n", openr2_chan_get_number(r2chan));
++		return;
++	}
++	p->mfcr2call = 1;
++	/* better safe than sorry ... */
++	p->cid_name[0] = 0;
++	p->cid_num[0] = 0;
++	p->rdnis[0] = 0;
++	p->exten[0] = 0;
++	p->mfcr2_ani_index = 0;
++	p->mfcr2_dnis_index = 0;
++	p->mfcr2_dnis_matched = 0;
++	p->mfcr2_call_accepted = 0;
++	ast_mutex_unlock(&p->lock);
++	ast_verbose("New MFC/R2 call detected on chan %d.\n", openr2_chan_get_number(r2chan));
++}
++
++static void handle_alarms(struct dahdi_pvt *p, int alarms);
++static int get_alarms(struct dahdi_pvt *p);
++static void dahdi_r2_on_hardware_alarm(openr2_chan_t *r2chan, int alarm)
++{
++	int res;
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_mutex_lock(&p->lock);
++	p->inalarm = alarm ? 1 : 0;
++	if (p->inalarm) {
++		res = get_alarms(p);
++		/* unknown_alarm may be set here */
++		handle_alarms(p, res);
++	} else {
++		if (!p->unknown_alarm) {
++			ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", p->channel);
++			manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", "Channel: %d\r\n", p->channel);
++		} else {
++			p->unknown_alarm = 0;
++		}
++	}
++	ast_mutex_unlock(&p->lock);
++	ast_log(LOG_WARNING, "Zap alarm on chan %d.\n", openr2_chan_get_number(r2chan));
++}
++
++static void dahdi_r2_on_os_error(openr2_chan_t *r2chan, int errorcode)
++{
++	ast_log(LOG_ERROR, "OS error on chan %d: %s\n", openr2_chan_get_number(r2chan), strerror(errorcode));
++}
++
++static void dahdi_r2_on_protocol_error(openr2_chan_t *r2chan, openr2_protocol_error_t reason)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_log(LOG_ERROR, "MFC/R2 protocol error on chan %d: %s\n", openr2_chan_get_number(r2chan), openr2_proto_get_error(reason));
++	if (p->owner) {
++		p->owner->hangupcause = AST_CAUSE_PROTOCOL_ERROR;
++		p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
++	} 
++	ast_mutex_lock(&p->lock);
++	p->mfcr2call = 0;
++	ast_mutex_unlock(&p->lock);
++}
++
++static void dahdi_r2_disconnect_call(struct dahdi_pvt *p, openr2_call_disconnect_cause_t cause)
++{
++	if (openr2_chan_disconnect_call(p->r2chan, cause)) {
++		ast_log(LOG_NOTICE, "Bad! failed to disconnect call on channel %d with reason %s, hope for the best!\n", 
++				p->channel, openr2_proto_get_disconnect_string(cause));
++		/* force the chan to idle and release the call flag now since we will not see a clean on_call_end */
++		openr2_chan_set_idle(p->r2chan);
++		ast_mutex_lock(&p->lock);
++		p->mfcr2call = 0;
++		ast_mutex_unlock(&p->lock);
++	}
++}
++
++static void dahdi_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, const char *dnis, openr2_calling_party_category_t category)
++{
++	struct dahdi_pvt *p;
++	struct ast_channel *c;
++	ast_verbose("MFC/R2 call offered on chan %d. ANI = %s, DNIS = %s, Category = %s\n", 
++			openr2_chan_get_number(r2chan), ani ? ani : "(restricted)", dnis, openr2_proto_get_category_string(category));
++	p = openr2_chan_get_client_data(r2chan);
++	if (!p->mfcr2_allow_collect_calls && category == OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL) {
++		ast_log(LOG_NOTICE, "Rejecting MFC/R2 collect call on chan %d\n", p->channel);
++		dahdi_r2_disconnect_call(p, OR2_CAUSE_COLLECT_CALL_REJECTED);
++		return;
++	}
++	ast_mutex_lock(&p->lock);
++	p->mfcr2_recvd_category = category;
++	/* if we're not supposed to use CID, clear whatever we have */
++	if (!p->use_callerid) {
++		ast_log(LOG_DEBUG, "No CID allowed in configuration, CID is being cleared!\n");
++		p->cid_num[0] = 0;
++		p->cid_name[0] = 0;
++	}
++	/* if we're supposed to answer immediately, clear DNIS and set 's' exten */
++	if (p->immediate || !openr2_context_get_max_dnis(openr2_chan_get_context(r2chan))) {
++		ast_log(LOG_DEBUG, "Setting exten => s because of immediate or 0 DNIS configured\n");
++		p->exten[0] = 's';
++		p->exten[1] = 0;
++	}
++	ast_mutex_unlock(&p->lock);
++	if (!ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num)) {
++		ast_log(LOG_NOTICE, "MFC/R2 call on channel %d requested non-existent extension '%s' in context '%s'. Rejecting call.\n",
++				p->channel, p->exten, p->context);
++		dahdi_r2_disconnect_call(p, OR2_CAUSE_UNALLOCATED_NUMBER);
++	} else {
++		/* if the user does not want to accept on offer, then we should launch the PBX thread now */
++		if (!p->mfcr2_accept_on_offer) {
++			c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
++			if (!c) {
++				ast_log(LOG_ERROR, "Unable to create PBX channel on chan %d\n", p->channel);
++				dahdi_r2_disconnect_call(p, OR2_CAUSE_OUT_OF_ORDER);
++			}
++			/* Don't disable reading since we still need to generate MF tone to accept
++			   the call or reject it and detect the tone off condition of the other end */
++		} else if (p->mfcr2_charge_calls) {
++			ast_log(LOG_DEBUG, "Accepting MFC/R2 call on offer with charge on chan %d\n", p->channel);
++			openr2_chan_accept_call(r2chan, OR2_CALL_WITH_CHARGE);
++		} else {
++			ast_log(LOG_DEBUG, "Accepting MFC/R2 call on offer with no charge on chan %d\n", p->channel);
++			openr2_chan_accept_call(r2chan, OR2_CALL_NO_CHARGE);
++		}	
++	}	
++}
++
++static void dahdi_r2_on_call_end(openr2_chan_t *r2chan)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_verbose("MFC/R2 call end on chan %d\n", p->channel);
++	ast_mutex_lock(&p->lock);
++	p->mfcr2call = 0;
++	ast_mutex_unlock(&p->lock);
++}
++
++static void dahdi_enable_ec(struct dahdi_pvt *p);
++static void dahdi_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode)
++{
++	struct dahdi_pvt *p = NULL;
++	struct ast_channel *c = NULL;
++	p = openr2_chan_get_client_data(r2chan);
++	dahdi_enable_ec(p);
++	p->mfcr2_call_accepted = 1;
++	if (OR2_DIR_BACKWARD == openr2_chan_get_direction(r2chan)) {
++		ast_verbose("MFC/R2 call has been accepted on backward channel %d\n", openr2_chan_get_number(r2chan));
++		/* if accept on offer is not set, it means at this point the PBX thread is already
++		   launched and therefore this callback is being executed in the PBX thread rather than
++		   the monitor thread, don't launch any other thread, just disable the R2 reading and
++		   answer the call */
++		if (!p->mfcr2_accept_on_offer) {
++			openr2_chan_disable_read(r2chan);
++			ast_verbose("Answering MFC/R2 call after accepting it on chan %d\n", openr2_chan_get_number(r2chan));
++			dahdi_r2_answer(p);
++			return;
++		}
++		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
++		if (c) {
++			/* chan_dahdi will take care of reading from now on, tell the library to forget about it */
++			openr2_chan_disable_read(r2chan);
++		} else {
++			ast_log(LOG_ERROR, "Unable to create PBX channel on chan %d\n", p->channel);
++			dahdi_r2_disconnect_call(p, OR2_CAUSE_OUT_OF_ORDER);
++			return;
++		}
++	} else {
++		ast_verbose("Call accepted on forward channel %d\n", p->channel);
++		p->subs[SUB_REAL].needringing = 1;
++		p->dialing = 0;
++		/* chan_dahdi will take care of reading from now on, tell the library to forget about it */
++		openr2_chan_disable_read(r2chan);
++	}	
++}
++
++static void dahdi_r2_on_call_answered(openr2_chan_t *r2chan)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_verbose("MFC/R2 call has been answered on chan %d\n", openr2_chan_get_number(r2chan));
++	p->subs[SUB_REAL].needanswer = 1;
++}
++
++static void dahdi_r2_on_call_read(openr2_chan_t *r2chan, const unsigned char *buf, int buflen)
++{
++	/*ast_log(LOG_DEBUG, "Read data from dahdi channel %d\n", openr2_chan_get_number(r2chan));*/
++}
++
++/*static int dahdi_r2_cause_to_ast_cause(openr2_call_disconnect_cause_t cause)
++{
++	switch (cause) {
++	case OR2_CAUSE_BUSY_NUMBER:
++		return AST_CAUSE_BUSY;
++	case OR2_CAUSE_NETWORK_CONGESTION:
++		return AST_CAUSE_CONGESTION;
++	case OR2_CAUSE_OUT_OF_ORDER:
++		return AST_CAUSE_DESTINATION_OUT_OF_ORDER;
++	case OR2_CAUSE_UNALLOCATED_NUMBER:
++		return AST_CAUSE_UNREGISTERED;
++	case OR2_CAUSE_NO_ANSWER:
++		return AST_CAUSE_NO_ANSWER;
++	case OR2_CAUSE_NORMAL_CLEARING:
++		return AST_CAUSE_NORMAL_CLEARING;
++	case OR2_CAUSE_UNSPECIFIED:
++	default:
++		return AST_CAUSE_NOTDEFINED;
++	}	
++}*/
++
++static void dahdi_r2_on_call_disconnect(openr2_chan_t *r2chan, openr2_call_disconnect_cause_t cause)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_verbose("MFC/R2 call disconnected on chan %d\n", openr2_chan_get_number(r2chan));
++	ast_mutex_lock(&p->lock);
++	if (p->owner) {
++		/* when we have an owner we don't call openr2_chan_disconnect_call here, that will
++		   be done in zt_hangup */
++		if (p->owner->_state == AST_STATE_UP) {
++			p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
++			ast_mutex_unlock(&p->lock);
++		} else if (openr2_chan_get_direction(r2chan) == OR2_DIR_FORWARD) {
++			/* being the forward side we must report what happened to the call to whoever requested it */
++			switch (cause) {
++			case OR2_CAUSE_BUSY_NUMBER:
++				p->owner->hangupcause = AST_CAUSE_BUSY;
++				p->subs[SUB_REAL].needbusy = 1;
++				break;
++			case OR2_CAUSE_NUMBER_CHANGED:
++				p->owner->hangupcause = AST_CAUSE_NUMBER_CHANGED;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_NETWORK_CONGESTION:
++				p->owner->hangupcause = AST_CAUSE_NETWORK_OUT_OF_ORDER;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_OUT_OF_ORDER:
++				p->owner->hangupcause = AST_CAUSE_DESTINATION_OUT_OF_ORDER;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_UNALLOCATED_NUMBER:
++				p->owner->hangupcause = AST_CAUSE_UNALLOCATED;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_NO_ANSWER:
++				p->owner->hangupcause = AST_CAUSE_NO_ANSWER;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_UNSPECIFIED:
++				p->owner->hangupcause = AST_CAUSE_NOTDEFINED;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			case OR2_CAUSE_NORMAL_CLEARING:
++				p->owner->hangupcause = AST_CAUSE_NORMAL_CLEARING;
++				p->subs[SUB_REAL].needcongestion = 1;
++				break;
++			default:
++				ast_log(LOG_WARNING, "Unhandled cause %d\n", cause);
++			}
++			p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
++			ast_mutex_unlock(&p->lock);
++		} else {
++			ast_mutex_unlock(&p->lock);
++			/* being the backward side and not UP yet, we only need to request hangup */
++			/* TODO: what about doing this same thing when were AST_STATE_UP? */
++			ast_queue_hangup(p->owner);
++		}	
++	} else {
++		ast_mutex_unlock(&p->lock);
++		/* no owner, therefore we can't use zt_hangup to disconnect, do it right now */
++		dahdi_r2_disconnect_call(p, OR2_CAUSE_NORMAL_CLEARING);
++	}
++}
++
++static void dahdi_r2_write_log(openr2_log_level_t level, char *logmessage)
++{
++	switch (level) {
++	case OR2_LOG_NOTICE:
++		ast_verbose("%s", logmessage);
++		break;
++	case OR2_LOG_WARNING:
++		ast_log(LOG_WARNING, "%s", logmessage);
++		break;
++	case OR2_LOG_ERROR:
++		ast_log(LOG_ERROR, "%s", logmessage);
++		break;
++	case OR2_LOG_STACK_TRACE:
++	case OR2_LOG_MF_TRACE:
++	case OR2_LOG_CAS_TRACE:
++	case OR2_LOG_DEBUG:
++	case OR2_LOG_EX_DEBUG:
++		ast_log(LOG_DEBUG, "%s", logmessage);
++		break;
++	default:
++		ast_log(LOG_WARNING, "We should handle logging level %d here.\n", level);
++		ast_log(LOG_NOTICE, "%s", logmessage);
++		break;
++	}
++}
++
++#define DAHDI_R2_REMOTE_BLOCK (1 << 0)
++#define DAHDI_R2_LOCAL_BLOCK (1 << 1)
++static void dahdi_r2_on_line_blocked(openr2_chan_t *r2chan)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_log(LOG_NOTICE, "Far end blocked on chan %d\n", p->channel);
++	ast_mutex_lock(&p->lock);
++	p->mfcr2block |= DAHDI_R2_REMOTE_BLOCK;
++	ast_mutex_unlock(&p->lock);
++}
++
++static void dahdi_r2_on_line_idle(openr2_chan_t *r2chan)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	ast_log(LOG_NOTICE, "Far end unblocked on chan %d\n", openr2_chan_get_number(r2chan));
++	ast_mutex_lock(&p->lock);
++	p->mfcr2block &= ~DAHDI_R2_REMOTE_BLOCK;
++	ast_mutex_unlock(&p->lock);
++}
++
++static void dahdi_r2_on_context_log(openr2_context_t *r2context, openr2_log_level_t level, const char *fmt, va_list ap)
++	__attribute__((format (printf, 3, 0)));
++static void dahdi_r2_on_context_log(openr2_context_t *r2context, openr2_log_level_t level, const char *fmt, va_list ap)
++{
++	char logmsg[256];
++	char completemsg[sizeof(logmsg)+50];
++	vsnprintf(logmsg, sizeof(logmsg), fmt, ap);
++	snprintf(completemsg, sizeof(completemsg), "Context - %s", logmsg);
++	dahdi_r2_write_log(level, completemsg);
++}
++
++static void dahdi_r2_on_chan_log(openr2_chan_t *r2chan, openr2_log_level_t level, const char *fmt, va_list ap)
++	__attribute__((format (printf, 3, 0)));
++static void dahdi_r2_on_chan_log(openr2_chan_t *r2chan, openr2_log_level_t level, const char *fmt, va_list ap)
++{
++	char logmsg[256];
++	char completemsg[sizeof(logmsg)+50];
++	vsnprintf(logmsg, sizeof(logmsg), fmt, ap);
++	snprintf(completemsg, sizeof(completemsg), "Chan %d - %s", openr2_chan_get_number(r2chan), logmsg);
++	dahdi_r2_write_log(level, completemsg);
++}
++
++static int dahdi_r2_on_dnis_digit_received(openr2_chan_t *r2chan, char digit)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	/* if 'immediate' is set, let's stop requesting DNIS */
++	if (p->immediate) {
++		return 0;
++	}
++	p->exten[p->mfcr2_dnis_index] = digit;
++	p->rdnis[p->mfcr2_dnis_index] = digit;
++	p->mfcr2_dnis_index++;
++	p->exten[p->mfcr2_dnis_index] = 0;
++	p->rdnis[p->mfcr2_dnis_index] = 0;
++	/*
++	ast_log(LOG_DEBUG, "Got digit %c in dahdi, dnis so far: %s\n", digit, p->exten);
++	int ret;
++	ret = ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num);
++	ast_log(LOG_DEBUG, "ast_exists_extension(%s, %s, 1, %s) = %d\n", p->context, p->exten, p->cid_num, ret);
++	ret = ast_matchmore_extension(NULL, p->context, p->exten, 1, p->cid_num);
++	ast_log(LOG_DEBUG, "ast_matchmore_extension(%s, %s, 1, %s) = %d\n", p->context, p->exten, p->cid_num, ret);
++	*/
++	/* if the DNIS is a match and cannot match more, stop requesting DNIS */
++	if ((p->mfcr2_dnis_matched || 
++	    (ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num) && (p->mfcr2_dnis_matched = 1))) &&
++	    !ast_matchmore_extension(NULL, p->context, p->exten, 1, p->cid_num)) {
++		return 0;
++	}
++	/* otherwise keep going */
++	return 1;
++}
++
++static void dahdi_r2_on_ani_digit_received(openr2_chan_t *r2chan, char digit)
++{
++	struct dahdi_pvt *p = openr2_chan_get_client_data(r2chan);
++	p->cid_num[p->mfcr2_ani_index] = digit;
++	p->cid_name[p->mfcr2_ani_index] = digit;
++	p->mfcr2_ani_index++;
++	p->cid_num[p->mfcr2_ani_index] = 0;
++	p->cid_name[p->mfcr2_ani_index] = 0;
++}
++
++static void dahdi_r2_on_billing_pulse_received(openr2_chan_t *r2chan)
++{
++	ast_log(LOG_NOTICE, "MFC/R2 billing pulse received on channel %d\n", openr2_chan_get_number(r2chan));
++}
++
++static openr2_event_interface_t dahdi_r2_event_iface = {
++	.on_call_init = dahdi_r2_on_call_init,
++	.on_call_offered = dahdi_r2_on_call_offered,
++	.on_call_accepted = dahdi_r2_on_call_accepted,
++	.on_call_answered = dahdi_r2_on_call_answered,
++	.on_call_disconnect = dahdi_r2_on_call_disconnect,
++	.on_call_end = dahdi_r2_on_call_end,
++	.on_call_read = dahdi_r2_on_call_read,
++	.on_hardware_alarm = dahdi_r2_on_hardware_alarm,
++	.on_os_error = dahdi_r2_on_os_error,
++	.on_protocol_error = dahdi_r2_on_protocol_error,
++	.on_line_blocked = dahdi_r2_on_line_blocked,
++	.on_line_idle = dahdi_r2_on_line_idle,
++	/* cast seems to be needed to get rid of the annoying warning regarding format attribute */
++	.on_context_log = (openr2_handle_context_logging_func)dahdi_r2_on_context_log,
++	.on_dnis_digit_received = dahdi_r2_on_dnis_digit_received,
++	.on_ani_digit_received = dahdi_r2_on_ani_digit_received,
++	/* so far we do nothing with billing pulses, just log it */
++	.on_billing_pulse_received = dahdi_r2_on_billing_pulse_received 
++};
++
++static inline int16_t dahdi_r2_alaw_to_linear(uint8_t sample)
++{
++	return AST_ALAW(sample);
++}
++
++static inline uint8_t dahdi_r2_linear_to_alaw(int sample)
++{
++	return AST_LIN2A(sample);
++}
++
++static openr2_transcoder_interface_t dahdi_r2_transcode_iface = {
++	dahdi_r2_alaw_to_linear,
++	dahdi_r2_linear_to_alaw
++};
++
++#endif /* HAVE_OPENR2 */
++
+ static int restore_gains(struct dahdi_pvt *p);
+ 
+ static void swap_subs(struct dahdi_pvt *p, int a, int b)
+@@ -1584,6 +2154,8 @@ static char *dahdi_sig2str(int sig)
+ 		return "FXO Kewlstart";
+ 	case SIG_PRI:
+ 		return "ISDN PRI";
++	case SIG_MFCR2:
++		return "MFC/R2";
+ 	case SIG_SF:
+ 		return "SF (Tone) Immediate";
+ 	case SIG_SFWINK:
+@@ -2433,6 +3005,7 @@ static int dahdi_call(struct ast_channel
+ 		ast_setstate(ast, AST_STATE_UP);
+ 		break;		
+ 	case SIG_PRI:
++	case SIG_MFCR2:
+ 		/* We'll get it in a moment -- but use dialdest to store pre-setup_ack digits */
+ 		p->dialdest[0] = '\0';
+ 		p->dialing = 1;
+@@ -2442,6 +3015,35 @@ static int dahdi_call(struct ast_channel
+ 		ast_mutex_unlock(&p->lock);
+ 		return -1;
+ 	}
++#ifdef HAVE_OPENR2
++	if (p->mfcr2) {
++		int strip = p->stripmsd;
++		int callres = 0;
++		c = strchr(dest, '/');
++		if (c) {
++			c++;
++		} else {
++			c = dest;
++		}
++		if (!p->hidecallerid) {
++			l = ast->cid.cid_num;
++		} else {
++			l = NULL;
++		}
++		if (strlen(c) < strip) {
++			ast_log(LOG_WARNING, "Destiny number '%s' is shorter than stripmsd(%d)? hum, you should fix that. Assuming stripmsd = 0\n", c, strip);
++			strip = 0;
++		}
++		p->dialing = 1;
++		callres = openr2_chan_make_call(p->r2chan, l, (c + strip), dahdi_r2_get_channel_category(ast));
++		if (-1 == callres) {
++			ast_mutex_unlock(&p->lock);
++			ast_log(LOG_ERROR, "unable to make new MFC/R2 call!\n");
++			return -1;
++		}
++		ast_setstate(ast, AST_STATE_DIALING);
++	}
++#endif /* HAVE_OPENR2 */
+ #ifdef HAVE_PRI
+ 	if (p->pri) {
+ 		struct pri_sr *sr;
+@@ -2852,6 +3454,166 @@ static int pri_find_dchan(struct dahdi_p
+ }
+ #endif
+ 
++#ifdef HAVE_OPENR2
++static char *dahdi_accept_r2_call_app = "DAHDIAcceptR2Call";
++static char *zap_accept_r2_call_app = "ZapAcceptR2Call";
++
++static char *dahdi_accept_r2_call_synopsis = "Accept an R2 call if its not already accepted (you still need to answer it)";
++static char *zap_accept_r2_call_synopsis = "Accept an R2 call if its not already accepted (you still need to answer it)";
++
++static char *dahdi_accept_r2_call_descrip = 
++"  DAHDIAcceptR2Call(): This application will accept the current MFC/R2 call\n"
++"  You can specify yes or no as argument to accept with or without charge.\n";
++
++static char *zap_accept_r2_call_descrip = 
++"  ZapAcceptR2Call(): This application will accept the current MFC/R2 call\n"
++"  You can specify yes or no as argument to accept with or without charge.\n";
++
++static int dahdi_accept_r2_call_exec(struct ast_channel *chan, void *data)
++{
++	/* data is whether to accept with charge or no charge */
++	openr2_call_mode_t accept_mode;
++	int res, timeout, maxloops;
++	struct ast_frame *f;
++	struct dahdi_pvt *p;
++	char *parse;
++	AST_DECLARE_APP_ARGS(args,
++			AST_APP_ARG(charge);
++	);
++
++	if (ast_strlen_zero(data)) {
++		ast_log(LOG_DEBUG, "No data sent to application!\n");
++		return -1;
++	}
++
++	if (chan->tech != &dahdi_tech) {
++		ast_log(LOG_DEBUG, "Only DAHDI technology accepted!\n");
++		return -1;
++	}
++
++	p = (struct dahdi_pvt *)chan->tech_pvt;
++	if (!p) {
++		ast_log(LOG_DEBUG, "Unable to find technology private!\n");
++		return -1;
++	}
++
++	parse = ast_strdupa(data);
++	AST_STANDARD_APP_ARGS(args, parse);
++
++	if (ast_strlen_zero(args.charge)) {
++		ast_log(LOG_WARNING, "DAHDIAcceptR2Call requires 'yes' or 'no' for the charge parameter\n");
++		return -1;
++	}
++
++	ast_mutex_lock(&p->lock);
++	if (!p->mfcr2 || !p->mfcr2call) {
++		ast_mutex_unlock(&p->lock);
++		ast_log(LOG_DEBUG, "Channel %s does not seems to be an R2 active channel!\n", chan->name);
++		return -1;
++	}
++
++	if (p->mfcr2_call_accepted) {
++		ast_mutex_unlock(&p->lock);
++		ast_log(LOG_DEBUG, "MFC/R2 call already accepted on channel %s!\n", chan->name);
++		return 0;
++	}
++	accept_mode = ast_true(args.charge) ? OR2_CALL_WITH_CHARGE : OR2_CALL_NO_CHARGE;
++	if (openr2_chan_accept_call(p->r2chan, accept_mode)) {
++		ast_mutex_unlock(&p->lock);
++		ast_log(LOG_WARNING, "Failed to accept MFC/R2 call!\n");
++		return -1;
++	}
++	ast_mutex_unlock(&p->lock);
++
++	res = 0;
++	timeout = 100;
++	maxloops = 50; /* wait up to 5 seconds */
++	/* we need to read() until the call is accepted */
++	while (maxloops > 0) {
++		maxloops--;
++		if (ast_check_hangup(chan)) {
++			break;
++		}
++		res = ast_waitfor(chan, timeout);
++		if (res < 0) {
++			ast_log(LOG_DEBUG, "ast_waitfor failed on channel %s, going out ...\n", chan->name);
++			res = -1;
++			break;
++		}
++		if (res == 0) {
++			continue;
++		}
++		f = ast_read(chan);
++		if (!f) {
++			ast_log(LOG_DEBUG, "No frame read on channel %s, going out ...\n", chan->name);
++			res = -1;
++			break;
++		}
++		if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP) {
++			ast_log(LOG_DEBUG, "Got HANGUP frame on channel %s, going out ...\n", chan->name);
++			ast_frfree(f);
++			res = -1;
++			break;
++		}
++		ast_frfree(f);
++		ast_mutex_lock(&p->lock);
++		if (p->mfcr2_call_accepted) {
++			ast_mutex_unlock(&p->lock);
++			ast_log(LOG_DEBUG, "Accepted MFC/R2 call!\n");
++			break;
++		}
++		ast_mutex_unlock(&p->lock);
++	}
++	if (res == -1) {
++		ast_log(LOG_WARNING, "Failed to accept MFC/R2 call!\n");
++	}
++	return res;
++}
++
++static int zap_accept_r2_call_exec(struct ast_channel *chan, void *data)
++{
++	return dahdi_accept_r2_call_exec(chan, data);
++}
++
++static openr2_call_disconnect_cause_t dahdi_ast_cause_to_r2_cause(int cause)
++{
++	openr2_call_disconnect_cause_t r2cause = OR2_CAUSE_NORMAL_CLEARING;
++	switch (cause) {
++	case AST_CAUSE_USER_BUSY:
++	case AST_CAUSE_CALL_REJECTED:
++	case AST_CAUSE_INTERWORKING: /* I don't know wtf is this but is used sometimes when ekiga rejects a call */
++		r2cause = OR2_CAUSE_BUSY_NUMBER;
++		break;
++
++	case AST_CAUSE_NORMAL_CIRCUIT_CONGESTION:
++	case AST_CAUSE_SWITCH_CONGESTION:
++		r2cause = OR2_CAUSE_NETWORK_CONGESTION;
++		break;
++
++	case AST_CAUSE_UNALLOCATED:
++		r2cause = OR2_CAUSE_UNALLOCATED_NUMBER;
++		break;
++
++	case AST_CAUSE_NETWORK_OUT_OF_ORDER:
++	case AST_CAUSE_DESTINATION_OUT_OF_ORDER:
++		r2cause = OR2_CAUSE_OUT_OF_ORDER;
++		break;
++
++	case AST_CAUSE_NO_ANSWER:
++	case AST_CAUSE_NO_USER_RESPONSE:
++		r2cause = OR2_CAUSE_NO_ANSWER;
++		break;
++
++	default:
++		r2cause = OR2_CAUSE_NORMAL_CLEARING;
++		break;
++	}
++	ast_log(LOG_DEBUG, "dahdi_ast_cause_to_r2_cause returned %d/%s for ast cause %d\n", 
++			r2cause, openr2_proto_get_disconnect_string(r2cause), cause);
++	return r2cause;
++}
++#endif
++
+ static int dahdi_hangup(struct ast_channel *ast)
+ {
+ 	int res;
+@@ -3076,6 +3838,25 @@ static int dahdi_hangup(struct ast_chann
+ 		if (res < 0) 
+ 			ast_log(LOG_WARNING, "Unable to set law on channel %d to default: %s\n", p->channel, strerror(errno));
+ 		/* Perform low level hangup if no owner left */
++#ifdef HAVE_OPENR2
++		if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
++			ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %d\n", p->channel);
++			ast_log(LOG_DEBUG, "ast->hangupcause is %d\n", ast->hangupcause);
++			if (openr2_chan_get_direction(p->r2chan) == OR2_DIR_BACKWARD && p->mfcr2_forced_release) {
++				dahdi_r2_disconnect_call(p, OR2_CAUSE_FORCED_RELEASE);
++			} else {
++				const char *r2causestr = pbx_builtin_getvar_helper(ast,"MFCR2_CAUSE");
++				int r2cause_user = r2causestr ? atoi(r2causestr) : 0;
++				openr2_call_disconnect_cause_t r2cause = r2cause_user
++								       ? dahdi_ast_cause_to_r2_cause(r2cause_user)
++								       : dahdi_ast_cause_to_r2_cause(ast->hangupcause);
++				dahdi_r2_disconnect_call(p, r2cause);
++			}
++		} else if (p->mfcr2call) {
++			ast_log(LOG_DEBUG, "Clearing call request on channel %d\n", p->channel);
++			p->mfcr2call = 0;
++		}
++#endif
+ #ifdef HAVE_PRI
+ 		if (p->pri) {
+ #ifdef SUPPORT_USERUSER
+@@ -3129,7 +3910,7 @@ static int dahdi_hangup(struct ast_chann
+ 			}
+ 		}
+ #endif
+-		if (p->sig && (p->sig != SIG_PRI))
++		if (p->sig && (p->sig != SIG_PRI) && (p->sig != SIG_MFCR2))
+ 			res = dahdi_set_hook(p->subs[SUB_REAL].dfd, DAHDI_ONHOOK);
+ 		if (res < 0) {
+ 			ast_log(LOG_WARNING, "Unable to hangup line %s\n", ast->name);
+@@ -3310,6 +4091,24 @@ static int dahdi_answer(struct ast_chann
+ 		}
+ 		break;
+ #endif
++#ifdef HAVE_OPENR2
++	case SIG_MFCR2:
++		if (!p->mfcr2_accept_on_offer) {
++			/* the call was not accepted on offer, so it must be accepted now before answering,
++			   the answer will be executed when the callback on_call_accepted is executed */
++			if (p->mfcr2_charge_calls) {
++				ast_log(LOG_DEBUG, "Accepting MFC/R2 call before answering with charge on chan %d\n", p->channel);
++				openr2_chan_accept_call(p->r2chan, OR2_CALL_WITH_CHARGE);
++			} else {
++				ast_log(LOG_DEBUG, "Accepting MFC/R2 call before answering with no charge on chan %d\n", p->channel);
++				openr2_chan_accept_call(p->r2chan, OR2_CALL_NO_CHARGE);
++			}
++		} else {
++			ast_log(LOG_DEBUG, "Answering MFC/R2 call on chan %d\n", p->channel);
++			res = dahdi_r2_answer(p);
++		}
++		break;
++#endif
+ 	case 0:
+ 		ast_mutex_unlock(&p->lock);
+ 		return 0;
+@@ -4079,8 +4878,6 @@ static int dahdi_ring_phone(struct dahdi
+ 
+ static void *ss_thread(void *data);
+ 
+-static struct ast_channel *dahdi_new(struct dahdi_pvt *, int, int, int, int, int);
+-
+ /*!
+  * \internal
+  * \brief Attempt to transfer 3-way call.
+@@ -4422,13 +5219,29 @@ static struct ast_frame *dahdi_handle_ev
+ 			break;
+ #endif
+ 		case DAHDI_EVENT_BITSCHANGED:
++#ifdef HAVE_OPENR2
++			if (p->sig != SIG_MFCR2) {
++				ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
++			} else {
++				ast_log(LOG_DEBUG, "bits changed in chan %d\n", p->channel);
++				openr2_chan_handle_cas(p->r2chan);
++			}
++#else
+ 			ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
++#endif
+ 		case DAHDI_EVENT_PULSE_START:
+ 			/* Stop tone if there's a pulse start and the PBX isn't started */
+ 			if (!ast->pbx)
+ 				tone_zone_play_tone(p->subs[index].dfd, -1);
+ 			break;	
+ 		case DAHDI_EVENT_DIALCOMPLETE:
++#ifdef HAVE_OPENR2
++			if ((p->sig & SIG_MFCR2) && p->r2chan && ast->_state != AST_STATE_UP) {
++				/* we don't need to do anything for this event for R2 signaling 
++				   if the call is being setup */
++				break;
++			}
++#endif
+ 			if (p->inalarm) break;
+ 			if ((p->radio || (p->oprmode < 0))) break;
+ 			if (ioctl(p->subs[index].dfd,DAHDI_DIALING,&x) == -1) {
+@@ -4509,6 +5322,10 @@ static struct ast_frame *dahdi_handle_ev
+ 				break;
+ 			}
+ #endif
++#ifdef HAVE_OPENR2
++			if (p->sig == SIG_MFCR2)
++				break;
++#endif
+ 		case DAHDI_EVENT_ONHOOK:
+ 			if (p->radio) {
+ 				p->subs[index].f.frametype = AST_FRAME_CONTROL;
+@@ -5421,6 +6238,12 @@ static struct ast_frame  *dahdi_read(str
+ 	else if (p->ringt > 0) 
+ 		p->ringt--;
+ 
++#ifdef HAVE_OPENR2
++	if (p->mfcr2) {
++		openr2_chan_process_event(p->r2chan);
++	}	
++#endif
++
+ 	if (p->subs[index].needringing) {
+ 		/* Send ringing frame if requested */
+ 		p->subs[index].needringing = 0;
+@@ -5465,6 +6288,24 @@ static struct ast_frame  *dahdi_read(str
+ 		ast_mutex_unlock(&p->lock);
+ 		return &p->subs[index].f;
+ 	}	
++
++#ifdef HAVE_OPENR2
++	if (p->mfcr2 && openr2_chan_get_read_enabled(p->r2chan)) {
++		/* openr2 took care of reading and handling any event 
++		  (needanswer, needbusy etc), if we continue we will read()
++		  twice, lets just return a null frame. This should only
++		  happen when openr2 is dialing out */
++		p->subs[index].f.frametype = AST_FRAME_NULL;
++		p->subs[index].f.subclass = 0;
++		p->subs[index].f.samples = 0;
++		p->subs[index].f.mallocd = 0;
++		p->subs[index].f.offset = 0;
++		p->subs[index].f.data = NULL;
++		p->subs[index].f.datalen= 0;
++		ast_mutex_unlock(&p->lock);
++		return &p->subs[index].f;
++	}
++#endif
+ 	
+ 	if (p->subs[index].needflash) {
+ 		/* Send answer frame if requested */
+@@ -5791,8 +6632,15 @@ static int dahdi_indicate(struct ast_cha
+ 	int func = DAHDI_FLASH;
+ 	ast_mutex_lock(&p->lock);
+ 	index = dahdi_get_index(chan, p, 0);
+-	if (option_debug)
+-		ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name);
++	ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name);
++#ifdef HAVE_OPENR2
++	if (p->mfcr2 && !p->mfcr2_call_accepted) {
++		ast_mutex_unlock(&p->lock);
++		/* if this an R2 call and the call is not yet accepted we don't want the 
++		   tone indications to mess up with the MF tones */
++		return 0;
++	}
++#endif
+ 	if (index == SUB_REAL) {
+ 		switch (condition) {
+ 		case AST_CONTROL_BUSY:
+@@ -6137,6 +6985,11 @@ static struct ast_channel *dahdi_new(str
+ 	/* Configure the new channel jb */
+ 	ast_jb_configure(tmp, &global_jbconf);
+ 	if (startpbx) {
++#ifdef HAVE_OPENR2
++		if (i->mfcr2call) {
++			pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category));
++		}
++#endif
+ 		if (ast_pbx_start(tmp)) {
+ 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
+ 			ast_hangup(tmp);
+@@ -7673,7 +8526,7 @@ static void *do_monitor(void *data)
+ 		count = 0;
+ 		i = iflist;
+ 		while (i) {
+-			if ((i->subs[SUB_REAL].dfd > -1) && i->sig && (!i->radio)) {
++			if ((i->subs[SUB_REAL].dfd > -1) && i->sig && (!i->radio) && !(i->sig & SIG_MFCR2)) {
+ 				if (!i->owner && !i->subs[SUB_REAL].owner) {
+ 					/* This needs to be watched, as it lacks an owner */
+ 					pfds[count].fd = i->subs[SUB_REAL].dfd;
+@@ -7862,6 +8715,17 @@ static int restart_monitor(void)
+ 	return 0;
+ }
+ 
++#ifdef HAVE_OPENR2
++static struct dahdi_mfcr2 *mfcr2_get_context(int id)
++{
++	if ((id < 0) || (id >= (sizeof(r2links)/sizeof(r2links[0])))) {
++		ast_log(LOG_ERROR, "No more R2 links available!.\n");
++		return NULL;
++	}
++	return &r2links[id];
++}
++#endif
++
+ #ifdef HAVE_PRI
+ static int pri_resolve_span(int *span, int channel, int offset, struct dahdi_spaninfo *si)
+ {
+@@ -8213,6 +9077,90 @@ static struct dahdi_pvt *mkintf(int chan
+ 				tmp->prioffset = 0;
+ 			}
+ #endif
++#ifdef HAVE_OPENR2
++			if (chan_sig == SIG_MFCR2 && reloading != 1) {
++				char logdir[OR2_MAX_PATH];
++				struct dahdi_mfcr2 *dahdi_r2;
++				int threshold = 0;
++				int snres = 0;
++				dahdi_r2 = mfcr2_get_context(mfcr2_cur_context_index);
++				if (!dahdi_r2) {
++					ast_log(LOG_WARNING, "Cannot get another R2 DAHDI context!\n");
++				} else if (!dahdi_r2->protocol_context){
++					char tmplogdir[] = "/tmp";
++					dahdi_r2->protocol_context = openr2_context_new(NULL, &dahdi_r2_event_iface, 
++							&dahdi_r2_transcode_iface, mfcr2_cur_variant, mfcr2_cur_max_ani, mfcr2_cur_max_dnis);
++					if (!dahdi_r2->protocol_context) {
++						ast_log(LOG_ERROR, "Cannot create OpenR2 protocol context.\n");
++						destroy_dahdi_pvt(&tmp);
++						return NULL;
++					} 
++					openr2_context_set_log_level(dahdi_r2->protocol_context, mfcr2_cur_loglevel);
++					openr2_context_set_ani_first(dahdi_r2->protocol_context, mfcr2_cur_get_ani_first);
++					openr2_context_set_skip_category_request(dahdi_r2->protocol_context, mfcr2_cur_skip_category);
++					openr2_context_set_mf_threshold(dahdi_r2->protocol_context, threshold);
++					openr2_context_set_mf_back_timeout(dahdi_r2->protocol_context, mfcr2_cur_mfback_timeout);
++					openr2_context_set_metering_pulse_timeout(dahdi_r2->protocol_context, mfcr2_cur_metering_pulse_timeout);
++					openr2_context_set_double_answer(dahdi_r2->protocol_context, mfcr2_cur_double_answer);
++					openr2_context_set_immediate_accept(dahdi_r2->protocol_context, mfcr2_cur_immediate_accept);
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
++					openr2_context_set_dtmf_dialing(dahdi_r2->protocol_context, mfcr2_cur_dtmf_dialing, mfcr2_cur_dtmf_time_on, mfcr2_cur_dtmf_time_off);
++					openr2_context_set_dtmf_detection(dahdi_r2->protocol_context, mfcr2_cur_dtmf_detection);
++#endif
++					if (ast_strlen_zero(mfcr2_cur_logdir)) {
++						if (openr2_context_set_log_directory(dahdi_r2->protocol_context, tmplogdir)) {
++							ast_log(LOG_ERROR, "Failed setting default MFC/R2 log directory %s\n", tmplogdir);
++						}
++					} else {
++						snres = snprintf(logdir, sizeof(logdir), "%s/%s/%s", ast_config_AST_LOG_DIR, "mfcr2", mfcr2_cur_logdir);
++						if (snres >= sizeof(logdir)) {
++							ast_log(LOG_ERROR, "MFC/R2 logging directory truncated, using %s\n", tmplogdir);
++							if (openr2_context_set_log_directory(dahdi_r2->protocol_context, logdir)) {
++								ast_log(LOG_ERROR, "Failed setting default MFC/R2 log directory %s\n", tmplogdir);
++							}
++						} else {
++							if (openr2_context_set_log_directory(dahdi_r2->protocol_context, logdir)) {
++								ast_log(LOG_ERROR, "Failed setting MFC/R2 log directory %s\n", logdir);
++							}
++						}	
++					}
++					if (!ast_strlen_zero(mfcr2_cur_r2proto_file)) {
++						if (openr2_context_configure_from_advanced_file(dahdi_r2->protocol_context, mfcr2_cur_r2proto_file)) {
++							ast_log(LOG_ERROR, "Failed to configure r2context from advanced configuration file %s\n", mfcr2_cur_r2proto_file);
++						}
++					}
++				} 
++				if (dahdi_r2) {
++					/* TODO: should we check numchans overflow, or is it already done by DAHDI? */
++					dahdi_r2->pvts[dahdi_r2->numchans++] = tmp;
++					tmp->r2chan = openr2_chan_new_from_fd(dahdi_r2->protocol_context,
++							tmp->subs[SUB_REAL].dfd, NULL, NULL);
++					if (!tmp->r2chan) {
++						openr2_liberr_t err = openr2_context_get_last_error(dahdi_r2->protocol_context);
++						ast_log(LOG_ERROR, "Cannot create OpenR2 channel: %s\n", openr2_context_error_string(err));
++						destroy_dahdi_pvt(&tmp);
++						return NULL;
++					}
++					openr2_chan_set_client_data(tmp->r2chan, tmp);
++					/* cast seems to be needed to get rid of the annoying warning regarding format attribute */
++					openr2_chan_set_logging_func(tmp->r2chan, (openr2_logging_func_t)dahdi_r2_on_chan_log);
++					openr2_chan_set_log_level(tmp->r2chan, mfcr2_cur_loglevel);
++					if (mfcr2_cur_call_files) {
++						openr2_chan_enable_call_files(tmp->r2chan);
++					}
++					tmp->mfcr2_category = mfcr2_cur_category;
++					tmp->mfcr2 = dahdi_r2;
++					tmp->mfcr2call = 0;
++					tmp->mfcr2block = DAHDI_R2_REMOTE_BLOCK | DAHDI_R2_LOCAL_BLOCK;
++					tmp->mfcr2_accept_on_offer = mfcr2_cur_accept_on_offer;
++					tmp->mfcr2_charge_calls = mfcr2_cur_charge_calls;
++					tmp->mfcr2_ani_index = 0;
++					tmp->mfcr2_dnis_index = 0;
++					tmp->mfcr2_allow_collect_calls = mfcr2_cur_allow_collect_calls;
++					tmp->mfcr2_forced_release = mfcr2_cur_forced_release;
++				}
++			}
++#endif
+ 		} else {
+ 			chan_sig = tmp->sig;
+ 			if (tmp->subs[SUB_REAL].dfd > -1) {
+@@ -8410,7 +9358,7 @@ static struct dahdi_pvt *mkintf(int chan
+ 				ast_dsp_digitmode(tmp->dsp, DSP_DIGITMODE_DTMF | tmp->dtmfrelax);
+ 			update_conf(tmp);
+ 			if (!here) {
+-				if (chan_sig != SIG_PRI)
++				if ((chan_sig != SIG_PRI) && (chan_sig != SIG_MFCR2))
+ 					/* Hang it up to be sure it's good */
+ 					dahdi_set_hook(tmp->subs[SUB_REAL].dfd, DAHDI_ONHOOK);
+ 			}
+@@ -8532,6 +9480,15 @@ static inline int available(struct dahdi
+ 				return 1;
+ 		}
+ #endif
++#ifdef HAVE_OPENR2
++		/* Trust MFC/R2 */
++		if (p->mfcr2) {
++			if (p->mfcr2call || p->mfcr2block)
++				return 0;
++			else
++				return 1;
++		}
++#endif
+ 		if (!(p->radio || (p->oprmode < 0)))
+ 		{
+ 			if (!p->sig || (p->sig == SIG_FXSLS))
+@@ -8827,6 +9784,23 @@ static struct ast_channel *dahdi_request
+ 				}
+ 			}
+ #endif			
++#ifdef HAVE_OPENR2
++			if (p->mfcr2) {
++				ast_mutex_lock(&p->lock);
++				if (p->mfcr2call) {
++					ast_mutex_unlock(&p->lock);
++					ast_log(LOG_NOTICE, "Yay!, someone just beat us in the race for channel %d.\n", p->channel);
++					goto next;
++				}
++				if (p->mfcr2block) {
++					ast_mutex_unlock(&p->lock);
++					ast_log(LOG_NOTICE, "Yay!, channel %d just got blocked (%d).\n", p->channel, p->mfcr2block);
++					goto next;
++				}
++				p->mfcr2call = 1;
++				ast_mutex_unlock(&p->lock);
++			}
++#endif
+ 			if (p->channel == CHAN_PSEUDO) {
+ 				p = chandup(p);
+ 				if (!p) {
+@@ -8905,6 +9879,95 @@ next:
+ 	return tmp;
+ }
+ 
++#ifdef HAVE_OPENR2
++static void *mfcr2_monitor(void *data)
++{
++	struct dahdi_pvt *p;
++	struct dahdi_mfcr2 *mfcr2 = data;
++	/* we should be using pthread_key_create
++	   and allocate pollers dynamically.
++	   I think do_monitor() could be leaking, since it
++	   could be cancelled at any time and is not
++	   using thread keys, why?, */
++	struct pollfd pollers[mfcr2->numchans];
++	int maxsleep = 20;
++	int res = 0;
++	int i = 0;
++	int pollsize = 0;
++	int oldstate = 0;
++	int was_idle = 0;
++	int quit_loop = 0;
++	/* now that we're ready to get calls, unblock our side and
++	   get current line state */
++	for (i = 0; i < mfcr2->numchans; i++) {
++		p = mfcr2->pvts[i];
++		pollers[i].fd = mfcr2->pvts[i]->subs[SUB_REAL].dfd;
++		if (openr2_chan_set_idle(p->r2chan)) {
++			ast_log(LOG_ERROR, "Failed to set channel %d in IDLE\n", p->channel);
++		} else {
++			ast_mutex_lock(&p->lock);
++			mfcr2->pvts[i]->mfcr2block &= ~DAHDI_R2_LOCAL_BLOCK;
++			mfcr2->pvts[i]->mfcr2call = 0;
++			ast_mutex_unlock(&p->lock);
++		}
++		openr2_chan_handle_cas(mfcr2->pvts[i]->r2chan);
++	}
++	while(1) {
++		/* we trust here that the mfcr2 channel list will not ever change once
++		   the module is loaded */
++		pollsize = 0;
++		for (i = 0; i < mfcr2->numchans; i++) {
++			pollers[i].events = 0;
++			pollers[i].revents = 0;
++			if (mfcr2->pvts[i]->owner) {
++				continue;
++			}
++			if (!mfcr2->pvts[i]->r2chan) {
++				ast_log(LOG_DEBUG, "Wow, no r2chan on channel %d\n", mfcr2->pvts[i]->channel);
++				quit_loop = 1;
++				break;
++			}
++			openr2_chan_enable_read(mfcr2->pvts[i]->r2chan);
++			pollers[i].events = POLLIN | POLLPRI;
++			pollsize++;
++		}
++		if (quit_loop) {
++			break;
++		}
++
++		if (pollsize == 0) {
++			if (!was_idle) {
++				ast_log(LOG_NOTICE, "Monitor thread going idle since everybody has an owner\n");
++				was_idle = 1;
++			}
++			poll(NULL, 0, maxsleep);
++			continue;
++		}
++		was_idle = 0;
++
++		/* probably poll() is a valid cancel point, lets just be on the safe side
++		   by calling pthread_testcancel */
++		pthread_testcancel();
++		res = poll(pollers, mfcr2->numchans, maxsleep);
++		pthread_testcancel();
++		if ((res < 0) && (errno != EINTR)) {
++			ast_log(LOG_ERROR, "going out, poll failed: %s\n", strerror(errno));
++			break;
++		} 
++		/* do we want to allow to cancel while processing events? */
++		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
++		for (i = 0; i < mfcr2->numchans; i++) {
++			if ((pollers[i].revents & POLLPRI) || (pollers[i].revents & POLLIN)) {
++				openr2_chan_process_event(mfcr2->pvts[i]->r2chan);
++			}
++		}
++		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
++	}
++	ast_log(LOG_NOTICE, "Quitting MFC/R2 monitor thread\n");
++	return 0;
++}
++#endif
++
+ 
+ #ifdef HAVE_PRI
+ static struct dahdi_pvt *pri_find_crv(struct dahdi_pri *pri, int crv)
+@@ -10829,6 +11892,341 @@ static struct ast_cli_entry dahdi_pri_cl
+ 
+ #endif /* HAVE_PRI */
+ 
++#ifdef HAVE_OPENR2
++
++static int handle_mfcr2_version(int fd, int argc, char *argv[])
++{
++	ast_cli(fd, "OpenR2 version: %s, revision: %s\n", openr2_get_version(), openr2_get_revision());
++	return RESULT_SUCCESS;
++}
++
++static int handle_mfcr2_show_variants(int fd, int argc, char *argv[]) 
++{
++#define FORMAT "%4s %40s\n"
++	int numvariants = 0;
++	int i;
++	const openr2_variant_entry_t *variants;
++	if (!(variants = openr2_proto_get_variant_list(&numvariants))) {
++		ast_cli(fd, "Failed to get list of variants.\n");
++		return RESULT_FAILURE;
++	}
++	ast_cli(fd, FORMAT, "Variant Code", "Country");
++	for (i = 0; i < numvariants; i++) {
++		ast_cli(fd, FORMAT, variants[i].name, variants[i].country);
++	}
++	return RESULT_SUCCESS;
++#undef FORMAT
++}	
++
++static int handle_mfcr2_show_channels(int fd, int argc, char *argv[])
++{
++#define FORMAT "%4s %-7.7s %-7.7s %-8.8s %-9.9s %-16.16s %-8.8s %-8.8s\n"
++	int filtertype = 0;
++	int targetnum = 0;
++	char channo[5];
++	char anino[5];
++	char dnisno[5];
++	struct dahdi_pvt *p;
++	openr2_context_t *r2context;
++	openr2_variant_t r2variant;
++	if (!((argc == 3) || (argc == 5))) {
++		return RESULT_SHOWUSAGE;
++	}
++	if (argc == 5) {
++		if (!strcasecmp(argv[3], "group")) {
++			targetnum = atoi(argv[4]);
++			if ((targetnum < 0) || (targetnum > 63))
++				return RESULT_SHOWUSAGE;
++			targetnum = 1 << targetnum;
++			filtertype = 1;
++		} else if (!strcasecmp(argv[3], "context")) {
++			filtertype = 2;
++		} else {
++			return RESULT_SHOWUSAGE;
++		}
++	}
++	ast_cli(fd, FORMAT, "Chan", "Variant", "Max ANI", "Max DNIS", "ANI First", "Immediate Accept", "Tx CAS", "Rx CAS");
++	ast_mutex_lock(&iflock);
++	p = iflist;
++	while (p) {
++		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
++			p = p->next;
++			continue;
++		}
++		if (filtertype) {
++			switch(filtertype) {
++			case 1: /* mfcr2 show channels group <group> */
++				if (p->group != targetnum) {
++					p = p->next;
++					continue;
++				}
++				break;
++			case 2: /* mfcr2 show channels context <context> */
++				if (strcasecmp(p->context, argv[4])) {
++					p= p->next;
++					continue;
++				}
++				break;
++			default:
++				;
++			}
++		}
++		r2context = openr2_chan_get_context(p->r2chan);
++		r2variant = openr2_context_get_variant(r2context);
++		snprintf(channo, sizeof(channo), "%d", p->channel);
++		snprintf(anino, sizeof(anino), "%d", openr2_context_get_max_ani(r2context));
++		snprintf(dnisno, sizeof(dnisno), "%d", openr2_context_get_max_dnis(r2context));
++		ast_cli(fd, FORMAT, channo, openr2_proto_get_variant_string(r2variant), 
++				anino, dnisno, openr2_context_get_ani_first(r2context) ? "Yes" : "No",  
++				openr2_context_get_immediate_accept(r2context) ? "Yes" : "No",
++				openr2_chan_get_tx_cas_string(p->r2chan), openr2_chan_get_rx_cas_string(p->r2chan));
++		p = p->next;
++	}
++	ast_mutex_unlock(&iflock);
++	return RESULT_SUCCESS;
++#undef FORMAT
++}
++
++static int handle_mfcr2_set_debug(int fd, int argc, char *argv[])
++{
++	struct dahdi_pvt *p = NULL;
++	int channo = 0;
++	char *toklevel = NULL;
++	char *saveptr = NULL;
++	char *logval = NULL;
++	openr2_log_level_t loglevel = OR2_LOG_NOTHING;
++	openr2_log_level_t tmplevel = OR2_LOG_NOTHING;
++	if (argc < 4) {
++		return RESULT_SHOWUSAGE;
++	}
++	channo = (argc == 5) ? atoi(argv[4]) : -1;
++	logval = ast_strdupa(argv[3]);
++	toklevel = strtok_r(logval, ",", &saveptr);
++	if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
++		ast_cli(fd, "Invalid MFC/R2 logging level '%s'.\n", argv[3]);
++		return RESULT_FAILURE;
++	} else if (OR2_LOG_NOTHING == tmplevel) {
++		loglevel = tmplevel;
++	} else {
++		loglevel |= tmplevel;
++		while ((toklevel = strtok_r(NULL, ",", &saveptr))) {
++			if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
++				ast_cli(fd, "Ignoring invalid logging level: '%s'.\n", toklevel);
++				continue;
++			}
++			loglevel |= tmplevel;
++		}
++	}
++	ast_mutex_lock(&iflock);
++	p = iflist;
++	while (p) {
++		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
++			p = p->next;
++			continue;
++		}
++		if ((channo != -1) && (p->channel != channo )) {
++			p = p->next;
++			continue;
++		}
++		openr2_chan_set_log_level(p->r2chan, loglevel);
++		if (channo != -1) {
++			ast_cli(fd, "MFC/R2 debugging set to '%s' for channel %d.\n", argv[3], p->channel);
++			break;
++		} else {
++			p = p->next;
++		}
++	}
++	if ((channo != -1) && !p) {
++		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
++	}
++	if (channo == -1) {
++		ast_cli(fd, "MFC/R2 debugging set to '%s' for all channels.\n", argv[3]);
++	}
++	ast_mutex_unlock(&iflock);
++	return RESULT_SUCCESS;
++}
++
++static int handle_mfcr2_call_files(int fd, int argc, char *argv[])
++{
++	struct dahdi_pvt *p = NULL;
++	int channo = 0;
++	if (argc < 4) {
++		return RESULT_SHOWUSAGE;
++	}
++	channo = (argc == 5) ? atoi(argv[4]) : -1;
++	ast_mutex_lock(&iflock);
++	p = iflist;
++	while (p) {
++		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
++			p = p->next;
++			continue;
++		}
++		if ((channo != -1) && (p->channel != channo )) {
++			p = p->next;
++			continue;
++		}
++		if (ast_true(argv[3])) {
++			openr2_chan_enable_call_files(p->r2chan);
++		} else {
++			openr2_chan_disable_call_files(p->r2chan);
++		}
++		if (channo != -1) {
++			if (ast_true(argv[3])) {
++				ast_cli(fd, "MFC/R2 call files enabled for channel %d.\n", p->channel);
++			} else {
++				ast_cli(fd, "MFC/R2 call files disabled for channel %d.\n", p->channel);
++			}
++			break;
++		} else {
++			p = p->next;
++		}
++	}
++	if ((channo != -1) && !p) {
++		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
++	}
++	if (channo == -1) {
++		if (ast_true(argv[3])) {
++			ast_cli(fd, "MFC/R2 Call files enabled for all channels.\n");
++		} else {
++			ast_cli(fd, "MFC/R2 Call files disabled for all channels.\n");
++		}	
++	}
++	ast_mutex_unlock(&iflock);
++	return RESULT_SUCCESS;
++}	
++
++static int handle_mfcr2_set_idle(int fd, int argc, char *argv[])
++{
++	struct dahdi_pvt *p = NULL;
++	int channo = 0;
++	channo = (argc == 4) ? atoi(argv[3]) : -1;
++	ast_mutex_lock(&iflock);
++	p = iflist;
++	while (p) {
++		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
++			p = p->next;
++			continue;
++		}
++		if ((channo != -1) && (p->channel != channo )) {
++			p = p->next;
++			continue;
++		}
++		if (!openr2_chan_set_idle(p->r2chan)) {
++			ast_mutex_lock(&p->lock);
++			p->mfcr2call = 0;
++			p->mfcr2block &= ~DAHDI_R2_LOCAL_BLOCK;
++			ast_mutex_unlock(&p->lock);
++		}
++		if (channo != -1) {
++			break;
++		} else {
++			p = p->next;
++		}
++	}
++	if ((channo != -1) && !p) {
++		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
++	}
++	ast_mutex_unlock(&iflock);
++	return RESULT_SUCCESS;
++}
++
++static int handle_mfcr2_set_blocked(int fd, int argc, char *argv[])
++{
++	struct dahdi_pvt *p = NULL;
++	int channo = 0;
++	channo = (argc == 4) ? atoi(argv[3]) : -1;
++	ast_mutex_lock(&iflock);
++	p = iflist;
++	while (p) {
++		if (!(p->sig & SIG_MFCR2) || !p->r2chan) {
++			p = p->next;
++			continue;
++		}
++		if ((channo != -1) && (p->channel != channo )) {
++			p = p->next;
++			continue;
++		}
++		if (!openr2_chan_set_blocked(p->r2chan)) {
++			ast_mutex_lock(&p->lock);
++			p->mfcr2block |= DAHDI_R2_LOCAL_BLOCK;
++			ast_mutex_unlock(&p->lock);
++		} else {
++			ast_cli(fd, "MFC/R2 channel %d could not be blocked.\n", p->channel);
++		}
++		if (channo != -1) {
++			break;
++		} else {
++			p = p->next;
++		}
++	}
++	if ((channo != -1) && !p) {
++		ast_cli(fd, "MFC/R2 channel %d not found.\n", channo);
++	}
++	ast_mutex_unlock(&iflock);
++	return RESULT_SUCCESS;
++}
++
++static const char dahdi_r2_version_help[] = 
++			"Usage: mfcr2 show version\n"
++			"       Shows the version of the OpenR2 library being used.\n";
++static const char dahdi_r2_variants_help[] = 
++			"Usage: mfcr2 show variants\n"
++			"       Show supported MFC/R2 variants.\n";
++static const char dahdi_r2_showchannels_help[] =
++			"Usage: mfcr2 show channels [group <group> | context <context>]\n"
++			"       Shows the zap channels configured with MFC/R2 signaling.\n";
++static const char dahdi_r2_setdebug_help[] =
++			"Usage: mfcr2 set debug <loglevel> <channel>\n"
++			"       Set a new logging level for the specified channel.\n"
++			"       If no channel is specified the logging level will be applied to all channels.\n";
++static const char dahdi_r2_callfiles_help[] =
++			"Usage: mfcr2 call files [on|off] <channel>\n"
++			"       Enable call files creation on the specified channel.\n"
++			"       If no channel is specified call files creation policy will be applied to all channels.\n";
++static const char dahdi_r2_setidle_help[] =
++			"Usage: mfcr2 set idle <channel>\n"
++			"       DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.\n"
++			"       Force the given channel into IDLE state.\n"
++			"       If no channel is specified, all channels will be set to IDLE.\n";
++static const char dahdi_r2_setblocked_help[] =
++			"Usage: mfcr2 set blocked <channel>\n"
++			"       DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.\n"
++			"       Force the given channel into BLOCKED state.\n"
++			"       If no channel is specified, all channels will be set to BLOCKED.\n";
++
++static struct ast_cli_entry dahdi_mfcr2_cli[] = {
++	{ { "mfcr2", "show", "version", NULL },
++	handle_mfcr2_version, "Show OpenR2 library version",
++	dahdi_r2_version_help },
++
++	{ { "mfcr2", "show", "variants", NULL },
++	handle_mfcr2_show_variants, "Show supported MFC/R2 variants",
++	dahdi_r2_variants_help },
++
++	{ { "mfcr2", "show", "channels", NULL },
++	handle_mfcr2_show_channels, "Show MFC/R2 channels",
++	dahdi_r2_showchannels_help },
++
++	{ { "mfcr2", "set", "debug", NULL },
++	handle_mfcr2_set_debug, "Set MFC/R2 channel logging level",
++	dahdi_r2_setdebug_help },
++
++	{ { "mfcr2", "call", "files", NULL },
++	handle_mfcr2_call_files, "Enable/Disable MFC/R2 call files",
++	dahdi_r2_callfiles_help },
++
++	{ { "mfcr2", "set", "idle", NULL },
++	handle_mfcr2_set_idle, "Reset MFC/R2 channel forcing it to IDLE",
++	dahdi_r2_setidle_help },
++
++	{ { "mfcr2", "set", "blocked", NULL },
++	handle_mfcr2_set_blocked, "Reset MFC/R2 channel forcing it to BLOCKED",
++	dahdi_r2_setblocked_help }
++
++};
++
++#endif /* HAVE_OPENR2 */
++
+ static int dahdi_destroy_channel(int fd, int argc, char **argv)
+ {
+ 	int channel;
+@@ -10872,6 +12270,9 @@ retry:
+ static int setup_dahdi(int reload);
+ static int dahdi_restart(void)
+ {
++#ifdef HAVE_OPENR2
++	int r;
++#endif
+ #if defined(HAVE_PRI)
+ 	int i, j;
+ #endif
+@@ -10886,6 +12287,18 @@ static int dahdi_restart(void)
+ 	if (option_verbose > 3)
+ 		ast_verbose("Initial softhangup of all DAHDI channels complete.\n");
+ 
++#ifdef HAVE_OPENR2
++	for (r = 0; r < NUM_SPANS; r++) {
++		if (r2links[r].master != AST_PTHREADT_NULL) {
++			ast_log(LOG_DEBUG, "Killing MFC/R2 monitor thread %p\n", &r2links[r].master);
++			pthread_cancel(r2links[r].master);
++			pthread_join(r2links[r].master, NULL);
++			openr2_context_delete(r2links[r].protocol_context);
++		}
++	}
++	init_mfcr2_globals();
++#endif
++
+ 	#if defined(HAVE_PRI)
+ 	for (i = 0; i < NUM_SPANS; i++) {
+ 		if (pris[i].master && (pris[i].master != AST_PTHREADT_NULL)) {
+@@ -11120,6 +12533,41 @@ static int dahdi_show_channel(int fd, in
+ 				if (tmp->slaves[x])
+ 					ast_cli(fd, "Slave Channel: %d\n", tmp->slaves[x]->channel);
+ 			}
++#ifdef HAVE_OPENR2
++			if (tmp->mfcr2) {
++				char calldir[OR2_MAX_PATH];
++				openr2_context_t *r2context = openr2_chan_get_context(tmp->r2chan);
++				openr2_variant_t r2variant = openr2_context_get_variant(r2context);
++				ast_cli(fd, "MFC/R2 Call: %s\n", tmp->mfcr2call ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Blocked: %s\n", tmp->mfcr2block ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 MF State: %s\n", openr2_chan_get_mf_state_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 MF Group: %s\n", openr2_chan_get_mf_group_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 State: %s\n", openr2_chan_get_r2_state_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 Call State: %s\n", openr2_chan_get_call_state_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 Call Files Enabled: %s\n", openr2_chan_get_call_files_enabled(tmp->r2chan) ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Variant: %s\n", openr2_proto_get_variant_string(r2variant));
++				ast_cli(fd, "MFC/R2 Max ANI: %d\n", openr2_context_get_max_ani(r2context));
++				ast_cli(fd, "MFC/R2 Max DNIS: %d\n", openr2_context_get_max_dnis(r2context));
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
++				ast_cli(fd, "MFC/R2 DTMF Dialing: %s\n", openr2_context_get_dtmf_dialing(r2context, NULL, NULL) ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 DTMF Detection: %s\n", openr2_context_get_dtmf_detection(r2context) ? "Yes" : "No");
++#endif
++				ast_cli(fd, "MFC/R2 Get ANI First: %s\n", openr2_context_get_ani_first(r2context) ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Skip Category: %s\n", openr2_context_get_skip_category_request(r2context) ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Immediate Accept: %s\n", openr2_context_get_immediate_accept(r2context) ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Accept On Offer: %s\n", tmp->mfcr2_accept_on_offer ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Charge Calls: %s\n", tmp->mfcr2_charge_calls ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Allow Collect Calls: %s\n", tmp->mfcr2_allow_collect_calls ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 Forced Release: %s\n", tmp->mfcr2_forced_release ? "Yes" : "No");
++				ast_cli(fd, "MFC/R2 MF Back Timeout: %dms\n", openr2_context_get_mf_back_timeout(r2context));
++				ast_cli(fd, "MFC/R2 R2 Metering Pulse Timeout: %dms\n", openr2_context_get_metering_pulse_timeout(r2context));
++				ast_cli(fd, "MFC/R2 Rx CAS: %s\n", openr2_chan_get_rx_cas_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 Tx CAS : %s\n", openr2_chan_get_tx_cas_string(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 MF Tx Signal: %d\n", openr2_chan_get_tx_mf_signal(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 MF Rx Signal: %d\n", openr2_chan_get_rx_mf_signal(tmp->r2chan));
++				ast_cli(fd, "MFC/R2 Call Files Directory: %s\n", openr2_context_get_log_directory(r2context, calldir, sizeof(calldir)));
++			}
++#endif
+ #ifdef HAVE_PRI
+ 			if (tmp->pri) {
+ 				ast_cli(fd, "PRI Flags: ");
+@@ -11599,7 +13047,9 @@ static int dahdi_action_restart(struct m
+ static int __unload_module(void)
+ {
+ 	struct dahdi_pvt *p;
+-
++#ifdef HAVE_OPENR2
++	int r;
++#endif
+ #ifdef HAVE_PRI
+ 	int i, j;
+ 	for (i = 0; i < NUM_SPANS; i++) {
+@@ -11613,6 +13063,19 @@ static int __unload_module(void)
+ 	}
+ 	ast_unregister_application(zap_send_keypad_facility_app);
+ #endif
++#ifdef HAVE_OPENR2
++	for (r = 0; r < NUM_SPANS; r++) {
++		if (r2links[r].master != AST_PTHREADT_NULL) {
++			pthread_cancel(r2links[r].master);
++			pthread_join(r2links[r].master, NULL);
++		}
++	}
++	ast_cli_unregister_multiple(dahdi_mfcr2_cli, sizeof(dahdi_mfcr2_cli) / sizeof(dahdi_mfcr2_cli[0]));
++	if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
++		ast_unregister_application(dahdi_accept_r2_call_app);
++	}
++	ast_unregister_application(zap_accept_r2_call_app);
++#endif
+ 	ast_cli_unregister_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry));
+ 	local_astman_unregister("DialOffHook");
+ 	local_astman_unregister("Hangup");
+@@ -11650,6 +13113,13 @@ static int __unload_module(void)
+ 		}
+ 	}
+ #endif
++#ifdef HAVE_OPENR2
++	for (r = 0; r < NUM_SPANS; r++) {
++		if (r2links[r].protocol_context) {
++			openr2_context_delete(r2links[r].protocol_context);
++		}
++	}
++#endif
+ 	ast_cond_destroy(&ss_thread_complete);
+ 	return 0;
+ }
+@@ -11749,6 +13219,11 @@ static int build_channels(struct dahdi_c
+ 				return -1;
+ 			}
+ 		}
++#ifdef HAVE_OPENR2
++		if (reload != 1 && r2links[mfcr2_cur_context_index].protocol_context) {
++			mfcr2_cur_context_index++;
++		}	
++#endif
+ 	}
+ 
+ 	return 0;
+@@ -12093,6 +13568,10 @@ static int process_dahdi(struct dahdi_ch
+ 				} else if (!strcasecmp(v->value, "featb")) {
+ 					confp->chan.sig = SIG_FEATB;
+ 					confp->chan.radio = 0;
++#ifdef HAVE_OPENR2
++				} else if (!strcasecmp(v->value, "mfcr2")) {
++					confp->chan.sig = SIG_MFCR2;
++#endif
+ #ifdef HAVE_PRI
+ 				} else if (!strcasecmp(v->value, "pri_net")) {
+ 					confp->chan.radio = 0;
+@@ -12303,6 +13782,97 @@ static int process_dahdi(struct dahdi_ch
+ 			} else if (!strcasecmp(v->name, "facilityenable")) {
+ 				confp->pri.facilityenable = ast_true(v->value);
+ #endif /* HAVE_PRI */
++#ifdef HAVE_OPENR2
++			} else if (!strcasecmp(v->name, "mfcr2_advanced_protocol_file")) {
++				ast_copy_string(mfcr2_cur_r2proto_file, v->value, sizeof(mfcr2_cur_r2proto_file));
++				ast_log(LOG_WARNING, "MFC/R2 Protocol file '%s' will be used, you only should use this if you *REALLY  KNOW WHAT YOU ARE DOING*.\n", mfcr2_cur_r2proto_file);
++			} else if (!strcasecmp(v->name, "mfcr2_logdir")) {
++				ast_copy_string(mfcr2_cur_logdir, v->value, sizeof(mfcr2_cur_logdir));
++			} else if (!strcasecmp(v->name, "mfcr2_variant")) {
++				mfcr2_cur_variant = openr2_proto_get_variant(v->value);
++				if (OR2_VAR_UNKNOWN == mfcr2_cur_variant) {
++					ast_log(LOG_WARNING, "Unknown MFC/R2 variant '%s' at line %d.\n", v->value, v->lineno);
++				}
++			} else if (!strcasecmp(v->name, "mfcr2_mfback_timeout")) {
++				mfcr2_cur_mfback_timeout = atoi(v->value);
++				if (!mfcr2_cur_mfback_timeout) {
++					ast_log(LOG_WARNING, "MF timeout of 0? hum, I will protect you from your ignorance. Setting default.\n");
++					mfcr2_cur_mfback_timeout = -1;
++				} else if (mfcr2_cur_mfback_timeout > 0 && mfcr2_cur_mfback_timeout < 500) {
++					ast_log(LOG_WARNING, "MF timeout less than 500ms is not recommended, you have been warned!\n");
++				}
++			} else if (!strcasecmp(v->name, "mfcr2_metering_pulse_timeout")) {
++				mfcr2_cur_metering_pulse_timeout = atoi(v->value);
++				if (mfcr2_cur_metering_pulse_timeout > 500) {
++					ast_log(LOG_WARNING, "mfcr2_metering_pulse_timeout greater than 500ms is not recommended, you have been warned!\n");
++				}
++#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 2
++			} else if (!strcasecmp(v->name, "mfcr2_dtmf_detection")) {
++				mfcr2_cur_dtmf_detection = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_dtmf_dialing")) {
++				mfcr2_cur_dtmf_dialing = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_dtmf_time_on")) {
++				mfcr2_cur_dtmf_time_on = atoi(v->value);
++			} else if (!strcasecmp(v->name, "mfcr2_dtmf_time_off")) {
++				mfcr2_cur_dtmf_time_off = atoi(v->value);
++#endif
++			} else if (!strcasecmp(v->name, "mfcr2_get_ani_first")) {
++				mfcr2_cur_get_ani_first = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_skip_category")) {
++				mfcr2_cur_skip_category = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_double_answer")) {
++				mfcr2_cur_double_answer = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_accept_on_offer")) {
++				mfcr2_cur_accept_on_offer = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_charge_calls")) {
++				mfcr2_cur_charge_calls = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_allow_collect_calls")) {
++				mfcr2_cur_allow_collect_calls = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_forced_release")) {
++				mfcr2_cur_forced_release= ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_immediate_accept")) {
++				mfcr2_cur_immediate_accept = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_call_files")) {
++				mfcr2_cur_call_files = ast_true(v->value) ? 1 : 0;
++			} else if (!strcasecmp(v->name, "mfcr2_max_ani")) {
++				mfcr2_cur_max_ani = atoi(v->value);
++				if (mfcr2_cur_max_ani >= AST_MAX_EXTENSION) {
++					mfcr2_cur_max_ani = AST_MAX_EXTENSION - 1;
++				}
++			} else if (!strcasecmp(v->name, "mfcr2_max_dnis")) {
++				mfcr2_cur_max_dnis = atoi(v->value);
++				if (mfcr2_cur_max_dnis >= AST_MAX_EXTENSION) {
++					mfcr2_cur_max_dnis = AST_MAX_EXTENSION - 1;
++				}
++			} else if (!strcasecmp(v->name, "mfcr2_category")) {
++				mfcr2_cur_category = openr2_proto_get_category(v->value);
++				if (OR2_CALLING_PARTY_CATEGORY_UNKNOWN == mfcr2_cur_category) {
++					mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
++					ast_log(LOG_WARNING, "Invalid MFC/R2 caller category '%s' at line %d. Using national subscriber as default.\n", 
++							v->value, v->lineno);
++				}
++			} else if (!strcasecmp(v->name, "mfcr2_logging")) {
++				openr2_log_level_t tmplevel;
++				char *toklevel = NULL;
++				char *saveptr = NULL;
++				char *logval = ast_strdupa(v->value);
++				toklevel = strtok_r(logval, ",", &saveptr);
++				if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
++					ast_log(LOG_WARNING, "Invalid MFC/R2 logging level '%s' at line %d.\n", v->value, v->lineno);
++				} else if (OR2_LOG_NOTHING == tmplevel) {
++					mfcr2_cur_loglevel = tmplevel;
++				} else {
++					mfcr2_cur_loglevel |= tmplevel;
++					while ((toklevel = strtok_r(NULL, ",", &saveptr))) {
++						if (-1 == (tmplevel = openr2_log_get_level(toklevel))) {
++							ast_log(LOG_WARNING, "Ignoring invalid logging level: '%s' at line %d.\n", toklevel, v->lineno);
++							continue;
++						}
++						mfcr2_cur_loglevel |= tmplevel;
++					}
++				}
++#endif /* HAVE_OPENR2 */
++
+ 			} else if (!strcasecmp(v->name, "cadence")) {
+ 				/* setup to scan our argument */
+ 				int element_count, c[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+@@ -12599,6 +14169,21 @@ static int setup_dahdi(int reload)
+ 		}
+ 	}
+ #endif
++#ifdef HAVE_OPENR2
++	if (reload != 1) {
++		int x;
++		for (x = 0; x < NUM_SPANS; x++) {
++			if (r2links[x].protocol_context) {
++				if (ast_pthread_create(&r2links[x].master, NULL, mfcr2_monitor, &r2links[x])) {
++					ast_log(LOG_ERROR, "Unable to start R2 context on span %d\n", x + 1);
++					return -1;
++				} else {
++					ast_verbose(VERBOSE_PREFIX_2 "Starting R2 context on span %d\n", x + 1);
++				}
++			}
++		}
++	}
++#endif
+ 	/* And start the monitor for the first time */
+ 	restart_monitor();
+ 	return 0;
+@@ -12634,6 +14219,15 @@ static int load_module(void)
+ 	ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
+ 		zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
+ #endif
++#ifdef HAVE_OPENR2
++	init_mfcr2_globals();
++	if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
++		ast_register_application(dahdi_accept_r2_call_app, dahdi_accept_r2_call_exec,
++			dahdi_accept_r2_call_synopsis, dahdi_accept_r2_call_descrip);
++	}
++	ast_register_application(zap_accept_r2_call_app, zap_accept_r2_call_exec,
++		zap_accept_r2_call_synopsis, zap_accept_r2_call_descrip);
++#endif
+ 	if ((res = setup_dahdi(0))) {
+ 		return AST_MODULE_LOAD_DECLINE;
+ 	}
+@@ -12652,6 +14246,9 @@ static int load_module(void)
+ 	ast_string_field_set(&inuse, name, "GR-303InUse");
+ 	ast_cli_register_multiple(dahdi_pri_cli, sizeof(dahdi_pri_cli) / sizeof(struct ast_cli_entry));
+ #endif	
++#ifdef HAVE_OPENR2
++	ast_cli_register_multiple(dahdi_mfcr2_cli, sizeof(dahdi_mfcr2_cli)/sizeof(dahdi_mfcr2_cli[0]));
++#endif
+ 	ast_cli_register_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry));
+ 	
+ 	memset(round_robin, 0, sizeof(round_robin));
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
new file mode 100644
index 0000000..ffea412
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/channels_chan_sip.c.patch
@@ -0,0 +1,76 @@
+--- asterisk-1.4.39.1/channels/chan_sip.c	2010-12-09 14:00:30.000000000 -0800
++++ asterisk-1.4.39.1-vici/channels/chan_sip.c	2011-02-08 18:14:49.000000000 -0800
+@@ -1557,6 +1557,7 @@ static int sip_reg_timeout(const void *d
+ static void sip_send_all_registers(void);
+ 
+ /*--- Parsing SIP requests and responses */
++static int check_cpd_results(struct sip_pvt *p, struct sip_request *req);
+ static void append_date(struct sip_request *req);	/* Append date to SIP packet */
+ static int determine_firstline_parts(struct sip_request *req);
+ static const struct cfsubscription_types *find_subscription_type(enum subscriptiontype subtype);
+@@ -4613,6 +4614,37 @@ static const char *find_alias(const char
+ 
+ 	return _default;
+ }
++/*! \brief Check for a CPD-Result
++		This looks for a CPD-Result in the sip_request 
++		and throws a manager event if it finds one
++ */
++static int check_cpd_results(struct sip_pvt *p, struct sip_request *req) {
++	const char *cpdr = get_header(req, "CPD-Result");\
++	/* See if NetBorder had anything to say */
++	if (!(ast_strlen_zero(cpdr))) {
++		if (p->owner) {
++			/* If so throw a manager event with the result */
++			manager_event(
++				EVENT_FLAG_SYSTEM, 
++				"CPD-Result", 
++				"ChannelDriver: SIP\r\nChannel: %s\r\nCallerIDName: %s\r\nUniqueid: %s\r\nResult: %s\r\n",
++				p->owner->name,
++				p->owner->cid.cid_name,
++				p->owner->uniqueid,
++				cpdr
++			);
++		} else {  
++			/* Apparently we can have a CPD-Result and no owner, better not crash it though */
++			manager_event(
++				EVENT_FLAG_SYSTEM,
++				"CPD-Result",
++				"ChannelDriver: SIP\r\nChannel: UNKNOWN\r\nCallerIDName: UNKNOWN\r\nUniqueid: UNKNOWN\r\nResult: %s\r\n",
++				cpdr
++                        );
++		}
++	} 
++	return 0;
++}
+ 
+ static const char *__get_header(const struct sip_request *req, const char *name, int *start)
+ {
+@@ -7611,6 +7643,7 @@ static void initreqprep(struct sip_reque
+ 	char tmp2[SIPBUFSIZE/2];
+ 	const char *l = NULL, *n = NULL, *d = NULL;
+ 	const char *urioptions = "";
++	const char *netbordercpd = ";cpd=on";  /* string used to enable NetBorder's CPD */
+ 
+ 	if (ast_test_flag(&p->flags[0], SIP_USEREQPHONE)) {
+ 	 	const char *s = p->username;	/* being a string field, cannot be NULL */
+@@ -7699,6 +7732,9 @@ static void initreqprep(struct sip_reque
+ 	if (p->options && !ast_strlen_zero(p->options->uri_options))
+ 		ast_build_string(&invite, &invite_max, ";%s", p->options->uri_options);
+ 	
++	/* Tell NetBorder to enable CPD */
++	ast_build_string(&invite, &invite_max, "%s", netbordercpd);
++	
+ 	ast_string_field_set(p, uri, invite_buf);
+ 
+ 	if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 
+@@ -13882,6 +13918,9 @@ static void handle_response(struct sip_p
+ 		return;
+ 	}
+ 
++	/* Check if NetBorder had anything to say */
++	check_cpd_results(p, req);
++
+ 	if (p->relatedpeer && p->method == SIP_OPTIONS) {
+ 		/* We don't really care what the response is, just that it replied back. 
+ 		   Well, as long as it's not a 100 response...  since we might
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch b/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
new file mode 100644
index 0000000..8714aa9
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/configure.ac.patch
@@ -0,0 +1,19 @@
+--- asterisk-1.4.39.1/configure.ac	2010-10-04 13:15:26.000000000 -0700
++++ asterisk-1.4.39.1-vici/configure.ac	2011-02-08 18:15:16.000000000 -0800
+@@ -260,6 +260,7 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL],
+ AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+ AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
+ AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
++AST_EXT_LIB_SETUP([OPENR2], [MFCR2], [openr2])
+ AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
+ AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
+ AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
+@@ -1498,6 +1499,8 @@ AST_EXT_LIB_CHECK([PRI_VERSION], [pri],
+ 
+ AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])
+ 
++AST_EXT_LIB_CHECK([OPENR2], [openr2], [openr2_chan_new], [openr2.h])
++
+ if test "${USE_PWLIB}" != "no"; then
+ 	if test -n "${PWLIB_DIR}"; then
+ 		PWLIBDIR="${PWLIB_DIR}"
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch b/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
new file mode 100644
index 0000000..f875ab1
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch
@@ -0,0 +1,11 @@
+--- asterisk-1.4.39.1/contrib/scripts/get_ilbc_source.sh	2009-04-22 07:29:28.000000000 -0700
++++ asterisk-1.4.39.1-vici/contrib/scripts/get_ilbc_source.sh	2013-04-28 05:14:16.000000000 -0700
+@@ -22,7 +22,7 @@ read tmp
+ 
+ wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
+ 
+-wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | tr -d '\r' > codecs/ilbc/extract-cfile.awk
++wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.txt | tr -d '\r' > codecs/ilbc/extract-cfile.awk
+ 
+ (cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)
+ 
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
new file mode 100644
index 0000000..dfc85f8
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_channel.h.patch
@@ -0,0 +1,39 @@
+--- asterisk-1.4.39.1/include/asterisk/channel.h	2010-11-22 10:46:26.000000000 -0800
++++ asterisk-1.4.39.1-vici/include/asterisk/channel.h	2011-02-08 18:16:22.000000000 -0800
+@@ -645,6 +645,15 @@ enum {
+ 	 * instead of actually hanging up.
+ 	 */
+ 	AST_SOFTHANGUP_UNBRIDGE =  (1 << 6),
++
++
++	/*!
++	 * \brief All softhangup flags.
++	 *
++	 * This can be used as an argument to ast_channel_softhangup_clear
++	 * to clear all softhangup flags from a channel.
++	 */
++	AST_SOFTHANGUP_ALL =       (0xFFFFFFFF)
+ };
+ 
+ 
+@@ -834,6 +843,20 @@ int ast_softhangup(struct ast_channel *c
+  * \param reason an AST_SOFTHANGUP_* reason code */
+ int ast_softhangup_nolock(struct ast_channel *chan, int cause);
+ 
++/*!
++ * \brief Clear a set of softhangup flags from a channel
++ *
++ * Never clear a softhangup flag from a channel directly.  Instead,
++ * use this function.  This ensures that all aspects of the softhangup
++ * process are aborted.
++ *
++ * \param chan the channel to clear the flag on
++ * \param flag the flag or flags to clear
++ *
++ * \return Nothing.
++ */
++void ast_channel_clear_softhangup(struct ast_channel *chan, int flag);
++
+ /*! \brief Check to see if a channel is needing hang up 
+  * \param chan channel on which to check for hang up
+  * This function determines if the channel is being requested to be hung up.
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
new file mode 100644
index 0000000..47cb495
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch
@@ -0,0 +1,12 @@
+--- asterisk-1.4.39.1/include/asterisk/dahdi_compat.h	2009-02-13 13:53:16.000000000 -0800
++++ asterisk-1.4.39.1-vici/include/asterisk/dahdi_compat.h	2011-02-08 18:15:16.000000000 -0800
+@@ -320,6 +320,9 @@
+ #if defined(ZT_SETTONEZONE)
+ #define DAHDI_SETTONEZONE ZT_SETTONEZONE
+ #endif
++#if defined(ZT_SIG_CAS)
++#define DAHDI_SIG_CAS ZT_SIG_CAS
++#endif
+ #if defined(ZT_SIG_CLEAR)
+ #define DAHDI_SIG_CLEAR ZT_SIG_CLEAR
+ #endif
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
new file mode 100644
index 0000000..eae3840
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/main_channel.c.patch
@@ -0,0 +1,60 @@
+--- asterisk-1.4.39.1/main/channel.c	2010-12-07 14:57:48.000000000 -0800
++++ asterisk-1.4.39.1-vici/main/channel.c	2011-02-08 18:16:22.000000000 -0800
+@@ -1571,6 +1571,31 @@ struct ast_datastore *ast_channel_datast
+ 	return datastore;
+ }
+ 
++void ast_channel_clear_softhangup(struct ast_channel *chan, int flag)
++{
++	ast_channel_lock(chan);
++
++	chan->_softhangup &= ~flag;
++
++	if (!chan->_softhangup) {
++		struct ast_frame *fr;
++
++		/* If we have completely cleared the softhangup flag,
++		 * then we need to fully abort the hangup process.  This requires
++		 * pulling the END_OF_Q frame out of the channel frame queue if it
++		 * still happens to be there. */
++
++		fr = AST_LIST_LAST(&chan->readq);
++		if (fr && fr->frametype == AST_FRAME_CONTROL &&
++				fr->subclass == AST_CONTROL_END_OF_Q) {
++			AST_LIST_REMOVE(&chan->readq, fr, frame_list);
++			ast_frfree(fr);
++		}
++	}
++
++	ast_channel_unlock(chan);
++}
++
+ /*! \brief Softly hangup a channel, don't lock */
+ int ast_softhangup_nolock(struct ast_channel *chan, int cause)
+ {
+@@ -4598,10 +4623,10 @@ static enum ast_bridge_result ast_generi
+ 				ast_jb_get_and_deliver(c0, c1);
+ 			if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
+ 				if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
+-					c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
++					ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
+ 				}
+ 				if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
+-					c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
++					ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
+ 				}
+ 				c0->_bridge = c1;
+ 				c1->_bridge = c0;
+@@ -4844,10 +4869,10 @@ enum ast_bridge_result ast_channel_bridg
+ 
+ 		if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
+ 			if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
+-				c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
++				ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
+ 			}
+ 			if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
+-				c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
++				ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
+ 			}
+ 			c0->_bridge = c1;
+ 			c1->_bridge = c0;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
new file mode 100644
index 0000000..8c10f06
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/main_manager.c.patch
@@ -0,0 +1,38 @@
+--- asterisk-1.4.39.1/main/manager.c	2010-10-02 01:50:05.000000000 -0700
++++ asterisk-1.4.39.1-vici/main/manager.c	2012-05-16 19:10:51.000000000 -0700
+@@ -224,6 +224,7 @@ struct mansession_session {
+ 	struct eventqent *eventq;
+ 	/* Timeout for ast_carefulwrite() */
+ 	int writetimeout;
++	int needclose;             /*!< Boolean, indicating that the client has closed, but we still have things to write */
+ 	int pending_event;         /*!< Pending events indicator in case when waiting_thread is NULL */
+ 	AST_LIST_ENTRY(mansession_session) list;
+ };
+@@ -2221,8 +2222,9 @@ static int process_events(struct mansess
+ 		if ((s->session->authenticated && (s->session->readperm & eqe->category) == eqe->category) &&
+ 				   ((s->session->send_events & eqe->category) == eqe->category)) {
+ 			if (s->fd > -1) {
+-				if (!ret && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->session->writetimeout) < 0)
+-					ret = -1;
++				if (!ret && !s->session->needclose && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->session->writetimeout) < 0) {
++					s->session->needclose = 1;
++				}
+ 			} else if (!s->session->outputstr && !(s->session->outputstr = ast_calloc(1, sizeof(*s->session->outputstr)))) 
+ 				ret = -1;
+ 			else 
+@@ -2384,7 +2386,14 @@ static int get_input(struct mansession_s
+ 		s->waiting_thread = pthread_self();
+ 		ast_mutex_unlock(&s->__lock);
+ 
+-		res = ast_poll(fds, 1, -1);
++		/* If the pipe is closed, read only those events still queued */
++		if (s->needclose) {
++			if ((res = poll(fds, 1, s->writetimeout)) == 0) {
++				res = -1;
++			}
++		} else {
++			res = poll(fds, 1, -1);
++		}
+ 
+ 		ast_mutex_lock(&s->__lock);
+ 		s->waiting_thread = AST_PTHREADT_NULL;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
new file mode 100644
index 0000000..b9686f9
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/main_pbx.c.patch
@@ -0,0 +1,44 @@
+--- asterisk-1.4.39.1/main/pbx.c	2010-11-22 10:46:26.000000000 -0800
++++ asterisk-1.4.39.1-vici/main/pbx.c	2011-02-08 18:16:22.000000000 -0800
+@@ -2383,7 +2383,7 @@ static int collect_digits(struct ast_cha
+ 		   keep reading digits until we can't possibly get a right answer anymore.  */
+ 		digit = ast_waitfordigit(c, waittime * 1000);
+ 		if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
+-			c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
++			ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
+ 		} else {
+ 			if (!digit)	/* No entry */
+ 				break;
+@@ -2474,7 +2474,7 @@ static int __ast_pbx_run(struct ast_chan
+ 				if (option_verbose > 1)
+ 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
+ 				if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
+-					c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
++					ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
+ 				} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT) {
+ 					/* atimeout, nothing bad */
+ 				} else {
+@@ -2485,12 +2485,12 @@ static int __ast_pbx_run(struct ast_chan
+ 				}
+ 			}
+ 			if (c->_softhangup & AST_SOFTHANGUP_ASYNCGOTO) {
+-				c->_softhangup &= ~AST_SOFTHANGUP_ASYNCGOTO;
++				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
+ 			} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT && ast_exists_extension(c,c->context,"T",1,c->cid.cid_num)) {
+ 				set_ext_pri(c, "T", 0); /* 0 will become 1 with the c->priority++; at the end */
+ 				/* If the AbsoluteTimeout is not reset to 0, we'll get an infinite loop */
+ 				c->whentohangup = 0;
+-				c->_softhangup &= ~AST_SOFTHANGUP_TIMEOUT;
++				ast_channel_clear_softhangup(c, AST_SOFTHANGUP_ASYNCGOTO);
+ 			} else if (c->_softhangup) {
+ 				if (option_debug)
+ 					ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
+@@ -2522,7 +2522,7 @@ static int __ast_pbx_run(struct ast_chan
+ 			}
+ 		} else if (c->_softhangup & AST_SOFTHANGUP_TIMEOUT) {
+ 			/* If we get this far with AST_SOFTHANGUP_TIMEOUT, then we know that the "T" extension is next. */
+-			c->_softhangup &= ~AST_SOFTHANGUP_TIMEOUT;
++			ast_channel_clear_softhangup(c, AST_SOFTHANGUP_TIMEOUT);
+ 		} else {	/* keypress received, get more digits for a full extension */
+ 			int waittime = 0;
+ 			if (digit)
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
new file mode 100644
index 0000000..acd1763
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/main_utils.c.patch
@@ -0,0 +1,25 @@
+--- asterisk-1.4.39.1/main/utils.c	2011-01-17 10:57:55.000000000 -0800
++++ asterisk-1.4.39.1-vici/main/utils.c	2012-05-16 19:18:38.000000000 -0700
+@@ -951,18 +951,18 @@ int ast_carefulwrite(int fd, char *s, in
+ 					}
+ 					/* This was an acceptable error, go back into poll() */
+ 					continue;
++				} else if (errno != EPIPE) {
++					/* Fatal error, bail. */
++					ast_log(LOG_ERROR, "poll returned error: %s\n", strerror(errno));
+ 				}
+ 
+-				/* Fatal error, bail. */
+-				ast_log(LOG_ERROR, "poll returned error: %s\n", strerror(errno));
+-
+ 				return -1;
+ 			}
+ 		}
+ 
+ 		res = write(fd, s, len);
+ 
+-		if (res < 0 && errno != EAGAIN && errno != EINTR) {
++		if (res < 0 && errno != EAGAIN && errno != EINTR && errno != EPIPE) {
+ 			/* fatal error from write() */
+ 			ast_log(LOG_ERROR, "write() returned error: %s\n", strerror(errno));
+ 			return -1;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch b/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
new file mode 100644
index 0000000..306ad6e
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/makeopts.in.patch
@@ -0,0 +1,12 @@
+--- asterisk-1.4.39.1/makeopts.in	2010-09-05 23:54:18.000000000 -0700
++++ asterisk-1.4.39.1-vici/makeopts.in	2011-02-08 18:15:16.000000000 -0800
+@@ -138,6 +138,9 @@ POPT_LIB=@POPT_LIB@
+ PRI_INCLUDE=@PRI_INCLUDE@
+ PRI_LIB=@PRI_LIB@
+ 
++OPENR2_INCLUDE=@OPENR2_INCLUDE@
++OPENR2_LIB=@OPENR2_LIB@
++
+ PWLIB_INCLUDE=@PWLIB_INCLUDE@
+ PWLIB_LIB=@PWLIB_LIB@
+ 
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch b/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
new file mode 100644
index 0000000..2cbe098
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/menuselect-tree.patch
@@ -0,0 +1,292 @@
+--- asterisk-1.4.39.1/menuselect-tree	2011-01-17 11:08:23.000000000 -0800
++++ asterisk-1.4.39.1-vici/menuselect-tree	2013-05-13 21:48:22.000000000 -0700
+@@ -2,182 +2,182 @@
+ 
+ <menu name="Asterisk Module and Build Option Selection">
+ <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
+-<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
+-	<depend>res_adsi</depend>
+-</member>
+-<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
++<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
+ </member>
+-<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
++<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
++	<depend>dahdi</depend>
++	<depend>tonezone</depend>
++	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
++<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
+ </member>
+-<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
++<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
+ </member>
+-<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
++<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
+ </member>
+-<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
++<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
+ </member>
+-<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
++<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
+ </member>
+-<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
++<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
+ </member>
+-<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
+-	<depend>dahdi</depend>
++<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
++	<depend>res_indications</depend>
+ </member>
+-<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
+-	<depend>dahdi</depend>
+-	<depend>working_fork</depend>
++<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
+ </member>
+-<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
+-	<depend>dahdi</depend>
++<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
+ </member>
+-<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
++<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
+ </member>
+-<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
+-        <depend>chan_local</depend>
++<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
+ </member>
+ <member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
+ </member>
+-<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
++<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
++	<depend>dahdi</depend>
++	<depend>app_meetme</depend>
+ </member>
+-<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
++<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
+ </member>
+-<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
++<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
+ </member>
+-<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
++<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
+ </member>
+-<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
++<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
+ </member>
+-<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
++<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
+ </member>
+-<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
+-	<depend>working_fork</depend>
++<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
+ </member>
+-<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
+-	<depend>working_fork</depend>
++<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
+ </member>
+-<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
+-	<depend>dahdi</depend>
++<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
+ </member>
+-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
+-        <depend>chan_local</depend>
++<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
+ </member>
+-<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
++<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
+ </member>
+-<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
++<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
+ </member>
+-<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
++<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
++	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
+-	<depend>working_fork</depend>
++<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
++</member>
++<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
++</member>
++<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
++	<depend>res_adsi</depend>
++	<depend>res_smdi</depend>
+ </member>
+ <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
+ </member>
+-<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
+-	<defaultenabled>no</defaultenabled>
++<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
++        <depend>chan_local</depend>
+ </member>
+-<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
++<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
+ </member>
+-<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
++<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
+ </member>
+-<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
++<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
+ </member>
+-<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
++<member name="app_dahdibarge" displayname="Barge in on channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
+ 	<depend>dahdi</depend>
+ </member>
+-<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
+-	<depend>res_indications</depend>
++<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
+ </member>
+-<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
++<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
++        <depend>chan_local</depend>
+ </member>
+-<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
++<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
++</member>
++<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
++</member>
++<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
+ </member>
+ <member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
+ 	<depend>working_fork</depend>
+ </member>
+-<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
++<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
++</member>
++<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
+ 	<depend>working_fork</depend>
+ </member>
+-<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
+-	<depend>osptk</depend>
+-	<depend>ssl</depend>
++<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
+ </member>
+-<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
++<member name="app_dahdiscan" displayname="Scan Zap channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
+ 	<depend>dahdi</depend>
+-	<depend>app_meetme</depend>
+-</member>
+-<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
+-</member>
+-<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
+ </member>
+-<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
+-</member>
+-<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
+-        <depend>res_monitor</depend>
+-</member>
+-<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
++<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
+ </member>
+-<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
++<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
+ </member>
+-<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
++<member name="app_dahdiras" displayname="DAHDI RAS Application" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
++	<depend>dahdi</depend>
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
++<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
++<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
++	<depend>osptk</depend>
++	<depend>ssl</depend>
+ </member>
+-<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
+-	<depend>dahdi</depend>
+-	<depend>tonezone</depend>
++<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
+ 	<defaultenabled>no</defaultenabled>
+ </member>
+-<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
+-</member>
+-<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
++<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
++	<depend>dahdi</depend>
+ </member>
+-<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
++<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
+ </member>
+ <member name="app_setcallerid" displayname="Set CallerID Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
+ </member>
+-<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
++<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
++	<depend>res_adsi</depend>
+ </member>
+-<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
++<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
+ </member>
+-<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
+-	<defaultenabled>no</defaultenabled>
++<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
+ </member>
+-<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
++<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
+ </member>
+-<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
++<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
+ </member>
+-<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
++<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
+ </member>
+-<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
++<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
++<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
+ </member>
+-<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
++<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
++	<depend>working_fork</depend>
+ </member>
+-<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
++<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
+ </member>
+-<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
++<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
+ </member>
+-<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
++<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
++        <depend>res_monitor</depend>
+ </member>
+-<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
++<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
+ </member>
+-<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
++<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
+ </member>
+-<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
+-	<depend>res_adsi</depend>
+-	<depend>res_smdi</depend>
++<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
++	<depend>dahdi</depend>
+ </member>
+-<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
++<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
+ </member>
+-<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
++<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
+ </member>
+-<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
++<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
+ </member>
+-<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
++<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
++</member>
++<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
+ </member>
+ </category>
+ <category name="MENUSELECT_CDR" displayname="Call Detail Recording" remove_on_change="cdr/modules.link">
+@@ -217,6 +217,7 @@
+ 	<depend>tonezone</depend>
+ 	<depend>res_features</depend>
+ 	<use>pri</use>
++	<use>openr2</use>
+ </member>
+ <member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
+         <defaultenabled>no</defaultenabled>
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
new file mode 100644
index 0000000..0f03ff2
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/res_res_features.c.patch
@@ -0,0 +1,10 @@
+--- asterisk-1.4.39.1/res/res_features.c	2010-11-04 14:28:12.000000000 -0700
++++ asterisk-1.4.39.1-vici/res/res_features.c	2011-02-08 18:16:22.000000000 -0800
+@@ -258,6 +258,7 @@ static void check_goto_on_transfer(struc
+ 	xferchan->_state = AST_STATE_UP;
+ 	ast_clear_flag(xferchan, AST_FLAGS_ALL);	
+ 	xferchan->_softhangup = 0;
++	ast_channel_clear_softhangup(xferchan, AST_SOFTHANGUP_ALL);
+ 	if ((f = ast_read(xferchan))) {
+ 		ast_frfree(f);
+ 		f = NULL;
diff --git a/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch b/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
new file mode 100644
index 0000000..63cd639
--- /dev/null
+++ b/net-misc/asterisk/files/1.4.39.1/patches/res_res_musiconhold.c.patch
@@ -0,0 +1,155 @@
+--- asterisk-1.4.39.1/res/res_musiconhold.c	2010-09-09 10:20:17.000000000 -0700
++++ asterisk-1.4.39.1-vici/res/res_musiconhold.c	2011-02-08 18:14:57.000000000 -0800
+@@ -49,6 +49,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
++#include <sys/dir.h>
++#include <sys/param.h>
+ #ifdef SOLARIS
+ #include <thread.h>
+ #endif
+@@ -830,57 +833,89 @@ static int moh_add_file(struct mohclass
+ 	return 0;
+ }
+ 
+-static int moh_scan_files(struct mohclass *class) {
+-
+-	DIR *files_DIR;
+-	struct dirent *files_dirent;
++static int moh_scan_files(struct mohclass *class)
++{
++	int file_count;
++	int i, j;
+ 	char path[PATH_MAX];
+ 	char filepath[PATH_MAX];
+ 	char *ext;
+ 	struct stat statbuf;
+-	int dirnamelen;
+-	int i;
+-	
+-	files_DIR = opendir(class->dir);
+-	if (!files_DIR) {
+-		ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist\n", class->dir);
+-		return -1;
+-	}
++	struct direct **files;
+ 
++	/* free the current file list */
+ 	for (i = 0; i < class->total_files; i++)
+ 		free(class->filearray[i]);
+ 
++	/* reset the file count */
+ 	class->total_files = 0;
+-	dirnamelen = strlen(class->dir) + 2;
++
++	/* save the current directory */
+ 	if (!getcwd(path, sizeof(path))) {
+ 		ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
+ 		return -1;
+ 	}
++
++	/* go to the directory in question*/
+ 	if (chdir(class->dir) < 0) {
+-		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
++		ast_log(LOG_WARNING, "chdir(%s) failed: %s\n", class->dir, strerror(errno));
+ 		return -1;
+ 	}
+-	while ((files_dirent = readdir(files_DIR))) {
++
++	if (option_verbose > 2)
++		ast_verbose(VERBOSE_PREFIX_3 "Loading musiconhold files from directory '%s'\n",class->dir);
++
++	/* get the file listing for the directory and sort it alphabetically */
++	file_count = scandir(class->dir, &files, NULL, alphasort);
++
++	/* scandir returned and error */
++	if (file_count <= -1) {
++		ast_log(LOG_WARNING, "Cannot open dir %s or dir does not exist\n", class->dir);
++		return -1;
++	}
++
++	/* loop through the files */
++	for (j=1; j < file_count+1; ++j) {
++
+ 		/* The file name must be at least long enough to have the file type extension */
+-		if ((strlen(files_dirent->d_name) < 4))
++		if ((strlen(files[j-1]->d_name) < 4)) {
++			if (option_verbose > 2)
++				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename is too short to have an acceptable extension.\n", files[j-1]->d_name);
+ 			continue;
++		}
+ 
+ 		/* Skip files that starts with a dot */
+-		if (files_dirent->d_name[0] == '.')
++		if (files[j-1]->d_name[0] == '.') {
++			if (option_verbose > 2)
++				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename begins with a dot.\n", files[j-1]->d_name);
+ 			continue;
++		}
+ 
+ 		/* Skip files without extensions... they are not audio */
+-		if (!strchr(files_dirent->d_name, '.'))
++		if (!strchr(files[j-1]->d_name, '.')) {
++			if (option_verbose > 2)
++				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Filename has no extension.\n", files[j-1]->d_name);
+ 			continue;
++		}
+ 
+-		snprintf(filepath, sizeof(filepath), "%s/%s", class->dir, files_dirent->d_name);
++		/* get the full path to the file */
++		snprintf(filepath, sizeof(filepath), "%s/%s", class->dir, files[j-1]->d_name);
+ 
+-		if (stat(filepath, &statbuf))
++		/* if we cannot stat the file skip it */
++		if (stat(filepath, &statbuf)) {
++			if (option_verbose > 2)
++				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Cannot stat the file.\n", files[j-1]->d_name);
+ 			continue;
++		}
+ 
+-		if (!S_ISREG(statbuf.st_mode))
++		/* if the file is not a regular file skip it */
++		if (!S_ISREG(statbuf.st_mode)) {
++			if (option_verbose > 2)
++				ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. File is not a regular file.\n", files[j-1]->d_name);
+ 			continue;
++		}
+ 
++		/* remove the file extension */
+ 		if ((ext = strrchr(filepath, '.'))) {
+ 			*ext = '\0';
+ 			ext++;
+@@ -888,18 +923,27 @@ static int moh_scan_files(struct mohclas
+ 
+ 		/* if the file is present in multiple formats, ensure we only put it into the list once */
+ 		for (i = 0; i < class->total_files; i++)
+-			if (!strcmp(filepath, class->filearray[i]))
++			if (!strcmp(filepath, class->filearray[i])) {
++				if (option_verbose > 2)
++					ast_verbose(VERBOSE_PREFIX_3 "Skipping file '%s'. Base filename already exists from another format.\n", files[j-1]->d_name);
+ 				break;
++			}
+ 
++		/* add the file */
+ 		if (i == class->total_files) {
+-			if (moh_add_file(class, filepath))
++			if (moh_add_file(class, filepath)) {
++				ast_log(LOG_WARNING, "Unable to add file %s.", filepath);
+ 				break;
++			} else {
++				if (option_verbose > 2)
++					ast_verbose(VERBOSE_PREFIX_3 "Adding file '%s' as '%s'.\n", files[j-1]->d_name, filepath);
++			}
+ 		}
+ 	}
+ 
+-	closedir(files_DIR);
++	/* go back where we came from */
+ 	if (chdir(path) < 0) {
+-		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
++		ast_log(LOG_WARNING, "chdir(%s) failed: %s\n", path, strerror(errno));
+ 		return -1;
+ 	}
+ 	return class->total_files;
diff --git a/net-misc/asterisk/files/get_ilbc_source.sh b/net-misc/asterisk/files/get_ilbc_source.sh
new file mode 100644
index 0000000..f2d0fd0
--- /dev/null
+++ b/net-misc/asterisk/files/get_ilbc_source.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
+
+wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.txt | tr -d '\r' > codecs/ilbc/extract-cfile.awk
+
+(cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)
+
+echo "***"
+echo "The iLBC source code download is complete."
+echo "***"
+
+exit 0

From 2295db485fb74981fdee2b9f9a4cc7fa562913e0 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 21 Oct 2014 14:19:57 -0700
Subject: [PATCH 044/261] updated path for cyneric stuff, and added new ebuild
 for cyneric cdr

---
 net-misc/freeswitch-cyneric-cdr/Manifest      |  9 ++++
 .../files/cdrprocessor.1                      | 39 +++++++++++++++
 .../files/cdrprocessor.2                      | 39 +++++++++++++++
 .../files/cdrprocessor.3                      | 39 +++++++++++++++
 .../files/cdrprocessor.4                      | 39 +++++++++++++++
 .../files/cdrprocessor.5                      | 39 +++++++++++++++
 .../files/cdrprocessor.6                      | 39 +++++++++++++++
 .../files/cdrprocessor.in                     | 39 +++++++++++++++
 .../freeswitch-cyneric-cdr-0.1.0.ebuild       | 47 +++++++++++++++++++
 net-misc/freeswitch-cyneric/Manifest          |  4 +-
 .../freeswitch-cyneric-0.1.0.ebuild           |  2 +-
 11 files changed, 332 insertions(+), 3 deletions(-)
 create mode 100644 net-misc/freeswitch-cyneric-cdr/Manifest
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.1
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.2
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.3
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.4
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.5
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.6
 create mode 100755 net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.in
 create mode 100644 net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild

diff --git a/net-misc/freeswitch-cyneric-cdr/Manifest b/net-misc/freeswitch-cyneric-cdr/Manifest
new file mode 100644
index 0000000..337c7d1
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/Manifest
@@ -0,0 +1,9 @@
+AUX cdrprocessor.1 939 SHA256 970f00b0328e999842c94a35b55cce57ff121199330d4ce348e5a385007da08c SHA512 6897283614d9cac6f5b9f645df3b57918da9399a4fe083bc9eb9c9811f671950dccc66fadbc7b9bc219db7083e79f796753e5da8b41ebfbc7f5f4ea3aa91f24c WHIRLPOOL bfb19a167b53b5c666b5a053871a8a3bf53807d9d6caf5c706099158f080e58df3636dc70428f97ec94c95d69db0255185679ad53db5cc4da15c02f0643e8bb7
+AUX cdrprocessor.2 939 SHA256 f439467fdc8ce47b11820dce0830e1f6cf62184bd8fcd9c65a8f73295a16251f SHA512 bded00fce5ea621f7f23e0abf568f2ccdd147c41c0a8281660892fe308f2016bf3c25ab984d05a88dfa34e96013a8bbf90d27267962c839f5a22589593f9895d WHIRLPOOL bb56c480e2ba34bb30bc601682393b4850e49aaab51646f0f21f77534fcab41362970c5472d28e68c5144a03a3b59e9e74379d2e86ef3136ce743330650c3aa5
+AUX cdrprocessor.3 939 SHA256 5b29de05f7fc7ff2570cd8a7e423a33c1b084208b91a2e2ad14d99c41ccb5119 SHA512 7f1c22e73807997d4fc1a1b90a2ef5a77c669350749352a52296353f24485a509d74d04b3e2230eeaddf12c09e63333ec538c6c31e7cf4ee3706df8a5ce857e4 WHIRLPOOL f7b0790c14d9cf1ab9acb281a7dc69f9083d6caf284419eafb206f80710ae304a3fb5139bcdfd65528235ca0e7e155b25f319460e90a6c19835ee5aeab5e7dd2
+AUX cdrprocessor.4 939 SHA256 df97e114a383912e8c51ba192631beebdd8c40580f6873c970df9c8d959fdb15 SHA512 e48af43ae576f55cd6644834685b1ced19d4af51b3a193d1fc3a48a93a1114e3c06989b8c2e07a9f72e9e8141fcb80507d92ad447a3edec431bb9b5d6818ff6b WHIRLPOOL 96d96ea5351c99fe2928d8b12bc0a4ae4ab485e3120047a309c50219a0ec304f519f5eb0e3377db4454815581ed748093f37fa69a63b0e44fa484807fefe1fba
+AUX cdrprocessor.5 939 SHA256 f97c03b6358f44f452b8267761bce1a6275047c704692b05f3283e0c525d2544 SHA512 c7a28ce7fc7d1489bc619b5275a691d1e717151ecb8f01dfdbbd6e8525f234629798aa5b2fab0b9002eeaef79a8c4b5331af992726fc568970d9e101c92ec399 WHIRLPOOL 04782ebbd72e7a119c81b174317d1497482345241f688a49f546a116a0a98c88de13177f55cc0f518071b03b1225e81da4135cc7aad63ce50ff25f7840167aeb
+AUX cdrprocessor.6 939 SHA256 36bb010f475f969ec6c32590b7118d9c3dd67ead3632f0d2ff74286ef0c7adc1 SHA512 e0df4d75c1d5a64ab5b55e7734d95e7d517d772e7b629b57aafa503d568a77f07f789488e0ed0dbb5b46fdc2a288747406b65b63454620c802da3b89deff3eea WHIRLPOOL 2c30d984d466f0adf9ccc58651316cc3638e209cee71702889ded4202cbc0b18b15ab0e67fc950adf1f0d8fb2b65744f0f4751b27f32f0cd3d93630790d04c9b
+AUX cdrprocessor.in 940 SHA256 68afba5dd6db0810522e4dcdad0d1cac1cafa1ba40b0a9578c390617d76075b7 SHA512 d2f5ca4e7c5b5c63bb9788989f02680d138d89ae43357897a4bcfea2aa18efd7ccaddde3f684265a4a168c2645ae1f728dfb270502fba4b8c54579c3a86e37d6 WHIRLPOOL fc639edb99f86a6b1944b5659c719b7353091360e3c01a0304872ac89521b0fc849293c04a526cb1e5667f2936be53045583757385aee27a137cf52eb39f4937
+DIST freeswitch-cyneric-cdr-0.1.0.tar.gz 8203236 SHA256 81bea0cc69f3bd780661f56f09ec5721065e9f3e2eb158655924db2a37aa9d1c SHA512 bd35738833129da8e4ca07da58ee99f11cdfc271a77b4b3ba2a7aa1d149e9375857cb225937aec4912daa4e908bc017591e2368cc273f393827228529fca2954 WHIRLPOOL 871f19a17df8871b0b34e77c263c46557138ac8e1280b3b46ec09b79585b8c87c0f144a7dc4712ad93a057cd11f6c5191a477c67a55c6dabb1d17b2de5c36440
+EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 1059 SHA256 1613c9e5f60bc435fcad3038f8d5a3a198cf6da9e05d2158fabb55805f6f235b SHA512 4bbf03353c1f0517f00c7298051f2ff6daf494fe746d4c9aba4572cbafcf7e816b34b47b93676757a66051b52b785c31aa4be3e034a7b78b67d70216d7663bd0 WHIRLPOOL 7f92421332b5c436439eddb12f70e452430048b1ac53310806d1dea70c2a1e9e4616b4ef59a200ba83217d4ac746d7fb5d13b432d7e4da5bbeb19c0edc10e81e
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.1 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.1
new file mode 100755
index 0000000..e961edd
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.1
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor1"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.2 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.2
new file mode 100755
index 0000000..cbecfbe
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.2
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor2"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.3 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.3
new file mode 100755
index 0000000..6fa9ae9
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.3
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor3"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.4 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.4
new file mode 100755
index 0000000..c4b032b
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.4
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor4"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.5 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.5
new file mode 100755
index 0000000..f810e75
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.5
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor5"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.6 b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.6
new file mode 100755
index 0000000..7c992ff
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.6
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessor6"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.in b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.in
new file mode 100755
index 0000000..543d62a
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/files/cdrprocessor.in
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+CDR="CDRProcessorIn"
+CDRDIR="/opt/cyneric/${CDR}"
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	ebegin "Starting ${CDR}"
+	start-stop-daemon --start --quiet --exec ${CDRDIR}/scripts/start-java.sh start --pidfile ${CDRDIR}/log/java.isrunning
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CDR}"
+	start-stop-daemon --stop --quiet --exec ${CDRDIR}/scripts/start-java.sh stop --pidfile ${CDRDIR}/log/java.isrunning
+        eend $?
+}
+
+status() {
+	ebegin "Status ${CDR}"
+	${CDRDIR}/scripts/start-java.sh status
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
new file mode 100644
index 0000000..ca6f187
--- /dev/null
+++ b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright whoever
+# Free as in beer
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Cyneric CDR processor"
+HOMEPAGE="http://safesoft.us"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+LICENSE=""
+IUSE=""
+RESTRICT="mirror"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/cyneric/${P}.tar.gz"
+
+RDEPEND="dev-java/oracle-jdk-bin
+	net-analyzer/netcat"
+
+DEPEND="${RDEPEND}"
+
+
+pkg_preinst() {
+	einfo "installing new cyneric files"
+
+        cd ${WORKDIR}
+        cp -R * /opt/cyneric/
+
+}
+
+pkg_postinst() {
+        einfo ""
+        elog "updating init scripts"
+        einfo ""
+
+        newinitd "${FILESDIR}"/cdrprocessor.1	cdrprocessor.1
+        newinitd "${FILESDIR}"/cdrprocessor.2	cdrprocessor.2
+        newinitd "${FILESDIR}"/cdrprocessor.3	cdrprocessor.3
+        newinitd "${FILESDIR}"/cdrprocessor.4	cdrprocessor.4
+        newinitd "${FILESDIR}"/cdrprocessor.5	cdrprocessor.5
+        newinitd "${FILESDIR}"/cdrprocessor.6	cdrprocessor.6
+        newinitd "${FILESDIR}"/cdrprocessor.in	cdrprocessor.in
+
+	einfo ""
+        einfo "cyneric cdr install completed"
+}
diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index b2ab867..6d4d217 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,5 +4,5 @@ AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda406026
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
 AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
-DIST freeswitch-cyneric-0.1.0.tar.gz 5864803 SHA256 30d88283bf583bee6a9b9f20df428e5a6feffed616b90b1163c5b083fb734db0 SHA512 9350b0e793690bbeb3c36dd8a1c499da1fdc28d67bfb8d784c7cdb83d8d445ab13c55033a9ac286b55f0edd7451e097b03a7cd9d404494140529d5fc5c93a98e WHIRLPOOL cb3085d6c4c5c123ba23922619c4355da51646b01dbe2c8fc7ce033d1af86ce6d9ae2300dfd08e21fe951f1bac9bba1d131e704c789f12acf89d67b0b2f22e1d
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1812 SHA256 44f6babef8c34da02c06cc8acfb9865b0d7e598c345b2dd9b6dc5fe36571e027 SHA512 649b28ba3c273f3e9fdb0ce59d41cfcc522c1a44a1f3c3bc6f744dd2367873c694b963168f49136041334baa74cbb2f372875e3b4084c82392350cc64d458a51 WHIRLPOOL c008cb65e50dffea3c9e72a4030fcad0333bb23388eb2c748d351dbff630c96110169b61d3b3e40d6b462bb5dcbf32d07e948f266ae6cb976360c91fb860da8d
+DIST freeswitch-cyneric-0.1.0.tar.gz 5903323 SHA256 84063583627ab4b8bf2819fd59320e41e6dbe3442b1234db0ad28573f8b9a869 SHA512 97f4f57d56d6e65f3522f250ab05f6c7b8ab70d013ffdabe1b5da24cfd190b6b4f2c51ba8d8a698145c8910dc530a583506b6478171b52e191b6baf90ed1cb44 WHIRLPOOL 2f4915d92d679651e8af773ab9326bccb156943856a83aab51e2b67ce77795e123e4aeef891b292a08f863c495386cb8719b34dedfa7328b69acf62d8b161eae
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1809 SHA256 426ef2885abf307ab19ac6a6396e92010f08ca0b19701efcc299d310d9e70e4d SHA512 f6845b0f6f9f8158cb3a1aeb0298fff7bbdcc309898b34eda67d1759d9a97d4857becf8c2a4945442255f05d9381a56b002a22107f607dfcdb751a32d4408998 WHIRLPOOL 021c58c6a5892b52af82f6532d7ddbc85cff649b2521fd2db772d059d1352271f9e77dc8858a75e1fa2f1ea2c3115e58833e80d5f0bf86827160254bda5b43b2
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index 575e537..bf47689 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE=""
 IUSE=""
 RESTRICT="mirror"
-SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/freeswitch/${P}.tar.gz"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/cyneric/${P}.tar.gz"
 
 RDEPEND="dev-java/oracle-jdk-bin
         net-misc/freeswitch

From cb349e395140aabea8840406b48ff3c91465717a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 21 Oct 2014 17:07:50 -0700
Subject: [PATCH 045/261] forgot to have it create the /opt/cyneric dir if it
 doesn't exists

---
 net-misc/freeswitch-cyneric-cdr/Manifest                        | 2 +-
 .../freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric-cdr/Manifest b/net-misc/freeswitch-cyneric-cdr/Manifest
index 337c7d1..bc80615 100644
--- a/net-misc/freeswitch-cyneric-cdr/Manifest
+++ b/net-misc/freeswitch-cyneric-cdr/Manifest
@@ -6,4 +6,4 @@ AUX cdrprocessor.5 939 SHA256 f97c03b6358f44f452b8267761bce1a6275047c704692b05f3
 AUX cdrprocessor.6 939 SHA256 36bb010f475f969ec6c32590b7118d9c3dd67ead3632f0d2ff74286ef0c7adc1 SHA512 e0df4d75c1d5a64ab5b55e7734d95e7d517d772e7b629b57aafa503d568a77f07f789488e0ed0dbb5b46fdc2a288747406b65b63454620c802da3b89deff3eea WHIRLPOOL 2c30d984d466f0adf9ccc58651316cc3638e209cee71702889ded4202cbc0b18b15ab0e67fc950adf1f0d8fb2b65744f0f4751b27f32f0cd3d93630790d04c9b
 AUX cdrprocessor.in 940 SHA256 68afba5dd6db0810522e4dcdad0d1cac1cafa1ba40b0a9578c390617d76075b7 SHA512 d2f5ca4e7c5b5c63bb9788989f02680d138d89ae43357897a4bcfea2aa18efd7ccaddde3f684265a4a168c2645ae1f728dfb270502fba4b8c54579c3a86e37d6 WHIRLPOOL fc639edb99f86a6b1944b5659c719b7353091360e3c01a0304872ac89521b0fc849293c04a526cb1e5667f2936be53045583757385aee27a137cf52eb39f4937
 DIST freeswitch-cyneric-cdr-0.1.0.tar.gz 8203236 SHA256 81bea0cc69f3bd780661f56f09ec5721065e9f3e2eb158655924db2a37aa9d1c SHA512 bd35738833129da8e4ca07da58ee99f11cdfc271a77b4b3ba2a7aa1d149e9375857cb225937aec4912daa4e908bc017591e2368cc273f393827228529fca2954 WHIRLPOOL 871f19a17df8871b0b34e77c263c46557138ac8e1280b3b46ec09b79585b8c87c0f144a7dc4712ad93a057cd11f6c5191a477c67a55c6dabb1d17b2de5c36440
-EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 1059 SHA256 1613c9e5f60bc435fcad3038f8d5a3a198cf6da9e05d2158fabb55805f6f235b SHA512 4bbf03353c1f0517f00c7298051f2ff6daf494fe746d4c9aba4572cbafcf7e816b34b47b93676757a66051b52b785c31aa4be3e034a7b78b67d70216d7663bd0 WHIRLPOOL 7f92421332b5c436439eddb12f70e452430048b1ac53310806d1dea70c2a1e9e4616b4ef59a200ba83217d4ac746d7fb5d13b432d7e4da5bbeb19c0edc10e81e
+EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 1082 SHA256 6c43e5233ea44a7d1014df99cd0bb211f48d598ae9507246ae2cd202b4af86c9 SHA512 b9baef26f90bf4399964e4b541727ccd0b599d5e06f50176f9ea5c94390354b23810c1eb3ea77ca83e6a53afeb73c8f220ad2f299142c73d3c2aa9990a431ba4 WHIRLPOOL 394c7257512e636256d4399eb453709c546de848f6e7477c685b68ce33ca0b1db8e26a3f3db5cf543da2347282d753cb7d7fb769a20501f6d32979a37538830b
diff --git a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
index ca6f187..84f2fcc 100644
--- a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
@@ -25,6 +25,7 @@ pkg_preinst() {
 	einfo "installing new cyneric files"
 
         cd ${WORKDIR}
+	mkdir -p /opt/cyneric
         cp -R * /opt/cyneric/
 
 }

From 3a40b499aed5a52fd83346418eb77447e1fdf6f4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 21 Oct 2014 17:18:27 -0700
Subject: [PATCH 046/261] fixed the init script copying

---
 net-misc/freeswitch-cyneric-cdr/Manifest                  | 2 +-
 .../freeswitch-cyneric-cdr-0.1.0.ebuild                   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/net-misc/freeswitch-cyneric-cdr/Manifest b/net-misc/freeswitch-cyneric-cdr/Manifest
index bc80615..1da8c7f 100644
--- a/net-misc/freeswitch-cyneric-cdr/Manifest
+++ b/net-misc/freeswitch-cyneric-cdr/Manifest
@@ -6,4 +6,4 @@ AUX cdrprocessor.5 939 SHA256 f97c03b6358f44f452b8267761bce1a6275047c704692b05f3
 AUX cdrprocessor.6 939 SHA256 36bb010f475f969ec6c32590b7118d9c3dd67ead3632f0d2ff74286ef0c7adc1 SHA512 e0df4d75c1d5a64ab5b55e7734d95e7d517d772e7b629b57aafa503d568a77f07f789488e0ed0dbb5b46fdc2a288747406b65b63454620c802da3b89deff3eea WHIRLPOOL 2c30d984d466f0adf9ccc58651316cc3638e209cee71702889ded4202cbc0b18b15ab0e67fc950adf1f0d8fb2b65744f0f4751b27f32f0cd3d93630790d04c9b
 AUX cdrprocessor.in 940 SHA256 68afba5dd6db0810522e4dcdad0d1cac1cafa1ba40b0a9578c390617d76075b7 SHA512 d2f5ca4e7c5b5c63bb9788989f02680d138d89ae43357897a4bcfea2aa18efd7ccaddde3f684265a4a168c2645ae1f728dfb270502fba4b8c54579c3a86e37d6 WHIRLPOOL fc639edb99f86a6b1944b5659c719b7353091360e3c01a0304872ac89521b0fc849293c04a526cb1e5667f2936be53045583757385aee27a137cf52eb39f4937
 DIST freeswitch-cyneric-cdr-0.1.0.tar.gz 8203236 SHA256 81bea0cc69f3bd780661f56f09ec5721065e9f3e2eb158655924db2a37aa9d1c SHA512 bd35738833129da8e4ca07da58ee99f11cdfc271a77b4b3ba2a7aa1d149e9375857cb225937aec4912daa4e908bc017591e2368cc273f393827228529fca2954 WHIRLPOOL 871f19a17df8871b0b34e77c263c46557138ac8e1280b3b46ec09b79585b8c87c0f144a7dc4712ad93a057cd11f6c5191a477c67a55c6dabb1d17b2de5c36440
-EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 1082 SHA256 6c43e5233ea44a7d1014df99cd0bb211f48d598ae9507246ae2cd202b4af86c9 SHA512 b9baef26f90bf4399964e4b541727ccd0b599d5e06f50176f9ea5c94390354b23810c1eb3ea77ca83e6a53afeb73c8f220ad2f299142c73d3c2aa9990a431ba4 WHIRLPOOL 394c7257512e636256d4399eb453709c546de848f6e7477c685b68ce33ca0b1db8e26a3f3db5cf543da2347282d753cb7d7fb769a20501f6d32979a37538830b
+EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 693 SHA256 109d1f676b54ec16c1399c58e8cb56e02731f68dd2602d761440e75c5ac66a19 SHA512 77fb1c36c30d42162b6c0599bba05973b0994c8ca7fb8aa103f7fb6dafc51680f0f64e46de98fb84eb513ac6082043ab46d43b9ba27c677eb34767c3a3a06761 WHIRLPOOL a01793cff04dbd6ff90ce28fc55b9bd67a57274fb27c0b68fd9d81987c54285e3c3bbe06257a7b76eb0d6e6b7c4d91a731502719bdebcc3fca1fcb39850b0f38
diff --git a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
index 84f2fcc..351316c 100644
--- a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
@@ -35,13 +35,7 @@ pkg_postinst() {
         elog "updating init scripts"
         einfo ""
 
-        newinitd "${FILESDIR}"/cdrprocessor.1	cdrprocessor.1
-        newinitd "${FILESDIR}"/cdrprocessor.2	cdrprocessor.2
-        newinitd "${FILESDIR}"/cdrprocessor.3	cdrprocessor.3
-        newinitd "${FILESDIR}"/cdrprocessor.4	cdrprocessor.4
-        newinitd "${FILESDIR}"/cdrprocessor.5	cdrprocessor.5
-        newinitd "${FILESDIR}"/cdrprocessor.6	cdrprocessor.6
-        newinitd "${FILESDIR}"/cdrprocessor.in	cdrprocessor.in
+        cp "${FILESDIR}"/* /etc/init.d/
 
 	einfo ""
         einfo "cyneric cdr install completed"

From aa1c77281edc7b42895eca35136870269c775674 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 21 Oct 2014 17:45:20 -0700
Subject: [PATCH 047/261] fixed a bug in not setting the permissions

---
 .../freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
index 351316c..0e96b3c 100644
--- a/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric-cdr/freeswitch-cyneric-cdr-0.1.0.ebuild
@@ -27,7 +27,7 @@ pkg_preinst() {
         cd ${WORKDIR}
 	mkdir -p /opt/cyneric
         cp -R * /opt/cyneric/
-
+	chown -R cyneric:cyneric /opt/cyneric
 }
 
 pkg_postinst() {

From 505cb9b849a320748af3413549fa3ad38894fb8f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 21 Oct 2014 17:46:15 -0700
Subject: [PATCH 048/261] wrong digest

---
 net-misc/freeswitch-cyneric-cdr/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric-cdr/Manifest b/net-misc/freeswitch-cyneric-cdr/Manifest
index 1da8c7f..23273ce 100644
--- a/net-misc/freeswitch-cyneric-cdr/Manifest
+++ b/net-misc/freeswitch-cyneric-cdr/Manifest
@@ -6,4 +6,4 @@ AUX cdrprocessor.5 939 SHA256 f97c03b6358f44f452b8267761bce1a6275047c704692b05f3
 AUX cdrprocessor.6 939 SHA256 36bb010f475f969ec6c32590b7118d9c3dd67ead3632f0d2ff74286ef0c7adc1 SHA512 e0df4d75c1d5a64ab5b55e7734d95e7d517d772e7b629b57aafa503d568a77f07f789488e0ed0dbb5b46fdc2a288747406b65b63454620c802da3b89deff3eea WHIRLPOOL 2c30d984d466f0adf9ccc58651316cc3638e209cee71702889ded4202cbc0b18b15ab0e67fc950adf1f0d8fb2b65744f0f4751b27f32f0cd3d93630790d04c9b
 AUX cdrprocessor.in 940 SHA256 68afba5dd6db0810522e4dcdad0d1cac1cafa1ba40b0a9578c390617d76075b7 SHA512 d2f5ca4e7c5b5c63bb9788989f02680d138d89ae43357897a4bcfea2aa18efd7ccaddde3f684265a4a168c2645ae1f728dfb270502fba4b8c54579c3a86e37d6 WHIRLPOOL fc639edb99f86a6b1944b5659c719b7353091360e3c01a0304872ac89521b0fc849293c04a526cb1e5667f2936be53045583757385aee27a137cf52eb39f4937
 DIST freeswitch-cyneric-cdr-0.1.0.tar.gz 8203236 SHA256 81bea0cc69f3bd780661f56f09ec5721065e9f3e2eb158655924db2a37aa9d1c SHA512 bd35738833129da8e4ca07da58ee99f11cdfc271a77b4b3ba2a7aa1d149e9375857cb225937aec4912daa4e908bc017591e2368cc273f393827228529fca2954 WHIRLPOOL 871f19a17df8871b0b34e77c263c46557138ac8e1280b3b46ec09b79585b8c87c0f144a7dc4712ad93a057cd11f6c5191a477c67a55c6dabb1d17b2de5c36440
-EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 693 SHA256 109d1f676b54ec16c1399c58e8cb56e02731f68dd2602d761440e75c5ac66a19 SHA512 77fb1c36c30d42162b6c0599bba05973b0994c8ca7fb8aa103f7fb6dafc51680f0f64e46de98fb84eb513ac6082043ab46d43b9ba27c677eb34767c3a3a06761 WHIRLPOOL a01793cff04dbd6ff90ce28fc55b9bd67a57274fb27c0b68fd9d81987c54285e3c3bbe06257a7b76eb0d6e6b7c4d91a731502719bdebcc3fca1fcb39850b0f38
+EBUILD freeswitch-cyneric-cdr-0.1.0.ebuild 731 SHA256 65d7f5123037068e4e5d86fd768157107865df61d8cb7e5fd2183850c9c733c4 SHA512 715c32043c685ac91867c983f73f291d7cf63817f4bdcc6c270a3778595748157cdf4b082ce3f8746d8dee4648904c27ff3b3377d07c0ab1d456c5f2a6aea34c WHIRLPOOL 016852857f53854f2cb074e72abef8416c213892d48e640a502002253a23ff9b10c297dcf495d22b8f6291fec9fa46590a8ec4f1bc438044be885e6896cbdd0c

From 2140b07400d508c8d32fc807511cafc749900405 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Nov 2014 20:27:18 -0800
Subject: [PATCH 049/261] added opensips but 1.11.3 is broken so use 1.10.3

---
 net-misc/opensips/Manifest               |  10 ++
 net-misc/opensips/opensips-1.10.3.ebuild | 134 ++++++++++++++++++++++
 net-misc/opensips/opensips-1.11.3.ebuild | 136 +++++++++++++++++++++++
 3 files changed, 280 insertions(+)
 create mode 100644 net-misc/opensips/opensips-1.10.3.ebuild
 create mode 100644 net-misc/opensips/opensips-1.11.3.ebuild

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index ebe3d6b..506d944 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -1,2 +1,12 @@
+AUX Makefile-1.8.0.patch 653 SHA256 5f1323751bcbb6f32c665559a6d658b725d278308969127d879ecf2831138f56 SHA512 44fe13addc7f0cb1c241724f8865d2b673b55ed3379ef74976b7dbc6333fd997f130c5ab96e68f35380b380f8593cc712dcc119abeb4f8d644f664acfc6f9e53 WHIRLPOOL 1b3b429ca8bd254334c71f5011579a162a6f51850fd5dfa9167fad931cbb16dc1fed6fa8587fa404abe2b602741fe90030d46a7397c4077fd04521e17114b75b
+AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bdcb19746df47a038d SHA512 25fc5e61f6ffc2d9aa0ba28b2ff37cb7376c2917d9c3bf60bd1a73c9195b3f9b3b74a7f0cbb3f743db12efe5866c58cae1f3bc83ee0a27d5e4aea6172175412f WHIRLPOOL ddd46bd046751eff342ebd5ef965d684148e5d0a41aaf296764545d05518781065d981169ba9a6d5110efca7012b39b4654eeb33dc1500ce9726d780c51bbdf6
+AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d540466be30bc63 SHA512 a6bc407d96bfaca17e893ff8200e09703d4592e610dd5df66d2cccc635b134dac4b57a32ea5d9efd91a8f24d932616613115328bd561f34aabce84dff0c287e8 WHIRLPOOL aa67bce3127926b35e4c9bca24ec0f17490c41637645b58f37a24fa7f4a27ca5e99e115f1417e26d82a7a7b6c223074341e9bb24c5304d90a5f89e6305678cf6
+AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
+DIST opensips-1.10.3_src.tar.gz 4352917 SHA256 2e8c5c9000c1560f862f5290e933c647452ffe9a117b3ee9cd680936de93ac29 SHA512 470fe2b614e399babc9df237756fe89bd4196b61d993e5ded8934dbf1eb20ef3f2124ce50ae42b989dd7be524d0e654815d6f65897ef0612c6051739160b5038 WHIRLPOOL a6491c33ad9bb725c740df6adc6efb404300f4f4c4004e6c78e08acf0f95be429b0ac6169ac3bc20f3f275e3f6e65dc9ac86700e5d378a41a70038f70b6dbfdb
+DIST opensips-1.11.3-42f6d89_src.tar.gz 5492526 SHA256 51337cc8d69c08624b27e420b4bcd5bb5f3b6f042dfb4e366febc049f6306971 SHA512 e7916174161b3cd39375d70b02adacaa5ddf972f39b9b041bbc9977dd5b5b2df8154d73b4e0b01e9718f71b77c6a23a342fbef416daac1cb8ec019f2f7d9f8c4 WHIRLPOOL df63352e93a876a9bbc61abb88882366b1fb1eb76900b59cb6dde216761271d66c85f441cbf67598bf7cc0349987297b55f3cc55c4bcc615aa374d74ba39276d
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
+EBUILD opensips-1.10.3.ebuild 3311 SHA256 e21a485238a46fbd3412f512c175392efd8159a5f08faee633fb0d9051164a17 SHA512 ecc210b3866be4b989216985ce30635ecb099a731687bb2f4989056f622f3ed6d7d5ede2a226b7427b60efa1fcb2ab7e4d4d85a1e657d10e1c25518835aa2f94 WHIRLPOOL 714dcdf6b0a1454e95c40e615a2e2496be63c56c6be447c7f2babb1a68a23349490e52e1e0c4f4bc2f3a94fe8c3f812e43c90126e7731d1bbcb0d204fab87fb9
+EBUILD opensips-1.11.3.ebuild 3337 SHA256 4f2d83b09ee28d4d8d83fe8c5b1a7064a8c7ee97313c78299a1ffb93bfbf94a4 SHA512 374b81afc186c0576c25c384ce719adb65f1ed302ee49636effe880f293d95df2e1acaef3f1631afc589cdca954d50a59fcbf72cbec472e433e81b49863671d0 WHIRLPOOL cffaa180eb6b7a8fead75ab74e34ff7c0c99e599473627f43b5bcd0ddccb37325b7349b597f2ef13b3be46e999bc52091bbf255e01f57df35f8396efece312b6
+EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
+EBUILD opensips-1.8.0.ebuild 3311 SHA256 fabf16768b2709a9a11e63b0bd15acd68e8ae1804808f3c7f9cc4fc23b2daaeb SHA512 2589bd748e043d171bab81cbfe0fbdb63c59273bd451f3fba34948005a3390c4a3eee1427713a79319d650d7c9de91935b5561f178657f40837eff56b84e474f WHIRLPOOL 75001d3e16fdeac740807b9e83b306c0a36510e686693c40dd3ad7bd59578bb8941b48a1687d9754ffda0d4fb080dfa43ef9dbf3da94e66bb601f5042aa33926
diff --git a/net-misc/opensips/opensips-1.10.3.ebuild b/net-misc/opensips/opensips-1.10.3.ebuild
new file mode 100644
index 0000000..f727e45
--- /dev/null
+++ b/net-misc/opensips/opensips-1.10.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+EAPI="3"
+inherit eutils
+
+DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
+HOMEPAGE="http://www.opensips.org/"
+MY_P="${P}_src"
+P2="${P}-tls"
+SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc"
+
+RDEPEND="
+	mysql? ( >=dev-db/mariadb-4.1.20 )
+	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	postgres? ( >=dev-db/postgresql-8.0.8 )
+	jabber? ( dev-libs/expat )
+	ssl? ( dev-libs/openssl )
+	cpl? ( dev-libs/libxml2 )
+	b2bua? ( dev-libs/libxml2 )
+	presence? ( dev-libs/libxml2 )
+	xmlrpc? ( dev-libs/xmlrpc-c[abyss] )
+	unixodbc? ( >=dev-db/unixODBC-2.3.0 )"
+
+inc_mod=""
+make_options=""
+
+pkg_setup() {
+	use mysql && \
+		inc_mod="${inc_mod} db_mysql"
+
+	use postgres && \
+		inc_mod="${inc_mod} db_postgres"
+
+	use radius && \
+		inc_mod="${inc_mod} aaa_radius peering"
+
+	use jabber && \
+		inc_mod="${inc_mod} jabber"
+
+	use cpl && \
+		inc_mod="${inc_mod} cpl-c"
+
+	use b2bua && \
+		inc_mod="${inc_mod} b2b_entities b2bua_logic"
+
+	use presence && \
+		inc_mod="${inc_mod} presence presence_dialoginfo presence_mwi presence_xcapdiff presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client"
+
+	use unixodbc && \
+		inc_mod="${inc_mod} db_unixodbc"
+
+	use xmlrpc  && \
+                inc_mod="${inc_mod} mi_xmlrpc"
+
+	export inc_mod
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	mv ${P2} ${P}
+
+	cd ${S}
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
+	epatch ${FILESDIR}/Makefile-1.8.0.patch
+}
+
+src_compile() {
+	local compile_options
+
+	pkg_setup
+
+	# optimization can result in strange debuging symbols so omit it in case
+	if use debug; then
+		compile_options="${compile_options} mode=debug"
+	else
+		compile_options="${compile_options} CFLAGS=${CFLAGS}"
+	fi
+	
+	if use ssl; then
+		compile_options="TLS=1 ${compile_options}"
+	fi
+	emake all "${compile_options}" \
+		prefix=${ROOT}/ \
+		include_modules="${inc_mod}" \
+		cfg-prefix=${ROOT}/ \
+		cfg-target=${ROOT}/etc/opensips/ || die
+}
+
+src_install () {
+	local install_options
+	emake install \
+		prefix=${d}/ \
+		include_modules="${inc_mod}" \
+		bin-prefix=${d}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${d}/etc \
+		cfg-dir=opensips/ \
+		cfg-target=${d}/etc/opensips \
+		modules-prefix=${d}/usr/lib/opensips \
+		modules-dir=modules \
+		modules-target=${D}/usr/lib/opensips/modules \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${PF} \
+		data-prefix=${D}/usr || die
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/opensips.init opensips
+	newconfd ${FILESDIR}/opensips.default opensips
+	mv menuconfig/configure menuconfig/osipsconfig
+	dosbin menuconfig/osipsconfig 
+	# fix what the Makefile don't do
+	use mysql && \
+		rm ${D}/usr/sbin/opensips_mysql.sh
+}
+
+pkg_postinst() {
+	einfo "WARNING: If you upgraded from a previous OpenSIPS version"
+	einfo "please read the README, NEWS and INSTALL files in the"
+	einfo "documentation directory because the database and the"
+	einfo "configuration file of old OpenSIPS versions are incompatible"
+	einfo "with the current version."
+}
+
+pkg_prerm () {
+	${D}/etc/init.d/opensips stop >/dev/null
+}
diff --git a/net-misc/opensips/opensips-1.11.3.ebuild b/net-misc/opensips/opensips-1.11.3.ebuild
new file mode 100644
index 0000000..2779903
--- /dev/null
+++ b/net-misc/opensips/opensips-1.11.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+EAPI="3"
+inherit eutils
+
+MAGIC="42f6d89"
+
+DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
+HOMEPAGE="http://www.opensips.org/"
+MY_P="${P}-${MAGIC}_src"
+P2="${P}-tls"
+SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc"
+
+RDEPEND="
+	mysql? ( >=dev-db/mariadb-4.1.20 )
+	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	postgres? ( >=dev-db/postgresql-8.0.8 )
+	jabber? ( dev-libs/expat )
+	ssl? ( dev-libs/openssl )
+	cpl? ( dev-libs/libxml2 )
+	b2bua? ( dev-libs/libxml2 )
+	presence? ( dev-libs/libxml2 )
+	xmlrpc? ( dev-libs/xmlrpc-c[abyss] )
+	unixodbc? ( >=dev-db/unixODBC-2.3.0 )"
+
+inc_mod=""
+make_options=""
+
+pkg_setup() {
+	use mysql && \
+		inc_mod="${inc_mod} db_mysql"
+
+	use postgres && \
+		inc_mod="${inc_mod} db_postgres"
+
+	use radius && \
+		inc_mod="${inc_mod} aaa_radius peering"
+
+	use jabber && \
+		inc_mod="${inc_mod} jabber"
+
+	use cpl && \
+		inc_mod="${inc_mod} cpl-c"
+
+	use b2bua && \
+		inc_mod="${inc_mod} b2b_entities b2bua_logic"
+
+	use presence && \
+		inc_mod="${inc_mod} presence presence_dialoginfo presence_mwi presence_xcapdiff presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client"
+
+	use unixodbc && \
+		inc_mod="${inc_mod} db_unixodbc"
+
+	use xmlrpc  && \
+                inc_mod="${inc_mod} mi_xmlrpc"
+
+	export inc_mod
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	mv ${P2} ${P}
+
+	cd ${S}
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
+	epatch ${FILESDIR}/Makefile-1.8.0.patch
+}
+
+src_compile() {
+	local compile_options
+
+	pkg_setup
+
+	# optimization can result in strange debuging symbols so omit it in case
+	if use debug; then
+		compile_options="${compile_options} mode=debug"
+	else
+		compile_options="${compile_options} CFLAGS=${CFLAGS}"
+	fi
+	
+	if use ssl; then
+		compile_options="TLS=1 ${compile_options}"
+	fi
+	emake all "${compile_options}" \
+		prefix=${ROOT}/ \
+		include_modules="${inc_mod}" \
+		cfg-prefix=${ROOT}/ \
+		cfg-target=${ROOT}/etc/opensips/ || die
+}
+
+src_install () {
+	local install_options
+	emake install \
+		prefix=${d}/ \
+		include_modules="${inc_mod}" \
+		bin-prefix=${d}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${d}/etc \
+		cfg-dir=opensips/ \
+		cfg-target=${d}/etc/opensips \
+		modules-prefix=${d}/usr/lib/opensips \
+		modules-dir=modules \
+		modules-target=${D}/usr/lib/opensips/modules \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${PF} \
+		data-prefix=${D}/usr || die
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/opensips.init opensips
+	newconfd ${FILESDIR}/opensips.default opensips
+	mv menuconfig/configure menuconfig/osipsconfig
+	dosbin menuconfig/osipsconfig 
+	# fix what the Makefile don't do
+	use mysql && \
+		rm ${D}/usr/sbin/opensips_mysql.sh
+}
+
+pkg_postinst() {
+	einfo "WARNING: If you upgraded from a previous OpenSIPS version"
+	einfo "please read the README, NEWS and INSTALL files in the"
+	einfo "documentation directory because the database and the"
+	einfo "configuration file of old OpenSIPS versions are incompatible"
+	einfo "with the current version."
+}
+
+pkg_prerm () {
+	${D}/etc/init.d/opensips stop >/dev/null
+}

From 726bceb260f16f1f3a142212ad5420734b247d1e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 19 Nov 2014 11:23:37 -0800
Subject: [PATCH 050/261] opensipsnodes fixed

---
 net-misc/opensips/Manifest               |  6 +++---
 net-misc/opensips/opensips-1.10.3.ebuild | 14 ++++++++++++--
 net-misc/opensips/opensips-1.11.3.ebuild | 15 ++++++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 506d944..3aaa04a 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -3,10 +3,10 @@ AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bd
 AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d540466be30bc63 SHA512 a6bc407d96bfaca17e893ff8200e09703d4592e610dd5df66d2cccc635b134dac4b57a32ea5d9efd91a8f24d932616613115328bd561f34aabce84dff0c287e8 WHIRLPOOL aa67bce3127926b35e4c9bca24ec0f17490c41637645b58f37a24fa7f4a27ca5e99e115f1417e26d82a7a7b6c223074341e9bb24c5304d90a5f89e6305678cf6
 AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.10.3_src.tar.gz 4352917 SHA256 2e8c5c9000c1560f862f5290e933c647452ffe9a117b3ee9cd680936de93ac29 SHA512 470fe2b614e399babc9df237756fe89bd4196b61d993e5ded8934dbf1eb20ef3f2124ce50ae42b989dd7be524d0e654815d6f65897ef0612c6051739160b5038 WHIRLPOOL a6491c33ad9bb725c740df6adc6efb404300f4f4c4004e6c78e08acf0f95be429b0ac6169ac3bc20f3f275e3f6e65dc9ac86700e5d378a41a70038f70b6dbfdb
-DIST opensips-1.11.3-42f6d89_src.tar.gz 5492526 SHA256 51337cc8d69c08624b27e420b4bcd5bb5f3b6f042dfb4e366febc049f6306971 SHA512 e7916174161b3cd39375d70b02adacaa5ddf972f39b9b041bbc9977dd5b5b2df8154d73b4e0b01e9718f71b77c6a23a342fbef416daac1cb8ec019f2f7d9f8c4 WHIRLPOOL df63352e93a876a9bbc61abb88882366b1fb1eb76900b59cb6dde216761271d66c85f441cbf67598bf7cc0349987297b55f3cc55c4bcc615aa374d74ba39276d
+DIST opensips-1.11.3-41408f0_src.tar.gz 5492230 SHA256 fad921f65590ef09372f157ca762176514b86bad073a9036bbaa7a1658a51cf6 SHA512 01b1366d6b36b0c9b01f55610bc4e01ad017788f9ed2e86b7c3c5ceb1d11a675cf37a503faba2e4cc338371fee8da1c23f50a7d33670a3c9324e7fe974f32284 WHIRLPOOL d695d42d3cbb011a34fb927062b2b5bc191814b5a62fc398344e2a2235e67191f49148099dc59bcb5b99066d485bf3f8714c1fff8966c4f2ffc15820857dedfd
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
-EBUILD opensips-1.10.3.ebuild 3311 SHA256 e21a485238a46fbd3412f512c175392efd8159a5f08faee633fb0d9051164a17 SHA512 ecc210b3866be4b989216985ce30635ecb099a731687bb2f4989056f622f3ed6d7d5ede2a226b7427b60efa1fcb2ab7e4d4d85a1e657d10e1c25518835aa2f94 WHIRLPOOL 714dcdf6b0a1454e95c40e615a2e2496be63c56c6be447c7f2babb1a68a23349490e52e1e0c4f4bc2f3a94fe8c3f812e43c90126e7731d1bbcb0d204fab87fb9
-EBUILD opensips-1.11.3.ebuild 3337 SHA256 4f2d83b09ee28d4d8d83fe8c5b1a7064a8c7ee97313c78299a1ffb93bfbf94a4 SHA512 374b81afc186c0576c25c384ce719adb65f1ed302ee49636effe880f293d95df2e1acaef3f1631afc589cdca954d50a59fcbf72cbec472e433e81b49863671d0 WHIRLPOOL cffaa180eb6b7a8fead75ab74e34ff7c0c99e599473627f43b5bcd0ddccb37325b7349b597f2ef13b3be46e999bc52091bbf255e01f57df35f8396efece312b6
+EBUILD opensips-1.10.3.ebuild 3505 SHA256 fd98226f14ef35f49f8924b13b48f4a785e6e9efc7432c3a2c160cbc6daecaac SHA512 5f8d8f7019016cbad4e09327b9ec10a3d34f0b8a51b17a3bcbf26673e9f2fa4a8f14e589df9dccd48604fdf7d14676f4a418d943b73ebbc63d1d8270defc714f WHIRLPOOL f4dc8bf583283486d23367f1688038b35cc2d6ff260e0a3a6992b02f750072a8471168f43a80f2a9b835264d035ab757bb0db7b034b5190c3868616099762584
+EBUILD opensips-1.11.3.ebuild 3578 SHA256 c8937f6cbd9fbac7e33fb4cf3c1ab30a19fdabfd568f361422038b4bfc4ea13f SHA512 701a0c672d62f212878def6aba3ec71a5e6718b6faf05336f313bf8ef03f2ebae29e3d6a6fa44a3be0c3aa1d791b0cb2331cd89b496a1ceaf8010c108563cd81 WHIRLPOOL 6bb4dd716c5189bba778a7ee042f1f7a61d699101e9d8e718e905bfb6aa5b446f747e20c9e86aed7008cdb7681a9e73ee11b5825e3462a44b16beada0497a5b6
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
 EBUILD opensips-1.8.0.ebuild 3311 SHA256 fabf16768b2709a9a11e63b0bd15acd68e8ae1804808f3c7f9cc4fc23b2daaeb SHA512 2589bd748e043d171bab81cbfe0fbdb63c59273bd451f3fba34948005a3390c4a3eee1427713a79319d650d7c9de91935b5561f178657f40837eff56b84e474f WHIRLPOOL 75001d3e16fdeac740807b9e83b306c0a36510e686693c40dd3ad7bd59578bb8941b48a1687d9754ffda0d4fb080dfa43ef9dbf3da94e66bb601f5042aa33926
diff --git a/net-misc/opensips/opensips-1.10.3.ebuild b/net-misc/opensips/opensips-1.10.3.ebuild
index f727e45..4341613 100644
--- a/net-misc/opensips/opensips-1.10.3.ebuild
+++ b/net-misc/opensips/opensips-1.10.3.ebuild
@@ -8,14 +8,17 @@ DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
 HOMEPAGE="http://www.opensips.org/"
 MY_P="${P}_src"
 P2="${P}-tls"
+
 SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc httpd json"
 
 RDEPEND="
+	json? ( dev-libs/json-c )
+	httpd? ( =net-libs/libmicrohttpd-0.9.22 )
 	mysql? ( >=dev-db/mariadb-4.1.20 )
 	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	postgres? ( >=dev-db/postgresql-8.0.8 )
@@ -31,6 +34,13 @@ inc_mod=""
 make_options=""
 
 pkg_setup() {
+
+	use json && \
+		inc_mod="${inc_mod} json mi_json"
+
+	use httpd && \
+		inc_mod="${inc_mod} httpd"
+
 	use mysql && \
 		inc_mod="${inc_mod} db_mysql"
 
@@ -56,7 +66,7 @@ pkg_setup() {
 		inc_mod="${inc_mod} db_unixodbc"
 
 	use xmlrpc  && \
-                inc_mod="${inc_mod} mi_xmlrpc"
+                inc_mod="${inc_mod} mi_xmlrpc mi_xmlrpc_ng"
 
 	export inc_mod
 }
diff --git a/net-misc/opensips/opensips-1.11.3.ebuild b/net-misc/opensips/opensips-1.11.3.ebuild
index 2779903..14c675a 100644
--- a/net-misc/opensips/opensips-1.11.3.ebuild
+++ b/net-misc/opensips/opensips-1.11.3.ebuild
@@ -4,20 +4,23 @@
 EAPI="3"
 inherit eutils
 
-MAGIC="42f6d89"
+MAGIC="41408f0"
 
 DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
 HOMEPAGE="http://www.opensips.org/"
 MY_P="${P}-${MAGIC}_src"
 P2="${P}-tls"
+
 SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc httpd json"
 
 RDEPEND="
+        json? ( dev-libs/json-c )
+        httpd? ( =net-libs/libmicrohttpd-0.9.22 )
 	mysql? ( >=dev-db/mariadb-4.1.20 )
 	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	postgres? ( >=dev-db/postgresql-8.0.8 )
@@ -33,6 +36,12 @@ inc_mod=""
 make_options=""
 
 pkg_setup() {
+        use json && \
+                inc_mod="${inc_mod} json"
+
+        use httpd && \
+                inc_mod="${inc_mod} httpd"
+
 	use mysql && \
 		inc_mod="${inc_mod} db_mysql"
 
@@ -58,7 +67,7 @@ pkg_setup() {
 		inc_mod="${inc_mod} db_unixodbc"
 
 	use xmlrpc  && \
-                inc_mod="${inc_mod} mi_xmlrpc"
+                inc_mod="${inc_mod} mi_xmlrpc mi_xmlrpc_ng"
 
 	export inc_mod
 }

From 598e2e5360fe4515f98d0a4e28d32e9bcc823e78 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 21 Nov 2014 16:46:23 -0800
Subject: [PATCH 051/261] added package requirements for opensips 1.11.3

---
 dev-libs/xmlrpc-c/ChangeLog                   | 640 ++++++++++++++++++
 dev-libs/xmlrpc-c/Manifest                    |   5 +
 .../files/xmlrpc-c-1.32.05-Wimplicit.patch    |  20 +
 dev-libs/xmlrpc-c/metadata.xml                |  18 +
 dev-libs/xmlrpc-c/xmlrpc-c-1.25.30.ebuild     | 100 +++
 net-libs/libmicrohttpd/Manifest               |   2 +
 .../libmicrohttpd/libmicrohttpd-0.9.22.ebuild |  45 ++
 7 files changed, 830 insertions(+)
 create mode 100644 dev-libs/xmlrpc-c/ChangeLog
 create mode 100644 dev-libs/xmlrpc-c/Manifest
 create mode 100644 dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
 create mode 100644 dev-libs/xmlrpc-c/metadata.xml
 create mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.25.30.ebuild
 create mode 100644 net-libs/libmicrohttpd/Manifest
 create mode 100644 net-libs/libmicrohttpd/libmicrohttpd-0.9.22.ebuild

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
new file mode 100644
index 0000000..7c72d21
--- /dev/null
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -0,0 +1,640 @@
+# ChangeLog for dev-libs/xmlrpc-c
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.151 2013/07/06 03:17:44 zlogene Exp $
+
+  06 Jul 2013; Mikle Kolyada <zlogene@gentoo.org> -xmlrpc-c-1.28.03-r1.ebuild,
+  -xmlrpc-c-1.32.05.ebuild:
+  drop old
+
+  30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for s390, wrt bug #471912
+
+  29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for sparc, wrt bug #471912
+
+  26 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for ia64, wrt bug #471912
+
+  26 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for alpha, wrt bug #471912
+
+  16 Jun 2013; Vicente Olivert Riera <vincent@gentoo.org>
+  xmlrpc-c-1.32.05-r1.ebuild:
+  ppc ppc64 stable : bug #471912
+
+  12 Jun 2013; Mikle Kolyada <zlogene@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  x86 stable wrt bug #471912
+
+  10 Jun 2013; Mikle Kolyada <zlogene@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  amd64 stable wrt bug #471912
+
+  09 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for sh, wrt bug #471912
+
+  06 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
+  Reassigning due to Zlogene became Gentoo developer, remove proxy maintainers
+  herd
+
+  02 Jun 2013; Markus Meier <maekke@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  arm stable, bug #471912
+
+  31 May 2013; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.32.05-r1.ebuild:
+  Stable for HPPA (bug #471912).
+
+  27 May 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
+  Assign new maintainers
+
+*xmlrpc-c-1.32.05-r1 (27 May 2013)
+
+  27 May 2013;  <qnikst@gentoo.org> +xmlrpc-c-1.32.05-r1.ebuild:
+  allow tools to be used in xmlrpc-c-1.32.05 (bug #460730)
+
+  14 Mar 2013; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for HPPA (bug #457298).
+
+  08 Mar 2013; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Fix typo.
+
+  01 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for sh, wrt bug #457298
+
+  27 Feb 2013; Jeroen Roovers <jer@gentoo.org> -files/xmlrpc-c-1.05-pic.patch,
+  -files/xmlrpc-c-1.06.02-strsol.patch,
+  -files/xmlrpc-c-1.06.02-threadupdatestatus.patch,
+  -files/xmlrpc-c-1.06.03-mustbuildclient.patch,
+  -files/xmlrpc-c-1.06.09+curl-7.18.patch,
+  -files/xmlrpc-c-1.06.09-asneeded.patch, -files/xmlrpc-c-1.06.09-strsol.patch,
+  -files/xmlrpc-c-1.06.27-abyss-header-fixup.patch,
+  -files/xmlrpc-c-1.06.27-curl-easy-setopt.patch,
+  -files/xmlrpc-c-1.06.27-curl-headers.patch,
+  -files/xmlrpc-c-1.06.27-gcc43-test-fix.patch,
+  -files/xmlrpc-c-1.28.00-advanced-test.patch,
+  +files/xmlrpc-c-1.32.05-Wimplicit.patch, -files/xmlrpc-c-gcc43.patch,
+  -files/xmlrpc-c-1.18.02/cpp-depends.patch,
+  -files/xmlrpc-c-1.18.02/curl-headers.patch,
+  -files/xmlrpc-c-1.18.02/dump-symlinks.patch,
+  -files/xmlrpc-c-1.18.02/dumpvalue.patch, xmlrpc-c-1.32.05.ebuild:
+  Enable -Wimplicit only for C, not for C++.
+
+  26 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for s390, wrt bug #457298
+
+  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for sparc, wrt bug #457298
+
+  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for x86, wrt bug #457298
+
+  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for amd64, wrt bug #457298
+
+  23 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for ppc64, wrt bug #457298
+
+  23 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for alpha, wrt bug #457298
+
+  22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for arm, wrt bug #457298
+
+  22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for ppc, wrt bug #457298
+
+  22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild:
+  Stable for ia64, wrt bug #457298
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> -xmlrpc-c-1.29.02.ebuild,
+  metadata.xml:
+  Cleanup due bug #96436
+
+*xmlrpc-c-1.32.05 (26 Dec 2012)
+
+  26 Dec 2012; Maxim Koltsov <maksbotan@gentoo.org> +xmlrpc-c-1.32.05.ebuild:
+  Bump to 1.32.05, bug #443872. Thanks to slepnoga.
+
+  31 Oct 2012; Christoph Junghans <ottxor@gentoo.org> xmlrpc-c-1.29.02.ebuild:
+  added prefix keywords
+
+  21 Aug 2012; Alexander Vershilov <qnikst@gentoo.org> -xmlrpc-c-1.28.03.ebuild:
+  removing xmlrpc-c due to 320253, 409549; thanks to slepnoga
+
+  05 Jun 2012; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  Marking xmlrpc-c-1.28.03-r1 ppc for bug 409549
+
+  28 May 2012; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #409549
+
+  05 Apr 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xmlrpc-c-1.28.03-r1.ebuild:
+  x86 stable wrt bug #409549
+
+  03 Apr 2012; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  Stable for HPPA (bug #409549).
+
+  31 Mar 2012; Markus Meier <maekke@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  arm stable, bug #409549
+
+  29 Mar 2012; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  Stable for amd64, wrt bug #409549
+
+  28 Mar 2012; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.28.03-r1.ebuild:
+  Marking xmlrpc-c-1.28.03-r1 ppc64 for bug 409549
+
+*xmlrpc-c-1.29.02 (25 Mar 2012)
+*xmlrpc-c-1.28.03-r1 (25 Mar 2012)
+
+  25 Mar 2012; Peter Volkov <pva@gentoo.org> -xmlrpc-c-1.06.27.ebuild,
+  -xmlrpc-c-1.18.02.ebuild, -xmlrpc-c-1.28.00.ebuild,
+  +xmlrpc-c-1.28.03-r1.ebuild, +xmlrpc-c-1.29.02.ebuild:
+  Version bump. Drop old. Drop optional libwww support, bug 409549 by Pacho
+  Ramos. Thank slepnoga for this work.
+
+  03 Mar 2012; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  Marking xmlrpc-c-1.28.03 ppc64 for bug 393267
+
+  04 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> Manifest:
+  Fix maintainer's email in metadata
+
+  04 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
+  Fix maintainer's email in metadata
+
+  01 Feb 2012; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  Marking xmlrpc-c-1.28.03 ppc for bug 393267
+
+  01 Jan 2012; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #393267
+
+  18 Dec 2011; Markus Meier <maekke@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  arm stable, bug #393267
+
+  18 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  x86 stable wrt bug #393267
+
+  13 Dec 2011; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  Stable for AMD64, wrt bug #393267
+
+  13 Dec 2011; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  Stable for HPPA (bug #393267).
+
+  12 Dec 2011; Peter Volkov <pva@gentoo.org> xmlrpc-c-1.28.00.ebuild,
+  xmlrpc-c-1.28.03.ebuild:
+  Add readline into deps, bug #393267 thank Agostino Sarubbo for report.
+
+  28 Nov 2011; Naohiro Aota <naota@gentoo.org> xmlrpc-c-1.28.03.ebuild:
+  Add ~x86-fbsd. Bug #267616
+
+  24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Drop maintainer due retirement, bug #220219
+
+*xmlrpc-c-1.28.03 (20 Nov 2011)
+
+  20 Nov 2011; Peter Volkov <pva@gentoo.org> +xmlrpc-c-1.28.03.ebuild:
+  Version bump, thank slepnoga for report.
+
+*xmlrpc-c-1.28.00 (01 Oct 2011)
+
+  01 Oct 2011; Peter Volkov <pva@gentoo.org> +xmlrpc-c-1.28.00.ebuild,
+  +files/xmlrpc-c-1.28.00-advanced-test.patch, metadata.xml:
+  Version bump, bug #299011 wrt Arfrever Frehtes Taifersar Arahesis. Fixes
+  parallel build issue, bug 291881 wrt simon. Fixes build on BSD, bug #283751
+  wrt Henning Schild. Fixes installation of shared libraries, bug #274536 wrt
+  Ambroz Bizjak. Fixes build failure with specific USE flags combination, bug
+  301076 wrt Marco Clocchiatti. And thank Andreis_Vinogradovs (slepnoga) for
+  making me work on this version bump.
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org> xmlrpc-c-1.06.27.ebuild,
+  +files/xmlrpc-c-1.06.27-curl-headers.patch, xmlrpc-c-1.18.02.ebuild,
+  +files/xmlrpc-c-1.18.02/curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376101)
+
+  15 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Migrate to new base eclass structure.
+
+  16 Jun 2009; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  arm/ia64/s390/sh/sparc stable wrt #271986
+
+  08 Jun 2009; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  Stable for HPPA (bug #271986).
+
+  07 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Stable on alpha, bug #271986
+
+  01 Jun 2009; nixnut <nixnut@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  ppc stable #271986
+
+  31 May 2009; Markus Meier <maekke@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  amd64/x86 stable, bug #271986
+
+  31 May 2009; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  Marking xmlrpc-c-1.18.02 ppc64 for bug 271986
+
+  31 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Set LC_ALL=C and LANG=C w.r.t. bug 255440. Use as seperator in sed to not
+  fail with legitimate CFLAGS.
+
+  17 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -xmlrpc-c-1.14.07-r1.ebuild, -files/xmlrpc-c-1.14.07-abyss-disable.patch,
+  -xmlrpc-c-1.15.05.ebuild, -xmlrpc-c-1.16.06.ebuild,
+  -xmlrpc-c-1.16.06-r1.ebuild, -files/xmlrpc-c-1.16.06-no-undefined.patch,
+  -files/xmlrpc-c-1.16.06-parallel-make.patch:
+  Drop old
+
+  04 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Fix erroneous use of 'use cpp' instead of 'use cxx', make ebuild emit an
+  elog if trying to run src_test without USE='abyss curl', w.r.t. bug
+  268630, thanks to jer/rej for reporting.
+
+  02 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.18.02/cpp-depends.patch,
+  +files/xmlrpc-c-1.18.02/dump-symlinks.patch, xmlrpc-c-1.18.02.ebuild:
+  Add patches to fix parallel compilation problems, bug 255440. Also remove
+  some dead code from ebuild.
+
+  01 May 2009; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  Add ~alpha/~arm/~s390/~sh wrt #267616
+
+  29 Apr 2009; Brent Baude <ranger@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  keyworded ~arch for ppc64, bug 267616
+
+  29 Apr 2009; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.18.02.ebuild:
+  Marked ~hppa (bug #267616).
+
+  29 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Drop tools useflag by default. Pulls in too many external deps.
+
+*xmlrpc-c-1.18.02 (27 Apr 2009)
+
+  27 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.18.02/dumpvalue.patch, +xmlrpc-c-1.18.02.ebuild:
+  Install tools, bug 242154. Install abyss server, bug 251718. Fix parallel
+  make, bug 255440. Also, bump bug 256253.
+
+  11 Apr 2009; Joshua Kinard <kumba@gentoo.org> xmlrpc-c-1.16.06-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  03 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.16.06-r1.ebuild:
+  Bug 251415 not solved, reverting previous change.
+
+  03 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.16.06-r1.ebuild:
+  We need to "emake all" or we'll run into bug 251415. Per suggestion from
+  upstream.
+
+*xmlrpc-c-1.16.06-r1 (02 Jan 2009)
+
+  02 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.16.06-parallel-make.patch, +xmlrpc-c-1.16.06-r1.ebuild:
+  Fix bug 251850, parallel make issue that would cause xmlrpc.h to not be
+  installed. Thanks to Diego for the report.
+
+  03 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.16.06.ebuild:
+  The --no-undefined patch had the fortunate effect of making parallel make
+  work, halving compilation time.
+
+*xmlrpc-c-1.16.06 (03 Dec 2008)
+
+  03 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/xmlrpc-c-1.16.04-abyss-disable.patch,
+  -files/xmlrpc-c-1.16.04-compile.patch,
+  -files/xmlrpc-c-1.16.04-cpplinking.patch,
+  -files/xmlrpc-c-1.16.04-linking-order.patch,
+  +files/xmlrpc-c-1.16.06-no-undefined.patch, -xmlrpc-c-1.16.04.ebuild,
+  +xmlrpc-c-1.16.06.ebuild:
+  Add new version. Upstream accepted our fixes from .04. New fixes included
+  fixing bug 246749.
+
+*xmlrpc-c-1.16.04 (29 Nov 2008)
+
+  29 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.16.04-abyss-disable.patch,
+  +files/xmlrpc-c-1.16.04-compile.patch,
+  +files/xmlrpc-c-1.16.04-cpplinking.patch,
+  +files/xmlrpc-c-1.16.04-linking-order.patch, +xmlrpc-c-1.16.04.ebuild:
+  Bump, bug 246083. Also solves bug 235989 (!!).
+
+*xmlrpc-c-1.15.05 (24 Aug 2008)
+
+  24 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -xmlrpc-c-1.06.09-r2.ebuild, -xmlrpc-c-1.15.02.ebuild,
+  -xmlrpc-c-1.15.03.ebuild, +xmlrpc-c-1.15.05.ebuild:
+  Bump to 1.15.05, remove old
+
+  09 Aug 2008; Santiago M. Mola <coldwind@gentoo.org>
+  xmlrpc-c-1.06.27.ebuild:
+  amd64 stable wrt bug #233123
+
+  06 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.14.07-r1.ebuild, xmlrpc-c-1.15.02.ebuild,
+  xmlrpc-c-1.15.03.ebuild:
+  Make >=xmlrpc-c-1.14.07 multilib-strict safe. For real this time. Bug
+  #233468, thanks to en.ABCD@gmail.com. Re-enable cxx useflag for
+  >=xmlrpc-c-1.15.02. Disable running unneeded autotools, bug #233436,
+  thanks to gentoobugsie@gmail.com.
+
+  02 Aug 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.27.ebuild:
+  Stable on ppc64; bug #233123
+
+  01 Aug 2008; nixnut <nixnut@gentoo.org> xmlrpc-c-1.06.27.ebuild:
+  Stable on ppc wrt bug 233123
+
+*xmlrpc-c-1.14.07-r1 (31 Jul 2008)
+
+  31 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/xmlrpc-c-1.14.07-multilib.patch, -xmlrpc-c-1.14.07.ebuild,
+  +xmlrpc-c-1.14.07-r1.ebuild:
+  Reverse the damage I've done, multilib patch installed into /usr/usr/lib64
+  on amd64, see bug 233468. This is not strict-multilib, but we'll deal with
+  that later.
+
+  30 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.14.07-multilib.patch, xmlrpc-c-1.14.07.ebuild:
+  Fixup for multilib, bug #233143.
+
+  28 Jul 2008; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.06.27.ebuild:
+  alpha/ia64/x86 stable wrt #233123
+
+  28 Jul 2008; Ferris McCormick <fmccor@gentoo.org> xmlrpc-c-1.06.27.ebuild:
+  Sparc stable, Bug #233123.
+
+  28 Jul 2008; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.06.27.ebuild:
+  Stable for HPPA (bug #233123).
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.14.07.ebuild:
+  Prepare for public consumption.
+
+*xmlrpc-c-1.15.03 (27 Jul 2008)
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +xmlrpc-c-1.15.03.ebuild:
+  Bump
+
+*xmlrpc-c-1.15.02 (20 Jul 2008)
+
+  20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +xmlrpc-c-1.15.02.ebuild:
+  Bump
+
+  15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.14.07-abyss-disable.patch, xmlrpc-c-1.14.07.ebuild:
+  Really, *don't* build abyss. Bug 227187.
+
+  08 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -xmlrpc-c-1.06.03.ebuild:
+  Remove old.
+
+  08 Jun 2008; Kenneth Prugh <ken69267@gentoo.org>
+  xmlrpc-c-1.06.09-r2.ebuild:
+  amd64 stable, bug #224275
+
+*xmlrpc-c-1.14.07 (04 Jun 2008)
+
+  04 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +xmlrpc-c-1.14.07.ebuild:
+  Add 1.14.07 for testing. Resolves bug 203810.
+
+  04 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -xmlrpc-c-1.06.09.ebuild, -xmlrpc-c-1.06.09-r1.ebuild:
+  Remove old.
+
+  02 Jun 2008; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.06.09-r2.ebuild:
+  alpha/ia64/sparc stable wrt #224275
+
+  01 Jun 2008; nixnut <nixnut@gentoo.org> xmlrpc-c-1.06.09-r2.ebuild:
+  Stable on ppc wrt bug 224275
+
+  31 May 2008; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.06.09-r2.ebuild:
+  Stable for HPPA (bug #224275).
+
+  31 May 2008; Christian Faulhammer <opfer@gentoo.org>
+  xmlrpc-c-1.06.09-r2.ebuild:
+  stable x86, bug 224275
+
+  31 May 2008; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.06.09-r2.ebuild, xmlrpc-c-1.06.27.ebuild:
+  Committing build-time fix for bug 214137; SRCDIR was getting passed to the
+  ebuild
+
+*xmlrpc-c-1.06.27 (30 May 2008)
+
+  30 May 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.06.27-abyss-header-fixup.patch,
+  +files/xmlrpc-c-1.06.27-curl-easy-setopt.patch,
+  +files/xmlrpc-c-1.06.27-gcc43-test-fix.patch, metadata.xml,
+  +xmlrpc-c-1.06.27.ebuild:
+  Version bump. Taking over as maintainer.
+
+  27 May 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.09-r2.ebuild:
+  Stable on ppc64
+
+  28 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Remove Wulf C. Krueger (philantrop) from metadata.xml (as per #168573).
+
+*xmlrpc-c-1.06.09-r2 (22 Apr 2008)
+
+  22 Apr 2008; Doug Goldstein <cardoe@gentoo.org>
+  +xmlrpc-c-1.06.09-r2.ebuild:
+  rev bump to bump EAPI so everything builds properly with default USE flags
+
+  21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xmlrpc-c-1.06.09+curl-7.18.patch, xmlrpc-c-1.06.09-r1.ebuild:
+  Add patch to fix building with curl 7.18, thanks to Christophe Philemotte
+  in bug #216139.
+
+  02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  files/xmlrpc-c-1.06.09-asneeded.patch,
+  +files/xmlrpc-c-1.06.09-strsol.patch, xmlrpc-c-1.06.09-r1.ebuild:
+  Added an updated linking patch as kindly provided by corsair on bug 209138.
+  xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.
+
+*xmlrpc-c-1.06.09-r1 (22 Feb 2008)
+
+  22 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +xmlrpc-c-1.06.09-r1.ebuild:
+  Revision bump to ensure that -Wl,--as-needed get Flameeyes' fix.
+
+  21 Feb 2008; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  alpha/ia64/sparc/x86 stable
+
+  11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xmlrpc-c-1.06.09-asneeded.patch, xmlrpc-c-1.06.09.ebuild:
+  Fix linking with --as-needed by properly link to libxml2 when using it.
+  Fixes cmake build with --as-needed.
+
+  06 Feb 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Back to ~ppc64. It fails on another machine
+
+  05 Feb 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Stable on ppc64
+
+  03 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  xmlrpc-c-1.06.09.ebuild:
+  Fixed overriding custom MAKEOPTS. Fixes bug 207924. Thanks, Jokey!
+
+  20 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/xmlrpc-c-gcc43.patch, xmlrpc-c-1.06.03.ebuild,
+  xmlrpc-c-1.06.09.ebuild:
+  Added a patch for gcc-4.3-compatibility as kindly provided by Devils-Hawk on
+  bug 206353.
+
+  14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  xmlrpc-c-1.06.09.ebuild:
+  ppc. stable
+
+  13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  xmlrpc-c-1.06.09.ebuild:
+  Made the build system respect the user's CFLAGS/CXXFLAGS.
+
+  10 Jan 2008; Guy Martin <gmsoft@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Added hppa to KEYWORDS.
+
+  13 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -files/xmlrpc-c-1.10.00-cmake.patch,
+  -files/xmlrpc-c-1.10.00-mutexcreate.patch, metadata.xml,
+  xmlrpc-c-1.06.09.ebuild, -xmlrpc-c-1.10.00.ebuild:
+  Removed broken version 1.10.00. Fixed several minor issues as per bug 194031.
+
+  11 Dec 2007; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
+  update metadata
+
+  14 Oct 2007; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Added ~ppc64; bu #194031
+
+  06 Oct 2007; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Add ~ia64/~sparc wrt #194031
+
+  02 Oct 2007; Jeroen Roovers <jer@gentoo.org> xmlrpc-c-1.06.09.ebuild:
+  Marked ~hppa (bug #194031).
+
+  01 Oct 2007; Roy Marples <uberlord@gentoo.org> xmlrpc-c-1.06.03.ebuild,
+  xmlrpc-c-1.06.09.ebuild:
+  Keyworded ~sparc-fbsd and ~x86-fbsd, #194031.
+
+  22 May 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/gentoo-0.9.9-r1.patch, -files/xmlrpc-c-gcc-3.4.patch,
+  -xmlrpc-c-0.9.9-r1.ebuild:
+  clean up
+
+  22 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+  xmlrpc-c-1.06.03.ebuild:
+  Stable on Alpha, bug 166998.
+
+*xmlrpc-c-1.10.00 (22 May 2007)
+
+  22 May 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/xmlrpc-c-1.10.00-cmake.patch,
+  +files/xmlrpc-c-1.10.00-mutexcreate.patch, -xmlrpc-c-1.09.00.ebuild,
+  +xmlrpc-c-1.10.00.ebuild:
+  version bump; uses experimental cmake patch from Enrico Scholz
+
+  14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
+  add <herd>no-herd</herd>
+
+  17 Mar 2007; Steve Dibb <beandog@gentoo.org> xmlrpc-c-1.06.03.ebuild:
+  amd64 stable, bug 166998
+
+  18 Feb 2007; nixnut <nixnut@gentoo.org> xmlrpc-c-1.06.03.ebuild:
+  Stable on ppc wrt bug 166998
+
+  15 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  xmlrpc-c-1.06.03.ebuild:
+  stable x86; bug 166998
+
+*xmlrpc-c-1.06.09 (15 Feb 2007)
+
+  15 Feb 2007; Benedikt Böhm <hollow@gentoo.org> +xmlrpc-c-1.06.09.ebuild:
+  version bump
+
+*xmlrpc-c-1.09.00 (30 Jan 2007)
+
+  30 Jan 2007; Benedikt Böhm <hollow@gentoo.org> -xmlrpc-c-1.06.02.ebuild,
+  +xmlrpc-c-1.09.00.ebuild:
+  version bump; remove old version
+
+  12 Aug 2006; Benedikt Böhm <hollow@gentoo.org>
+  files/xmlrpc-c-1.06.03-mustbuildclient.patch, xmlrpc-c-1.06.03.ebuild:
+  fix previous patch for optional client libs
+
+*xmlrpc-c-1.06.03 (12 Aug 2006)
+
+  12 Aug 2006; Benedikt Böhm <hollow@gentoo.org>
+  -files/xmlrpc-c-1.05-client-global.patch,
+  -files/xmlrpc-c-1.05-iostream.patch,
+  -files/xmlrpc-c-1.05-no-extra-qual.patch,
+  +files/xmlrpc-c-1.06.03-mustbuildclient.patch, -xmlrpc-c-1.05-r2.ebuild,
+  +xmlrpc-c-1.06.03.ebuild:
+  version bump; fix #142929
+
+*xmlrpc-c-1.06.02 (31 Jul 2006)
+
+  31 Jul 2006; Benedikt Böhm <hollow@gentoo.org>
+  +files/xmlrpc-c-1.06.02-strsol.patch,
+  +files/xmlrpc-c-1.06.02-threadupdatestatus.patch,
+  -xmlrpc-c-1.03.14.ebuild, -xmlrpc-c-1.05.ebuild, -xmlrpc-c-1.05-r1.ebuild,
+  xmlrpc-c-1.05-r2.ebuild, +xmlrpc-c-1.06.02.ebuild:
+  version bump; fix #142231
+
+*xmlrpc-c-1.05-r2 (06 Jul 2006)
+
+  06 Jul 2006; Benedikt Böhm <hollow@gentoo.org>
+  +files/xmlrpc-c-1.05-client-global.patch, +files/xmlrpc-c-1.05-pic.patch,
+  +xmlrpc-c-1.05-r2.ebuild:
+  install missing client_global.h; fix PIC handling on amd64
+
+*xmlrpc-c-1.05-r1 (01 Jul 2006)
+
+  01 Jul 2006; Benedikt Böhm <hollow@gentoo.org>
+  +files/xmlrpc-c-1.05-no-extra-qual.patch, +xmlrpc-c-1.05-r1.ebuild:
+  fix #138668
+
+*xmlrpc-c-1.05 (24 Jun 2006)
+*xmlrpc-c-1.03.14 (24 Jun 2006)
+
+  24 Jun 2006; Benedikt Böhm <hollow@gentoo.org> -files/gentoo-0.9.9.patch,
+  -files/gentoo-1.2.patch, +files/xmlrpc-c-1.05-iostream.patch,
+  metadata.xml, -xmlrpc-c-0.9.9.ebuild, -xmlrpc-c-1.2.ebuild,
+  +xmlrpc-c-1.03.14.ebuild, +xmlrpc-c-1.05.ebuild:
+  version bumps; update metadata
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> xmlrpc-c-0.9.9-r1.ebuild:
+  Mark 0.9.9-r1 stable on alpha
+
+  26 Jul 2005; Jared Hudson <jhhudso@gentoo.org> xmlrpc-c-1.2.ebuild:
+  Modified latest ebuild to force make -j1 since greater than -j1 fails to
+  compile
+
+  22 May 2005; Jared Hudson <jhhudso@gentoo.org> : Version bump.
+	
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xmlrpc-c-0.9.9-r1.ebuild:
+  ~alpha keyword, bug 89340.
+
+  17 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  xmlrpc-c-0.9.9-r1.ebuild:
+  Fixed sandbox access violation, bug #82178
+
+  23 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/xmlrpc-c-gcc-3.4.patch, xmlrpc-c-0.9.9-r1.ebuild:
+  Fixed gcc-3.4 compile issues. Bug #64330
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmlrpc-c-0.9.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+*xmlrpc-c-0.9.9-r1; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  16 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Fixes 47830
+
+*xmlrpc-c-0.9.9 (07 Mar 2003)
+
+  07 Mar 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Created an ebuild - also tested on ppc
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
new file mode 100644
index 0000000..1817c30
--- /dev/null
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -0,0 +1,5 @@
+AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 SHA256 9a39a6d1c01c8fe1dc2d6673d35da13643d805eb8d717112735b7a7c75768d44 SHA512 e39c694f8fed9f2b55592043cdc6776260980e0e6751362c15026f82c2a777e37183f6a7d42e7e2ed36b4fada5124f3fd3c7d6104dc447ef494f4bf82e5dfe04 WHIRLPOOL 6c239ad331ce221dedc59b54ac96b96490d00f74e7e39d64f380490fafd508976a22fbab2afc69a536e1e5f7e2532cea75aab28c26a546e701bd621bc3a6688f
+DIST xmlrpc-c-1.25.30.tgz 779934 SHA256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 SHA512 a1fdbf154b48e78bec4143ffa906eb91f10c096ffc23fd924a05df2c1914d840c8b585fb7a3082cd5c6a79a4c3bbb875bb69340a1bff5f00614a441d7224949e WHIRLPOOL c14ff9e845df668d291a84b23301b62fa45e5224c30a8cf062d0f847ffba17f8186bc5bb8eeb0db10abb5517a17a1354c9dd28677e2c603aa4ad6aeaa77c959d
+EBUILD xmlrpc-c-1.25.30.ebuild 3093 SHA256 c29e061dc5847f946d825bcb400ee26102ac0cf5491ca278a9c05c5ae4b65014 SHA512 cfa3075f5b421ab1292fd7fb860f3f8cfedcc040a82dca642fde5430bcab0d13c9a6e2646ec21f42693b91df5ecbff2135c066d1a36f5db0938b3084e6d25d5b WHIRLPOOL d38cbdb441d7f3043ad5a6cfcd87d7baf46923f90390c832982ac47804ae0070997ad2a98f325cd4e2a5ce01cc621bfc0234149c3dd918323c5d2a42f0aa2d4f
+MISC ChangeLog 23358 SHA256 1e354c5f89663bcd2a6083385d708d4b77ad6af21af6831b30929540b2d631ab SHA512 6901a842498c44b45079c788c744af70725ddba8525151c910c3e793ca4fda809d9927849085e46c90d40c8f089db314161480546d130327cfb3fc0b7955b230 WHIRLPOOL bfdadd8f6b4dbffae0b04fd1439268f54cd0b3f8a77ba848b3a3de820761e7e35805c11f10904e8a67347f25a0ed6cce8b2938832c84e82479343de57afb9828
+MISC metadata.xml 671 SHA256 531ee5a34812e8c17d0786aebb7da992ec0c79c4d7c03f80b204fdd5e7013011 SHA512 2636519b3565a53daded955eb79dd8546738860a7fbb2ecc4d4a793c19d796bb54578bbb1fe7b84cae39980c875d5adef81e64ddb59d3852617f0bd13816a5f9 WHIRLPOOL 90aaf5ba34d0ad054a488d9724e5d3717752357e2ab873fb2dbbc2a6c095f299c6efb158245ea5a9b75b668fbe1b7d743fc95a2eca296a1e3fa8e329b67d33b5
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
new file mode 100644
index 0000000..affa917
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
@@ -0,0 +1,20 @@
+--- a/common.mk
++++ b/common.mk
+@@ -17,7 +17,7 @@
+ # fully made.
+ .DELETE_ON_ERROR:
+ 
+-GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef -Wimplicit \
++GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef \
+   -Wno-unknown-pragmas
+   # We need -Wwrite-strings after we fix all the missing consts
+   #
+@@ -27,7 +27,7 @@
+   # on -Wuninitialized for all the others.
+ 
+ GCC_C_WARNINGS = $(GCC_WARNINGS) \
+-  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes
++  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wimplicit
+ 
+ GCC_CXX_WARNINGS = $(GCC_WARNINGS)  -Wsynth
+ 
diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml
new file mode 100644
index 0000000..225673b
--- /dev/null
+++ b/dev-libs/xmlrpc-c/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<use>
+		<flag name='abyss'>Build the Abyss mini web-server.</flag>
+		<flag name='libxml2'>Use dev-libs/libxml2 to parse XML instead of the internal expat library.</flag>
+		<flag name='threads'>Controls whether to build the Abyss web-server with pthreads or fork 'threading'.</flag>
+		<flag name='tools'>Build the xmlrpc* tools.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.25.30.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.25.30.ebuild
new file mode 100644
index 0000000..63f1144
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.25.30.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild,v 1.11 2013/06/30 18:08:07 ago Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+# Maintainer notes: Take a look at http://xmlrpc-c.sourceforge.net/release.html
+# We use "advanced" branch, so for the current release revision take look here:
+# http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/version.mk?view=log
+# e.g. for 1.27.05 corresponds following revision 2182 and thus following URL:
+# http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz?view=tar&pathrev=2182
+# Note: autogenerated tarball checksum changes every download, thus download it
+# manually and distribute on mirrors.
+# It's possible to build net-libs/libwww without ssl support, but taking into
+# account that libwww is not really well maintained and upstream is dead we
+# better use it only in case ssl is required.
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/dev-libs/libxmlrpc-c/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads tools"
+
+REQUIRED_USE="test? ( static-libs abyss curl cxx ) tools? ( curl )"
+
+DEPEND="
+	sys-libs/ncurses
+	sys-libs/readline
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+#Bug 214137: We need to filter this.
+unset SRCDIR
+
+# Bug 255440
+export LC_ALL=C
+export LANG=C
+
+src_prepare() {
+	#epatch "${FILESDIR}"/${PN}-1.32.05-Wimplicit.patch
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		"${S}"/common.mk || die
+
+	export LADD=${LDFLAGS} # Respect the user's LDFLAGS.
+
+	use static-libs || { sed \
+		-e '/\(^TARGET_STATIC_LIBRARIES =\)/{s:\(^TARGET_STATIC_LIBRARIES =\).*:\1:;P;N;d;}' \
+			-i common.mk || die; }
+}
+
+src_configure() {
+	#Disable libwww support due GBZ #409549 and #320253
+
+	econf --disable-wininet-client \
+		$(use_enable libxml2 libxml2-backend) \
+		--disable-libwww-client \
+		--without-libwww-ssl  \
+		$(use_enable threads abyss-threads) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable curl curl-client)
+}
+
+src_compile() {
+	emake -r
+	use tools && emake -rC "${S}"/tools
+}
+
+src_install() {
+	default_src_install
+	use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}
+
+src_test() {
+	unset LDFLAGS LADD SRCDIR
+	cd "${S}"/test/
+	einfo "Building general tests"
+	make || die "Make of general tests failed"
+	einfo "Running general tests"
+	./test || die "General tests failed"
+	cd "${S}"/test/cpp/
+	einfo "Running C++ tests"
+	./test || die "C++ tests failed"
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
new file mode 100644
index 0000000..6898aff
--- /dev/null
+++ b/net-libs/libmicrohttpd/Manifest
@@ -0,0 +1,2 @@
+DIST libmicrohttpd-0.9.22.tar.gz 829899 SHA256 198daebb695eb6b97923200a26c143d38c11b582019927a75b2872ae4ec2f687 SHA512 66e1fb900ab9aea511af83b5fe3640577f6b60a0f4510c605f3f6c9315f5e664453d70a36d3b82e9165ed929fcb320edee6019fd79a763b71298049dc101ed27 WHIRLPOOL 9930745a7aa4343709a4aa0c3aff4acc267299d8ef2fa2ab29a335264e32f70e4692a49c23cb540b68d1fa9dc3af6ebbcd55a143613b416d1811e2a6ff1fe5ab
+EBUILD libmicrohttpd-0.9.22.ebuild 1045 SHA256 d0a0eaaf478e62abff3477c0b4d826df9db4185b42310352a43652f7fc5fa8bb SHA512 d2bcc198235edc9f527b3ea0c5eb89a527e08bc390b5ff93b7902bba571307dc9f03b386ef0752257d870e41996bf821d049b82654f569359e05cbd269edcf42 WHIRLPOOL 6f103b493f3f2bb4fbc622d7dd9733105d735296e715436f93a8a1c14d9a8058650ac270e0004fe52729353f5f943013c6e62412320e7eb21688171089f03303
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.22.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.22.ebuild
new file mode 100644
index 0000000..7e4a3c1
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.22.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/Attic/libmicrohttpd-0.9.22.ebuild,v 1.4 2012/12/26 16:39:50 blueness dead $
+
+EAPI="4"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application."
+HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+IUSE="messages ssl static-libs test"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="ssl? (
+		dev-libs/libgcrypt
+		net-libs/gnutls
+	)"
+
+DEPEND="${RDEPEND}
+	test?	(
+		ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+	econf \
+		$(use_enable test curl) \
+		$(use_enable messages) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}

From 928ea872825b365a46ad36a74fdd32ebabd54320 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 25 Nov 2014 15:39:49 -0800
Subject: [PATCH 052/261] link opensips to latest source for that version

---
 net-misc/opensips/Manifest               | 4 ++--
 net-misc/opensips/opensips-1.11.3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 3aaa04a..0443684 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -3,10 +3,10 @@ AUX opensips.default 810 SHA256 9e157e9697e2486b06c17aeb0e03ebe08e70ce2108a7d6bd
 AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d540466be30bc63 SHA512 a6bc407d96bfaca17e893ff8200e09703d4592e610dd5df66d2cccc635b134dac4b57a32ea5d9efd91a8f24d932616613115328bd561f34aabce84dff0c287e8 WHIRLPOOL aa67bce3127926b35e4c9bca24ec0f17490c41637645b58f37a24fa7f4a27ca5e99e115f1417e26d82a7a7b6c223074341e9bb24c5304d90a5f89e6305678cf6
 AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.10.3_src.tar.gz 4352917 SHA256 2e8c5c9000c1560f862f5290e933c647452ffe9a117b3ee9cd680936de93ac29 SHA512 470fe2b614e399babc9df237756fe89bd4196b61d993e5ded8934dbf1eb20ef3f2124ce50ae42b989dd7be524d0e654815d6f65897ef0612c6051739160b5038 WHIRLPOOL a6491c33ad9bb725c740df6adc6efb404300f4f4c4004e6c78e08acf0f95be429b0ac6169ac3bc20f3f275e3f6e65dc9ac86700e5d378a41a70038f70b6dbfdb
-DIST opensips-1.11.3-41408f0_src.tar.gz 5492230 SHA256 fad921f65590ef09372f157ca762176514b86bad073a9036bbaa7a1658a51cf6 SHA512 01b1366d6b36b0c9b01f55610bc4e01ad017788f9ed2e86b7c3c5ceb1d11a675cf37a503faba2e4cc338371fee8da1c23f50a7d33670a3c9324e7fe974f32284 WHIRLPOOL d695d42d3cbb011a34fb927062b2b5bc191814b5a62fc398344e2a2235e67191f49148099dc59bcb5b99066d485bf3f8714c1fff8966c4f2ffc15820857dedfd
+DIST opensips-1.11.3-latest_src.tar.gz 5492639 SHA256 0da34293014e579f93a4fe62f8284b6de22cc5d3bdf3650a3e6b40f1de086310 SHA512 d48e46a46d69875fc541c250b89b3e820587b5e9f5f9aaf1b589aa37759014af9f85ad0b63a06fe79e7d86d1c6098f9d1d2ded645b7ca3fc7d266c0c77769f29 WHIRLPOOL 664e98917dc8dd27ddae275da19c62d70860fa1540c8293d8640824931b8ebae05945e08c8a86d69f55f16b2825b4a0736bc82e7abcc8e929c0d2a8d1822c285
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
 EBUILD opensips-1.10.3.ebuild 3505 SHA256 fd98226f14ef35f49f8924b13b48f4a785e6e9efc7432c3a2c160cbc6daecaac SHA512 5f8d8f7019016cbad4e09327b9ec10a3d34f0b8a51b17a3bcbf26673e9f2fa4a8f14e589df9dccd48604fdf7d14676f4a418d943b73ebbc63d1d8270defc714f WHIRLPOOL f4dc8bf583283486d23367f1688038b35cc2d6ff260e0a3a6992b02f750072a8471168f43a80f2a9b835264d035ab757bb0db7b034b5190c3868616099762584
-EBUILD opensips-1.11.3.ebuild 3578 SHA256 c8937f6cbd9fbac7e33fb4cf3c1ab30a19fdabfd568f361422038b4bfc4ea13f SHA512 701a0c672d62f212878def6aba3ec71a5e6718b6faf05336f313bf8ef03f2ebae29e3d6a6fa44a3be0c3aa1d791b0cb2331cd89b496a1ceaf8010c108563cd81 WHIRLPOOL 6bb4dd716c5189bba778a7ee042f1f7a61d699101e9d8e718e905bfb6aa5b446f747e20c9e86aed7008cdb7681a9e73ee11b5825e3462a44b16beada0497a5b6
+EBUILD opensips-1.11.3.ebuild 3577 SHA256 de69c75f717d3beb3bc266abe7ef5cb67d316dbe5dbf0b10f903a692e0554d1d SHA512 c21406bcb74ed33c8771d1dae785bbe338cc446d979d277fb1efe5068be611392150f53f2ca843ad1ff006710f25637a012e39b91f9a087f918fcca5027a2853 WHIRLPOOL babc1653a8d7f0fbe0792737c429649f3b7687b94876f5861fbb6739ff1d7a918b438c62dde639e2661754387093933b1be4357556ea44a4cb729902a42f5436
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
 EBUILD opensips-1.8.0.ebuild 3311 SHA256 fabf16768b2709a9a11e63b0bd15acd68e8ae1804808f3c7f9cc4fc23b2daaeb SHA512 2589bd748e043d171bab81cbfe0fbdb63c59273bd451f3fba34948005a3390c4a3eee1427713a79319d650d7c9de91935b5561f178657f40837eff56b84e474f WHIRLPOOL 75001d3e16fdeac740807b9e83b306c0a36510e686693c40dd3ad7bd59578bb8941b48a1687d9754ffda0d4fb080dfa43ef9dbf3da94e66bb601f5042aa33926
diff --git a/net-misc/opensips/opensips-1.11.3.ebuild b/net-misc/opensips/opensips-1.11.3.ebuild
index 14c675a..1eebf9e 100644
--- a/net-misc/opensips/opensips-1.11.3.ebuild
+++ b/net-misc/opensips/opensips-1.11.3.ebuild
@@ -4,7 +4,7 @@
 EAPI="3"
 inherit eutils
 
-MAGIC="41408f0"
+MAGIC="latest"
 
 DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
 HOMEPAGE="http://www.opensips.org/"

From 913b9921b706a82c2bd256744a1cc0f1a5839db3 Mon Sep 17 00:00:00 2001
From: bhakimi <bobby@safesoftsolutions.com>
Date: Wed, 10 Dec 2014 11:48:44 -0800
Subject: [PATCH 053/261] Update repo_name

---
 profiles/repo_name | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/repo_name b/profiles/repo_name
index 975a719..423323e 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-ScurvyNet
+SafeSoft

From 5525d9048d8c88dde614b432936ff8038aa1c37d Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 10 Dec 2014 14:07:03 -0800
Subject: [PATCH 054/261] added old pecl php extention thats not supported by
 gentoo anymore

---
 dev-php/pecl-apc/Manifest                     |  4 ++
 .../files/pecl-apc-3.0.16-CVE-2008-1488.patch | 12 ++++
 .../pecl-apc-3.0.16-apc_set_signals.patch     | 11 ++++
 dev-php/pecl-apc/files/pecl-apc.ini           | 11 ++++
 dev-php/pecl-apc/metadata.xml                 | 11 ++++
 dev-php/pecl-apc/pecl-apc-3.1.11.ebuild       | 63 +++++++++++++++++++
 dev-php/pecl-apc/pecl-apc-3.1.12.ebuild       | 63 +++++++++++++++++++
 dev-php/pecl-apc/pecl-apc-3.1.13.ebuild       | 63 +++++++++++++++++++
 dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild     | 61 ++++++++++++++++++
 9 files changed, 299 insertions(+)
 create mode 100644 dev-php/pecl-apc/Manifest
 create mode 100644 dev-php/pecl-apc/files/pecl-apc-3.0.16-CVE-2008-1488.patch
 create mode 100644 dev-php/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
 create mode 100644 dev-php/pecl-apc/files/pecl-apc.ini
 create mode 100644 dev-php/pecl-apc/metadata.xml
 create mode 100644 dev-php/pecl-apc/pecl-apc-3.1.11.ebuild
 create mode 100644 dev-php/pecl-apc/pecl-apc-3.1.12.ebuild
 create mode 100644 dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
 create mode 100644 dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild

diff --git a/dev-php/pecl-apc/Manifest b/dev-php/pecl-apc/Manifest
new file mode 100644
index 0000000..d4ec97e
--- /dev/null
+++ b/dev-php/pecl-apc/Manifest
@@ -0,0 +1,4 @@
+DIST APC-3.1.11.tgz 157478 SHA256 478ae91c735087dda4f02d03399fb06ceba4355125ad8fd532b187c93004ebc7 SHA512 9882f3b2c9b26dbe1626ef389b7de43e711ab48546773dcfd13c9ad1e894ffc0067c0997ffa89783a816c4391201559e5fcc32cf9fbd54fd89221727107422d3 WHIRLPOOL ad7615f46132b0823071ec95a86e8e1a3023569b014c6a7ac653466bed01ea46a5f716efd5e13a015d96b5d9c443b0fdc64abcd18b91635ba5f17d15256346b4
+DIST APC-3.1.12.tgz 170655 SHA256 d41879b2ba08ca861bd6b59605e2544c039a9982d3d92a811fc5f6c85afe9ed2 SHA512 bcfe37aae8b07525094d7babfa5579dbab5a10c7f5ea2448c388128129029a57724715a08826f29bf3003c1b4bb4e61cdcdd3d0461c8b2c7055fed4dd5883c7d WHIRLPOOL 58b4c2c23e3441976560b24606afcdc24327d5528d19be6770e1ace1b4425fcdb21944272e30a223cd4e978d58b4dd37ad18fd37eb0a981b886f682903dc63ff
+DIST APC-3.1.13.tgz 171591 SHA256 5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd SHA512 4ccfa12a61a9276be207c9b70b108b725cf2faa3ed805bab8c9a39b04039fd16a8da6919ab7d5a84592f7b4a7827dcd9adeb154c6a04d208e7071be22268b332 WHIRLPOOL 335020f6ec44ec188b9544fb4132d2c1c62c4d342c3e07f3bfb0266c3827c311316c95ec08517946481724350314a06e7f3b49b13c0cedf2a2dcd1ca5d38149e
+DIST APC-3.1.9.tgz 155540 SHA256 47def118d9da1a68521e1c9b3dd6660cf94be638ebecad010bdd7d7ca482d671 SHA512 dd4ab9e1d130e757117bb5a43eb2155dcd58d7e15f94add85834d2d488de9a2f8cacd4d5bee222302a2e651f17ecd750b227dd2d4ae7102932208bbc24a132f0 WHIRLPOOL 63354d4c6836378a211f3f22110dcbd452b58a13431b9d2fe227fd5d0c950ec764420922968d75cb43f4d085c21f7dc26245f1a14a30eb88534df6f6cf128a36
diff --git a/dev-php/pecl-apc/files/pecl-apc-3.0.16-CVE-2008-1488.patch b/dev-php/pecl-apc/files/pecl-apc-3.0.16-CVE-2008-1488.patch
new file mode 100644
index 0000000..7ece786
--- /dev/null
+++ b/dev-php/pecl-apc/files/pecl-apc-3.0.16-CVE-2008-1488.patch
@@ -0,0 +1,12 @@
+--- apc.c.old	2008-03-26 19:22:02.000000000 +0100
++++ apc.c	2008-03-26 19:22:23.000000000 +0100
+@@ -331,7 +331,7 @@
+             /* not: [no active file] or no path */
+             memcpy(fileinfo->fullpath, exec_fname, exec_fname_length);
+             fileinfo->fullpath[exec_fname_length] = DEFAULT_SLASH;
+-            strcpy(fileinfo->fullpath +exec_fname_length +1, filename);
++            strlcpy(fileinfo->fullpath +exec_fname_length +1, filename,sizeof(fileinfo->fullpath)-exec_fname_length-1);
+             /* apc_wprint("filename: %s, exec_fname: %s, fileinfo->fullpath: %s", filename, exec_fname, fileinfo->fullpath); */
+             if (apc_stat(fileinfo->fullpath, &fileinfo->st_buf) == 0) {
+                 found = 1;
+
diff --git a/dev-php/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch b/dev-php/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
new file mode 100644
index 0000000..0e12918
--- /dev/null
+++ b/dev-php/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
@@ -0,0 +1,11 @@
+--- APC-3.0.16/php_apc.c.orig      2007-12-26 23:51:32.000000000 +0100
++++ APC-3.0.16/php_apc.c       2008-01-04 23:34:30.000000000 +0100
+@@ -300,7 +300,7 @@
+         apc_request_init(TSRMLS_C);
+ 
+ #if HAVE_SIGACTION
+-        apc_set_signals();
++        apc_set_signals(TSRMLS_C);
+ #endif
+     }
+     return SUCCESS;
diff --git a/dev-php/pecl-apc/files/pecl-apc.ini b/dev-php/pecl-apc/files/pecl-apc.ini
new file mode 100644
index 0000000..97b968d
--- /dev/null
+++ b/dev-php/pecl-apc/files/pecl-apc.ini
@@ -0,0 +1,11 @@
+apc.enabled="1"
+apc.shm_segments="1"
+apc.shm_size="30M"
+apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
+apc.file_update_protection="2"
+apc.enable_cli="0"
+apc.max_file_size="1M"
+apc.stat="1"
+apc.write_lock="1"
+apc.include_once_override="0"
+
diff --git a/dev-php/pecl-apc/metadata.xml b/dev-php/pecl-apc/metadata.xml
new file mode 100644
index 0000000..cf71629
--- /dev/null
+++ b/dev-php/pecl-apc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+	<use>
+		<flag name="lock_semaphore">Enable semaphore locks instead of fcntl</flag>
+		<flag name="lock_pthreadmutex">Enable pthread mutex locking</flag>
+		<flag name="lock_pthreadrw">Enable pthread read/write locking</flag>
+		<flag name="lock_spinlock">Enable spin locks (EXPERIMENTAL)</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.11.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.11.ebuild
new file mode 100644
index 0000000..8bb8b55
--- /dev/null
+++ b/dev-php/pecl-apc/pecl-apc-3.1.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.11.ebuild,v 1.1 2012/07/24 18:32:55 olemarkus Exp $
+
+EAPI=4
+
+PHP_EXT_NAME="apc"
+PHP_EXT_PECL_PKG="APC"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
+
+PHP_EXT_INIFILE="${PN}.ini"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="mmap"
+
+DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apc"
+	enable_extension_enable "apc-mmap" "mmap" 0
+
+	enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
+	enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
+	enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
+	enable_extension_enable "apc-sem" "lock_semaphore" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of PECL-APC was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.12.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.12.ebuild
new file mode 100644
index 0000000..133c915
--- /dev/null
+++ b/dev-php/pecl-apc/pecl-apc-3.1.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.12.ebuild,v 1.1 2012/08/17 09:50:44 olemarkus Exp $
+
+EAPI=4
+
+PHP_EXT_NAME="apc"
+PHP_EXT_PECL_PKG="APC"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
+
+PHP_EXT_INIFILE="${PN}.ini"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="mmap"
+
+DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apc"
+	enable_extension_enable "apc-mmap" "mmap" 0
+
+	enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
+	enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
+	enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
+	enable_extension_enable "apc-sem" "lock_semaphore" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of PECL-APC was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
new file mode 100644
index 0000000..a09bc0e
--- /dev/null
+++ b/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild,v 1.1 2012/09/04 12:29:31 olemarkus Exp $
+
+EAPI=4
+
+PHP_EXT_NAME="apc"
+PHP_EXT_PECL_PKG="APC"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
+
+PHP_EXT_INIFILE="${PN}.ini"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="mmap"
+
+DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apc"
+	enable_extension_enable "apc-mmap" "mmap" 0
+
+	enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
+	enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
+	enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
+	enable_extension_enable "apc-sem" "lock_semaphore" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of PECL-APC was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
new file mode 100644
index 0000000..12175bd
--- /dev/null
+++ b/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild,v 1.7 2012/09/04 12:29:31 olemarkus Exp $
+
+EAPI=4
+
+PHP_EXT_NAME="apc"
+PHP_EXT_PECL_PKG="APC"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
+
+PHP_EXT_INIFILE="${PN}.ini"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+KEYWORDS="amd64 ppc ~ppc64 x86"
+
+DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="mmap"
+
+DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apc"
+	enable_extension_enable "apc-mmap" "mmap" 0
+
+	enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
+	enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
+	enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
+	enable_extension_enable "apc-sem" "lock_semaphore" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of PECL-APC was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}

From 9738912302d72ab87c7c2037ae0015333666359f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 10 Dec 2014 14:09:10 -0800
Subject: [PATCH 055/261] new manifest

---
 dev-php/pecl-apc/Manifest | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-php/pecl-apc/Manifest b/dev-php/pecl-apc/Manifest
index d4ec97e..62dbd17 100644
--- a/dev-php/pecl-apc/Manifest
+++ b/dev-php/pecl-apc/Manifest
@@ -1,4 +1,12 @@
+AUX pecl-apc-3.0.16-CVE-2008-1488.patch 733 SHA256 4d2dc22c1b2f2fe89848b2167605af2d5d0cab906de306ac29ace9319aed2e0c SHA512 abdfcbe86276a2bec2b90892f22f0e28970577f9b7be991054eb5b85d9c42e9cf1bc683fda0462aa7705e2587d1fe19a83e99ba678be2b8ec7c4472be331c54d WHIRLPOOL bcb792a189bbf71141c5463b07d6d2df601650ae13174092dc213dbee4cf2601bd16e1b13233651c09e5bd3cc95072927df40bc957daa534684fe8582bd110be
+AUX pecl-apc-3.0.16-apc_set_signals.patch 317 SHA256 99ef89e19effcff193791910ce376e9b284c8f8048407e86f81d6746656db95c SHA512 7d1f4ff9faf2ed5adedf1b15874938e6c1ba23c0f02a1af583ba0a3821e03cec4abdcbaa74e017bdf54e4778a69a1de96a95e3a24884b263c01e2d0761860064 WHIRLPOOL 91a7329b61bc4dc7827b5f488dd76cacbd681c043fa09fe1b51b6ba8ba838502c9ee132b8ca14bb9f80a312aec5747983b862936d3a3151db9a1d03eec4cb7b5
+AUX pecl-apc.ini 233 SHA256 1529ee803ce25a13bd303c9b40a32b238daf21aa0a993d8e66ae90dc1042d080 SHA512 ec206fd3fc6ebda209e2ff19db7910c7deeced53e8041b9ba5283684cde84144c99ea7521b9291b6b62c6cbc8fdd219bb9141fa11df75b76688d9e706b59c985 WHIRLPOOL 6ee07613551c3032a39296f516caff0b4f25e2cd0e2431af56b945986000146cdc6f585f607041258aecef9351c6852885082ccd6e3fca3c6c0e32db593d3c21
 DIST APC-3.1.11.tgz 157478 SHA256 478ae91c735087dda4f02d03399fb06ceba4355125ad8fd532b187c93004ebc7 SHA512 9882f3b2c9b26dbe1626ef389b7de43e711ab48546773dcfd13c9ad1e894ffc0067c0997ffa89783a816c4391201559e5fcc32cf9fbd54fd89221727107422d3 WHIRLPOOL ad7615f46132b0823071ec95a86e8e1a3023569b014c6a7ac653466bed01ea46a5f716efd5e13a015d96b5d9c443b0fdc64abcd18b91635ba5f17d15256346b4
 DIST APC-3.1.12.tgz 170655 SHA256 d41879b2ba08ca861bd6b59605e2544c039a9982d3d92a811fc5f6c85afe9ed2 SHA512 bcfe37aae8b07525094d7babfa5579dbab5a10c7f5ea2448c388128129029a57724715a08826f29bf3003c1b4bb4e61cdcdd3d0461c8b2c7055fed4dd5883c7d WHIRLPOOL 58b4c2c23e3441976560b24606afcdc24327d5528d19be6770e1ace1b4425fcdb21944272e30a223cd4e978d58b4dd37ad18fd37eb0a981b886f682903dc63ff
 DIST APC-3.1.13.tgz 171591 SHA256 5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd SHA512 4ccfa12a61a9276be207c9b70b108b725cf2faa3ed805bab8c9a39b04039fd16a8da6919ab7d5a84592f7b4a7827dcd9adeb154c6a04d208e7071be22268b332 WHIRLPOOL 335020f6ec44ec188b9544fb4132d2c1c62c4d342c3e07f3bfb0266c3827c311316c95ec08517946481724350314a06e7f3b49b13c0cedf2a2dcd1ca5d38149e
 DIST APC-3.1.9.tgz 155540 SHA256 47def118d9da1a68521e1c9b3dd6660cf94be638ebecad010bdd7d7ca482d671 SHA512 dd4ab9e1d130e757117bb5a43eb2155dcd58d7e15f94add85834d2d488de9a2f8cacd4d5bee222302a2e651f17ecd750b227dd2d4ae7102932208bbc24a132f0 WHIRLPOOL 63354d4c6836378a211f3f22110dcbd452b58a13431b9d2fe227fd5d0c950ec764420922968d75cb43f4d085c21f7dc26245f1a14a30eb88534df6f6cf128a36
+EBUILD pecl-apc-3.1.11.ebuild 1520 SHA256 11fb2884ef371870476cbe139d2531d870ee9d9c7c805643b33a33840d6f4eee SHA512 17190076efd952bfcb8c6cdb8b5afe99531e60a0534f7906a688c4d8d11976c3bcd1964a1fffeaf211ccceba9fcfec67fd09d3ecb9abcada812dbbb107077ed5 WHIRLPOOL 0b92f984de608e564da3b50a55c35939ad247b9a51876f4085fcbad3193ff0875a394a4e5116389b94b272144a80c9d6cd7e1ec44c904c3790dbc0c5abac1922
+EBUILD pecl-apc-3.1.12.ebuild 1520 SHA256 3fc76c76f0dadb50380d54305a0782f255bab3d857ac2d15c98bc93cbbd40b06 SHA512 1c60eb85c252c2e8b8247a74b159b17cd9ac55f4013ab9eb2c16a46834c32bf2b68a109f0906532a12c926501b3f7e96f6b072481b54417f8bed2d4dce450676 WHIRLPOOL 06dccbf727883475ae0b24e91e1e3c5c460c56a9d93abe3f60bbefec0b3cf3a91af995a4a89dcc9c7b2318793c65bb879405fa7fe5970c3c58479c891728a52a
+EBUILD pecl-apc-3.1.13.ebuild 1520 SHA256 add069b6d9fe530e3f63631a1409ca01602dc696ae9690559957e2898dd1fe8e SHA512 a83224153f53be912f3b6301b267f460fc70443d2d91c980d7c2bc698a73d204478dde7778880ff70f57a9edc2068dccf48fb1878fe95cc34f9807addb323d04 WHIRLPOOL 361d42b1597c023a74fc982ed6593216ade509940e470c69645623c8c1e3480331f5ee854870b3ecc1cf6ea1afc4c0d7bfd0a124f72bd282c2dff003d4f986f0
+EBUILD pecl-apc-3.1.9-r2.ebuild 1488 SHA256 95e6bb17a7546ad9f2d61d6816c60462b5358124fbd85638710e9c0267384b54 SHA512 17053e7bacd6d896693fb99df8bea2de51e614a90f343d5799fc12b6e22b7acf0da1548c374b39f214d0c9fef1b320cd43b4de8c67d4c0722fc647afa1558ebb WHIRLPOOL 69d59ed09f676f6d04c3d71e8427ae9c537e4b098d4222e8911af8b460cd0723656ccf4594a992d054b7440daf28d06ab2b3e26a94469bb551fea842a5a751c1
+MISC metadata.xml 458 SHA256 9dbd7d8b0b8072cf8504510a566265a44932457a08d31eb2937840c70da9ff4e SHA512 65905ceeabae80e81e0cdb13220706c887e6569d307adb79a026c0626f6b27f98955e4e4b56f6ea9bd4d3095084279c4fb9fab21d43c46f66f5db67431e14f4a WHIRLPOOL 6c5ebf7dea5771b561e53898bb65282349974636a6f8ca6d14df0dcc444d1b4c93992f86aed331e35521417400fa878e19dca52c04db565170da4d93459ca122

From d96f73d0bb8c62593bb8d9fc228c48673eb3268b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 10 Dec 2014 18:27:57 -0800
Subject: [PATCH 056/261] added pecl php 5.3 support back

---
 dev-php/pecl-geoip/ChangeLog                  | 92 +++++++++++++++++++
 dev-php/pecl-geoip/Manifest                   |  6 ++
 dev-php/pecl-geoip/metadata.xml               |  5 +
 dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild | 24 +++++
 dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild    | 24 +++++
 5 files changed, 151 insertions(+)
 create mode 100644 dev-php/pecl-geoip/ChangeLog
 create mode 100644 dev-php/pecl-geoip/Manifest
 create mode 100644 dev-php/pecl-geoip/metadata.xml
 create mode 100644 dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild
 create mode 100644 dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild

diff --git a/dev-php/pecl-geoip/ChangeLog b/dev-php/pecl-geoip/ChangeLog
new file mode 100644
index 0000000..aaed766
--- /dev/null
+++ b/dev-php/pecl-geoip/ChangeLog
@@ -0,0 +1,92 @@
+# ChangeLog for dev-php/pecl-geoip
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/ChangeLog,v 1.11 2014/10/14 15:27:09 grknight Exp $
+
+  14 Oct 2014; Brian Evans <grknight@gentoo.org> -pecl-geoip-1.0.8-r1.ebuild:
+  Drop old
+
+  12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> pecl-geoip-1.0.8-r2.ebuild:
+  Stable for x86, wrt bug #488854
+
+*pecl-geoip-1.1.0 (29 Sep 2014)
+
+  29 Sep 2014; Brian Evans <grknight@gentoo.org> +pecl-geoip-1.1.0.ebuild:
+  Version bump; add php 5.6; wrt bug 518656
+
+  18 Jan 2014; Pacho Ramos <pacho@gentoo.org> pecl-geoip-1.0.8-r2.ebuild:
+  amd64 stable, bug #488854
+
+*pecl-geoip-1.0.8-r2 (26 Jul 2013)
+
+  26 Jul 2013; Ole Markus With <olemarkus@gentoo.org>
+  +pecl-geoip-1.0.8-r2.ebuild:
+  Adding 5.5 support, removing 5.3 support
+
+  05 Mar 2013; Ole Markus With <olemarkus@gentoo.org>
+  -pecl-geoip-1.0.7-r1.ebuild:
+  Version bump
+
+  04 Dec 2012;  <ago@gentoo.org> pecl-geoip-1.0.8-r1.ebuild:
+  Stable for x86, wrt bug #438738
+
+  01 Dec 2012; <ago@gentoo.org> pecl-geoip-1.0.8-r1.ebuild:
+  Stable for amd64, wrt bug #438738
+
+  03 Mar 2012; Ole Markus With <olemarkus@gentoo.org> -pecl-geoip-1.0.8.ebuild:
+  Removed older versions
+
+*pecl-geoip-1.0.8-r1 (03 Mar 2012)
+
+  03 Mar 2012; Ole Markus With <olemarkus@gentoo.org>
+  +pecl-geoip-1.0.8-r1.ebuild:
+  Version bump supporting php 5.4
+
+*pecl-geoip-1.0.8 (12 Dec 2011)
+
+  12 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +pecl-geoip-1.0.8.ebuild:
+  Version bump (bug 391813)
+
+  10 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  pecl-geoip-1.0.7-r1.ebuild:
+  Stable on amd64 wrt bug #351208
+
+  10 Feb 2011; Thomas Kahle <tomka@gentoo.org> pecl-geoip-1.0.7-r1.ebuild:
+  x86 stable per bug 351208
+
+*pecl-geoip-1.0.7-r1 (04 Nov 2010)
+
+  04 Nov 2010; Matti Bickel <mabi@gentoo.org> -pecl-geoip-1.0.2.ebuild,
+  +pecl-geoip-1.0.7-r1.ebuild:
+  add version that supports minor version slotting
+
+*pecl-geoip-1.0.7 (27 Jun 2009)
+
+  27 Jun 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +pecl-geoip-1.0.7.ebuild:
+  Bug #275649: version bump.
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> -pecl-geoip-1.0.1.ebuild,
+  pecl-geoip-1.0.2.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-geoip-1.0.2.ebuild:
+  Fix LICENSE
+
+*pecl-geoip-1.0.2 (29 Nov 2007)
+
+  29 Nov 2007; Markus Ullmann <jokey@gentoo.org> +pecl-geoip-1.0.2.ebuild:
+  Version bump from project overlay
+
+  22 Nov 2007; Jakub Moc <jakub@gentoo.org>
+  +pecl-geoip-1.0.2.ebuild:
+  Version bump
+
+*pecl-geoip-1.0.1 (30 Aug 2007)
+
+  30 Aug 2007; Markus Ullmann <jokey@gentoo.org>
+  +pecl-geoip-1.0.1.ebuild:
+  Port from project overlay
+
+  28 Aug 2007; Jakub Moc <jakub@gentoo.org> +metadata.xml,
+  +pecl-geoip-1.0.1.ebuild:
+  New ebuild, Bug 187405
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
new file mode 100644
index 0000000..465d00d
--- /dev/null
+++ b/dev-php/pecl-geoip/Manifest
@@ -0,0 +1,6 @@
+DIST geoip-1.0.8.tgz 10061 SHA256 08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a SHA512 3a8a64f1d420472cc5b3a760391be28bd6bd8a34092715b0f75f308502fa76ca71a029cb2f0ba2fb87ba26166781547edbb7f151609c91db48bb025add4d0447 WHIRLPOOL a79497cd4f9fe0bc8c50138a1c17ff4b0d08b615f6458a8b48149dccfbb7d5927c6cdb47ece5127ae477796d5a7ca2e38139fe71266584a5874b043d6a12ff95
+DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6
+EBUILD pecl-geoip-1.0.8-r2.ebuild 552 SHA256 54ff14334eb6325ea50e902bdaeccdddee4b47f702db4424eec887e32a5b9ca9 SHA512 e588af9bcbb81e756532a04b49c22f7a10146812907f3d894df39bb652b7beef91302a95b0fd61212b51a58613e18257a9e0afedef109fb0e51221c56198692e WHIRLPOOL f9a2204756af98a1fbb78aed710e0677f8a13fc10b6d8c8589b50bea7bf8c33a96e7dec017b09ad75641988a2b9a6c16c56e12cab235a3f0e0594a76da6222be
+EBUILD pecl-geoip-1.1.0.ebuild 563 SHA256 7c85ebafd8ab8015bc02e96eab900589a05f1f3afe0df05c38f1266a49429b9c SHA512 c1254bb9f42fa1924983e41b20781d686c7cc5ee689febfdc6cd9b159a9882b47726750227efbfa0700493428ade7a0cb4e371a70b795970a9b02b3169249dd8 WHIRLPOOL ed48858d5776eba9ec7926c937254396ac86e20d257bb1ff8408f9e0043b909d4473f197516498c488a8e704bdc4167049193bda53d9ed7487aab1b8c86af86f
+MISC ChangeLog 2796 SHA256 cef4739a56192984e5493ce60aaa47c241825a2222f9d8c6c150860205ff4f04 SHA512 5ded2d8b2aebab52a8682c4b3923499145aca7f503633458b22c2ae09e881988e2aeb5841a9f3e2f4eb971c883d376199a9c4946df9ac7e3d229ae6334cf85de WHIRLPOOL b9ad0f01fca76843fccc4fe921d58d8941b905a6ddf89b496ac9c616444102fc8c65bbb81919ff526b43b7ac1284e11768a8ccabfa9a9df69bbcde0881ce35f3
+MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
new file mode 100644
index 0000000..fd3dbe3
--- /dev/null
+++ b/dev-php/pecl-geoip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+</pkgmetadata>
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild
new file mode 100644
index 0000000..fec1f38
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild,v 1.3 2014/10/12 08:59:26 ago Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="geoip"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README ChangeLog"
+
+USE_PHP="php5-5 php5-4 php5-3"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/geoip-1.4.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild
new file mode 100644
index 0000000..96cec1b
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild,v 1.1 2014/09/29 23:51:17 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="geoip"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README ChangeLog"
+
+USE_PHP="php5-6 php5-5 php5-4 php5-3"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/geoip-1.4.0"
+RDEPEND="${DEPEND}"

From f348e52eacc8227d84347d39d09f939edc79f0fd Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 10 Dec 2014 18:33:26 -0800
Subject: [PATCH 057/261] added php 5.3 support back for redis

---
 dev-php/pecl-redis/ChangeLog               | 17 ++++++++++++
 dev-php/pecl-redis/Manifest                |  6 ++++
 dev-php/pecl-redis/metadata.xml            | 14 ++++++++++
 dev-php/pecl-redis/pecl-redis-2.2.3.ebuild | 32 ++++++++++++++++++++++
 dev-php/pecl-redis/pecl-redis-2.2.5.ebuild | 32 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 dev-php/pecl-redis/ChangeLog
 create mode 100644 dev-php/pecl-redis/Manifest
 create mode 100644 dev-php/pecl-redis/metadata.xml
 create mode 100644 dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
 create mode 100644 dev-php/pecl-redis/pecl-redis-2.2.5.ebuild

diff --git a/dev-php/pecl-redis/ChangeLog b/dev-php/pecl-redis/ChangeLog
new file mode 100644
index 0000000..9e9ee51
--- /dev/null
+++ b/dev-php/pecl-redis/ChangeLog
@@ -0,0 +1,17 @@
+# ChangeLog for dev-php/pecl-redis
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-redis/ChangeLog,v 1.4 2014/10/09 20:51:49 grknight Exp $
+
+*pecl-redis-2.2.5 (29 Sep 2014)
+
+  29 Sep 2014; Brian Evans <grknight@gentoo.org> +pecl-redis-2.2.5.ebuild:
+  Version bump; add PHP 5.6 support; wrt bug 486732
+
+  03 Mar 2014; Pacho Ramos <pacho@gentoo.org> pecl-redis-2.2.3.ebuild:
+  amd64 stable, bug #486932
+
+*pecl-redis-2.2.3 (26 Jul 2013)
+
+  26 Jul 2013; Ole Markus With <olemarkus@gentoo.org> +metadata.xml,
+  +pecl-redis-2.2.3.ebuild:
+  New pkg: pecl-redis
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
new file mode 100644
index 0000000..105ed4e
--- /dev/null
+++ b/dev-php/pecl-redis/Manifest
@@ -0,0 +1,6 @@
+DIST redis-2.2.3.tgz 86664 SHA256 87861198403ef7bf09306494f2efc5b55bfdcc6095b7aac059a546a2e662967d SHA512 17ff00c0ee3fa36fa6a2040740c51a9ad36e16be19b9b6df9872138a9015e3f01add59b0b6437c66966fb2850a4c63800b47737e468f4103d7285bdebf377b3b WHIRLPOOL bf0a30d2b9ba399edaddaae7856c6e42e48ed4be88e86a4da88ba5556a7aa36d54a448830810d3ffd3a3e49329f5a8e36a1d0eac9436843fc00b157e0fc592aa
+DIST redis-2.2.5.tgz 96970 SHA256 dceb18c9b563a8da92752ffc2c280beb1b14a86649342af307831a881c053343 SHA512 a0ae16146b97be678d3a25037ada6eb65b4a5cfbc02622c3c056635428851d52634e9d8fef9d393db4787f568d3d4d0c4ebbc740d1b008acc2f168ea5002aeb5 WHIRLPOOL bbb13c9d4b9e9a2d1b60314325cdf0eb921fb2e6d1962919499db89d9a3a11f82ad196c1bff81e404a7133fd21231decd7277b9a537a079d4cdd953fff24d451
+EBUILD pecl-redis-2.2.3.ebuild 701 SHA256 e9c7d2a842cbf7b3cfcbe9abfd29ed4fcc516b24905e2569b81e5b8778cccab0 SHA512 dcdc604df783120e5b91488ea579ad025b9bfb392f531583946d365914b6942a88304a891f1593cf75a85a8ff4826d7faeebae004d1adf2fceba6572ff6b3a5d WHIRLPOOL bed57f6aa8f1c5a6f9170a866cb88c0214cec5c71912ed7941cd19a984d754c0a52b76529fad8ea4476accf6cde3d734d25f902a52126d2d3b441f60a961e8c0
+EBUILD pecl-redis-2.2.5.ebuild 712 SHA256 33e7c4fd8133afcb780eb569883a3b66b300ab680c3f51e517b684c1ba395002 SHA512 ceb400f3ff5a12ab458f96fface6682d593c9c97bc4427646e90ca8ce64d492e7df7bd495ccd04e92293866b54ee0d659a0eff4c50d61e4ad9a4f1b57b14ecc5 WHIRLPOOL c72a0124af5358f98244b807d520ae151669feb4313e38b17e03bf69ccedec07fbc8d6b5e2010d8cc3f81b92a8d1ca6ccaa5259153f3046ae25c5608f567f6d6
+MISC ChangeLog 624 SHA256 fb0ac6a141e2e28a292be1bff9556998847171469c8000206516b8fbc27b9287 SHA512 d2dcdb5a8a8288dd4905060cbab72309cd0b262e0dba2c23024390c7d0fc6406e3757c602894efe580b207a990f6c2965bef98b13645354418eb1f5a33733aaa WHIRLPOOL 7b4a55c389a035c53d8b29816943c6097cd04b139ceeb5c024aadcc9050113458421fcecd99bc5d62c5454fe3e4fda9f5963d61d36b913582ca4affdbef1fb51
+MISC metadata.xml 372 SHA256 b404529dc338f559a6bdf98576e71f044c2dc2ed794633d8f0ce682c26ca24b8 SHA512 3014820b3938426ca67bfe0ccbb8b5a595874baa05be25dd877f072315c6840a8b016835424dd70281f9315f120134379bd5e08c80f944f458362cbe35b25e44 WHIRLPOOL 92310978487cd4f00dce6a3ad75c762f95a98260f4d2ce7ff80ac506455547c40823aabc22c1164b8caf9176cadccbe14e4136b3fb10b4abe242b8eb6aa4c7d5
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
new file mode 100644
index 0000000..f18c632
--- /dev/null
+++ b/dev-php/pecl-redis/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>olemarkus@gentoo.org</email>
+		<name>Ole Markus With</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<use>
+		<flag name="igbinary">Enables igbinary serialisation support</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
new file mode 100644
index 0000000..18c0e6c
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild,v 1.2 2014/03/03 23:33:55 pacho Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="redis"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-5 php5-4 php5-3"
+
+DOCS="README ChangeLog"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="amd64"
+
+DESCRIPTION="This extension provides an API for communicating with Redis servers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="igbinary"
+
+DEPEND="igbinary? ( dev-php/igbinary )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	my_conf="--enable-redis
+		$(use_enable igbinary redis-igbinary)"
+
+	php-ext-source-r2_src_configure
+}
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild
new file mode 100644
index 0000000..30e7fd3
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild,v 1.1 2014/09/29 19:32:13 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="redis"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php5-4 php5-3"
+
+DOCS="README ChangeLog"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="This extension provides an API for communicating with Redis servers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="igbinary"
+
+DEPEND="igbinary? ( dev-php/igbinary )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	my_conf="--enable-redis
+		$(use_enable igbinary redis-igbinary)"
+
+	php-ext-source-r2_src_configure
+}

From 12f40eb9491fefcc3eb99edbfa763fbf759b507c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 10 Dec 2014 18:53:07 -0800
Subject: [PATCH 058/261] added php 5.3 support back to imagik

---
 dev-php/pecl-imagick/ChangeLog                | 236 ++++++++++++++++++
 dev-php/pecl-imagick/Manifest                 |   9 +
 .../files/remove-header-check.patch           |  16 ++
 dev-php/pecl-imagick/metadata.xml             |   5 +
 .../pecl-imagick-3.1.0_rc2.ebuild             |  43 ++++
 .../pecl-imagick/pecl-imagick-3.1.2.ebuild    |  25 ++
 .../pecl-imagick-3.2.0_rc1.ebuild             |  25 ++
 7 files changed, 359 insertions(+)
 create mode 100644 dev-php/pecl-imagick/ChangeLog
 create mode 100644 dev-php/pecl-imagick/Manifest
 create mode 100644 dev-php/pecl-imagick/files/remove-header-check.patch
 create mode 100644 dev-php/pecl-imagick/metadata.xml
 create mode 100644 dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
 create mode 100644 dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild
 create mode 100644 dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild

diff --git a/dev-php/pecl-imagick/ChangeLog b/dev-php/pecl-imagick/ChangeLog
new file mode 100644
index 0000000..d3baac9
--- /dev/null
+++ b/dev-php/pecl-imagick/ChangeLog
@@ -0,0 +1,236 @@
+# ChangeLog for dev-php/pecl-imagick
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/ChangeLog,v 1.12 2014/09/30 02:01:49 grknight Exp $
+
+  30 Sep 2014; Brian Evans <grknight@gentoo.org> -pecl-imagick-3.0.1-r1.ebuild,
+  pecl-imagick-3.2.0_rc1.ebuild:
+  Add PHP 5.6 support wrt bug 515100; Drop old
+
+  10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  pecl-imagick-3.0.1-r1.ebuild, pecl-imagick-3.1.0_rc2.ebuild,
+  pecl-imagick-3.1.2.ebuild, pecl-imagick-3.2.0_rc1.ebuild:
+  QA: drop trailing '.' from DESCRIPTION
+
+*pecl-imagick-3.2.0_rc1 (09 Dec 2013)
+*pecl-imagick-3.1.2 (09 Dec 2013)
+
+  09 Dec 2013; Matti Bickel <mabi@gentoo.org> +pecl-imagick-3.1.2.ebuild,
+  +pecl-imagick-3.2.0_rc1.ebuild:
+  version bump, include 3.1.2 as stable target (fixes bug #489110)
+
+  15 Aug 2013; Patrick Lauer <patrick@gentoo.org> pecl-imagick-3.1.0_rc2.ebuild:
+  Whitespace
+
+  25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> pecl-imagick-3.1.0_rc2.ebuild:
+  Stable for amd64, wrt bug #471230
+
+  25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> pecl-imagick-3.1.0_rc2.ebuild:
+  Stable for x86, wrt bug #471230
+
+  17 Apr 2013; Ole Markus With <olemarkus@gentoo.org>
+  +files/remove-header-check.patch, pecl-imagick-3.1.0_rc2.ebuild:
+  Fix building against newer imagemagick. Bug 466118
+
+  05 Mar 2013; Ole Markus With <olemarkus@gentoo.org>
+  -pecl-imagick-3.0.0-r1.ebuild, -pecl-imagick-3.1.0_rc1.ebuild,
+  pecl-imagick-3.0.1-r1.ebuild:
+  Removed older ebuilds. EAPI bump
+
+  12 Oct 2012; Agostino Sarubbo <ago@gentoo.org> pecl-imagick-3.0.1-r1.ebuild:
+  Stable for amd64, wrt bug #436874
+
+*pecl-imagick-3.1.0_rc2 (01 Aug 2012)
+
+  01 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  +pecl-imagick-3.1.0_rc2.ebuild:
+  RC bump. Bug 424051
+
+*pecl-imagick-3.1.0_rc1 (06 Apr 2012)
+
+  06 Apr 2012; Ole Markus With <olemarkus@gentoo.org>
+  +pecl-imagick-3.1.0_rc1.ebuild:
+  Version bump. RC that works with php 5.4
+
+  08 Jan 2011; Brent Baude <ranger@gentoo.org> pecl-imagick-3.0.0-r1.ebuild:
+  Marking pecl-imagick-3.0.0-r1 ~ppc for bug 349659
+
+  04 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+  pecl-imagick-3.0.0-r1.ebuild:
+  Stable on amd64 wrt bug #349659
+
+  04 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+  pecl-imagick-3.0.1-r1.ebuild:
+  stable x86, bug 349659
+
+  28 Dec 2010; Brent Baude <ranger@gentoo.org> pecl-imagick-3.0.0-r1.ebuild:
+  Marking pecl-imagick-3.0.0-r1 ~ppc64 for bug 349659
+
+  21 Nov 2010; Markus Meier <maekke@gentoo.org> pecl-imagick-3.0.0.ebuild:
+  x86 stable, bug #343005
+
+  20 Nov 2010; Markos Chandras <hwoarang@gentoo.org> pecl-imagick-3.0.0.ebuild:
+  Stable on amd64 wrt bug #343005
+
+*pecl-imagick-3.0.1-r1 (19 Nov 2010)
+*pecl-imagick-3.0.1 (19 Nov 2010)
+
+  19 Nov 2010; Ole Markus With <olemarkus@gentoo.org>
+  +pecl-imagick-3.0.1.ebuild, +pecl-imagick-3.0.1-r1.ebuild:
+  Version bump
+
+*pecl-imagick-3.0.0-r1 (04 Nov 2010)
+
+  04 Nov 2010; Matti Bickel <mabi@gentoo.org> +pecl-imagick-3.0.0-r1.ebuild:
+  add version supporting minor version slotting
+
+*pecl-imagick-3.0.0 (27 Jul 2010)
+
+  27 Jul 2010; Matti Bickel <mabi@gentoo.org> -pecl-imagick-2.1.1.ebuild,
+  +pecl-imagick-3.0.0.ebuild:
+  version bump, remove old (bug #330089)
+
+  10 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  pecl-imagick-2.3.0.ebuild:
+  stable x86, bug 319111
+
+  18 Jun 2010; <mabi@gentoo.org> pecl-imagick-2.3.0.ebuild:
+  amd64 stable with permission from angelos (bug #319111)
+
+  12 Jun 2010; <mabi@gentoo.org> -pecl-imagick-2.0.1.ebuild,
+  -pecl-imagick-2.2.2.ebuild, -pecl-imagick-2.3.0_beta1.ebuild:
+  remove old
+
+*pecl-imagick-2.3.0 (16 Dec 2009)
+
+  16 Dec 2009; Christian Hoffmann <hoffie@gentoo.org>
+  +pecl-imagick-2.3.0.ebuild:
+  version bump per bug 288440, thanks to Daniel T. <dane.tschi@gmx.at>
+
+*pecl-imagick-2.3.0_beta1 (09 Apr 2009)
+*pecl-imagick-2.2.2 (09 Apr 2009)
+
+  09 Apr 2009; Christian Hoffmann <hoffie@gentoo.org>
+  +pecl-imagick-2.2.2.ebuild, +pecl-imagick-2.3.0_beta1.ebuild:
+  version bump to 2.2.2 (stable) and 2.3.0_beta1, might fix bug 260578
+
+  06 Jul 2008; Markus Meier <maekke@gentoo.org> pecl-imagick-2.1.1.ebuild:
+  x86 stable, bug #230896
+
+  06 Jul 2008; Christian Hoffmann <hoffie@gentoo.org>
+  pecl-imagick-2.1.1.ebuild:
+  stable on amd64, bug 230896
+
+  07 May 2008; Christian Hoffmann <hoffie@gentoo.org>
+  -pecl-imagick-2.1.0.ebuild, -pecl-imagick-2.1.1_rc1.ebuild:
+  removing old (_rc1 would have needed fixing because of bug 220519 anyway)
+
+*pecl-imagick-2.1.1 (17 Mar 2008)
+
+  17 Mar 2008; <jokey@gentoo.org> +pecl-imagick-2.1.1.ebuild:
+  Version bump from project overlay
+
+  09 Mar 2008; Jakub Moc <jakub@gentoo.org>
+  pecl-imagick-2.1.1.ebuild:
+  Version bump
+
+*pecl-imagick-2.1.1_rc1 (03 Mar 2008)
+
+  03 Mar 2008; Markus Ullmann <jokey@gentoo.org>
+  +pecl-imagick-2.1.1_rc1.ebuild:
+  Version bump from project overlay
+
+  26 Feb 2008; Jakub Moc <jakub@gentoo.org>
+  +pecl-imagick-2.1.1_rc1.ebuild:
+  Version bump, fixed building against ImageMagick 6.3.8.x
+
+*pecl-imagick-2.1.0 (11 Feb 2008)
+
+  11 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  -pecl-imagick-2.1.0_rc2.ebuild, -pecl-imagick-2.1.0_rc3.ebuild,
+  +pecl-imagick-2.1.0.ebuild:
+  Version bump, from the php overlay
+
+  16 Jan 2008; Hanno Boeck <hanno@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  Stable on amd64.
+
+*pecl-imagick-2.1.0_rc3 (13 Jan 2008)
+
+  13 Jan 2008; Markus Ullmann <jokey@gentoo.org>
+  +pecl-imagick-2.1.0_rc3.ebuild:
+  Version bump from project overlay
+
+  13 Jan 2008; Jakub Moc <jakub@gentoo.org>
+  +pecl-imagick-2.1.0_rc3.ebuild:
+  Version bump
+
+*pecl-imagick-2.1.0_rc2 (27 Dec 2007)
+
+  27 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  +pecl-imagick-2.1.0_rc2.ebuild:
+  Version bump from project overlay
+
+  25 Dec 2007; Jakub Moc <jakub@gentoo.org>
+  +pecl-imagick-2.1.0_rc2.ebuild:
+  Version bump
+
+  19 Dec 2007; Markus Meier <maekke@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  x86 stable, bug #202641
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  Fix LICENSE
+
+*pecl-imagick-2.0.1 (28 Oct 2007)
+
+  28 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  -pecl-imagick-0.9.13.ebuild, -pecl-imagick-2.0.0_rc1.ebuild,
+  -pecl-imagick-2.0.0.ebuild, +pecl-imagick-2.0.1.ebuild:
+  Version bump from php project overlay
+
+*pecl-imagick-2.0.0 (11 Oct 2007)
+
+  11 Oct 2007; Anant Narayanan <anant@gentoo.org>
+  +pecl-imagick-2.0.0.ebuild:
+  bump to 2.0.0 (from overlay)
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -pecl-imagick-0.9.11.ebuild:
+  Cleanup
+
+*pecl-imagick-2.0.0_rc1 (17 Aug 2007)
+
+  17 Aug 2007; Christian Hoffmann <hoffie@gentoo.org>
+  +pecl-imagick-2.0.0_rc1.ebuild:
+  version bump wrt bug 177852, thanks to Niklas Närhinen and Jakub Moc
+
+*pecl-imagick-0.9.13 (17 Apr 2007)
+
+  17 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  pecl-imagick-0.9.11.ebuild, +pecl-imagick-0.9.13.ebuild:
+  Version bump, delete graphicsmagick dep.
+
+  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  pecl-imagick-0.9.11.ebuild:
+  Cleanup.
+
+  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  Transition to Manifest2.
+
+  27 May 2006; Luca Longinotti <chtekk@gentoo.org>
+  pecl-imagick-0.9.11.ebuild:
+  Added to ~amd64.
+
+  26 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  pecl-imagick-0.9.11.ebuild:
+  Fix var ordering.
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-imagick-0.9.11.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-imagick-0.9.11.ebuild:
+  Added ~sparc keyword.
+
+  18 Aug 2005; <stuart@gentoo.org> ChangeLog:
+  Initial version; replaces older dev-php/* packages
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
new file mode 100644
index 0000000..6eeccd0
--- /dev/null
+++ b/dev-php/pecl-imagick/Manifest
@@ -0,0 +1,9 @@
+AUX remove-header-check.patch 561 SHA256 87463f938e7614cd44cd82b1fb73729a2a9670ee0f542c74f69ae54b524c67da SHA512 de8d6931a19997133ea9d4f41dbafcb472eb7bfd752e731d5e92a16a01bd7b4260689d90650613a3e9c6bd5796169a57c6e3d07c6dcc78a50a1dbd8d27a38c31 WHIRLPOOL 7d3fcd5ac5a85fc9cd36fc21df92b5dc910e5cb60961d3e2c82aea77ef692836572ef151d18730497b506fcd8e740ca0eba12fe3ca3e8b758459bf2abe2f51ca
+DIST imagick-3.1.0RC2.tgz 93264 SHA256 0dbb7e5df61845f8eab68505711b9efcdc98cfaff96dcb982c7f8931dd9e8a31 SHA512 68d51e521f9a3d7e2a71247d7a03e821d8e2b6f9b20fddcdbac8dc40be6d236557580bfd7fb51d8bd2a0aafd5a70c71dee9e0414ec7cd06e9649c0f8898e1e5b WHIRLPOOL 99b845dc9fc78e3469eaf57c19ddcb4bbfe04e790cd6df87859e2795748b085e4f60e21cae565c94a631ce449f9161371e81cd72610522f8f16f799de2920abe
+DIST imagick-3.1.2.tgz 94657 SHA256 528769ac304a0bbe9a248811325042188c9d16e06de16f111fee317c85a36c93 SHA512 d30e129cc4b61e34830b34261671bf92579c355f36924a802952524119bf07b0e0d59fe2ad361a4caa0322f959bed669b82d1f12a531b106648ccf9d22b4fba3 WHIRLPOOL 99309fb01a43d369d6a348c623afedfa291470ff0299b38faa949ff9da4654af0ceef6d67d7b7889b6b50bcaf17c4893a6b719b3c7afaa4fc1c87eef79ea4dc9
+DIST imagick-3.2.0RC1.tgz 163503 SHA256 a5f1ea34b9a21f48ea0b978d11a3cac32c53306482097c63324f7ecd9b157b5e SHA512 2c898f5aceb8ef7cb1e2a6b3fc6c5f909afda1891ff67b53a2b7904fac528d0f444d5e655c117c91e261a31d7fb94781eb14d7e38a6365d923c28bdceba7b6ea WHIRLPOOL 38ade896bac904488da04627bdd321beecbb6f44d8cd352168128ecf222f40e4149fe2a99fd027a6789fd9c4a0411215ec5fa1e2e8d717442c66322d9ab67025
+EBUILD pecl-imagick-3.1.0_rc2.ebuild 942 SHA256 9958cf1e9a016d3027e7a84dfad778212b462a737ea87e19e55fe5c95a984676 SHA512 5d1c0c9fa340ff80ee3027c55d85ad505b92e7ea84deb23d8d7924ac949e8f39d2cc6f21d6df8816c19d327db0383cb6675ac601d6f93914e056eeb062707609 WHIRLPOOL 6e1073d5508ea887885d29c270186f237dc6aec5c1596bde35ff8c433c0cb174187e1a8c266bf1d7df981144e52ca7ff9cec803f4c9acc314a6600f69e694394
+EBUILD pecl-imagick-3.1.2.ebuild 541 SHA256 a121e64cac197604089fd057263525849bc1b861c502480bdd1239a36f6731b9 SHA512 d973f8d0c43225d5e83f5d1106247bdae805807e07aea4509128f89f7269c48e1c04c3e282fc4a48a5faebc2304101932d1993963485285558ce63ca0a870636 WHIRLPOOL 45627b2470fe142f76b882761c9ab2cfad088620f1e69f352866f185c92cd04415d5d96ba52fa637fce48f3644d6eeb1dc286e495d0f6039d902fd0dd8ff8046
+EBUILD pecl-imagick-3.2.0_rc1.ebuild 554 SHA256 2a6b5a3090252c54f5f64d401c26f4888c9b9a9057c617e3cc60435622e102fd SHA512 627f3620f22e73f9238b73043fbae8f9d38cb5067047683160f9293f50a3510df34a7bf45a5356ad1444a90d83ec7f8f638777ba770f0323170da5c769cbce51 WHIRLPOOL bbf79326b279468ee0b2b8d43e426d71b7425b89063a5989ffb54dc397fc9ef69dd2b64dba499e994012ba96e160a29896bba9b6f1cbdd614e816d0d9be0f6c4
+MISC ChangeLog 7675 SHA256 e71d82ecc5b2e3f3abfe972b90f748c62630c8f05f3f583a005c2f542f4a2342 SHA512 e27d8e17f8c9dde0419a943323160f61088ab965fbef73eb1c9502a4013312aa89061d20911f1ea156c824e86fe72670145249981c438dd9a9c31bdaaeb81022 WHIRLPOOL a31e70559185cea7bc3e49c9d2a6b6bc951c635faeb18fdde71973b2802ed657e7209decdeb129d8bcb4f493ccd58c9fdb1e11b1b35558e79e02c9c4f97f3d21
+MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
diff --git a/dev-php/pecl-imagick/files/remove-header-check.patch b/dev-php/pecl-imagick/files/remove-header-check.patch
new file mode 100644
index 0000000..94fbf47
--- /dev/null
+++ b/dev-php/pecl-imagick/files/remove-header-check.patch
@@ -0,0 +1,16 @@
+--- config.m4	2012-05-30 22:21:12.000000000 +0200
++++ config.m4	2013-04-17 11:47:27.753015522 +0200
+@@ -50,13 +50,6 @@
+   		AC_MSG_ERROR(Cannot locate header file magick-wand.h)
+     fi	
+   else	
+-    AC_MSG_CHECKING(for MagickWand.h header file)
+-
+-    if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+-      AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
+-    else
+-      AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+-    fi
+     AC_DEFINE(IMAGICK_USE_NEW_HEADER,1,[ ])
+     PHP_IMAGICK_USE_NEW_HEADER=1
+   fi
diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml
new file mode 100644
index 0000000..fd3dbe3
--- /dev/null
+++ b/dev-php/pecl-imagick/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+</pkgmetadata>
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
new file mode 100644
index 0000000..a59c56f
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild,v 1.6 2014/08/10 21:02:21 slyfox Exp $
+
+EAPI=4
+
+PHP_EXT_NAME="imagick"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="TODO"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+PECL_PKG_V="${PECL_PKG}-${MY_PV}"
+FILENAME="${PECL_PKG_V}.tgz"
+S="${WORKDIR}/${PECL_PKG_V}"
+
+USE_PHP="php5-5 php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples"
+
+DEPEND=">=media-gfx/imagemagick-6.2.4"
+RDEPEND="${DEPEND}"
+
+SRC_URI="http://pecl.php.net/get/${FILENAME}"
+
+my_conf="--with-imagick=/usr"
+
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots) ; do
+		cd "${WORKDIR}/${slot}"
+		epatch "${FILESDIR}/remove-header-check.patch"
+	done
+	php-ext-source-r2_src_prepare
+}
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild
new file mode 100644
index 0000000..9964c15
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild,v 1.2 2014/08/10 21:02:21 slyfox Exp $
+
+EAPI=5
+
+DOCS="TODO"
+
+MY_PV="${PV/rc/RC}"
+
+USE_PHP="php5-5 php5-4 php5-3"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples"
+
+DEPEND=">=media-gfx/imagemagick-6.2.4"
+RDEPEND="${DEPEND}"
+
+my_conf="--with-imagick=/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild
new file mode 100644
index 0000000..fce1e30
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild,v 1.3 2014/09/30 02:01:49 grknight Exp $
+
+EAPI=5
+
+DOCS="TODO"
+
+MY_PV="${PV/rc/RC}"
+
+USE_PHP="php5-6 php5-5 php5-4 php5-3"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples"
+
+DEPEND=">=media-gfx/imagemagick-6.2.4"
+RDEPEND="${DEPEND}"
+
+my_conf="--with-imagick=/usr"

From 56403ba66b58f81836e20bcd91a671aeb6af3254 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 15 Dec 2014 16:28:29 -0800
Subject: [PATCH 059/261] fixed asterisk perl libabry

---
 dev-perl/asterisk-perl/Manifest                  | 2 +-
 dev-perl/asterisk-perl/asterisk-perl-0.08.ebuild | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-perl/asterisk-perl/Manifest b/dev-perl/asterisk-perl/Manifest
index 24b0569..c3c7ca7 100644
--- a/dev-perl/asterisk-perl/Manifest
+++ b/dev-perl/asterisk-perl/Manifest
@@ -1,2 +1,2 @@
 DIST asterisk-perl-0.08.tar.gz 13217 SHA256 9be1c49c5f5519d90a8937ffef32bbde5c2ff9f565fc2f5f219afcef43ac2fa2 SHA512 80e2aeb5ee45504552e68f81fc3507690f3e02c0601370883c9497450b80f6590bb17cb0cb8226a2bda5ac36fb97d677930690de32482e29adc8a90ff6b74716 WHIRLPOOL 58843f1df17445bda67eeb218477df6746f99447ccca669b3ba3dfea7cc775a6e3e79d594d1a8aba04670a3f42b86cbbf60490006969e200724610011a493762
-EBUILD asterisk-perl-0.08.ebuild 918 SHA256 822582351548395918b12895d0728960ca4ca542011de220a3ac2b3a40d809d1 SHA512 eccfdbcc19febec3e1f4dae78b8de4b29d8a623892b327b5d1eeac917f895895bf919abefdfbd862dad27dc2ff08cf9c7f8dc5a752ff5f3b0b1f4bcb9bb9bca7 WHIRLPOOL 2ef583255fd78239deb0dd67bf80c4339c3ba147512ddbe03f385c42c0da164451b84cd5a7f872eabb9c57225dd4fad0759cff93960f6478972cfcf432b86d6b
+EBUILD asterisk-perl-0.08.ebuild 928 SHA256 1418fe1ece5c5fb7771850fb87c66b6c9bf65f7093c4c74e24165120ec3c7e52 SHA512 2b998e2873af87cc48313f46e1e24b6ce4081ed3270a4e53eeaa0bf3a868daad41d3d30bec81ba7c7fc6575671612b35eacf80092e7c8e63a37624e6ae1bdb20 WHIRLPOOL d51c9b63266f781bfdbd69e26ffb5c0485caae1f78c263eda9fe4cd8a7124cef66065a5dfec657e2aebfddaa3d14bbfa5da70e767f11c2b7d6e2fd081eb10422
diff --git a/dev-perl/asterisk-perl/asterisk-perl-0.08.ebuild b/dev-perl/asterisk-perl/asterisk-perl-0.08.ebuild
index a8a70bb..a619b99 100644
--- a/dev-perl/asterisk-perl/asterisk-perl-0.08.ebuild
+++ b/dev-perl/asterisk-perl/asterisk-perl-0.08.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/asterisk-perl/Attic/asterisk-perl-0.08.ebuild,v 1.4 2005/10/01 00:24:59 stkn dead $
 
+EAPI="5"
+
 inherit eutils perl-module
 
 DESCRIPTION="Perl bindings for the Asterisk AGI"

From 90e364aaa12e47a789186eeefbd26a8966f24687 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 15 Dec 2014 16:41:11 -0800
Subject: [PATCH 060/261] removed percona server

---
 .../percona-server-5.5.36.34.2.ebuild         | 138 ------------------
 1 file changed, 138 deletions(-)
 delete mode 100644 dev-db/percona-server/percona-server-5.5.36.34.2.ebuild

diff --git a/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild b/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
deleted file mode 100644
index 7c1debc..0000000
--- a/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# main.file_contents
-		# Fails finding a BZR revision number from a text file.
-		# This is an information only test and not needed in Gentoo
-		#
-		# main.percona_bug1289599
-		# Appears to be a syntax error in the test file itself
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 main.file_contents \
-			main.percona_bug1289599 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}

From 518e5b1fa157ab936e79a4db0815826d454006ed Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 15 Jan 2015 13:33:41 -0800
Subject: [PATCH 061/261] removed non used package

---
 net-dialup/misdnuser/Manifest                 |  5 --
 net-dialup/misdnuser/files/mISDNcapid.initd   | 17 -----
 .../files/misdnuser-2.0.13-udev-rulesd.patch  | 11 ---
 net-dialup/misdnuser/misdnuser-2.0.13.ebuild  | 62 -----------------
 net-dialup/misdnuser/misdnuser-2.0.17.ebuild  | 67 -------------------
 net-dialup/misdnuser/misdnuser-2.0.2.ebuild   | 41 ------------
 6 files changed, 203 deletions(-)
 delete mode 100644 net-dialup/misdnuser/Manifest
 delete mode 100755 net-dialup/misdnuser/files/mISDNcapid.initd
 delete mode 100644 net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
 delete mode 100644 net-dialup/misdnuser/misdnuser-2.0.13.ebuild
 delete mode 100644 net-dialup/misdnuser/misdnuser-2.0.17.ebuild
 delete mode 100644 net-dialup/misdnuser/misdnuser-2.0.2.ebuild

diff --git a/net-dialup/misdnuser/Manifest b/net-dialup/misdnuser/Manifest
deleted file mode 100644
index 2478261..0000000
--- a/net-dialup/misdnuser/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mISDNcapid.initd 372 SHA256 e701aedcd4c93ad819ec95ed84d9a970aa897cd8a93a70e751c8f41a10a9f7b2 SHA512 e66d5c0625962afec476d054dbddf1d15229e071e5cd0e1ecbc19e33bc4ccb5e76a6168db66711f6cbd6cdeee076f066bc29df442ffc60f8e2dbf65829dd820e WHIRLPOOL 5a090cff73c6981dff4abd8b7dc19c6e04e6346aac0c3303327859aa390480042cd5195add4e51ddf394996c815c2ac86f288f42fbfadbb8b095710828aa2312
-AUX misdnuser-2.0.13-udev-rulesd.patch 411 SHA256 dd977c5545eeb31b56b215dea6f51101e4f937fc4943b28269a8457cf6a6f81c SHA512 8634dce2be09a6df3d2f12e4a66bd2bb5c1ba66a61a9aecb09947797b285cc723c347fc80ad7a48c677f3e71a577498f3131083ad56ae87d3641380da0293728 WHIRLPOOL 625686df395f86b96c4222bff485a6dcc421f59d29a5054fcdedaad529d3a6588f722e5d8a3f4dd9d97a837e1e9ab1e1ef15faeba054ff16d1684b86f59b0d41
-EBUILD misdnuser-2.0.13.ebuild 1383 SHA256 438ac1eb53de66ad1f51c5ee8c883265a2f0731ab3745ced956fc96458df2201 SHA512 b513732e90c82ac40342d5dc768fef5433ab693371b517eb8444900ec4e4ae23dfff8ad65c1f64b35a1aeb22ed465debaa4cb279dbd73706f1bc3422bcda5472 WHIRLPOOL 859c6e353348a0f99851db8a6fd42d848a95420976de487a58bdc509cb8d0b1036ac70091531b17e1052dc54de4ddc98afff15060a8cc309086b404090f256ff
-EBUILD misdnuser-2.0.17.ebuild 1548 SHA256 e084addcee6c4db040966bc090d652b4fa154c859a673a1a00f61a0320663181 SHA512 c3700c87e114f2a15798db19b27453336843f43b51d6e2aafdd01322575b5e25652b724d3b7805813b9419c823e677e0e98d3f1874a78765b2b1f599230ef493 WHIRLPOOL 93114ab3cc1c4166b6b42d79d1346df85ab69fb8ef781a47bd5ebb171ebebcc3f2ea725a735c36d9a5db439ccbce19e930b2a38c006e963a7270925bfa15ec39
-EBUILD misdnuser-2.0.2.ebuild 938 SHA256 cd4605f91b739a94c8efacaeb136587220e43d506331e8c245842c87fe3ad9ef SHA512 9fac86d41317cd02fcdee328378ff19f2e48bbd1cf6191756bd6b1ed19e19cd5643d36ce02759313291e7de0bc38b161fb3c4b3ef84501427047296b6247f163 WHIRLPOOL 50919aee00e2586ac747b8989d250a3cf0cde26479dcd9e859b56a32a42c8724193ec1277f1a9a90cc36a241f9a1d43335e194de35575a14b91d2c456d1dfbcf
diff --git a/net-dialup/misdnuser/files/mISDNcapid.initd b/net-dialup/misdnuser/files/mISDNcapid.initd
deleted file mode 100755
index d521561..0000000
--- a/net-dialup/misdnuser/files/mISDNcapid.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: $
-
-
-start() {
-	ebegin "Starting mISDNcapid"
-	start-stop-daemon --start --quiet --exec /usr/sbin/mISDNcapid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mISDNcapid"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/mISDNcapid
-	eend $?
-}
diff --git a/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch b/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
deleted file mode 100644
index fb72731..0000000
--- a/net-dialup/misdnuser/files/misdnuser-2.0.13-udev-rulesd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mISDNuser/Makefile.am.orig	2012-05-15 22:18:19.955087141 +0200
-+++ mISDNuser/Makefile.am	2012-05-15 22:18:33.063944079 +0200
-@@ -38,6 +38,6 @@
- endif
- 
- install-data-local:
--	install -d $(DESTDIR)/etc/udev/rules.d
--	install -m 644 45-misdn.rules $(DESTDIR)/etc/udev/rules.d/45-misdn.rules
-+	install -d $(DESTDIR)/lib/udev/rules.d
-+	install -m 644 45-misdn.rules $(DESTDIR)/lib/udev/rules.d/45-misdn.rules
- 
diff --git a/net-dialup/misdnuser/misdnuser-2.0.13.ebuild b/net-dialup/misdnuser/misdnuser-2.0.13.ebuild
deleted file mode 100644
index b77a3d6..0000000
--- a/net-dialup/misdnuser/misdnuser-2.0.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-IUSE="+capi static-libs"
-
-inherit base eutils autotools git-2
-
-DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
-HOMEPAGE="http://www.mISDN.org/"
-
-EGIT_REPO_URI="git://git.misdn.eu/mISDNuser.git"
-EGIT_COMMIT="376ab1d56d654c8a5700dfaafe4e129854279b16"
-EGIT_BRANCH="socket"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses
-	capi? ( >=net-dialup/capi4k-utils-3.2.0
-		!!>=net-dialup/capi4k-utils-20050718
-		>=media-libs/spandsp-0.0.6_pre12 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mISDNuser"
-
-PATCHES=( "${FILESDIR}/${P}-udev-rulesd.patch" )
-DOCS=( "AUTHORS" "COPYING.LIB" "LICENSE" "NEWS" "README" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# install example applications too, contains some useful stuff like misdntestlayer1
-	econf \
-		$(use_enable capi) \
-		$(use_enable static-libs static) \
-		--with-mISDN_group=dialout \
-		--enable-example || die "econf failed"
-}
-
-src_install() {
-	base_src_install
-
-	use capi && \
-		newinitd "${FILESDIR}/mISDNcapid.initd" mISDNcapid
-
-	if ! use static-libs ; then
-		# remove all .la files
-		find "${D}" -name "*.la" -delete
-	elif use capi ; then
-		# remove capi plugin .la files
-		find "${D}/usr/$(get_libdir)/capi/" -name "*.la" -delete
-	fi
-
-}
diff --git a/net-dialup/misdnuser/misdnuser-2.0.17.ebuild b/net-dialup/misdnuser/misdnuser-2.0.17.ebuild
deleted file mode 100644
index 3edd769..0000000
--- a/net-dialup/misdnuser/misdnuser-2.0.17.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-IUSE="+capi static-libs"
-
-inherit base eutils autotools git-2 flag-o-matic
-
-DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
-HOMEPAGE="http://www.mISDN.org/"
-
-EGIT_REPO_URI="git://git.misdn.eu/mISDNuser.git"
-EGIT_COMMIT="7e5e9df238772138756d506b4ac24b4fd5725635"
-EGIT_BRANCH="socket"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses
-	capi? ( >=net-dialup/capi4k-utils-3.2.25
-		!!>=net-dialup/capi4k-utils-20050718
-		>=media-libs/spandsp-0.0.6_pre12 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mISDNuser"
-
-#PATCHES=( "${FILESDIR}/${P}-fix-printf-format.patch" )
-DOCS=( "AUTHORS" "COPYING.LIB" "LICENSE" "NEWS" "README" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -Wno-unused-result
-	# install example applications too, contains some useful stuff like misdntestlayer1
-	econf \
-		$(use_enable capi) \
-		$(use_enable static-libs static) \
-		--with-mISDN_group=dialout \
-		--enable-example || die "econf failed"
-}
-
-src_install() {
-	base_src_install
-
-	use capi && \
-		newinitd "${FILESDIR}/mISDNcapid.initd" mISDNcapid
-
-	# move udev rules file
-	dodir "/lib"
-	mv "${D}/etc/udev" "${D}/lib/" || die "Failed to move udev rules file"
-
-	if ! use static-libs ; then
-		# remove all .la files
-		find "${D}" -name "*.la" -delete
-	elif use capi ; then
-		# remove capi plugin .la files
-		find "${D}/usr/$(get_libdir)/capi/" -name "*.la" -delete
-	fi
-
-}
diff --git a/net-dialup/misdnuser/misdnuser-2.0.2.ebuild b/net-dialup/misdnuser/misdnuser-2.0.2.ebuild
deleted file mode 100644
index c401698..0000000
--- a/net-dialup/misdnuser/misdnuser-2.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-IUSE=""
-
-inherit eutils autotools git
-
-#MY_P="mISDNuser-${PV//./_}"
-
-DESCRIPTION="mISDN (modular ISDN) kernel link library and includes"
-HOMEPAGE="http://www.mISDN.org/"
-#SRC_URI="http://www.linux-call-router.de/download/lcr-1.7/${MY_P}.tar.gz"
-
-EGIT_REPO_URI="git://git.misdn.org/mISDNuser.git"
-EGIT_COMMIT="8d01cd531d4422b1368ecc76f7852bb40317a1a0"
-EGIT_BOOTSTRAP="eautoreconf"
-EGIT_BRANCH="socket"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mISDNuser"
-
-src_configure() {
-	# install example applications too, contains some useful stuff like misdntestlayer1
-	econf \
-		--enable-example || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS COPYING.LIB LICENSE NEWS README
-}

From 2637a343e93fbc63f3c0fb7bda20c4fe8cdbb738 Mon Sep 17 00:00:00 2001
From: root <root@devnode01.safesoftsolutions.com>
Date: Sun, 18 Jan 2015 12:32:49 -0800
Subject: [PATCH 062/261] fix manifest

---
 sys-auth/pam_yubico/Manifest | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-auth/pam_yubico/Manifest b/sys-auth/pam_yubico/Manifest
index cf2fc6a..7036eb9 100644
--- a/sys-auth/pam_yubico/Manifest
+++ b/sys-auth/pam_yubico/Manifest
@@ -1,3 +1,5 @@
 AUX 2.12-drop_privs.patch 427 SHA256 9ef850b639a255a9e372cfc8be8920f6ba64b1f042fcf1b678358e304bccb51e SHA512 69df5feeb84136b968fca098d5ab2356bf98be542b820984b45a501859c023ffe33988144adb45f55f34848e743f2ed5510921ce701d4582637c62b12b88b204 WHIRLPOOL 7529b601c4208b91d98864eaffbd21fe2b033ebe8e9e0cd52d9b2e17d4cf365664e7ed78b7036b428630a75a1b85abbb4180c8eb84ae7bf7747a3943c57ccc53
 DIST pam_yubico-2.12.tar.gz 367164 SHA256 b3efb41b72191b2ccb0b9cde691bd4ee6df5d8245254dd4f4c4e4bb8886c25c3 SHA512 129af764b5ea59343f75bfd649aa7f7ab927e26590aa2c43622e61f114a73711b420655e33fe344504456e71964d7d11fc8fce0ea0d4405e5fccd312c08152d3 WHIRLPOOL 8d435c597d14b5eeaac68a5d8977d27bf89a328544d810d6ab4ddfce913c5d2dba81d09ceca14fef509065b4cfa0d783fa7f9e521b531a48ecd1d1b7498aaed6
-EBUILD pam_yubico-2.12.ebuild 808 SHA256 3ce43c2d1d3f9bd136ea685314c12eab65bb8f17ed810c56901c56126cd63fa4 SHA512 a1ed9a02a05817ba81d21211480222e33ac66a1653e59616fa2e12925a6aaa8a5edbe2821bcbab427e0d0e7eb01fd68f1c7442e67d9209e1c37cd1382d5993bf WHIRLPOOL a35125f8806920846fcdcf34c110c0b255ba04b537f4d0f01654abccb728ebc2f34bc75d949d4a41f5f6c1367f0f7cbafae4054ab1da7b142a8c579dd54c4ed1
+EBUILD pam_yubico-2.12.ebuild 877 SHA256 ea9d199e933a4d9a28605297ba523e377475bafd29d627c8e3948c04991c0b31 SHA512 235a12a3e07a2fc7ea9e0ddadd6bb7a49100ac256153db7ae27d3cecdf546009570e2b5eba610e4b8793f52703f63849a39c83aebbf9dbb2772487284fcc42d9 WHIRLPOOL 6532ef0894445f2418a73ec701d0c256e606bc7cac6010957ab7e32c270fe44d345736d7e5afef1ccc48d4391afd475b6d5000f77bc4d018fe9ea79242080dbd
+MISC README.md 192 SHA256 357f61867afde96ae67f74128d9f2f7cb40f91e929a410375ca4ee6596c14139 SHA512 2e4fd999c66f5f1ea4b8d912f1644c51b316f7b5ab45d05188505ce08c64e737b64950cde2747ff7ad675a5d3305d37c3ac86ff70d42e46bd8f307be1657af05 WHIRLPOOL b9d0c2d70d3d1750076ef4eb0431163d043910e67fc85b41366d15fcfa5f54c65bbac0ddb6ec70b7231d6466245610e2d2416bc36aa0278c425906ad6762d6f8
+MISC sshd.example 869 SHA256 8cd7a29afc8610fe83226bd0e5086af7dfe25bfe948aca8df39c7af4650c9ea4 SHA512 eb7a6c6dae2ce6db3c0ff67bbcb5c1b8ad05ba8a0c5495dcc1e6b9a7a95b33bf1a7718e2072c192ea5096df3c5e81ffd6f1b3f58531c10d4ce281657f48c2c9e WHIRLPOOL a61c6a97b614d42034a3c50b41ec5e86be61ee1a07b10b3980c4ccc2b4cdbbb196d6d98c4d0f68462ea8c9bf10c6a03b5d9acbb3d22c03aec5de707eae0353b8

From 473e716e31a8b6834c2cda8396ffcc74de9fbbdf Mon Sep 17 00:00:00 2001
From: root <root@devnode01.safesoftsolutions.com>
Date: Mon, 19 Jan 2015 12:40:33 -0800
Subject: [PATCH 063/261] fixed manifest

---
 sys-auth/ykpers/Manifest | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index daa9e93..b1b3757 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,4 +1,2 @@
 DIST ykpers-1.11.3.tar.gz 463589 SHA256 9c89fa2ffe68612d10e7d4b733372706360abddbc3e7442958023f4f6110dac6 SHA512 1358140cdd9b1ae191f84487de49b2a67fb710d52cd26daf82e1d0ec7a09d102e5dfbf7c16632790733a7ebd64d314a17cf78cbadf896f370d0ad88f46d0beab WHIRLPOOL c79ba6e2e168bca5abda807bed5751293b23a6a768a182d2e10fc5fdb0a82090b55c369ca2ad727c1628ad6384855a330a86938b72ed200d2442bad874644d40
-DIST ykpers-1.9.0.tar.gz 454253 SHA256 5624593d23c5a7ea71d0779fe04f2b0e04404a99600ec8fc008331680b460d48 SHA512 c878cf4d1d05a91ddb9030646fd60bc32dec9fc7fce43408dac87d4985a644aae3835a9f529e644630c3fb0af733dfdd998afdbe9ce480669e2507be697de970 WHIRLPOOL 1a78e27058ddf77963f6251927ee434407f97b4b0b8687de4d74cf9c294764c34e5457f198e218f30401011e5524f3cf25465ca39bd4791b9fa76267cfbf2305
 EBUILD ykpers-1.11.3.ebuild 904 SHA256 d4e4976655f2d32bf1721eb7feadf93ad340069de2e80e9e351dd402ea18966c SHA512 c1d265fbcfff40daa83f8f0a3bb6b934f0d82dd20662467a4c731de01e871d02a62e5f8145aed20597844013a6ef1dab30e93affb30a394896c614e01fb28982 WHIRLPOOL cc560fc47b5e7038c95da14be101cac040f3308131f77386147609e1487d4b8ce25c16bbb31e9f320c09a776581c70465c58d644d66c23a145aac5bf33c71cac
-EBUILD ykpers-1.9.0.ebuild 904 SHA256 d4e4976655f2d32bf1721eb7feadf93ad340069de2e80e9e351dd402ea18966c SHA512 c1d265fbcfff40daa83f8f0a3bb6b934f0d82dd20662467a4c731de01e871d02a62e5f8145aed20597844013a6ef1dab30e93affb30a394896c614e01fb28982 WHIRLPOOL cc560fc47b5e7038c95da14be101cac040f3308131f77386147609e1487d4b8ce25c16bbb31e9f320c09a776581c70465c58d644d66c23a145aac5bf33c71cac

From 57b3c0942011ee7ab0f262e8f54e3d10d6a50790 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 19 Mar 2015 18:50:44 -0700
Subject: [PATCH 064/261] remove old snmp ebuild

---
 net-analyzer/net-snmp/ChangeLog               | 1094 -----------------
 net-analyzer/net-snmp/Manifest                |   14 -
 net-analyzer/net-snmp/files/allow-tmpfs.patch |   11 -
 .../net-snmp-5.1.2-snmpconf-selinux.patch     |   12 -
 net-analyzer/net-snmp/files/snmpd.conf        |   17 -
 net-analyzer/net-snmp/files/snmpd.init.2      |   35 -
 net-analyzer/net-snmp/files/snmptrapd.conf    |   16 -
 net-analyzer/net-snmp/files/snmptrapd.init.2  |   14 -
 net-analyzer/net-snmp/metadata.xml            |   26 -
 net-analyzer/net-snmp/net-snmp-5.7.2.ebuild   |  171 ---
 .../net-snmp/net-snmp-5.7.2_rc1.ebuild        |  169 ---
 11 files changed, 1579 deletions(-)
 delete mode 100644 net-analyzer/net-snmp/ChangeLog
 delete mode 100644 net-analyzer/net-snmp/Manifest
 delete mode 100644 net-analyzer/net-snmp/files/allow-tmpfs.patch
 delete mode 100644 net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
 delete mode 100644 net-analyzer/net-snmp/files/snmpd.conf
 delete mode 100644 net-analyzer/net-snmp/files/snmpd.init.2
 delete mode 100644 net-analyzer/net-snmp/files/snmptrapd.conf
 delete mode 100644 net-analyzer/net-snmp/files/snmptrapd.init.2
 delete mode 100644 net-analyzer/net-snmp/metadata.xml
 delete mode 100644 net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
 delete mode 100644 net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
deleted file mode 100644
index bae57bc..0000000
--- a/net-analyzer/net-snmp/ChangeLog
+++ /dev/null
@@ -1,1094 +0,0 @@
-# ChangeLog for net-analyzer/net-snmp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.249 2013/04/26 15:00:10 jer Exp $
-
-  26 Apr 2013; Jeroen Roovers <jer@gentoo.org> -net-snmp-5.7.2-r1.ebuild,
-  net-snmp-5.7.2.ebuild:
-  Revert.
-
-*net-snmp-5.7.2-r1 (25 Apr 2013)
-
-  25 Apr 2013; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.7.2-r1.ebuild:
-  Experimentally add --with-mibdirs="." (bug #249496).
-
-  07 Jan 2013; Jeroen Roovers <jer@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Fix LICENSE (bug #437172).
-
-  07 Jan 2013; Jeroen Roovers <jer@gentoo.org> net-snmp-5.7.2_rc1.ebuild,
-  net-snmp-5.7.2.ebuild:
-  Remove runtime dependency on sys-apps/openrc (bug #450564 by Geaaru).
-
-  22 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/snmpd.init.2,
-  files/snmptrapd.init.2:
-  Remove need net line.
-
-*net-snmp-5.7.2 (20 Oct 2012)
-
-  20 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +net-snmp-5.7.2.ebuild,
-  -net-snmp-5.7.2_rc3.ebuild:
-  Version bump to final 5.7.2 release.
-
-  05 Oct 2012; Brent Baude <ranger@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Marking net-snmp-5.7.2_rc1 ppc for bug 431752
-
-*net-snmp-5.7.2_rc3 (04 Oct 2012)
-
-  04 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
-  +net-snmp-5.7.2_rc3.ebuild, -files/CVE-2008-6123.patch,
-  -files/net-snmp-5.4.1-sensors3-version_detect.patch,
-  -files/net-snmp-5.4.1-sensors3.patch,
-  -files/net-snmp-5.4.2.1-perlcc-hppa.patch, -files/snmpd.init,
-  -files/snmptrapd.init, -net-snmp-5.4.2.1-r5.ebuild,
-  -net-snmp-5.7.2_rc1-r1.ebuild, metadata.xml:
-  Version bump to 5.7.2_rc3; add USE=mysql (bug #433169, thanks to Dag Bakke);
-  update LICENSE (bug #437172, thanks to Ben Sagal); remove old versions
-  (vulnerable and non-stable-candidate) and unused files.
-
-  28 Aug 2012; Brent Baude <ranger@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Marking net-snmp-5.7.2_rc1 ppc64 for bug 431752
-
-  27 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
-  net-snmp-5.7.2_rc1-r1.ebuild, net-snmp-5.7.2_rc1.ebuild:
-  Hopefully fix race condition reported in bug #432982 by Luis Ferreira; make
-  sure that there is no automagic dependency over libnl on the stable version.
-
-*net-snmp-5.7.2_rc1-r1 (27 Aug 2012)
-
-  27 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
-  +net-snmp-5.7.2_rc1-r1.ebuild, metadata.xml:
-  Add an USE flag to make picutils dependency optional (bug #432926), as well as
-  a netlink one to use libnl instead of parsing /proc/net/tcp.
-
-  26 Aug 2012; Raúl Porcel <armin76@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  alpha/arm/ia64/s390/sh/sparc stable wrt #431752
-
-  21 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/snmpd.init.2:
-  Fix init script. Thanks Seraphin in bug #432208.
-
-  20 Aug 2012; Johannes Huber <johu@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Stable for x86, wrt bug #431752
-
-  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Fix Manifest.
-
-  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Stable for HPPA (bug #431752).
-
-  20 Aug 2012; Agostino Sarubbo <ago@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
-  Stable for amd64, wrt bug #431752
-
-  20 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
-  -files/net-snmp-5.7.2_rc1-hppa.patch, net-snmp-5.7.2_rc1.ebuild:
-  Make sure not to depend on automake (not required).
-
-  20 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
-  net-snmp-5.7.2_rc1.ebuild:
-  Replace most seds with full-fledged, targeted patches. Add an ucd-compat USE
-  flag for those packages still using ucd-snmp.
-
-  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> net-snmp-5.7.2_rc1.ebuild,
-  +files/net-snmp-5.7.2_rc1-hppa.patch:
-  Fix toolchain quadruplet detection (bug #432004).
-
-*net-snmp-5.7.2_rc1 (19 Aug 2012)
-
-  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/snmpd.init.2,
-  +files/snmptrapd.init.2, +net-snmp-5.7.2_rc1.ebuild,
-  -net-snmp-5.4.3-r1.ebuild, -net-snmp-5.5.ebuild, -net-snmp-5.6.1.ebuild,
-  metadata.xml:
-  Version bump; remove old. This version closes bug #209667 (disabled ucd-snmp
-  compatibility); bug #328177 (lm_sensors 3 is supported by default now);
-  #425990 (added GPL-2 to LICENSE); should close bug #351051 as well, for the
-  most part; add new init scripts to use the new runscript features; restrict
-  tests (tests that might or might not fail are useless); build in parallel
-  (upstream fixed it); drop USE flags that added no dependencies.
-
-  03 Aug 2012; Jeroen Roovers <jer@gentoo.org> files/snmpd.init:
-  Fix bashishms by Outer Measure (bug #414703).
-
-  16 Jun 2012; Torsten Veller <tove@gentoo.org> -net-snmp-5.4.2.1-r4.ebuild:
-  Remove old
-
-  16 Jun 2012; Torsten Veller <tove@gentoo.org> net-snmp-5.4.2.1-r5.ebuild:
-  Lift keywords from 5.4.2.1-r4 (#342793)
-
-*net-snmp-5.4.3-r1 (02 Jun 2012)
-*net-snmp-5.4.2.1-r5 (02 Jun 2012)
-
-  02 Jun 2012; Torsten Veller <tove@gentoo.org> +net-snmp-5.4.2.1-r5.ebuild,
-  -net-snmp-5.4.3.ebuild, +net-snmp-5.4.3-r1.ebuild, net-snmp-5.5.ebuild,
-  net-snmp-5.6.1.ebuild:
-  Move perl modules to the vendor branch (#342793)
-
-  13 May 2012; <swift@gentoo.org> net-snmp-5.4.2.1-r4.ebuild,
-  net-snmp-5.4.3.ebuild, net-snmp-5.5.ebuild, net-snmp-5.6.1.ebuild:
-  SELinux policy module for SNMP daemons (and tools) is provided by
-  selinux-snmp
-
-  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/snmpd.init:
-  move reload to extra_started_commands
-
-*net-snmp-5.6.1 (19 Apr 2011)
-
-  19 Apr 2011; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.6.1.ebuild:
-  Version bump thanks to euscan.
-
-  01 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  net-snmp-5.4.2.1-r4.ebuild, net-snmp-5.4.3.ebuild, net-snmp-5.5.ebuild:
-  Use Python 2 (bug #356573).
-
-  26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  net-snmp-5.4.2.1-r4.ebuild, net-snmp-5.4.3.ebuild, net-snmp-5.5.ebuild:
-  Fix deprecation warnings.
-
-  26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -net-snmp-5.4.2.1-r1.ebuild:
-  Delete.
-
-  06 Nov 2010; Mark Loeser <halcy0n@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  Stable for ppc64; bug #323197
-
-  11 Aug 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.5.ebuild:
-  Build perl modules respecting LDFLAGS too (bug #328685).
-
-  11 Aug 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.3.ebuild:
-  Build perl modules respecting LDFLAGS too (bug #328685).
-
-  04 Aug 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1-r4.ebuild,
-  +files/net-snmp-5.4.2.1-perlcc-hppa.patch:
-  Fix toolchain quadruplet detection (bug #330353).
-
-  13 Jul 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.5.ebuild:
-  Remove unneeded autotools eclass.
-
-*net-snmp-5.5 (13 Jul 2010)
-*net-snmp-5.4.3 (13 Jul 2010)
-
-  13 Jul 2010; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.3.ebuild,
-  +net-snmp-5.5.ebuild:
-  Version bump (bug #317325). Respect LDFLAGS more (perl still broken).
-  Remove lm_sensors support from 5.5 until there is a patch.
-
-  12 Jul 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  Stable for HPPA (bug #323197).
-
-  27 Jun 2010; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  alpha/arm/ia64/s390/sh/sparc stable wrt #323197
-
-  27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
-  net-snmp-5.4.2.1-r1.ebuild:
-  Remove support for obsolete lm_sensors.
-
-  27 Jun 2010; <nixnut@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  ppc stable #323197
-
-  24 Jun 2010; Pacho Ramos <pacho@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  stable amd64, bug 323197
-
-  14 Jun 2010; Christian Faulhammer <fauli@gentoo.org> net-snmp-5.4.2.1-r4.ebuild:
-  stable x86, bug 323197
-
-  01 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  net-snmp-5.4.2.1-r1.ebuild, net-snmp-5.4.2.1-r2.ebuild,
-  net-snmp-5.4.2.1-r3.ebuild, net-snmp-5.4.2.1-r4.ebuild:
-  Delete calls to deprecated python_version(). Properly call
-  python_mod_optimize() and python_mod_cleanup().
-
-  01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  net-snmp-5.4.2.1-r4.ebuild:
-  Use -j1 for install (bug #317965).
-
-*net-snmp-5.4.2.1-r4 (29 Apr 2010)
-
-  29 Apr 2010; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.2.1-r4.ebuild:
-  Do not export CFLAGS/LDFLAGS to net-snmp-config (bug #303237).
-
-  16 Apr 2010; Fabio Erculiani <lxnay@gentoo.org>
-  net-snmp-5.4.2.1-r2.ebuild, net-snmp-5.4.2.1-r3.ebuild:
-  fix automagic RDEPEND when USE="rpm"
-
-*net-snmp-5.4.2.1-r3 (08 Dec 2009)
-
-  08 Dec 2009; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.2.1-r3.ebuild:
-  Remove CFLAGS from net-snmp-config script (bug #257622).
-
-*net-snmp-5.4.2.1-r2 (16 Oct 2009)
-
-  16 Oct 2009; Gordon Malm <gengor@gentoo.org>
-  +files/net-snmp-5.4.1-sensors3-version_detect.patch,
-  +files/net-snmp-5.4.1-sensors3.patch, -net-snmp-5.4.2.1.ebuild,
-  net-snmp-5.4.2.1-r1.ebuild, +net-snmp-5.4.2.1-r2.ebuild,
-  +files/snmpd.init, -files/snmpd.rc7, +files/snmptrapd.init,
-  -files/snmptrapd.rc7:
-  Minor revamp, add lm_sensors-3 support for bug #279423. Remove
-  old/vulnerable version.
-
-  27 Jul 2009; Markus Meier <maekke@gentoo.org> net-snmp-5.4.2.1-r1.ebuild:
-  amd64 stable, bug #250429
-
-  26 Jul 2009; Brent Baude <ranger@gentoo.org> net-snmp-5.4.2.1-r1.ebuild:
-  Marking net-snmp-5.4.2.1-r1 ppc64 for bug 250429
-
-  19 Jul 2009; nixnut <nixnut@gentoo.org> net-snmp-5.4.2.1-r1.ebuild:
-  ppc stable #250429
-
-  15 Jul 2009; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1-r1.ebuild:
-  Stable for HPPA (bug #250429).
-
-  15 Jul 2009; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.2.1-r1.ebuild:
-  arm/ia64/s390/sh/sparc stable wrt #250429
-
-  14 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
-  net-snmp-5.4.2.1-r1.ebuild:
-  stable x86, security bug 250429
-
-  12 Jul 2009; Tobias Klausmann <klausman@gentoo.org>
-  net-snmp-5.4.2.1-r1.ebuild:
-  Stable on alpha, bug #250429
-
-  11 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org>
-  files/CVE-2008-6123.patch:
-  Update patch for CVE-2008-6123
-
-*net-snmp-5.4.2.1-r1 (10 Jul 2009)
-
-  10 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org>
-  +net-snmp-5.4.2.1-r1.ebuild, +files/CVE-2008-6123.patch:
-  Revbump, include upstream fix for CVE-2008-6123, fixed #250429
-
-  31 May 2009; Jeroen Roovers <jer@gentoo.org>
-  -files/net-snmp-5.4.1-CVE-2008-2292.patch,
-  -files/net-snmp-5.4.1-clientaddr-fix.patch,
-  -files/net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch,
-  -files/net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch,
-  -files/net-snmp-5.4.1-perl-asneeded.patch,
-  -files/net-snmp-5.4.1-process-count-race.patch,
-  -files/net-snmp-5.4.1-suppresssuppress-annoying.patch,
-  -files/net-snmp-5.4-exec-crash.patch, -files/net-snmp-5.4-makefile.patch,
-  -files/net-snmp-lm_sensors.patch:
-  Remove unneeded patches.
-
-  31 May 2009; Jeroen Roovers <jer@gentoo.org> -net-snmp-5.4.ebuild,
-  -net-snmp-5.4.1-r1.ebuild, -net-snmp-5.4.1-r3.ebuild,
-  -net-snmp-5.4.1-r4.ebuild, -net-snmp-5.4.1.1.ebuild:
-  Remove old (bug #271699).
-
-  01 Jan 2009; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  s390/sh stable wrt #245306
-
-  15 Nov 2008; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  alpha/arm/ia64/sparc stable wrt #245306
-
-  15 Nov 2008; Markus Meier <maekke@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  amd64/x86 stable, bug #245306
-
-  14 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  net-snmp-5.4.2.1.ebuild:
-  ppc stable, bug #245306
-
-  14 Nov 2008; Markus Rothe <corsair@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  Stable on ppc64; bug #245306
-
-  13 Nov 2008; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  Stable for HPPA (bug #245306).
-
-  13 Nov 2008; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1.ebuild:
-  Automate version number fixing.
-
-*net-snmp-5.4.2.1 (13 Nov 2008)
-
-  13 Nov 2008; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.2.1.ebuild:
-  Version bump (bug #245306).
-
-  04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Describe local USE flags for GLEP 56.
-
-  23 Jun 2008; Brent Baude <ranger@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  Marking net-snmp-5.4.1.1 ppc for bug 225105
-
-  23 Jun 2008; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  Stable for HPPA (bug #225105).
-
-  22 Jun 2008; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  alpha/ia64/sparc stable wrt security #225105
-
-  22 Jun 2008; Markus Meier <maekke@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  amd64 stable, bug #225105
-
-  21 Jun 2008; Markus Rothe <corsair@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  Stable on ppc64; bug #225105
-
-  21 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
-  net-snmp-5.4.1.1.ebuild:
-  stable x86, security bug 225105
-
-  21 Jun 2008; Peter Volkov <pva@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  autoconf-2.62 is not ready to be stabilized. Updating dependency to a
-  patched version...
-
-  16 Jun 2008; Peter Volkov <pva@gentoo.org> net-snmp-5.4.1.1.ebuild:
-  Added dependency on autoconf-2.62 as a temporary measure untill we update
-  dependency in autotools.eclass, fixes bug #225893, thank Mark Haney for
-  report.
-
-  16 Jun 2008; Peter Volkov <pva@gentoo.org> -files/snmpd-5.1.conf,
-  -files/snmpd-5.1.rc6, -files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch,
-  -files/net-snmp-5.2.2-asneeded.patch,
-  -files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch,
-  -files/net-snmp-5.3.1-retrans-time.patch,
-  -files/net-snmp-5.3.1-tcp-udp-mib-byteorder.patch,
-  -files/net-snmp-maxreps.patch, -net-snmp-5.2.2-r3.ebuild,
-  -net-snmp-5.3.1-r1.ebuild:
-  Removed old. This also fixes bug #226583, thank Diego Pettenò for his
-  work.
-
-*net-snmp-5.4.1.1 (16 Jun 2008)
-
-  16 Jun 2008; Peter Volkov <pva@gentoo.org> +net-snmp-5.4.1.1.ebuild:
-  Version bump to fix security issue, bug #225105, thank Matthias Geerdsen
-  and Robert Buchholz for report.
-
-  07 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
-  +files/net-snmp-5.4.1-perl-asneeded.patch, net-snmp-5.4.1-r4.ebuild:
-  Add patch to fix bug #224251, remove filtering of --as-needed as it builds
-  fine with it (plus it's the wrong way to avoid it), and _if there are bugs
-  you can't solve, just ask me_.
-
-*net-snmp-5.4.1-r4 (06 Jun 2008)
-
-  06 Jun 2008; Peter Volkov <pva@gentoo.org>
-  +files/net-snmp-5.1.2-snmpconf-selinux.patch,
-  +files/net-snmp-5.4.1-CVE-2008-2292.patch,
-  +files/net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch,
-  +files/net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch,
-  +files/net-snmp-5.4.1-process-count-race.patch,
-  +files/net-snmp-5.4-exec-crash.patch, +net-snmp-5.4.1-r4.ebuild:
-  Incorporated patches from upstream to fix different issues: bug #203127 -
-  error on subcontainer, followed by crash, thank Andrew Belousoff for
-  report and Thomas Anders for the fix; bug #21660 - hrFSStorageIndex
-  incorrect, thank for report Dominique PRUNIER; bug #213415 - process
-  checking bug, reported by David Bosso; security bug #222265 - perl/python
-  module buffer overflow (CVE-2008-2292), thank Robert Buchholz for report.
-
-  31 Mar 2008; <ricmm@gentoo.org> net-snmp-5.4.ebuild:
-  Drop to ~mips due to unstable deps
-
-  05 Feb 2008; Markus Rothe <corsair@gentoo.org> net-snmp-5.4.1-r3.ebuild:
-  Stable on ppc64
-
-  19 Jan 2008; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.1-r3.ebuild:
-  alpha/ia64/sparc/x86 stable
-
-*net-snmp-5.4.1-r3 (27 Dec 2007)
-
-  27 Dec 2007; <pva@gentoo.org>
-  -files/net-snmp-5.2.1-fix-64bit-interface-counters.diff,
-  -files/net-snmp-5.2.1-fix-insecure-fixproc.diff,
-  -net-snmp-5.2.1.2-r1.ebuild, -net-snmp-5.3.0.1.ebuild,
-  -net-snmp-5.3.1.ebuild, -net-snmp-5.4-r1.ebuild, -net-snmp-5.4.1.ebuild,
-  -net-snmp-5.4.1-r2.ebuild, +net-snmp-5.4.1-r3.ebuild:
-  Added extensible USE flag to build extensible mib module, bug 200279, thank
-  Honza <hkmaly AT bigfoot.com> for report. Remove old.
-
-*net-snmp-5.4.1-r2 (27 Dec 2007)
-
-  27 Dec 2007; <pva@gentoo.org> files/net-snmp-5.4.1-clientaddr-fix.patch,
-  +files/net-snmp-5.4.1-suppresssuppress-annoying.patch,
-  +net-snmp-5.4.1-r2.ebuild:
-  Fixes memory leaks reported in bug #180266, thank Doug <doug.manley AT
-  gmail.com> for report and ivestigation. Added upstream patch to suppress
-  annoying "registration != duplicate" warning for root oids.
-
-  19 Nov 2007; Joshua Kinard <kumba@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  Marked unstable on mips, per #198346.
-
-  14 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  net-snmp-5.4.1-r1.ebuild:
-  Stable on amd64 wrt bug #198346.
-
-  13 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  net-snmp-5.4.1-r1.ebuild:
-  ppc stable, bug #198346
-
-  09 Nov 2007; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  Stable for HPPA (bug #198346).
-
-  09 Nov 2007; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  alpha/ia64/sparc stable wrt security #198346
-
-  09 Nov 2007; Dawid Węgliński <cla@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  Stable on x86 (bug #198346)
-
-  08 Nov 2007; Markus Rothe <corsair@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  Stable on ppc64; bug #198346
-
-  08 Nov 2007; Martin Jackson <mjolnir@gentoo.org>
-  +files/net-snmp-maxreps.patch, +net-snmp-5.4-r1.ebuild:
-  Add maxreps patch from upstream, to fix #198346
-
-*net-snmp-5.4-r1 (07 Nov 2007)
-
-  07 Sep 2007; Martin Jackson <mjolnir@gentoo.org> net-snmp-5.4.1-r1.ebuild:
-  Add dep on setuptools to fix #191504
-
-*net-snmp-5.4.1-r1 (06 Sep 2007)
-
-  06 Sep 2007; Martin Jackson <mjolnir@gentoo.org>
-  +net-snmp-5.4.1-r1.ebuild:
-  Add support for building python bindings, which ship with the 5.4 series of
-  net-snmp releases
-
-*net-snmp-5.4.1 (17 Aug 2007)
-
-  17 Aug 2007; Robin H. Johnson <robbat2@gentoo.org>
-  +files/net-snmp-5.4.1-clientaddr-fix.patch, +net-snmp-5.4.1.ebuild:
-  Bump to new upstream release, also apply patch for fixed clientaddr usage.
-
-  17 May 2007; Raúl Porcel <armin76@gentoo.org> net-snmp-5.4.ebuild:
-  alpha stable wrt #163094
-
-  12 May 2007; Joshua Kinard <kumba@gentoo.org> net-snmp-5.4.ebuild:
-  Stable on mips.
-
-  01 May 2007; Marius Mauch <genone@gentoo.org> net-snmp-5.2.1.2-r1.ebuild,
-  net-snmp-5.2.2-r3.ebuild, net-snmp-5.3.0.1.ebuild, net-snmp-5.3.1.ebuild,
-  net-snmp-5.3.1-r1.ebuild, net-snmp-5.4.ebuild:
-  Replacing einfo with elog
-
-  27 Mar 2007; Markus Ullmann <jokey@gentoo.org> net-snmp-5.2.1.2-r1.ebuild,
-  net-snmp-5.2.2-r3.ebuild, net-snmp-5.3.0.1.ebuild, net-snmp-5.3.1.ebuild,
-  net-snmp-5.3.1-r1.ebuild, net-snmp-5.4.ebuild:
-  Fix ROOT usage
-
-  31 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> net-snmp-5.4.ebuild:
-  Stable on ppc wrt bug #163094.
-
-  27 Jan 2007; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.ebuild:
-  Stable for HPPA (bug #163094).
-
-  26 Jan 2007; <solar@gentoo.org> net-snmp-5.4.ebuild:
-  - mark 5.4 stable on amd64 per kingtaco bug #163094
-
-  22 Jan 2007; Markus Rothe <corsair@gentoo.org> net-snmp-5.4.ebuild:
-  Stable on ppc64; bug #163094
-
-  22 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> net-snmp-5.4.ebuild:
-  Stable on sparc wrt #163094
-
-  22 Jan 2007; Christian Faulhammer <opfer@gentoo.org> net-snmp-5.4.ebuild:
-  stable x86, bug #163094
-
-  27 Nov 2006; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest
-
-*net-snmp-5.4 (26 Nov 2006)
-
-  26 Nov 2006; Cedric Krier <cedk@gentoo.org>
-  +files/net-snmp-5.4-makefile.patch, +files/snmpd.conf, +files/snmpd.rc7,
-  +files/snmptrapd.rc7, +net-snmp-5.4.ebuild:
-  Version bump
-
-*net-snmp-5.3.1-r1 (23 Oct 2006)
-
-  23 Oct 2006; Matthew Marlowe <mattm@gentoo.org>
-  +files/net-snmp-5.3.1-retrans-time.patch,
-  +files/net-snmp-5.3.1-tcp-udp-mib-byteorder.patch,
-  +net-snmp-5.3.1-r1.ebuild:
-  Adding several critical patches (source: redhat/fedora) for net-snmp 5.3.1 and
-  modifying the net-snmp-5.3.1-r1 ebuild to automatically apply them.
-  Hopefully, the patches will fix some amd64 and possibly sun issues.
-
-  22 Oct 2006; Matthew Marlowe <mattm@gentoo.org> ChangeLog:
-  version bump (5.3.1), fixed bugs #120412 and #152166.
-
-  21 Sep 2006; Markus Ullmann <jokey@gentoo.org> net-snmp-5.3.0.1.ebuild:
-  Stripping tuned CFLAGS per bug #147543 -- thanks to Jimmy Jazz
-
-  04 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
-  files/net-snmp-5.2.2-asneeded.patch:
-  Improve the patch for --as-needed. Closes bug #132659.
-
-*net-snmp-5.2.2-r3 (11 Feb 2006)
-
-  11 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
-  -net-snmp-5.2.2-r2.ebuild, +net-snmp-5.2.2-r3.ebuild,
-  net-snmp-5.3.0.1.ebuild:
-  Install example configuration file for bug 113788. Thanks to Allen Parker
-  <infowolfe at gmail dot com>.
-
-*net-snmp-5.2.2-r2 (05 Feb 2006)
-
-  05 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
-  -net-snmp-5.2.2-r1.ebuild, +net-snmp-5.2.2-r2.ebuild,
-  net-snmp-5.3.0.1.ebuild:
-  Add mfd-rewrites USE flag for bug 105047. Thanks to Micheal Marineau
-  <marineam at gentoo dot org> and Michiel Muhlenbaumer <michiel dot
-  muhlenbaumer at gmail dot com>.
-
-  04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
-  net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2-r1.ebuild,
-  net-snmp-5.3.0.1.ebuild:
-  Use net-snmp's built-in lm_sensors support, thanks to Daniel Willmann
-  <willmann dot daniel at web dot de> in bug 109785. Our patch is still
-  commented out.
-
-*net-snmp-5.3.0.1 (26 Jan 2006)
-
-  26 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
-  -net-snmp-5.3_rc2.ebuild, +net-snmp-5.3.0.1.ebuild:
-  5.3.0.1 version bump for bug 120412. Thanks to Frederic Mangeant <frederic
-  dot mangeant at gmail dot com>.
-
-  23 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
-  net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2-r1.ebuild,
-  net-snmp-5.3_rc2.ebuild:
-  Commented lm_sensors patch because it has a memory leak. Please see bug
-  109785. If you can fix this problem, please attach a patch.
-
-*net-snmp-5.2.2-r1 (16 Jan 2006)
-
-  16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
-  -net-snmp-5.1.3.1.ebuild, -net-snmp-5.2.2.ebuild,
-  +net-snmp-5.2.2-r1.ebuild, net-snmp-5.3_rc2.ebuild:
-  Install net-snmp-config even with USE=minimal. Fixes bug 104193. Thanks to
-  Sven Wegener <swegener at gentoo dot org>.
-
-  16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> net-snmp-5.1.3.1.ebuild,
-  net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2.ebuild,
-  net-snmp-5.3_rc2.ebuild:
-  Remove useless sys-libs/db dependency for bug 104195. Thanks to Sven Wegener
-  <swegener at gentoo dot org>.
-
-  06 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
-  +files/net-snmp-5.2.2-asneeded.patch, net-snmp-5.2.2.ebuild:
-  Add patch from bug 118016 to allow use of --as-needed. Thanks to Diego
-  Petteno <flameeyes at gentoo dot org>.
-
-*net-snmp-5.3_rc2 (26 Dec 2005)
-*net-snmp-5.2.2 (26 Dec 2005)
-
-  26 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
-  +files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch, +net-snmp-5.2.2.ebuild,
-  -net-snmp-5.3_pre4.ebuild, +net-snmp-5.3_rc2.ebuild,
-  -net-snmp-5.3.20050624.ebuild, -net-snmp-5.3.20050624-r1.ebuild:
-  5.2.2 and 5.3_rc2 version bumps for bug 116392. fix-insecure-fixproc was
-  fixed upstream, so this patch can be dropped. Thanks to Frederic Mangeant
-  <frederic dot mangeant at gmail dot com>.
-
-*net-snmp-5.3_pre4 (26 Nov 2005)
-
-  26 Nov 2005; Benjamin Smee <strerror@gentoo.org>
-  +net-snmp-5.3_pre4.ebuild:
-  New version for bug #113260
-
-*net-snmp-5.3.20050624-r1 (26 Nov 2005)
-
-  26 Nov 2005; Benjamin Smee <strerror@gentoo.org>
-  +net-snmp-5.3.20050624-r1.ebuild:
-  added diskio USE flag for bug #106053
-
-*net-snmp-5.2.1.2-r1 (04 Sep 2005)
-
-  04 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.2.1.2.ebuild,
-  +net-snmp-5.2.1.2-r1.ebuild:
-  Revision bump for the previous change.
-
-  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.1.1-r1.ebuild,
-  net-snmp-5.1.3.1.ebuild, -net-snmp-5.2.1-r1.ebuild,
-  net-snmp-5.2.1.2.ebuild, net-snmp-5.3.20050624.ebuild:
-  Add sedfu to fix insecure runpath issues, bug 103776; tidy old ebuilds.
-
-*net-snmp-5.1.3.1 (05 Aug 2005)
-
-  05 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.1.3.ebuild,
-  +net-snmp-5.1.3.1.ebuild:
-  New 5.1.x release.
-
-  24 Jul 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.1.2.ebuild:
-  Stable on mips, bug #99680.
-
-  23 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
-  net-snmp-5.2.1.2.ebuild:
-  Stable on alpha + ia64, bug 99680.
-
-  22 Jul 2005; Herbie Hopkins <herbs@gentoo.org> net-snmp-5.2.1.2.ebuild:
-  Stable on amd64 wrt bug #99680.
-
-  22 Jul 2005; Joseph Jezak <josejx@gentoo.org> net-snmp-5.2.1.2.ebuild:
-  Marked ppc stable for bug #99680.
-
-  21 Jul 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1.2.ebuild:
-  Stable on ppc64 (bug #99680)
-
-  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  net-snmp-5.2.1.2.ebuild:
-  Stable on hppa. bug #99680
-
-  21 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.2.ebuild:
-  Stable on sparc wrt sec bug 99680.
-
-*net-snmp-5.2.1.2 (20 Jul 2005)
-
-  20 Jul 2005; Daniel Black <dragonheart@gentoo.org>
-  +net-snmp-5.2.1.2.ebuild:
-  version bump for security bug #99680
-
-*net-snmp-5.1.3 (04 Jul 2005)
-
-  04 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -files/net-snmp-proc.patch,
-  -files/snmpd.conf, -files/snmpd.rc6, -net-snmp-5.1.1.ebuild,
-  net-snmp-5.1.1-r1.ebuild, -net-snmp-5.1.3_pre1.ebuild,
-  +net-snmp-5.1.3.ebuild, -net-snmp-5.2.ebuild, -net-snmp-5.2-r3.ebuild,
-  -net-snmp-5.2.1.ebuild, net-snmp-5.2.1-r1.ebuild,
-  net-snmp-5.3.20050624.ebuild:
-  Version bump (5.1.3 final); tidy old ebuilds/patches/cruft. Also added BSD
-  to LICENSE.
-
-  03 Jul 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.1-r1.ebuild:
-  Stable on mips bug #91792.
-
-*net-snmp-5.3.20050624 (25 Jun 2005)
-
-  25 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
-  +net-snmp-5.3.20050624.ebuild:
-  Added 5.3 cvs snapshot for interested folks to play with. Is currently (and
-  will remain) package.mask'd.
-
-*net-snmp-5.1.3_pre1 (21 Jun 2005)
-
-  21 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
-  +net-snmp-5.1.3_pre1.ebuild:
-  Version bump (5.1.x line) for first 5.1.3 pre-release.
-
-  25 May 2005; Michael Cummings <mcummings@gentoo.org> net-snmp-5.2.ebuild:
-  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
-
-  25 May 2005; Michael Cummings <mcummings@gentoo.org> net-snmp-5.1.1.ebuild:
-  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
-
-  25 May 2005; Michael Cummings <mcummings@gentoo.org>
-  net-snmp-5.1.1-r1.ebuild:
-  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
-
-  20 May 2005; Bryan Østergaard <kloeri@gentoo.org>
-  net-snmp-5.2.1-r1.ebuild:
-  Stable on alpha + ia64, bug 91792.
-
-  18 May 2005; Jason Wever <weeve@gentoo.org> net-snmp-5.2.1-r1.ebuild:
-  Stable on SPARC wrt security bug #91792.
-
-  18 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  net-snmp-5.2.1-r1.ebuild:
-  Stable on hppa; bug #91792
-
-  18 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
-  net-snmp-5.2.1-r1.ebuild:
-  stable on amd64 wrt #91792
-
-  18 May 2005; Michael Hanselmann <hansmi@gentoo.org>
-  net-snmp-5.2.1-r1.ebuild:
-  Stable on ppc.
-
-  18 May 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1-r1.ebuild:
-  Stable on ppc64; bug #91792
-
-*net-snmp-5.2.1-r1 (18 May 2005)
-
-  18 May 2005; Aaron Walker <ka0ttic@gentoo.org>
-  +files/net-snmp-5.2.1-fix-insecure-fixproc.diff,
-  +net-snmp-5.2.1-r1.ebuild:
-  Revision bump; added patch to fix fixproc insecure tmpfile handling, sec bug
-  91792.
-
-  17 May 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
-  net-snmp-5.2.1.ebuild:
-  Add missing lm_sensors conditional for mibs, bug 92513.
-
-  28 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
-  Only dep on TermReadKey if perl and !minimal. Thanks to solar for pointing
-  this out.
-
-  24 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
-  Removed || die after make test as there are legitimate reasons it might fail
-  (user doesnt already have a working config or an improperly configured/down
-  ethernet interface). Instead, display a message to the user explaining why 1
-  or 2 failed tests is ok.
-
-  20 Apr 2005; Simon Stelling <blubb@gentoo.org> net-snmp-5.2.1.ebuild:
-  stable on amd64
-
-  20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> net-snmp-5.2.1.ebuild:
-  Stable on sparc
-
-  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
-  Marked stable on x86.
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1.ebuild:
-  Stable on ppc64
-
-  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> net-snmp-5.2.ebuild:
-  Stable on ppc.
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> net-snmp-5.2.ebuild:
-  stable on amd64
-
-  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
-  Fix src_test access violation for bug 82342. Many thanks to soulse for
-  tracking this down.
-
-  15 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r3.ebuild,
-  net-snmp-5.2.1.ebuild:
-  Updated to use new fixlocalpod function from perl-module.eclass instead of
-  the nasty perl-module_src_install hack - see bug 83622.
-
-  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
-  net-snmp-5.1.1-r1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.ebuild:
-  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
-
-  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> net-snmp-5.2.1.ebuild:
-  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
-
-  21 Feb 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.1.1-r1.ebuild,
-  net-snmp-5.1.1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.1.ebuild,
-  net-snmp-5.2.ebuild:
-  removed PROVIDE virtual/snmp
-
-  20 Feb 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.ebuild:
-  Stable on mips
-
-  18 Feb 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.2.1.ebuild:
-  Giving full USE flag options to ppc64 as per bug #82341.
-
-  17 Feb 2005; Daniel Black <dragonheart@gentoo.org>
-  +files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch, net-snmp-5.2.1.ebuild:
-  Dependancy fixed as per bug #69775. Thanks Carsten Lohrke <carlo@gentoo.org>
-
-  12 Feb 2005; Jason Wever <weeve@gentoo.org> net-snmp-5.2.ebuild:
-  Stable on sparc.
-
-*net-snmp-5.2.1 (09 Feb 2005)
-
-  09 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +net-snmp-5.2.1.ebuild:
-  New upstream bugfix release.
-
-  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.1.1-r1.ebuild,
-  net-snmp-5.1.1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.ebuild:
-  Added dev-perl/TermReadKey as a dep for bug 78023.
-
-  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r3.ebuild:
-  Use perl-module.eclass and let it handle perllocal.pod to prevent a file
-  collision - bug 80041.
-
-*net-snmp-5.2-r3 (30 Jan 2005)
-
-  30 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.2-r2.ebuild,
-  +net-snmp-5.2-r3.ebuild:
-  Yet another revision bump; install html docs if USE=doc for bug 79934.
-
-  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r2.ebuild:
-  Fixed perms on snmptrapd init script. Thanks to Weeve for letting me know.
-
-*net-snmp-5.2-r2 (28 Jan 2005)
-
-  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/snmptrapd.conf,
-  net-snmp-5.1.1-r1.ebuild, net-snmp-5.1.1.ebuild, -net-snmp-5.1.2.ebuild,
-  -net-snmp-5.2-r1.ebuild, +net-snmp-5.2-r2.ebuild, net-snmp-5.2.ebuild:
-  Revision bump; added conf script (w/ a few sed's we can reuse snmpd's init)
-  for snmptrapd (bug 61705). Also added selinux support (via
-  sec-policy/selinux-snmpd) for bug 79749. Marked 5.2 stable on x86 and tidy'd
-  old ebuilds.
-
-*net-snmp-5.2-r1 (26 Jan 2005)
-
-  26 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +net-snmp-5.2-r1.ebuild:
-  Revision bump; added local USE flag smux for bug 77871. Also, use ht_fix_all
-  from fixheadtails.eclass rather than the nasty sed ... * call.
-
-  08 Jan 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.2.ebuild:
-  tail -1 problem fixed from bug #69775
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
-  net-snmp-5.1.1-r1.ebuild:
-  Stable on alpha.
-
-  17 Dec 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.2.ebuild:
-  autoconf re-fix (perl), changed sedding to be line-number independant for
-  future releases. Closes #59605.
-
-  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  Stable on amd64.
-
-*net-snmp-5.2 (27 Nov 2004)
-
-  27 Nov 2004; Martin Holzer <mholzer@gentoo.org> +net-snmp-5.2.ebuild:
-  VErsion bumped.
-
-  23 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  net-snmp-5.1.1-r1.ebuild:
-  Stable on sparc
-
-  22 Nov 2004; Eldad Zack <eldad@gentoo.org> -net-snmp-5.0.9-r1.ebuild,
-  -net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1-r1.ebuild, -net-snmp-5.1.ebuild:
-  5.1.1-r1 x86 stable. pruned 5.0.9 and 5.1.
-
-*net-snmp-5.1.2 (16 Nov 2004)
-
-  16 Nov 2004; Martin Holzer <mholzer@gentoo.org> +net-snmp-5.1.2.ebuild:
-  Version bumped. Closes 68467
-
-  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  marked ~mips for testing
-
-  01 Nov 2004; Lars Weiler <pylon@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  Stable on ppc for PHP5, Bug #60442.
-
-  27 Oct 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  Fixed sed typo. Closes #69069.
-
-  26 Oct 2004; Eldad Zack <eldad@gentoo.org> files/net-snmp-lm_sensors.patch:
-  Fixed lm_sensors patch to dlopen libsensors.so instead of libsensors.so.2.
-  Thanks to Chris Boot <bootc@bootc.net>. Closes #68856
-
-  25 Oct 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild,
-  net-snmp-5.1.1.ebuild:
-  Fixed net-snmp-config to include tcp-wrappers libs (if used), wrt Bug #68254.
-
-  16 Oct 2004; <solar@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  removed erroneous RDEPEND on sed4
-
-  26 Aug 2004; <solar@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  minimal USE flag added to net-snmp to yield a smaller net-snmp package. bug
-  #61401
-
-  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/snmpd.conf:
-  Trimmed trailing whitespace.
-
-  10 Aug 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild,
-  net-snmp-5.1.1.ebuild:
-  autoconf fix: configure didn't respect --disable-embedded-perl. Closes #59605.
-
-  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> net-snmp-5.1.1-r1.ebuild:
-  Stable on hppa.
-
-  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> net-snmp-5.1.1.ebuild:
-  Stable on alpha.
-
-  26 Jul 2004; Tom Gall <tgall@gentoo.org> net-snmp-5.1.1.ebuild:
-  stable on ppc64
-
-*net-snmp-5.1.1-r1 (21 Jul 2004)
-
-  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/net-snmp-lm_sensors.patch,
-  +net-snmp-5.1.1-r1.ebuild:
-  Added lm_sensor support (only for amd64 and x86). Thanks to Joshua Gerrish
-  <jgerrish@itsdarkhere.com> for the patch. Closes #57450.
-
-  21 Jul 2004; Travis Tilley <lv@gentoo.org> net-snmp-5.1.1.ebuild:
-  stable on amd64
-
-  15 Jul 2004; Tom Gall <tgall@gentoo.org> net-snmp-5.1.1.ebuild:
-  added ~ppc64, bug #55548
-
-  12 Jul 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
-  Fixed 'use_enable -ssl' to be 'use_enable !ssl'
-
-  09 Jul 2004; Lars Weiler <pylon@gentoo.org> net-snmp-5.1.1.ebuild:
-  Stable on ppc.
-
-  08 Jul 2004; Jason Wever <weeve@gentoo.org> net-snmp-5.1.1.ebuild:
-  Stable on sparc.
-
-  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> net-snmp-5.1.1.ebuild:
-  mark stable for x86, as requested by solar.
-
-  01 Jul 2004; Jon Hood <squinky86@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
-  change virtual/glibc to virtual/libc
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
-  Fix use invocation
-
-  11 May 2004; Michael McCabe <randy@gentoo.org> net-snmp-5.1.1.ebuild:
-  Added s390 keywords
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
-  Add die following econf for bug 48950
-
-*net-snmp-5.1.1 (10 Apr 2004)
-
-  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> metadata.xml,
-  net-snmp-5.1.1.ebuild, files/snmpd-5.1.conf, files/snmpd-5.1.rc6,
-  files/snmpd.conf, files/snmpd.rc6:
-  Version bumped.
-
-  20 Jan 2004; Max Kalika <max@gentoo.org> net-snmp-5.1.ebuild,
-  files/snmpd-5.1.conf:
-  Fix logging command-line parameters for version 5.1.
-
-  16 Jan 2004; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r3.ebuild,
-  net-snmp-5.1.ebuild, files/snmpd-5.1.rc6, files/snmpdnew.rc6:
-  Fix head/tail syntax. Submitted by Tony Vroon on bug #33851. Rename new rc6
-  file for future flexibility.
-
-  10 Jan 2004; <agriffis@gentoo.org> net-snmp-5.1.ebuild:
-  stable on alpha and ia64
-
-*net-snmp-5.1 (17 Dec 2003)
-
-  17 Dec 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.1.ebuild,
-  files/snmpdnew.rc6:
-  Version bumped.
-
-  24 Nov 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9-r3.ebuild:
-  adding RESTRICT="nomirror"
-
-  20 Nov 2003; Tavis Ormandy <taviso@gentoo.org> net-snmp-5.0.9-r1.ebuild:
-  stable on alpha
-
-*net-snmp-5.0.9-r3 (12 Nov 2003)
-
-  12 Nov 2003; <max@gentoo.org> net-snmp-5.0.9-r3.ebuild,
-  files/net-snmp-proc.patch:
-  Add /proc patch from net-snmp CVS. Bump to version 5.0.9-r3. Fixes bug 33249.
-
-  30 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.conf, files/snmpd.rc6:
-  Add connection logging example and do away with config file settings -- snmpd
-  already looks in /etc/snmp/snmpd.conf by itself.
-
-  30 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.rc6:
-  Use pidfile.
-
-  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
-  Add DEPEND on ExtUtils-MakeMaker-6.11-r1 to fix sandbox problems.
-
-  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
-  Make the perl-tk stuff depend on the X USE flag as well. Remove some things
-  that don't work anyway when USE=-perl.
-
-  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
-  Add perl? ( dev-perl/perl-tk ) to RDEPEND.
-
-*net-snmp-5.0.9-r2 (19 Oct 2003)
-
-  19 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
-  Add experimental perl support. Fixes bugs 29603 and 30439.
-
-  19 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r1.ebuild:
-  Add ucd-snmp/dlmod MIB support. Fixes bug 31217.
-
-  01 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.rc6:
-  Remove -C from startup script.
-
-  23 Sep 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.1.ebuild,
-  net-snmp-5.0.2a-r1.ebuild, net-snmp-5.0.2a.ebuild, net-snmp-5.0.6-r1.ebuild,
-  net-snmp-5.0.6.ebuild, net-snmp-5.0.8.ebuild, net-snmp-5.0.9-r1.ebuild,
-  net-snmp-5.0.9.ebuild, files/net-snmp-5.0.6-gentoo.diff,
-  files/net-snmpd.rc6, files/snmpd.conf, files/snmpd.rc6:
-  Purge all the no-longer download-able versions and tweak some minor tidbits.
-
-*net-snmp-5.0.9-r1 (19 Sep 2003)
-
-  01 Nov 2003; Guy Martin <gmsoft@gentoo.org> net-snmp-5.0.9-r1.ebuild:
-  Marked stable on hppa.
-
-  19 Sep 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r1.ebuild,
-  files/snmpd.conf, files/snmpd.rc6:
-  Major cleanup/rewrite: quote variables where possible; whitespace consistancy;
-  use more ebuild semantics (use_with, use_enable); put config in /etc/snmp
-  instead of /usr/share; add smux support; and new rc6 and corresponding conf
-  file for extra flexibility. Drop unneccessary die() calls. Start with an empty
-  set of SNMPD_FLAGS in snmpd.conf. Add "use logger" to depend() of snmpd.rc6.
-  Drop unneeded --with-cflags, --host, and --enable-shared parameters to econf.
-  Clean up ssl flags. Enable ucd-snmp compatibility and block virtual/snmp.
-  Fixes bugs 5882, 15536, 27177, 27308, and probably 14288.
-
-*net-snmp-5.0.9 (19 Sep 2003)
-
-  19 Sep 2003; Max Kalika <max@gentoo.org> metadata.xml,
-  net-snmp-5.0.9.ebuild:
-  Bump to version 5.0.9.
-
-  31 Jul 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6-r1.ebuild,
-  net-snmp-5.0.8.ebuild:
-  Mark 5.0.6-r1 stable on alpha, and 5.0.8 testing on ~alpha
-
-  01 Jul 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.0.6-r1.ebuild,
-  net-snmp-5.0.8.ebuild:
-  Fixing typo. Closes #23811
-
-  07 Jun 2003; <rac@gentoo.org> net-snmp-5.0.6-r1.ebuild,
-  net-snmp-5.0.6.ebuild, net-snmp-5.0.8.ebuild:
-  Add sed-4 dependency for ebuilds that use sed -i
-
-  05 Jun 2003; <rac@gentoo.org> net-snmp-5.0.6-r1.ebuild,
-  net-snmp-5.0.8.ebuild:
-  Disable the 5.0.6 patch in 5.0.8, as it doesn't exist, and builds without it.
-  Change ${PF} to ${P} so that 5.0.6-r1 finds the patch.
-
-*net-snmp-5.0.8 (26 May 2003)
-
-  26 May 2003; Daniel Ahlberg <aliz@gentoo.org> net-snmp-5.0.8.ebuild :
-  Version bump.
-
-*net-snmp-5.0.6-r1 (26 May 2003)
-
-  14 Jun 2003; Guy Martin <gmsoft@gentoo.org> net-snmp-5.0.6-r1.ebuild :
-  Added hppa to KEYWORDS.
-
-  26 May 2003; Daniel Ahlberg <aliz@gentoo.org> net-snmp-5.0.6-r1.ebuild :
-  Added virtual/snmp.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*net-snmp-5.0.6 (14 Oct 2002)
-
-  29 Mar 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6.ebuild:
-  Add ~alpha to KEYWORDS
-
-  07 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
-  Commented out kerberos support, generates compile errors.
-
-  02 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
-  Removed double quotes.  Closes #5882.  Now using sed for kerberos.
-
-  21 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
-  net-snmp-5.0.6.ebuild, files/net-snmpd.rc6:
-  Fixing type in doc info. Closes #15535.
-
-  06 Apr 2003; Zach Welch <zwelch@gentoo.org> net-snmp-5.0.6.ebuild:
-  add arm keyword
-
-  14 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Security update. Added patch to fix compilation with libwrap.
-
-*net-snmp-5.0.2a-r1 (4 Aug 2002)
-
-  28 Sep 2002; Owen Stampflee <owen@gentoo.org> :
-  Added PPC to KEYWORDS.
-
-  4 Aug 2002; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.2a-r1.ebuild:
-  
-  Closed bug #5882, manually recreate the symlink.
-
-*net-snmp-5.0.2a (23 Jul 2002)
-
-  23 Jul 2002; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.2a.ebuild:
-  Version bump, dropped emake in favor of make, add the host MIB module, and
-  commented out ipv6 transports.
-
-*net-snmp-5.0.1 (29 Jun 2002)
-
-  29 Jun 2002; Bruce A. Locke <blocke@shivan.org> net-snmp-5.0.1.ebuild:
-  ucd-snmp has been renamed to net-snmp and this release appears to be 
-  source incompatible with ucd-snmp
-
-  Known Issue:  The new optional perl module support is disabled (due to
-  configure/make issues) until someone who is familiar with the functionality 
-  can contribute a patch.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
deleted file mode 100644
index 903a7be..0000000
--- a/net-analyzer/net-snmp/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX allow-tmpfs.patch 329 SHA256 464dffe19394d84583d75b863a8f026bb7dc7d12f5304656a889230600816510 SHA512 08e97b54074555384317a877c50116a1f0a93538d6e22c2a865c8948fb4b7af201e43ef103dd633cf023b258f9dab0bf8a8bd92e55206545675548e807bae78f WHIRLPOOL 3585d08ef3c9bd203921b0b2f8c7c47ac5f4e6b23a607fc035673f207cb53d5bb6b3cd7586bc4090253e6c7bc799309cdece465d93e6fded1a94cd4039bf914f
-AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874 SHA512 704b6366c797e2c114b111869f920fd608ba75cdea2854de29f2df0d453906225e9af71318920465bd94a991f771c4a3ab4cf5efc8ee67c65053efa2113d7ee4 WHIRLPOOL b4e0ccc9d8fe3db265aef90ff11e054594e0de75fc2e503d09a64a770de27514d6e1948ead207b4ffa561cd94a82371f20d47dacd90ed6cc59beb72e2b7915d2
-AUX snmpd.conf 598 SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598 SHA512 3df54b15edef7347283aaad6eca4e4222a785f10abdbd42abe6a23b16ced2364e4302a3b8e87a62570b5b1d5d103f14244c7098034c4b941630478d6e72c3a68 WHIRLPOOL 69ef718567becf3d04cc25f0ec6491d7bbf6a9906edba146e6913fcbf41ae6d70d4cc010a217a7297398ce95b52c6d6091859432b8d73be99bee9e06c15ccd24
-AUX snmpd.init.2 797 SHA256 e167c3606b97a32e0831c38504d4eed5deb17b0abf54617d3783c0b37e9850eb SHA512 eed8fd549528b442cf8db847f848d5f264e4f0d9cde624312d3260ec24b05aadac3935bc6f009b4b0043ddcb7ed60dfa216742fab03e075d5ee7b7bce8e5f2c9 WHIRLPOOL 9d91c1da1febeb5a1d5fe17385613004d0cba69e9a49b8815129319a3f0ea3bb9a5ddacc38fba1f303ce9854be7a89c6228ff091e032f5f01d9c624bbc8c2f22
-AUX snmptrapd.conf 635 SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3 SHA512 ed7f5229cb080e77e9a461959e217f3a847eb800f139077bab6a9530683de4be212a2f7abe294b2261093a9e0f4a28ff8124f5ffc74ce0306ebe60d4f7fa3ea6 WHIRLPOOL 8dfc229f48062925957942613bf6125ac2eb7d13bf56869873c37522ccecb570d9bd861bc855c71f21827b9ed5a578a5b3617ed61fd7518571114f9376d051f0
-AUX snmptrapd.init.2 459 SHA256 b4dfa7b9084df5772a60ead0af97c653a4ff75dcf5bc2e661173b342e73a81fa SHA512 36374cc3b6971286c0df13861f34ff07c87e9c2347e47e40115fc97b6a15db60cc776cb57edca05275dc004fd8ca61cbf52db4ffa6750827a9d32d3b44c8c137 WHIRLPOOL b699d4483f9c46c22bfda16132955a483b1fe330b666293a16bfe6de174bec68fa71d7c4f0d276a8829aea56ed1396c2b8a1470b5dbf24c2e6f1bca31ab0f0df
-DIST net-snmp-5.7.2-patches-1.tar.xz 3332 SHA256 de70836fd5baff4c9223f3861eee9e625eea32859b72d7245ba6f2c35c8d7b7e SHA512 f2dfde64c81832619ca851de803a852cf4bc66b8503258bce14cacbc24083be70d100685a3cba4da0b17459bb12eb32cd38242eaafd5e320731b6ac7ee927d6c WHIRLPOOL 9978fce81414a739e65a7d66564fe13ae82059b81ce14f2f212626ee9b06ba842cea770e6918f2a71a5befb82a1d96d6e9c0e57279dcda20abd61305093f457b
-DIST net-snmp-5.7.2.rc1-patches-3.tar.xz 3320 SHA256 d9cbfffe0d458d2c2680d4959e0d5322833fdc7ba94f5a235e7c0c3579197cb0 SHA512 584b74cd7ae041da639889384365ccc7cff8c7d57c5686bf2624194ff55fa1d2b32290979a7b1f19c19381dd396fb5b5fe0535df8abbc4fda8785910a41b4074 WHIRLPOOL 7f72e35418a775d189763d0b0ab7a7235f03c8005016b15a52addeafe3f08d20ae0ecce61789f1ed87f8ec78de39a6fd012b3619cd22177878d981772a9c5c17
-DIST net-snmp-5.7.2.rc1.tar.gz 6277186 SHA256 ac6ffb1468d5d651e446ded30f8aea3efe80925be5794100c3d0e8c21c04b784 SHA512 905375b707909a164943d7394fa5cc6997101e64f3f641f29e2cf309d5572c8cea9c53be4b2f79893c9c00407a3bec44b495f90f4af5663d5da58f2dafc30fc7 WHIRLPOOL 1656b0e9d591d39e47b9a46943bc975d1c1d175799b1656ca877f57285db44ab54bc42ff31b3c9b13d1b60767c90b3af1a99d3c13ed8745106e0b79d97cc31af
-DIST net-snmp-5.7.2.tar.gz 6281352 SHA256 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816 SHA512 6cf9847c30d861f1c7002ca68f8317f84e7a7278ab78e92e6481a5296e0bf1e5f3525ec566002bd307d8d907699e9baef9f3919ba18d0948cc3bb550b99de882 WHIRLPOOL 6654d094a49a41f4039e0adcb6285f89a2bef941ef903a94838419b7784215464c588235273e9744941d48484937fa272496193248d12a730b3d400f5b1a8454
-EBUILD net-snmp-5.7.2.ebuild 4427 SHA256 b841f053070e810793933157a1f0b1fe35cb4451128e83c88cd4d7186a0e74da SHA512 7a158794cd2e7256ee2ba04d20592c68fbd57de3458b318e781a5072d63b8b9c1a5a663acb6adc2429ff493ddfdf7dec33a9f149a660ed18870670d6b2f35686 WHIRLPOOL 907900e1bc6bc66494d91cdbc1ea599393cdbdc8708a04f8f2d753f2adb2b6a67e714bb79a0abef18c951e26856b39d3016cdb4c83f7a9aadb7315fffa3ec684
-EBUILD net-snmp-5.7.2_rc1.ebuild 4338 SHA256 e93021cb8690cecb301a67be3b720a1f63a06f26c8bd838a644e62cae18baf7a SHA512 7f1c565627914d72ef54ccea06b8532b0e5598faed91ff9a5d655f93fa55e7132b1bbfa158b46b388c76a2aaee69b293667c0cdc684547514c4759e46c6fcbc0 WHIRLPOOL 1348538f12492c0c16f9647b3dbe6a6aafdc11029105cada9b8ee9c8900cde55722c900ab3dda8383d935197e94e4a4d5ce81dd8b3f97e75adbc3af7542526ce
-MISC ChangeLog 41866 SHA256 7e6e58d7e02c50906fbb57cbc1e601cb3abe3c9fa1ecaa2407c743299f88b4e3 SHA512 700b8b8bb624f311ebb4ea094fdf6a19cd477eb6f41de6fd3ff791b412f51bb8fb7b1b7b6ceecb74677cb8603d70114370d36454d696245ab88685140866aa5e WHIRLPOOL 11e4b2fc5c481319f26c57de4bd9e9789fe2c3aad90c78d6cd32cbbac8816c9048f044e64ee1de8a4439c14a3d0b719a9138bfd1a7f97d6ea00d4ae83dee9760
-MISC metadata.xml 969 SHA256 1f03f76f0787332dfd77b0631ba1f7a933b1d2facf0ffa5a0d8a258d591971d0 SHA512 d2200fd7ec47d88827b25b7b5ba4d357523b4bc2064671e98e59577a24b707adc64687a96e3fb9e75a2b792d717eb5279063996e64129bc0c9708ae5855951ae WHIRLPOOL 997bbdd7e56790fb82128c87efd7bc638c78cc2d472120410052ed309b9817d88e6ce6a5a7e285d91c60aa96254714b0bc4e6735b803cd69a037e02b223a74b8
diff --git a/net-analyzer/net-snmp/files/allow-tmpfs.patch b/net-analyzer/net-snmp/files/allow-tmpfs.patch
deleted file mode 100644
index baa2087..0000000
--- a/net-analyzer/net-snmp/files/allow-tmpfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- net-snmp-5.7.2_rc1/agent/mibgroup/host/hr_filesys.c.orig    2013-05-10 05:43:17.000000000 +0100
-+++ net-snmp-5.7.2_rc1/agent/mibgroup/host/hr_filesys.c    2013-05-10 05:52:35.000000000 +0100
-@@ -665,7 +665,7 @@
-     "shm",
-     "sockfs",
-     "sysfs",
--    "tmpfs",
-+    /* "tmpfs", */
-     "usbdevfs",
-     "usbfs",
- #endif
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch b/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
deleted file mode 100644
index 9171b69..0000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=248329
-
---- net-snmp-5.1.2/local/snmpconf.orig	2004-04-20 16:20:51.000000000 +0200
-+++ net-snmp-5.1.2/local/snmpconf	2007-07-09 15:34:48.000000000 +0200
-@@ -585,6 +585,7 @@
- 	    }
- 	}
- 	close(O);
-+	system("restorecon $outputf");
-     }
- }
- 
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
deleted file mode 100644
index 97a1d70..0000000
--- a/net-analyzer/net-snmp/files/snmpd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
-
-# Initial (empty) options.
-SNMPD_FLAGS=""
-
-# Enable connection logging.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
-
-# Enable syslog and disable file log.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-#        the /var/agentx directory exists.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
diff --git a/net-analyzer/net-snmp/files/snmpd.init.2 b/net-analyzer/net-snmp/files/snmpd.init.2
deleted file mode 100644
index 6b0ca74..0000000
--- a/net-analyzer/net-snmp/files/snmpd.init.2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init.2,v 1.3 2012/10/22 02:57:05 flameeyes Exp $
-
-SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
-
-extra_started_commands="reload"
-
-command="/usr/sbin/snmpd"
-command_args="-p ${SNMPD_PIDFILE} ${SNMPD_FLAGS}"
-pidfile="${SNMPD_PIDFILE}"
-
-depend() {
-	use logger
-}
-
-checkconfig() {
-	if [ ! -e /etc/snmp/snmpd.conf ] ; then
-		eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
-		return 1
-	fi
-}
-
-start_pre() {
-	checkconfig || return 1
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading ${SVCNAME} configuration"
-	kill -HUP $(cat ${SNMPD_PIDFILE}) 2>&1 > /dev/null
-	eend $?
-}
diff --git a/net-analyzer/net-snmp/files/snmptrapd.conf b/net-analyzer/net-snmp/files/snmptrapd.conf
deleted file mode 100644
index b6259fc..0000000
--- a/net-analyzer/net-snmp/files/snmptrapd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
-
-# extra flags to pass to snmptrapd
-SNMPTRAPD_FLAGS=""
-
-# ignore authentication failure traps
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
-
-# log messages to specified file
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
-
-# log messages to syslog with the specified facility
-# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
diff --git a/net-analyzer/net-snmp/files/snmptrapd.init.2 b/net-analyzer/net-snmp/files/snmptrapd.init.2
deleted file mode 100644
index fa0f807..0000000
--- a/net-analyzer/net-snmp/files/snmptrapd.init.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init.2,v 1.2 2012/10/22 02:57:05 flameeyes Exp $
-
-SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
-
-command="/usr/sbin/snmptrapd"
-command_args="-p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}"
-pidfile="${SNMPTRAPD_PIDFILE}"
-
-depend() {
-	use logger
-}
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
deleted file mode 100644
index b01afd6..0000000
--- a/net-analyzer/net-snmp/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>netmon</herd>
-  <use>
-    <flag name='elf'>Enable the use of elf utils to check uptime on some systems</flag>
-    <flag name='mfd-rewrites'>Use MFD rewrites of mib modules where available</flag>
-    <flag name='rpm'>
-      Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires
-      the bzip2 and zlib flags to be enabled as well.
-    </flag>
-    <flag name='ucd-compat'>
-      Build UCD compatibility library. Increases significantly the
-      install size.
-    </flag>
-    <flag name='pci'>
-      Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up
-      network interface description. This feature is only available on
-      Linux.
-    </flag>
-    <flag name='netlink'>
-      Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of
-      using /proc/net/tcp (Linux only).
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
deleted file mode 100644
index feea276..0000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild,v 1.3 2013/04/26 15:00:10 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE=none
-
-PATCHSET=1
-
-inherit eutils perl-module python autotools
-
-MY_P="${P/_rc/.rc}"
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-patches-${PATCHSET}.tar.xz"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? ( dev-python/setuptools )
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:1.1 )
-	mysql? ( virtual/mysql )"
-
-RDEPEND="${COMMON}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-# Dependency on autoconf due to bug #225893
-DEPEND="${COMMON}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="rpm? ( bzip2 zlib )"
-
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
-	use python && export PYTHON_DIR="$(python_get_sitedir)"
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		emake docsdox
-	fi
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		fixlocalpod
-		use X || rm -f "${D}"/usr/bin/tkmib
-	else
-		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/**/*.pl
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize netsnmp
-	fi
-
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup netsnmp
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
deleted file mode 100644
index cf5592a..0000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild,v 1.13 2013/01/07 04:09:58 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE=none
-
-PATCHSET=3
-
-inherit eutils perl-module python autotools
-
-MY_P="${P/_rc/.rc}"
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-patches-${PATCHSET}.tar.xz"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat"
-
-COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? ( dev-python/setuptools )
-	sys-apps/pciutils
-	lm_sensors? ( sys-apps/lm_sensors )"
-
-RDEPEND="${COMMON}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-# Dependency on autoconf due to bug #225893
-DEPEND="${COMMON}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="rpm? ( bzip2 zlib )"
-
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-	epatch "${FILESDIR}"/allow-tmpfs.patch
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
-	use python && export PYTHON_DIR="$(python_get_sitedir)"
-
-	econf \
-		--with-install-prefix="${D}" \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		--enable-shared --disable-static \
-		--with-ldflags="${LDFLAGS}" \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable !ssl internal-md5) \
-		$(use_with elf) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with bzip2) \
-		$(use_with zlib) \
-		$(use_with rpm) \
-		--without-nl \
-		--with-pci
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		emake docsdox
-	fi
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		fixlocalpod
-		use X || rm -f "${D}"/usr/bin/tkmib
-	else
-		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/**/*.pl
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize netsnmp
-	fi
-
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup netsnmp
-	fi
-}

From b8a6877bc906fb44babff0a234e891e635d6f240 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 4 Apr 2015 17:33:42 -0700
Subject: [PATCH 065/261] update

---
 net-misc/asterisk/Manifest                   |  78 +++++
 net-misc/asterisk/asterisk-11.15.0-r1.ebuild | 324 +++++++++++++++++++
 2 files changed, 402 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.15.0-r1.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index df15615..e8bfe46 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,11 +1,89 @@
+AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c 3131 SHA256 65974f24ae758f43fb3235830618685e6f257b7c6f9b076209796e7f790fd309 SHA512 fffa8d6798277b904ffd95699c78f9f85928b1bf51d9fd98c164f54026293cc48e76a99df5ca2962c2dd6fbecb4b69f449cda6556683fa9aa47c1b99ce35418e WHIRLPOOL 45144e8601fe79e09fc728cb86332fb0f1a6bebeed232fcffd79046e61bdd6390eef221e6e1fa8a0db2bae06c6f385c1d7fb16c025ade30d7c8f9e67f4c41aca
+AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h 613 SHA256 ff05c73dfd410b764af250bac75af8955825186ca8358cb11a2ceb900953d4a2 SHA512 0fbacea90fab45892a41004901e323bfde157b203afe911cd870238f0629a3028752ef54f8ca8b6f6f9b58e72b4532b364ca9e98a9ac3f7ed84f3e3d91820e1a WHIRLPOOL 6b5e5f250741278a7f68eb8192a418c54bdb2708716260658e892e68f8c2d55381d4270924ab7d6f9f13e37e9224cc8cec58a17c458ff468d3d114aff6a750b2
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c 4847 SHA256 903e62dfeb760c45c8ebae3166715615c85da285ce590ef5feb6e7c66682cfa5 SHA512 6afe96330a806422b3a11e47e3d5aca8686f5bb3e4f3bda30c56e74037cc3bf0d55f2d39dafe7c9b67982647e7384aad485d63d29cc512ac5df9cd4b32100b19 WHIRLPOOL 4f8997df5d8add1b3b1fab91dc146bd295d19ec4b8dd2d93b8b04f53c54d03999d862d9dc7df853d5d9c4a4153102105adc679dc1b4d30e97761dd4175d94994
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h 1376 SHA256 5e231946e10d23a5d17b6182808fef7850092f344618c4c8db60aaa39dca15bb SHA512 cb0b4375bace1c61d3884d47e82691063a1fdfb8ad6e4c28016963c83bdda2843479abab89bc571d5d3dfaba896cce4dd5632756fc5ed25fc96eecc1c2c3a3cf WHIRLPOOL 0d43bb16491197f763b53353909c0c78b15dce0642b9e2d0cc10d2d599d2b2235cdda37be0766779670d371be4de5ae34d430b4d96a04b8921bc30f722f8ed6f
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c 8335 SHA256 fa53f7cd92f830d2fa950cfa2256e545bc1a1cd56a5ea2683e3a1fda4b53e187 SHA512 1d71f9b7abd37c3b643edf62c0feb866fae936033ffd33f829bd8818b8c918628adaa8ccae9d4903742bdb91910075e47891ec0aec32e9dd438649462ff0433e WHIRLPOOL bf2296f11109965566bbb43bd1bc83bd66dead18ff0cf3f42b96195ea791cea9255c7b3aafdee446e3422533e33bc8302140dbf671e324510249dbd0fe922d5e
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h 866 SHA256 ca183c69364e2a9dfb209c340c5eab7a14c6818e9334f4c0f9cc9ff8938a4ba1 SHA512 78ca2a9ea565ce9f35df2f1fb93d7d8c6c2174258d621cfad353e04c6bb1c7b2333270c4d2bfef621c6436a58f1d388ada3e7be64119a60f97b663133d6b8938 WHIRLPOOL 7fc1fd1743498e912d486acc509e9086da10d4684c9998cb12cae3569a2b99972a0678478af1baa24f9e0b9a0d655ea3fb24829ea369aa2c5b9dbc1f7b9b319a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c 2233 SHA256 454a7645f4dfba5a1f778fe5fbf072e854c7eb1bfdadb1f9dee80e7040b1de69 SHA512 2472c52534dac936900190a2c3c0003424d484a78f392158d16ed8017ec1223c2108aa332dba096558aed11dcee7f6fc18bfe6dcb98ed8294d7757f9e325a52a WHIRLPOOL 2651c257ea416761d3719b03095ee7609f91c0a2fc587de1c53763fbb86e048207d183dfcf90b5f7677d9f06c601cb5b2eada9e59311f4c7632318051937d554
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h 791 SHA256 8fa3fcfe60b9b6715ec367e741d7bb6b6bf48a20a47434037055d3024407ea71 SHA512 adaf1b484034e833c7fe374dd2d5a95a66c85cf68ac134ba3162d771574f969934ddcfa06dac0461c19e7265f303d8adfc50fdd5334576a16c944fb81a2503d6 WHIRLPOOL 2ce220eed411159c1bbfca98d1faee471e4e36cae740129921211a3388e9a7f2eb59cdf0b79e372f764cc1c178d94048c148d1860eb4caebc4e61718f2fe0478
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c 6028 SHA256 0b63cd18d011a814c5b250e7328e66189c012d41503ef6740d0c85efacb8b78b SHA512 e46b2cfeae0817926692e427692aec201f9c1c7b01716949958b6a3031ae175816b6f5caadabaabf0d794b302a19d98f00577190008cb6d5487e7bfa7fcec3bd WHIRLPOOL c3667ec3a9244cbbd2335fae14b2b80097dddd91d1aef2462dde3b41b0715c31fc6a0c0cef9acccc5527c765c5caa00373b8f1f37925eacc21ce7d0220cbf393
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h 1626 SHA256 1cc6c4a1723b8fe27ff35f55b0fff5dcc0a9cbc90072259000ddd6cfff030fa8 SHA512 6b6d8a1ba3f4d8aa95b62c726ed7ab7197c9987f2596a6adb8e9b317b47e6b4b3ba1b61f61355f9415ff1813443fbdcf968b144c628f0dcdcb76f7c590eebccf WHIRLPOOL 558a4f5ba73184bc5ff6c77cb35f9eb4d1be95472c626f9f7536d703f6aa70c9ed264b1f46eddd88e42dc884584f0b2a918d84d9afa7fc3e095b2ba8678dcb3a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c 1701 SHA256 cdc1f00965079e598c9f60c91bedf552605bfabfebaaf2c5e745e423548607f9 SHA512 bd46c1e217fe0efbfc68aa350e5b26714422ba0bb711fe487a87b76487cd1161730d5ba91f713b1a6b57e09c18e7a5ea397f08f05cd625c4313d0f13e1f1b129 WHIRLPOOL 4db10848f3c9c489ce982103a268942f6dfbb7f4191a5de3896ddab9c38aa1bc778ddcd91fc3d9af3828676090631b43e6d173f3adf6946936aa4471211a656b
+AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h 617 SHA256 5600c59f34a4a3ce3cf93a1cc5a6964f0f9f619b10cdf91c6050d002064beba4 SHA512 f758014a8d0c9f4ac286eecfbabff08ca6a54cbaea1bb801a2264a6eeb2393ca2bbe52bb98f12a448e98415127cbc4662fa5ad65767a1e2787dd5513b1205998 WHIRLPOOL 670402f97718fe7bf3a845a1f5f37ca38ea0e1a51841d3b31bacb77f81c34db396f340b773dd6664998b292f9a576b6dd5c8f6ab0d58cf621ac4ffc2a314b10d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.c 36801 SHA256 cb1e41c3db63770b9a40159d196ed80ac6ebbf42d2e664e4bb9efc68eb855812 SHA512 591fd5226c44bc52ac44bb328ddd1de81c3c07d12dcdeb15fcf87a0589ba37dd3284e1906588aa8fb9c6c80e8be0859d29ec7101769d07db99b474db50f7b160 WHIRLPOOL fc15a6787ec0b0acffae05d35e175d7edff9a90cdb7bb128dc37bc895386007a9d64b873f0caeebbd2a03fca1c56e59a6e28a716abfac56d8e5bc66fb11e5853
+AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.h 1607 SHA256 a99d6a17f4961429a4b61d2a052d86d6d32d9bd6cfa9714c59c1c5faef724be1 SHA512 7ed00076dceb3b6dc75467157daf1be38269b8de4890e238452c962306d3a9f05d7521b11fa60d2fca71fa5b8908dad2cf85bc86c5761068a5b182d42a48d7ab WHIRLPOOL b1c2980d5e746852ca1c430e102f3b2a52f93043b719582803db25df11444b1f1786f7c8c5f13a31cf2758382a26b1bc31a3816a483a45db562a44a48b25ca74
+AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.c 6751 SHA256 955913c3a9deaa2a49c3a84181ba16d51c5106793d566b1bbb3c3423366dafc3 SHA512 5d58fe85e244f613bbe3f3d756fa4d0fdfb1de384836133b2077633588915dbcc1305631aaaf9cfe39c68fd0c6a9e7cc0b999fe0a6937370681001a20eb6e957 WHIRLPOOL d0ea64386475ce650f187f833ae51a3414790aa8f2b6d61459fcd9a6e533209b2fcadffb75e38635da0223c39219decd6dbe08afaef2a967d50acc2b8bc12bf3
+AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.h 1993 SHA256 d46a70ad1cc9f465a8f9e0bfb82ec8d31e8e65a94d2a57a0e354543ec342fba3 SHA512 e569740b62e45cbe8bc5c20dd0a0c095530845d8353254debe8d03e9fdf5c47f5dbce972f69d8e831acb08bf3ac61e91079637b2c35288354762a7c2298b7a23 WHIRLPOOL d41bf42b25e3894b709cd94a9f966c5e3e2517bee41cf56fc3115179c7b55695da7372a77342d553eb02491ffb051290d284a26dba28f57b2ba5e9d145e0079c
+AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c 7826 SHA256 68e34fb75db5fcaade4e9a58b254d80bca0b062502fb86090da30eaa27a3cd33 SHA512 89f1d3a68e2013abb2d60355c9ed57652f03332267ccbb1c4a9f5658e5f7e201fad6f8544fc14b9ac9227be401edee10a2d65a9b9ba410ecc2ff3140666efada WHIRLPOOL 8b578c86ae873195d44a9535a4f0861c9c7d1c5a15cea5bef3a849cfbb26c6acd8cf91642109b101fce9cd4da98131f81f686e451215d168d947c5b53f4de5df
+AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h 864 SHA256 8dde21a55ca985b657028a93c8f837c3ab98557854e41859864523c52d8777c4 SHA512 2b25bc764488bd831764880e8597a418ce824f111230e146f56627d474e9dd22d79488b56676fc9d41c3185bb92dfb8894e3a6569de76dfdace3bf41a55e9aa0 WHIRLPOOL f529a014ba19c1f035135c88c90ee7cd1d0186237cf8c1965cd4baadab636a3d7e30091ef414c38c16a8e67161b4ae656d9fe82a4a3b31548438362b675ed716
+AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.c 20605 SHA256 c2cbcfd67edf91bcbb27cd4e88fece09242466c80c733583f6c54cda1b363964 SHA512 788f81f8d32790417847dcbcd9aa4eace84a140cffaa16e0d3ae2a17419142e4e5dd40ecb98a785e48c25f060b14a2878fccf879e8a169e412ea4b89668376cf WHIRLPOOL 4bf8633345dcdfaf0d085090ee03c90774c8d9d6f586fbbaf0c1e16dfb43d8e6123a340f2b3536b30cb7d633e71c697c0c521b24ba69c507e5fa6bbb36d72ebe
+AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.h 828 SHA256 6504cbd083f939a0578be86db60223306de90b833c23178c9cd39f15b995b288 SHA512 99d94e49d8c0d12cd456fc007ae9a5ca6a406e72d17308a72c6ca9a57d513b3d822e67504262ee7790213e265825305775f7c893166a55abfbac7402682c57c8 WHIRLPOOL 5f66a06bfa3ea6fb6498f6d3d815bfa4ee39ead8ffbb52c8d5b83a4a3dced1f0a121424aa7c8320e01ec791a4378db9a0e6391f6aae677d586fdbd882451c621
+AUX 1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk 643 SHA256 cdf3927d184f82e28d94f6614c7e9dd107db5d3f58f59c5fd22aabaf2936a755 SHA512 0af248f3f09fadb3e9dbc496878694d273c47b6294dce7a3b76b343e0e198496ffbf47116edefd3f2e790641ee94441295a84145c36c0a9654587449ebe60458 WHIRLPOOL 73f5f31e5ff003dfb36c9ddc6596d0d7b8b0a8085adffa08897df22d60b9106ad7458e606532ff1ae8afa6d2b6186602f665383c2a907dd0eff6b1877a3159bf
+AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.c 5639 SHA256 0b252aee26607ff1b21834f5dac25f6a0356f3214fffb908ccd66776d04d4513 SHA512 d4a1b40099cf6041a00270b77b60e93a8e75aeaedbf060b2b8ef0387d810686646dbe6fc64cc19666939651dceebd38b6e38a7ab95d23784a6a89fe8c5c59a93 WHIRLPOOL 669e966ea4d29e3307a94f9249530a0d4243e9717ebac273d8eae207fe5f3ef1f1929e8ec6d519fbe2f5d13a4127493f45ab975d665bf40555153b9106f21646
+AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.h 2999 SHA256 f917999699fa2fcc8934401cd42093d4032c23f1316e6480ecbd0acc63d30465 SHA512 2a3e7f25b1312830e04dc0beeb39f07b9fbda0dcf319db66c1632a4b3c5801e530d52b2d0153bfa3f7ba939ba4f70cc7470d71d604b9ef74ff37f2dcc90bdd32 WHIRLPOOL 2a916b712af72da3da22a79d113b1983e783df262c69b7654279ef793565ae7e5f27c15b67150b9222b7441d5f081b3d09f6dbb90cf6fd512f8f22bbf6788cea
+AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.c 2665 SHA256 354890fd77ed9669f24deb288619cc51b2caed5043135e994b95006a598f7d1b SHA512 42fa6a57c2756565487bf5986cb4e3845c815342f16e65fc36efe261764dcdc9e3363298fc92cd93778fbd057f154320e5a8c118278b18fbc7c94db7b0cee565 WHIRLPOOL 0186018b7d4577744592c329bdfd7dbfb822ceff8cb3d7dec8651306799a02c16cbe6b44bce5346ac6145818c732d4165b9e0ce8b4f2931d040ff988f9854600
+AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.h 863 SHA256 8554210e762cfb79c89282ea028957d1ca91fe3d924f887c41b6a8e70ea9c9ef SHA512 217bc0397cde4f4aa9f48fb1bda2a9860343a4029d4e91a9541a08fb4a37626f3ab2a0e2d3d24b7446c2b1141887c2d467c67c71a13b9f2d99f53db469379f93 WHIRLPOOL 1da8466d668c0fbf73140031f35fc9c82ea95a49323c476b6ce4804ed73f19df5e25cd5fd2c798ee4189e58af3e57d99c4acf3f6db1e18e11ae24e6df1723827
+AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c 5043 SHA256 1dfe5eecb11d9ca2afecc11188c243cf25e560e458a1636d35e9575ede9b95d4 SHA512 51a8f6e8532d4b94430993b5f33405b81c457b59ecc2b1105819be85d3bd033bc6ee6554845457a6aa0130906c2600eb24a4eb9607e801fdb01104a7efc473db WHIRLPOOL a683e9022342e8b029b678c25d2250a339eb1cfa3cec3649be8e7d81fc7f2da4f8f99d0e22d6505704845fa476f753b01a0283cec4dde63e3ffa779e9349b6bd
+AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h 652 SHA256 dd2fc6a5038fb6df8b005348fdb067b595b123d1e4f035ab90d5d95d65f495b8 SHA512 a4dd1cba1696ed668c99fdc0dd05dc880ed6d683585f83f8c58bd206ce2ee97671da9232717818570ddfdcc5df9d3968978fdac69c70590b5da3ebea454f806e WHIRLPOOL 5b6d2630e20efa70dda2867582f47ccd123f595f50bf2be041f95ecf66b767764514818bc246cd57aebc2f5a009fe8c33bf16868c94ee8c00196b430e247643d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.c 9314 SHA256 426f51a9af77f05baf3d30a4a6a7275c6a63ecdb0c518c2a3e8d8bb714958efa SHA512 2a69a5bbfc3ca5e98a052644896f6342c136b484ff6973b4bc8dce31937685dda16790f3907671635e8a7e67297cf1e88be8b284ce13f2f074f4cc9d835a4853 WHIRLPOOL c7bb97de0898b7545aa32f13ef72594f319a0cfd881b6d6d985d4d536774324a6b081acb0f67606633fb81fd6bd7235889d805ddb377eebdec8754e01c84287d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.h 3471 SHA256 b0db99729d1dd224981543884ebb058ef7646129e1995166dc6f14a4090532a0 SHA512 cda538d5f1740c364683f06f3293e632dad8149eeed72069e5111e7984425a44dd4ab0e9a6d046463e21f89f02535bcd1dbd947ce1563ba0fcd3659561d0b452 WHIRLPOOL 2e24f429c246d66469c2d9d21c7866697fcc5f65daca0841aad6964252c5fcdd84d2a2d655f20a9536520ac6dc1bb3a6ad66d27f351a73ac10fe396d729c3a62
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.c 1378 SHA256 1b64cb361a3100fa408b5c6cc6a26e5f48c32128026e53ce6c2208538e3a4301 SHA512 da3d6c66ccda960791d88f2bc28a6216badfa2b41e1a1925e0a56e214dbe0e9b62c1304fd8f0fb90e2c5cccff1b9d5353413f3ea92e67131eb257c51fb986fc8 WHIRLPOOL e9ec9996747c2319ac216b77c3f0a5f175c14c15108da978936d16ee89b5cce0e3e6b40e6e208b07e8879738380d6fdf60775451211f3742ee543385c3c21d46
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.h 588 SHA256 b3a2c0c917216ce1cb3e4199dd68adf7b4ee13ba51faf31836368b1791962423 SHA512 84a894760438e9915431201a5d37ab34afb22b712a2e681fd9c7bd688da7d116b68feb3234eb6f50dd4f7b8e49a3c1faf4db0a1d6aa7450be8f04a2b7367e7d9 WHIRLPOOL 36107abb5c99a6b6235dc385c6bbaa249a26637314dc8792274d8d546e7991be13f94662d07eb604e0ed89d773512f8bc71d7e1ab53fffd21d2cfadc9c90783a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c 1373 SHA256 0fae033bc1c53122f3fb3bd7e5f1888d4cb76b26e80ec2897b6bd965193448ab SHA512 e7ab5667a23b4c19a204ce1fde2c580ad1cae4b55821efcdb76201b71dcf7856cde1d1b1fd6fe3cf94ed6f3bdd47823ec533185f72910500dc7ceb66ffaaa9c4 WHIRLPOOL d8308194e89bc2919bf7a3bf16db42bc4fadbf4678d48315c35acc1ab1f7c259c929e56dcd66b07494d464b8bf2a22d227a3b2970877ff4c5131478e874916c6
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h 588 SHA256 e0fc0c1410940b4d68ca6c1987f27372376dae3a8ca272d71230b11c7e0e1f24 SHA512 3a56a7d3bf2ad086eafe1b05d3514f0275ec4d00e19fbd22418374953d7e36b85ba44d1e72fae5587772f2cd22833e4e65acfbb25bbe1ab788250b40d39b4e12 WHIRLPOOL 036f488d319eaf830c0b0be43868d5c529a3e490657421ff59380edd3d98ba3119efa8c68ccce37850aa8209d0d80f6d249a340693e9b2934c4bffe28cca1a40
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c 2885 SHA256 0baae1dc6cf43583814f85fae53622ccee0205d78f35b81dd16856394a474395 SHA512 20211f18544285e615292225284f1bdb3264e8c900be3d28c31ee7e83432ce810dfd182a7941caf778a47f70adefcf6eb26d52e757043f1ba16a356d3841ab4f WHIRLPOOL c08085a0d1a5e0319302f0833d3b52d6db079c6640766942e59da4d0d8aaf1093f4ea968f8b33d82a42922861e4a5b3d06be5a242e05a536b4819c48cfa222ec
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h 986 SHA256 717e603767a286de36d7bf6587cf161cb05bab968453d50b16cda8a519b79475 SHA512 89dfddcb8ca0eac9c096b0d73d28194ab8f090798ed479a117f3f474e750d9fc6fd56eee9d778ed200aaf0bddfd7c2e905f8158652ab03a098c84a6cf90834e1 WHIRLPOOL edb9f7fa35252b61c8652271bfd097da8ef9695cf931891b973708749892f5c6df6ce8d78320c96eb5181c721a0158d124c70d5c36b91d6b4a81fbba4c14884d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c 14051 SHA256 f0db960244b8c58b505ad8293ffb51acab0e7f99ba1be58cceb6c15d6a5f7df8 SHA512 795b8cb0bfefabef66a0af84953cbcfb77f698b6bfeb468113ec2d2542c48890eba99a6f5e6a0964cbd6e988d7a094c80b4742301d0b785c682fed011fa73d18 WHIRLPOOL f2f1c6ba96a037ffb0c2dd6b0d942e4fc44bc35699e625565d3104be35a54811cf37684019473ac1c76d42d6fb5eb6f1a7cdf6591976c78b3d82610e30d604bc
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h 1086 SHA256 f00855f862619efdb20e29b5423b71a0c289359879f4ffc4b08bd38385d3b272 SHA512 7efcbd65bd3b8431e976254c5e840beebea057041906f575d65294951c7eb5284ca02a0ce5cc3fb8cbd3f01dc0faa4ae9cc8cc6dd7ef7e23087eeca78616f6c9 WHIRLPOOL 0d417a60496c3034081273a2a31b8f7dc9935090ff7e030cc12b4670d33ca86cd4bdfa49ab37a7f31aee7d2d9d7cda51ab42661e2f3173024e08db651910fe17
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c 20730 SHA256 869ce48ad05eac43d7fdf19fb5841614618674aaff87a1ce51de8552dd792337 SHA512 79cd2cd13523151123cc26da8f319af1cc2a831ab1865e371d1c108bddf85d18f4a93991440a057c0c77eb727f79a8da09bf1038658da85f573427be08d9da29 WHIRLPOOL a844e74990c79d8525e90c6cd7f111f267c230273fb633cf76f13a3c744f52514552e63ff4b2c0a3b9929b6aefd31069bc5f620d5bf01f857163f8c611c67ae2
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h 1258 SHA256 02017803f44419ff2e2dd86dd199ba183cdbbe0e84e683bb9ce38b604099c393 SHA512 272807b3e15a7160f1e14557c5e0217479b192821b0e9eadccdc65deb93ccebd57dac1b3bf571551b219841cd1d6701a3d7e44253576becb79ac0c4d3b898f00 WHIRLPOOL f8bd722f6d07f6db244b688dd25cf1bee49cae6f47df04f33c9f77147a3b9dc91ee1877cc126bc64dc1811b2a7a172cab1bae5d3c05bb0dbdc527da5374ebbce
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h 6251 SHA256 77fc1ed8b7d427340bda49df146a219ffba56f1cb9562e0032f104d33217d860 SHA512 7940fd069a4d6a230701b0d86fd83cbd7f6cf4c2f3362a2205e78bcf8bd86e7b4c5a423693a263b2df972dde53e6b33b0b4142470a09548ca46d2bc1175b3c24 WHIRLPOOL d314e6761321485010727c90e2d60efa3560bf509e63bdf21f1ebad57bc8ba111c88dae15ab5597d946d15f30c5c0a527872cf19159a94dc851feb916f0062ff
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c 17526 SHA256 b20b4ceb50a17b050b56387ec616a497c2d3613845d26ab370866f1ac5accfdd SHA512 80e112e3c11a8588c7582deb78e1c28d92eedb638e0813e7f44527aa9a5f302cf9bb10a39dcc097794ac6fe1ab2e23238167f4f5c3c7c3dafff0df8ad5196b76 WHIRLPOOL 1b5b20d6f8f9f85205c4b66a08db31d17b0024e67035207c755d7692656f511e7d7be37822d2f2c7004c14124eeb027086e58617dc109b2b9cb30c0c597aebb5
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h 997 SHA256 4bb62c648dd187367e5787e9b2af4c331257b02ca14b9179deaae2eed5436c52 SHA512 d011d3e153009485fc29e8dfa1d2ceb78e5393d1f3acb4dc3d4a4590ac0cb65b13181202d804639ced5e6fac7867d6dae098f92229bf96a7e03131f098d896a8 WHIRLPOOL d022a17256191b0de5716d086e4722a1cb3f106e5c8195982b49eb9130626fa8f78f9040f8b3c9913f781e2c9277bc6f5a50c54ab6997727f4c3a82701418330
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c 9078 SHA256 be1a99b227857570fcedca398c989bf201fb71356dc2a88ac77a46b4bdc1c834 SHA512 484038334898804952a7fe3534dae654fa798c2df4e0d13eddfc59083697305cd6dc677db13aa7d42a80ecc8a6238c4d825d7819c5eec0c7dc10f59b903a43bf WHIRLPOOL 418ee6d97fd9d81efd118acb4369162063c138832437eb02242e748fb8f0d9c593b4560ee5064556cfa27cdd25babbb62dcacb6f97cf1d8c346d40c050d328fd
+AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.c 7667 SHA256 ed2940504c832075bde8d6b8819b8b43a0f609e1543c4ab45feeae9fd4737d8a SHA512 06f1c936fd7e144c0cd16f9780140a8056a6fba96a4b3136acfb405d161313369250b1d87a1d973e7e214c2201e58835d30c6907131ec03dbabebfb41af7014d WHIRLPOOL 8b70576d17f3706ca49cf54f89cff6c143216a15bf1666a85ce6babd889565d0dad43a407c05a726e75b68c7f2cd5e778944903bf40bcb446b878aed29475271
+AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.h 579 SHA256 47024fb68e7c00f8b89cf2df41a57debcea098912fc80915fbf258f1377b3ea8 SHA512 2a912d218e6850483126dbd30f2026e29e513a101123fc2b55ce48eed9ac3e81192a410e08d0667a95b522b08f16a363bee574ce1e8ad8fb408135271a42a130 WHIRLPOOL 77830511830166c37c6fc27324fe337864d7639305b1f45c18a4646ed0de6599a5bf9d0051777c46ff354f7b12c8b953d91e915aefd9c5be90efea3c9d1e7e46
+AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.c 5628 SHA256 8715717aeb9cdf79f235793abd6cfa07dec0ef39605d9acb02cabb8f8498090a SHA512 4c9e06f54ffdb9e90fe0553d308390ec9b41e6c082189798a39e0b748a18541f726e364b5cc4793f159a9d44ef043a84d882012b7e89c7ea91d1672dd077b7d6 WHIRLPOOL ef94337cc199a015911cd11cd65b5c3784a861d69f3e66203fe44846c528ae3dc24fbb3ee2f06aa51a3dff6b78d9c7dec479be59dab4f133ffcdcc982fb11770
+AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.h 2688 SHA256 4daa342a3a2255d23d9fea030ccbeeb24c74e0e04ca101294a81c5c7feff3ec3 SHA512 f0d123298b112c6f46afa4b2a804398faba2a71eaed9537a0f99ad648901067ffcbfd224edc2aa62897a225ea66ca7af35c1f28f364d711263ddacf9e35b860f WHIRLPOOL 44b2602be68c7729ddf15438557dcb55fa7868ef4bf75d4bba0759a5b5e24e27d299658b641f4c20c486fe72360deaab40a080ce508b1b27a326e1062ea26638
+AUX 1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt 373442 SHA256 be5d79cc62d72ddc8ead6dede0ee5fff225305852b0beab2fca67f39e2aec47d SHA512 ad3df37c2dd65f4aeef4cb57f0052577e59bf9b0b5dce92664e77db016ae02519050d2ae4db66f034affec40f466c83dafdd56f29197ff3442b47d4fa358b7b6 WHIRLPOOL c98d09382df6f6872db855ddd9d090ec782db58871d22335e5639292d631c9371f9a4dd588f6a6a4f8e29e9cce518b743736a2c3880fcacc462a9082acd0fb2b
+AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c 1630 SHA256 aaa8be099a90e35d9f84dc2ee3294288d3f8d701a4191535c5eeefff3bec7ee4 SHA512 2ce9a5208e005ef9614fc7198a6858195d542ceae9ac78688ba6c5706fdc33a0014aecbb21d23721f9a9aaf67d6021247b30fd0618bb65c5486e241d3a85ff56 WHIRLPOOL 0572f8f8c46363aadaace26b5a017021be79b46f0ae418488c39b94f68d63a041f32ef7b2a97710a7310f0ae33ff53b1a732ea9c2d6da143501a18e18d46b248
+AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h 589 SHA256 62d687a7f3d11ebd19d9db9d6f29195a5dbbb8be6fd03740769ea22024b1dd1c SHA512 e7b8dc42e632153b45be4162fb166862e508c92d424ca4a1ba2ea4105d3ad7017b7e8dd141116de7b75f89084ee1b43d57b37046e355f3c064dbca0d4013ecae WHIRLPOOL 0a8890d9fba910b187cc554cb3fdb0b1d5e37c75cdf848756514ef78f45ff97f37fd456e7c1575d5acb819c4327b53668cc5c136214307a20f29ccba49b88ab0
+AUX 1.4.39.1/asterisk.confd 2207 SHA256 8d1e6061651291a754cab409bb7fd79171784c324c1e93d81f8f4b7a158d902e SHA512 5efb2e9944c0d6a22f4c5c3b746d44f03f2a862116eebbdb2e2b414ff6418aa14e61c7180053bcc9a6f8472aead98d18c9ed384fd119cc042b9bf30639fe5bf1 WHIRLPOOL 159d69a8ed3bee8bf31b46ba47a78bf1b7cea5be35982de42a0f0092885fd2ff55f712ee87909cbb23a0026537bd1959c8e328309093427f61d60fd30e75a855
+AUX 1.4.39.1/asterisk.initd 7274 SHA256 51eeb0a06fcac7680d8d21fda8b801d06f98045a824a820b6b474c0de97b0258 SHA512 c4f86b3ca301913a5e174c04e6fef234e5bf8c4f88673d900d50f120747206218b206238927ae881446c8eaa26b63a1ecb5f75cba17b397c168552704b859ac7 WHIRLPOOL 19db63ef40715efa4c94c29e8e05c9416dfd580611f52b84ed43de16996c39925558767b3b7675e764283a8cb51f8f3c7b5cfc828b268a3f89d70c4b9c1ffc11
+AUX 1.4.39.1/asterisk.logrotate 247 SHA256 b61c3d7614654c9a4c48b8963f7c4caf60ed74e0ae916fe3b0212619fab1cc24 SHA512 68a9fb2f3c5c992583ec4d5b5d2427d460a268f8b3b86c39314f1a481aac025c5e39c71a775c687df40d4d1f1e2178ba9aa1c3796f4cb0bc9e67af3a27628453 WHIRLPOOL f3065acc5f82b02a371e022dd50a20c63724f9853da8c593d457046dfe958bba32bfad783f16cd124775208d33608a5af6e378216e2a681bb7c841ceb1019064
+AUX 1.4.39.1/dahdi.initd 5962 SHA256 319003d37d0608edab1a8d8411fe666f2ddaede791e7bda5b0beafa3b4bda07a SHA512 d70184172cb83e37bbe6403de3488471b6339e8d10379a80eb497895a41ce4d5a248d13900736223e5629723ea164802edd6ae14b54c786464a4da426fe109c5 WHIRLPOOL 43263a4a5ac1be34e676b23b19040a4514db2bb4c11ae224720da10c381790687d2901b41d1b16e1fb32d6ae9b7f9816016c9b7df01e32b85fdc9bc662364de2
+AUX 1.4.39.1/patches/apps_.moduleinfo.patch 22296 SHA256 c7923ec9b5b2d62b8c7766f77a3f718709c66e2a498a96ee3965c4a9687541c6 SHA512 5bcd36a56e6b1d008ae58e9398ebd0a51b98b649f1a91b45775a0c807234f2f83e132644c1fa05e88f9365012c68ebc59b5695472b3c944beee157d8d2f70553 WHIRLPOOL dd3a44837969a8f0ad197f73f992e91a8429537695704ac04457e067d786c3305b852a0b6f0d6b011e280165053b0ee632d333bc8058ea19fd550214f4d62f3b
+AUX 1.4.39.1/patches/apps_app_meetme.c.patch 424 SHA256 32935b7cfe6e6a0f6d3a5c1510cb4ca829d9c3d8e5bf6379177b31b3e491c27c SHA512 9a510bfc09acd1b1946f407cc1fc2b066e66604f6e487cd5eb90c70cbb4151ba110001b3204988c7135f979c6d3ed27287a77d1e43fa82a0f780ad4cb98b583e WHIRLPOOL 16085b59bde8555e4d6b8980d23af40fde29e770cde7cdf6fdd9c04abd4478475b1f888d150af3231c6ddab8874c40a80e51385a60a42bfcf51baf5538e879cd
+AUX 1.4.39.1/patches/apps_app_waitforsilence.c.patch 1148 SHA256 581f27ef827cb77ef691e5432808d381836599927c3eb9a1fb657ff97bc66f67 SHA512 658f86fd89b7cd749ce353a3cdcf75c7a04fe1f926c43768fab8d9f74fee971248cffaaa55b10b11a319097faedaad08fa0aec7f81f81bd4810f11e443502712 WHIRLPOOL 71aeb0350b91ed1ce76dcd23909fef32a30935c83c4101759d6034c854ce6c626eb02e73a7765611b3c56539bfdbf68f1c04b33f77004ae065f654f191ae3514
+AUX 1.4.39.1/patches/build_tools_menuselect-deps.in.patch 357 SHA256 b4e0635fd44bae5dd4ee0326fea2d8236db01b7ed223af188706bf4ba30f6d41 SHA512 991f5c44095e4e39bc0089ed382956705e0fceb2579e708203564a297f867f70323af93d2375d4bcae308dedb59a22c709b915614acdcfb8a1a45d70911ac0bd WHIRLPOOL aa7f47c9905f6432e128b3d018b0adc3bc8ea6eda3acf1e561cf54b4cf9fff5741dc84917bb7f05cd677855b5bcb5d54b75e11ecc680efae1cffb454227e1fff
+AUX 1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch 309 SHA256 a1571d189c7eb3b128da4455901ac5a7d1729aa436d3ec5f9c9242bc725dc6dd SHA512 62e3580f8438a2ef8e3de4ce3e88d83bdfd598ba613ade58d4466932f3489bb22ed602d5b8c834ba25f1e4694a88dda5635749097b9d508a73cf373a8db9ab96 WHIRLPOOL f998580662dc1c46561bcc07c4a186aac64ae7890040a5ca7d4613dd5ff0633eee0bbc1b62cca21657d60576f8524acaf494609d17faab201e76b5d9253ab29c
+AUX 1.4.39.1/patches/channels_.moduleinfo.patch 471 SHA256 a86d18367d573a0aef594b134152db872564a32c9ac7d7bf589a4da3f902343f SHA512 65a19d221a2ba4cc79ea39036c47ffb18c1721b724903bccc614d29510bd50ac4533f37a0378f2ab872833dd002716614320ce1027009c56f9ff5ee1b60d5a76 WHIRLPOOL b229889b44b0faf82ace6951f341571ab84e1ff96108e502f904ff65a4ec41bbc61aa480f46e83df9a7f34e3b399a63e049b695ee4d7d71727cd9c46643e1703
+AUX 1.4.39.1/patches/channels_chan_dahdi.c.patch 68606 SHA256 c9ad2b9504a46ec03152bfed9db986c5ac0b639e9137c55628652f7fc98eb77e SHA512 4340b56589c3bc199c0b3e64144f17b99eb8d38759409eb37ae661ff25836f5434b8d8e373cd57d8ec458f10a98607df1d74ee0f9652b63c668810a0a75a5d87 WHIRLPOOL 55b33908d07135b142d12360720f93f13768c3feaa4d5c6975fe99979256e82e13357cd7dd07507595d144180de36492baf7b7f77313ab6b6cc0789a412a58a8
+AUX 1.4.39.1/patches/channels_chan_sip.c.patch 2986 SHA256 9a8979de38816e1b88b6f62ef88e2231e399911b3bf8776f6faebd43305473dd SHA512 22dde38de229635d8557d6350e88486fa3d981ee4e88148224359c53cb9a00b6b8e6bea7d09129a851148d6bdb6607289ddc42ef332b3ddce9d7a3f8bf36c0b3 WHIRLPOOL 06ae2e1d561ebf07d695460f48e257ec916e109f5b5e143197a6e57325249a6de59407cd86022fc7007cd2ef4432464586373c2326bce414bf7347e8f949fd73
+AUX 1.4.39.1/patches/configure.ac.patch 958 SHA256 944a1f08e49246a3bb89564798eadcc8c3c374c7f9979d98134e698fde2fd424 SHA512 4a7a9c9e05de8005379cb8664ab420147ade05144fab12ef13cf54811c9a74461a6492c9532b17c6ba22523a238ca4110c792d7d1f00c7e353901f806c984389 WHIRLPOOL 6178daf41c038c9b241b1f5864a9aae4735b140a76f7c8061492e5816a947e8f46fef1c585f99a78d29f824cc90e59d45c23106a6c2160f35d6e3d3c8047e523
+AUX 1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch 579 SHA256 618382d3ea634929676107ec08c75d11d8abb77a303cd265bd04329ba43d866c SHA512 f609b2c3967e97d9b61a1d1b46e897071294c78ff3eac3b10a0419b2c5744912e126a230f15b5a791a6a372a08c2395c0400fd54d16abc943645925a4df7186c WHIRLPOOL 35a97ddc399c29fdcfcd7f8e647a5656c3a4b7bcae51d544695fff3497d1c5b6aa4c6a3ab7bb89d8d946056fd9a29dca1c7c4da1cb32cf4e293bf14d0b7e5202
+AUX 1.4.39.1/patches/include_asterisk_channel.h.patch 1315 SHA256 9ca0f0d9975147d4fdc1ba83a103644966dda141af103052c6e6eae162ce4fe1 SHA512 4b8ca0549c3f608d10b85703e1a21f6341578b04611877a9c3ff57e6f2af57032b21dc7af4ff6bf745fe99bb7990762e07941e9b314ca754df0ed53b24a3746b WHIRLPOOL 939a4ea4fa9c7343deeb7146abdf2e607ac866701f3d1dd05326acb03bcf76bd848c8af2895aacc33987dd7c6e847bbf76f1fb2d20e4d6c10421d56b4906229d
+AUX 1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch 424 SHA256 fffcf7ce5185dca3d39588651cca7e971bcb7806097a78e7d507b3953363c20e SHA512 d0f22a71b197d366e590844ccff8c3bca2e7108c4cbbb020ef9ff3f04de1be0c9d955bbe90df1e6b675cb64a6f72d56fe1c81099e46209a4f2d21752d66808ed WHIRLPOOL 4837e9a2af92d8ddefe7d078f1c68ace0ea153f071319e08b5bd79e93dce14bbeec21dd7c697b5a9473592eb703e18da4509b6a6dc3a3789cda9f80215438697
+AUX 1.4.39.1/patches/main_channel.c.patch 2205 SHA256 c8dd25ff0b90cdcc3916dcb3f1d36520b6b629b4d34e57d27633a995197d917e SHA512 fc4e6ee97c8b018efa27bc61a1713311dd131ac96a30d791064c6a60e80ce8c3a7ce1b9a8f157bf6703b28ff44f144a1264d2423e714d644ee462984414ed7a9 WHIRLPOOL 93cbe3acfb9762b7536e95cdf52fd65eff3870c188067e8a3398c0a3124bb002a6f2738b7370f8cf2e5047f31661cb266be981f59e97750abba8cf7f3d4382fb
+AUX 1.4.39.1/patches/main_manager.c.patch 1708 SHA256 175df28eccbc39d9b367d908dfe64a8fdcc7d5d1488151db459c47fe3c6f91e2 SHA512 5005888c0ddb753597bbe58971043fe82e15cadb3ef02c93b9896fe86937e03305eb0b3d7cfe36e3390685a3c757c684d5c39b5abfaf406b4c4c74453e40b554 WHIRLPOOL 7b2cafc0c0313ee40591f1d27b892cb06016b65ed05825a71036b80b62f11eab6b822741f9a2eba9bb2c44e818e9607be188dfafda124ff0631907f6bdb17292
+AUX 1.4.39.1/patches/main_pbx.c.patch 2337 SHA256 3807d9633ec385ca94b8263334730ad861fa4bfde62dec4946e7d290ff42e160 SHA512 a30ab565b7bbf949e298b6fa76372641e65a25b05ddef26bacedbfcedb419d0d4e8e959b2c0f8491ab6f13a88444d6b161d57bf41ce9ee933474f7e72ce29414 WHIRLPOOL 7886801991967861ae3c39b5af2f2731297df35f9edeffa05e108c8696c5e91bb9b32f52f221a0a1ba24af47d4c61d907c5f99eb9ee5e5005918a98579eaecd4
+AUX 1.4.39.1/patches/main_utils.c.patch 855 SHA256 44cf32f85a3954fa22737c331dc3966912d34b269e68be536cccc602fa3b84e5 SHA512 38249a64252650f0dd1773fcd5f4c8e06c80f8ef33d6be2c1608db1c888b7e8f05d1b46ac7f1649a49234940825bbc319f465ceb35b9d857a8f7a3637a78159d WHIRLPOOL 1c37368a8beed6b8a1851c9688913bba4d6fc539ea79696759d6ef17ace801328841e2ed630df30c160c64a23485367ba9db6e1842278e2a9171b7b2720f0761
+AUX 1.4.39.1/patches/makeopts.in.patch 349 SHA256 ae2ee0657d38f79b2c9947f02014c22fd1492c8cfd302f7d486a3f46c078f5be SHA512 7379b00c59bf81f97e0adba769de882452fc1d52ab04ecfb26961c1a6280b19f8d3622091bb41f5bf79b1c79890751714d64cd48c96d874ff9483d7c7e909563 WHIRLPOOL 47b4055a03e504234f9786764ab851a4d2c0269bde45476cc5939c58af7e0c4022a44a69af933f0053eaba54e46c10d5cde345617c9bfc93335ad440016afdb1
+AUX 1.4.39.1/patches/menuselect-tree.patch 22770 SHA256 cf604fd5f36c237450339009a68974462899e6b8d9744fd9d6c65b932c1c8429 SHA512 1ab9a57a195f64c3c81771f30370ccd96e3d99cec95aa41dbe39597ea532b0e8dfa4d1dac5c7eaf7aecfc257fa2951a7b4ebbd4e2f3469ecdee712d6dc2794f3 WHIRLPOOL 398233d38045c0bf4ead08b34d5f1e89a5566692cfc1395c2ef9fe783a00024b87a3a24aae27a234ea3a289f016d650fa9c5ce6d874961c74c05dc2f446e124b
+AUX 1.4.39.1/patches/res_res_features.c.patch 455 SHA256 4e502ba368e37b5127edeaa168363d589df8bd11c584a87b43b65e1647e375fc SHA512 154cf2ed615c22db1fc13bc8acdb61b83b824f4a59f80053363c1aece78293980674555a8750a05c39225fd03567365baa1b283bc13ea911ae189928d597adcc WHIRLPOOL e4ddf6687f867355650bafcb61fd543ba442db2bebd19a36ae516b8aea69bea5a5dd00f702acbf77b94014ed19c0e34c3bb84b77d0e17cfa6b519592b540d748
+AUX 1.4.39.1/patches/res_res_musiconhold.c.patch 5019 SHA256 328bab1bd68aef365b06a1348fd3907f517eedcfe40e4d30b163a8fa986c24d1 SHA512 ea09e57587bc38a818283e18601cf2dc1032261544c1dfd76e2db29d1b24b83d960f665e2f2bac8918c4a9cdad34be71ce2139c50b8c3fc7c3b2006b5a867a18 WHIRLPOOL 9191c34d10e1185ff05a00d2c634eb86220cf11f81fec44e41c2dcacf51fb65cc08d0f1c109b6fb6adcde478b3964f81cc745f21b20b90a02c7f8190a9c8cddf
 AUX 1.8.0/patches/vicidial.patch 55603 SHA256 5923bed77ef4a9d29d4e0e196ccd571c0bb6c7bb4b7dae46ebc50ea82215ad3a SHA512 3db13bd173d3de6ad7d3e384f3eeaf24da04410783cc0fb26891ba2bc0176e627703f9bc48c01bc9c773cfc883e03c6fb3b7fe1d762582c2d6efaf3a2a423e19 WHIRLPOOL 0b69e0e0ef30fbf058a0f5f55452e51573e0e84856f61eeb91d007cff29458ca07e76f0589fb9ca8763b6892a81443b59b710035bb60bd7889176023a3148b44
 AUX 11.10.0/patches/asterisk-11.10.0-dtls.patch 97191 SHA256 1172f44f698b0b9a028037380f2597acc78862de28a79626c24310cb96e944b1 SHA512 fb618143dd797181e85fd6da859d74799ed5be87e1b45613a1fbeb261d80a6e8a45d24175ee71f98e59ba206b0cfff5ebd6b72b8edc8592550512fe90fab4f97 WHIRLPOOL b231581bffcb96387b2b9f0982045662346d6c7d84fd80dcb083a2563d509d8fd59c30851dd7ae48a6d6017a1a4eff46470770ee8ba2b23068a8a9a64c199c27
+AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
+DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.6.0.tar.gz 24828582 SHA256 c128ce24416b236fd73c403ad1e2da33c3816cf6db1beb6f97509659f8b281a0 SHA512 6a14d92d6a263edac0da23b091961adf54be9d5ff042117c5f1255241744a3f9a10cd851d46326f58c18932d5dfe8bff38bd760b4ca63aeae15d4eed222d6612 WHIRLPOOL eed712b55af394a2c4a9873bc39e8dee23b022530f290030bb08f2feb735188a1b6789067d6f149bf8065976af457b5795960259790fae8339e059a6eda0f117
 DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
+DIST asterisk-patchset.tar.gz 15840 SHA256 f0de33c50aff48ea090f85a8c993bb1439453082faa5d0ac2493b876edaba8de SHA512 bcdca6640d16385d9fd6e05cbc8f659efb7a8ec318d169d3a2af410024b03408a89f460cce1112b370bcdec08f0b45eb8f4f1d4c6d1ba1b8d3045f3b70cc217c WHIRLPOOL bc1ca700bdb915e39c80ae85ae61f3df053dc2d1be395ce8713ead076520964e75b674ad261944e269d055731c960a4473087bbd44c8fae4ef3f8ee5b65a4840
 DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.10.0.ebuild 9571 SHA256 9354bf11f69ecf36fd438bcda04a7f0950c30a88a8d4e138fc361ae536bcbf65 SHA512 2c7373f7bc54291b3f0bad39e23225bf733197642cfe08a1f7323ce4a1a3c7592dd13e41aeb7cd99ce73f647bbce04e53b22356d660b6fa8a51ac51a355934d5 WHIRLPOOL 2366705c63d7bbcecaaecb108161e81cf5283dcae904ef12bd97dfc62fb1d5bb0257e6301f75463ea4b34f3b511dcb58d3d2966bff4092c36cc7758a08b5e51e
+EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311
 EBUILD asterisk-11.6.0.ebuild 9501 SHA256 00ce68bfe742e929e4b8078db178db91e39572e7748ddc95871b275dca7a7d1d SHA512 f8775c265a54725fc3e7db586e60a333603c2d287c3da9f9f2ab36dbbd3842f2b09b4f475c9780209a1acfab232ffd64c66048a3843eb77aa3aeb4833c1dd72c WHIRLPOOL 0628f1c107439391f8480a43f6b666d1d669dfd6ce8ceb03ab6f2aded4d563d1298bf6a1f377031174791531fc0a1fc60e40183cdf6333e1b9a6dc0853bed40b
 EBUILD asterisk-11.8.1.ebuild 9502 SHA256 4305b03116e5198852dfcd04546684a81a07d9d547c76e3699fe6cf8f46b4f9e SHA512 21048ddb1e669e7c092921e3d9671640657f7547a2f6d78e8e7c4c0f525007d1a5eccd547e24697b38c63bff596ffe7bca6299c5122df91c9940da91cbb124be WHIRLPOOL 2de4f09270d24b42c23661eb9d9a4262f6cf2b3713252f376a820b807afa216eff4ef5bcfebd4310ec68f74760da2bcdda94c1edffe253fd15f557cb51ece3f4
diff --git a/net-misc/asterisk/asterisk-11.15.0-r1.ebuild b/net-misc/asterisk/asterisk-11.15.0-r1.ebuild
new file mode 100644
index 0000000..210f59f
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.15.0-r1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.15.0-r1.ebuild,v 1.3 2015/02/10 10:07:53 ago Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	jabber? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 554cdfdab4426b104103fc0c88938fc3c5689384 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 4 Apr 2015 17:43:03 -0700
Subject: [PATCH 066/261] missing files

---
 .../asterisk/files/1.6.2/asterisk.logrotate3  |  25 ++
 net-misc/asterisk/files/1.6.2/call_data.txt   |  32 ++
 .../asterisk/files/1.6.2/find_call_ids.sh     |  17 +
 .../files/1.6.2/find_call_sip_trace.sh        |  21 ++
 net-misc/asterisk/files/1.6.2/sip_calc_auth   |  25 ++
 net-misc/asterisk/files/1.8.0/asterisk.confd  |  95 +++++
 net-misc/asterisk/files/1.8.0/asterisk.initd7 | 347 ++++++++++++++++++
 .../asterisk/files/1.8.0/find_call_ids.sh     |  68 ++++
 .../files/1.8.0/find_call_sip_trace.sh        |  76 ++++
 net-misc/asterisk/files/asterisk.service      |  23 ++
 net-misc/asterisk/files/asterisk.service.conf |  11 +
 .../asterisk/files/asterisk.tmpfiles.conf     |   2 +
 12 files changed, 742 insertions(+)
 create mode 100644 net-misc/asterisk/files/1.6.2/asterisk.logrotate3
 create mode 100644 net-misc/asterisk/files/1.6.2/call_data.txt
 create mode 100644 net-misc/asterisk/files/1.6.2/find_call_ids.sh
 create mode 100644 net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
 create mode 100644 net-misc/asterisk/files/1.6.2/sip_calc_auth
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.confd
 create mode 100644 net-misc/asterisk/files/1.8.0/asterisk.initd7
 create mode 100644 net-misc/asterisk/files/1.8.0/find_call_ids.sh
 create mode 100644 net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
 create mode 100644 net-misc/asterisk/files/asterisk.service
 create mode 100644 net-misc/asterisk/files/asterisk.service.conf
 create mode 100644 net-misc/asterisk/files/asterisk.tmpfiles.conf

diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
new file mode 100644
index 0000000..69296c9
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
@@ -0,0 +1,25 @@
+/var/log/asterisk/messages /var/log/asterisk/queue_log {
+	missingok
+	notifempty
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/debug /var/log/asterisk/full {
+	missingok
+	notifempty
+	daily
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
+	missingok
+	notifempty
+	weekly
+	rotate 52
+}
diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt
new file mode 100644
index 0000000..ba9cbbb
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/call_data.txt
@@ -0,0 +1,32 @@
+It's sometimes useful to look at SIP conversations in retrospect.  If you have
+a troublesome system, enable sip debug (in the CLI: sip set debug on), set up
+logger.conf to log it to some file and then you can use the two scripts here to
+extract the SIP converssations as seen by asterisk.
+
+find_call_ids.sh:
+
+This script will locate Call-ID values given an A and B number. Just invoke it with:
+
+find_call_ids.sh /path/to/log A-num B-num
+
+eg:
+
+find_call_ids.sh /var/log/asterisk/debug 102 105
+
+To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your
+exact setup and the actual values being passed in the SIP INVITE packets)
+
+find_call_sip_trace.sh
+
+This script will extract a SIP conversation from the log for one or more
+Call-ID values.  Invoke with:
+
+find_call_sip_trace.sh /path/to/log Call-ID [...]
+
+Eg:
+
+find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3
+
+This will find the SIP packets for those two conversations from the log
+(interleaving the packets in the order asterisk output them - useful for
+analysing the two SIP legs of the same call).
diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
new file mode 100644
index 0000000..c4689bd
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}'
diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
new file mode 100644
index 0000000..5b2e69e
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$'
diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth
new file mode 100644
index 0000000..3f050ad
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/sip_calc_auth
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1
+
+un=$1
+realm=$2
+pw=$3
+method=$4
+uri=$5
+alg=$6
+nonce=$7
+
+echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)"
+
+a1=$un:$realm:$pw
+a2=$method:$uri
+ha1=$(echo -n "$a1" | openssl $alg)
+ha2=$(echo -n "$a2" | openssl $alg)
+resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg)
+
+echo "a1=$a1"
+echo "a2=$a2"
+echo "ha1=$ha1"
+echo "ha2=$ha2"
+echo "resp=$resp"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd
new file mode 100644
index 0000000..e46ad23
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.confd
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.confd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#
+#         ":asterisk" to run as user "root" and group "asterisk"
+#
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+ASTERISK_RESTART_DELAY=5
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7
new file mode 100644
index 0000000..a4a27eb
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd7
@@ -0,0 +1,347 @@
+#!/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/asterisk/files/1.8.0/asterisk.initd7,v 1.1 2013/08/28 10:15:35 chainsaw Exp $
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+# ast_spooldir: 
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_spooldir=/var/spool/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID
+	local tmp x
+
+	local OPTS ARGS 
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
+
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
+		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
+		if [ -n "${USER}" ]; then
+			if ! getent passwd "${USER}" &>/dev/null; then
+				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			if ! getent group "${GROUP}" &>/dev/null; then
+				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
+		find "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" ! -user "${USER}" | while read element; do
+ 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
+			chown ${USER} "${element}"
+			chmod u+rX "${element}"
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
+		ebegin "Waiting for ${ast_instancename} to fully boot"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+		eend $?
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+	
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 1)"
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/find_call_ids.sh b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
new file mode 100644
index 0000000..321f3da
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
@@ -0,0 +1,68 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+#echo "Finding calls from '${anum}' to '${bnum}' in ${logfile}."
+
+# modes:
+# 0 - not processing an INVITE.
+# 1 - processing an INVITE.
+# 2 - from matched (processing).
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode==0 && $1=="INVITE" && $2 ~ "^sip:'"${bnum}"'@" {
+		#print
+
+		mode=1
+
+		split($2, a, "[:@]")
+		bnum=a[2]
+	}
+
+	mode==1 && $1=="From:" {
+		#print
+		if ($3 ~ "^<sip:'"${anum}"'@.*>") {
+			mode=2
+			split($3, a, "[:@]")
+			anum=a[2]
+		} else {
+			#print "From does not match ... leaving block."
+			mode = 0
+		}
+	}
+
+	mode!=0 && $1=="Call-ID:" {
+		callid=$2
+
+		if (NF!=2) {
+			print "WTF @ Call-ID header having NF!=2"
+		}
+	}
+
+	mode==1 && $0=="" {
+		#print "Leaving block (no match)"
+		mode = 0
+	}
+
+	mode==2 && $0=="" {
+		#print "Leaving block (match)"
+		print dt " " anum " " bnum " " callid
+		mode = 0
+	}
+'
diff --git a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
new file mode 100644
index 0000000..06ae824
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
@@ -0,0 +1,76 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+# modes:
+# 0 - searching for SIP start block ...
+# 1 - transmit of sorts
+# 2 - receive
+
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode!=0 && $1 == "Call-ID:" {
+		#print
+
+		if ($2 ~ /('"${callid}"')/) {
+			callidmatch=1
+		} else {
+			#print $2" does not match ^('"${callid}"')$"
+			mode=0
+		}
+	}
+
+	(mode==1 && $0=="---") || (mode==2 && $0=="<------------->") {
+		if (callidmatch) {
+			print dt" "sipmode"\n"pckt"---"
+		}
+
+		mode=0
+	}
+
+	mode!=0 {
+		pckt = pckt $0 "\n"
+	}
+
+	mode==0 && $0 ~ "chan_sip[.]c: .*[tT]ransmitting" {
+		#print
+
+		if ($6 == "Retransmitting") {
+			sipmode = $6" "$7" to "$NF
+		} else {
+			sipmode = "Transmitting to "$NF
+		}
+
+		mode=1
+		pckt=""
+		callidmatch=0
+	}
+
+	mode==0 && $0 ~ "SIP read from" {
+		#print
+		mode=2
+		pckt=""
+		callidmatch=0
+		sipmode="Received from "$5":"
+	}
+'
diff --git a/net-misc/asterisk/files/asterisk.service b/net-misc/asterisk/files/asterisk.service
new file mode 100644
index 0000000..08245d9
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Asterisk PBX and telephony daemon.
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/var/lib/asterisk
+User=asterisk
+Group=asterisk
+ExecStart=/usr/sbin/asterisk -f -C /etc/asterisk/asterisk.conf
+ExecStop=/usr/sbin/asterisk -rx 'core stop now'
+ExecReload=/usr/sbin/asterisk -rx 'core reload'
+
+LimitNOFILE=4096
+ProtectSystem=full
+ProtectHome=yes
+PrivateTmp=yes
+
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/asterisk/files/asterisk.service.conf b/net-misc/asterisk/files/asterisk.service.conf
new file mode 100644
index 0000000..b7f83b7
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.service.conf
@@ -0,0 +1,11 @@
+# Uncomment the following 7 lines to start asterisk with a console on tty7
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# [Service]
+# ExecStart=
+# ExecStart=/usr/sbin/asterisk -f -c -C /etc/asterisk/asterisk.conf
+# TTYPath=/dev/tty7
+# StandardInput=tty
+# StandardOutput=tty
+# StandardError=tty
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles.conf b/net-misc/asterisk/files/asterisk.tmpfiles.conf
new file mode 100644
index 0000000..637302a
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles.conf
@@ -0,0 +1,2 @@
+d /var/run/asterisk 0750 asterisk asterisk
+d /var/spool/asterisk 0750 asterisk asterisk

From c7aa6c0d18211833fb3da4541defd3b1d13009c7 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 4 Apr 2015 17:45:27 -0700
Subject: [PATCH 067/261] missing files

---
 net-misc/asterisk/Manifest | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e8bfe46..9c5b7da 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -72,8 +72,20 @@ AUX 1.4.39.1/patches/makeopts.in.patch 349 SHA256 ae2ee0657d38f79b2c9947f02014c2
 AUX 1.4.39.1/patches/menuselect-tree.patch 22770 SHA256 cf604fd5f36c237450339009a68974462899e6b8d9744fd9d6c65b932c1c8429 SHA512 1ab9a57a195f64c3c81771f30370ccd96e3d99cec95aa41dbe39597ea532b0e8dfa4d1dac5c7eaf7aecfc257fa2951a7b4ebbd4e2f3469ecdee712d6dc2794f3 WHIRLPOOL 398233d38045c0bf4ead08b34d5f1e89a5566692cfc1395c2ef9fe783a00024b87a3a24aae27a234ea3a289f016d650fa9c5ce6d874961c74c05dc2f446e124b
 AUX 1.4.39.1/patches/res_res_features.c.patch 455 SHA256 4e502ba368e37b5127edeaa168363d589df8bd11c584a87b43b65e1647e375fc SHA512 154cf2ed615c22db1fc13bc8acdb61b83b824f4a59f80053363c1aece78293980674555a8750a05c39225fd03567365baa1b283bc13ea911ae189928d597adcc WHIRLPOOL e4ddf6687f867355650bafcb61fd543ba442db2bebd19a36ae516b8aea69bea5a5dd00f702acbf77b94014ed19c0e34c3bb84b77d0e17cfa6b519592b540d748
 AUX 1.4.39.1/patches/res_res_musiconhold.c.patch 5019 SHA256 328bab1bd68aef365b06a1348fd3907f517eedcfe40e4d30b163a8fa986c24d1 SHA512 ea09e57587bc38a818283e18601cf2dc1032261544c1dfd76e2db29d1b24b83d960f665e2f2bac8918c4a9cdad34be71ce2139c50b8c3fc7c3b2006b5a867a18 WHIRLPOOL 9191c34d10e1185ff05a00d2c634eb86220cf11f81fec44e41c2dcacf51fb65cc08d0f1c109b6fb6adcde478b3964f81cc745f21b20b90a02c7f8190a9c8cddf
+AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
+AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
+AUX 1.6.2/find_call_ids.sh 446 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b WHIRLPOOL eba7c3e8a8c2acee276177daf3649c34a8d863116c96f23ee8b377968d5ad13da16389e2881299b59270afe7cc961c8b1852d4aad13c02734bf96cd84a3ce604
+AUX 1.6.2/find_call_sip_trace.sh 530 SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 WHIRLPOOL 098d8556779b2c053f8bb808354ee9f90e92a63fda99b5eb405407a90889247fa413f964261622f2749a0860bbc2b08b25c3d823d2f014b7c17cdc578ade475d
+AUX 1.6.2/sip_calc_auth 493 SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 WHIRLPOOL 637cbad803360a4f7d2a5aa85b689fd072f6af7592e440025013e47cad77e1f54d614c15194511e37ba1e57630db97982a368cfdfc80264e8733d897a3aa0a10
+AUX 1.8.0/asterisk.confd 2203 SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969 SHA512 53219b410f29f9974fa2ec33ffb0aa914735e4a0897eed0f20a0cd740701757e56f48d0a954a1955cca7c94b2a17cd62dd494ba89a84c8a29312cb633288eee1 WHIRLPOOL 17fef9b012a13529864295629068d034bdd78bba3fc6211e5c2a888097614510c159747768ebb54e6e59999a5254353592f0da665541e82f4fdb2283f0d8dcc1
+AUX 1.8.0/asterisk.initd7 9382 SHA256 7951901371035da2cb958d029ddbd8af276a5de7becd01c9bd36d0c4576461f8 SHA512 44dc81f3b3cab8e65344dcb2767fdd6b573f9ee587c78afa6873995a019b60c1c8bfda1c9f3baf6b5e71ae76ca62fff53e5f2e27deaeb4f88fc78bfd54593707 WHIRLPOOL dfd7f5c4c7fe5c65181a30259bf96f5a813548733b298e9c41319812d4cd47035147616264d4bb91193fcfe81f6ea9fcdbb288a3759b9e86041116885613637b
+AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
+AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
 AUX 1.8.0/patches/vicidial.patch 55603 SHA256 5923bed77ef4a9d29d4e0e196ccd571c0bb6c7bb4b7dae46ebc50ea82215ad3a SHA512 3db13bd173d3de6ad7d3e384f3eeaf24da04410783cc0fb26891ba2bc0176e627703f9bc48c01bc9c773cfc883e03c6fb3b7fe1d762582c2d6efaf3a2a423e19 WHIRLPOOL 0b69e0e0ef30fbf058a0f5f55452e51573e0e84856f61eeb91d007cff29458ca07e76f0589fb9ca8763b6892a81443b59b710035bb60bd7889176023a3148b44
 AUX 11.10.0/patches/asterisk-11.10.0-dtls.patch 97191 SHA256 1172f44f698b0b9a028037380f2597acc78862de28a79626c24310cb96e944b1 SHA512 fb618143dd797181e85fd6da859d74799ed5be87e1b45613a1fbeb261d80a6e8a45d24175ee71f98e59ba206b0cfff5ebd6b72b8edc8592550512fe90fab4f97 WHIRLPOOL b231581bffcb96387b2b9f0982045662346d6c7d84fd80dcb083a2563d509d8fd59c30851dd7ae48a6d6017a1a4eff46470770ee8ba2b23068a8a9a64c199c27
+AUX asterisk.service 456 SHA256 a49fb681161d05b18b1cb6e8c3952de3baf53830709e38cfb125c4cf5085bb81 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 WHIRLPOOL f428284c586240a9e8bcba535cf34924d924649b0891c5306a911ab1416e30ff42f43941dc2aade73bcbfdc6f833b6c14341a39167051adb8365b43e5dfd987d
+AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278bf13bdb3f14ea08083877f SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 WHIRLPOOL efa9e1432e89efec4a0f78ac41f78e26e236f6397c528b6e5bd9d8b9191e4af8480d1ad5fbd3b12e5343e54ac4be5c20fd026ea437cfb28466ad96b9e3e4c988
+AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7

From a8ae6c1c0dda50c3e0741241f82fb11a82cd91c5 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 8 Apr 2015 01:25:55 -0700
Subject: [PATCH 068/261] should fix memeor issue

---
 net-misc/opensips/Manifest               |   2 +
 net-misc/opensips/opensips-1.11.4.ebuild | 145 +++++++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 net-misc/opensips/opensips-1.11.4.ebuild

diff --git a/net-misc/opensips/Manifest b/net-misc/opensips/Manifest
index 0443684..2693616 100644
--- a/net-misc/opensips/Manifest
+++ b/net-misc/opensips/Manifest
@@ -4,9 +4,11 @@ AUX opensips.init 3649 SHA256 e6f1c36ce01105916aa5354bebb41ac4f8d51de36e9a2aec0d
 AUX opensips.init.orig 479 SHA256 a00cb18bc238929b7a90222af1b95eb18304b0f5847e9464210db5ebeb654588 SHA512 0c8a28996e51bb893135abc01c9545684ca1e687f208ef6cbb8f0a725c4d0a844ca80c88a0a58c2463f0da4c5c027286abe54e46bb09def12deaf529e86da387 WHIRLPOOL d74d063f20843ceb0bd391eef45bded9aa429718e98a7a12c95897c3cfb00298f2e54e321dae0ac91c47155315b6c460ca48af7ca00726a306b0fde97fd9dff0
 DIST opensips-1.10.3_src.tar.gz 4352917 SHA256 2e8c5c9000c1560f862f5290e933c647452ffe9a117b3ee9cd680936de93ac29 SHA512 470fe2b614e399babc9df237756fe89bd4196b61d993e5ded8934dbf1eb20ef3f2124ce50ae42b989dd7be524d0e654815d6f65897ef0612c6051739160b5038 WHIRLPOOL a6491c33ad9bb725c740df6adc6efb404300f4f4c4004e6c78e08acf0f95be429b0ac6169ac3bc20f3f275e3f6e65dc9ac86700e5d378a41a70038f70b6dbfdb
 DIST opensips-1.11.3-latest_src.tar.gz 5492639 SHA256 0da34293014e579f93a4fe62f8284b6de22cc5d3bdf3650a3e6b40f1de086310 SHA512 d48e46a46d69875fc541c250b89b3e820587b5e9f5f9aaf1b589aa37759014af9f85ad0b63a06fe79e7d86d1c6098f9d1d2ded645b7ca3fc7d266c0c77769f29 WHIRLPOOL 664e98917dc8dd27ddae275da19c62d70860fa1540c8293d8640824931b8ebae05945e08c8a86d69f55f16b2825b4a0736bc82e7abcc8e929c0d2a8d1822c285
+DIST opensips-1.11.4_src.tar.gz 7946606 SHA256 b1aba35e35f27501118c74332cdab1e4911c631b567fcbef05eca4a1cd16997d SHA512 da89960e47a9c1075643f28232b8816615022a3c4f0483bd6d70f57bcd33c12479dd29e18befb417a49a94cb30f632a338a8668e4a143ebddd2bad0014c5ceed WHIRLPOOL d4bf64e624ffb5c9f563355be5e1fb4a7e116088fca99a02212786fbc1376377c2d33e68dbc81e5cc9456ca2ea124fde0e7cbe8982388834904e9338600d16a8
 DIST opensips-1.7.1_src.tar.gz 3986550 SHA256 3a36250616419ec07e2d522f5266da0eaa5aeabce27389c78dff741679e6543c SHA512 653cc6b3e951c945ccad34dabcf00d597ed1d549b051201dcd21b80235eba7f5e9a9aa4d119c272a0bf6f05449179fbbf3d2d2111c3407b82309b4febcdd6b96 WHIRLPOOL 5ec6ba6e5a40fb566ee64983c03307212ac04bd948ef12455e297dd9cf2255e43a9afe0f1dd7aa2b562494ecc7bf4227930260cabed8f79baf99af26d35634d0
 DIST opensips-1.8.0_src.tar.gz 4650154 SHA256 fdba385c2ebf7f29786d43081e9f6b6748996d1e2359255986490fa8d9dcdd8f SHA512 af7a3297a2d6674c471e6d75ddbb8008f795326ef5b0c917f94871a71af4aae823a080d90c4637f35d112bdf3035cfbb5213afabc7d2848ebc94f5747cafb7b3 WHIRLPOOL 683b942286a62b0745a6ca409f95c505d57107200babb58faca2d36be21a786aa4b29026ae0969625c4c97affecf04a255d3a0d1b1f943980575c89273b904af
 EBUILD opensips-1.10.3.ebuild 3505 SHA256 fd98226f14ef35f49f8924b13b48f4a785e6e9efc7432c3a2c160cbc6daecaac SHA512 5f8d8f7019016cbad4e09327b9ec10a3d34f0b8a51b17a3bcbf26673e9f2fa4a8f14e589df9dccd48604fdf7d14676f4a418d943b73ebbc63d1d8270defc714f WHIRLPOOL f4dc8bf583283486d23367f1688038b35cc2d6ff260e0a3a6992b02f750072a8471168f43a80f2a9b835264d035ab757bb0db7b034b5190c3868616099762584
 EBUILD opensips-1.11.3.ebuild 3577 SHA256 de69c75f717d3beb3bc266abe7ef5cb67d316dbe5dbf0b10f903a692e0554d1d SHA512 c21406bcb74ed33c8771d1dae785bbe338cc446d979d277fb1efe5068be611392150f53f2ca843ad1ff006710f25637a012e39b91f9a087f918fcca5027a2853 WHIRLPOOL babc1653a8d7f0fbe0792737c429649f3b7687b94876f5861fbb6739ff1d7a918b438c62dde639e2661754387093933b1be4357556ea44a4cb729902a42f5436
+EBUILD opensips-1.11.4.ebuild 3568 SHA256 71943e20e7bade4ddf3428cbab7ca569f7e264c12ba222bf2825a463ff04d732 SHA512 4d66c6d2cdf7ac1bbea2a1aa836bac746a0a13b191cc8ff9cc9eb9a87d8969078ba7d78e73b59362a609fcfb8457deb9e385f5e62ae2e3496ee71dcd33964e18 WHIRLPOOL 6c0ca773f11fa93ca8416cb466dc3ae3d5ba73edf6bc5d8d37ed703477c6a02e450f526e3ecc145dc5e28a28d2e564fb9ddaad9da0b4c1bf9433d04f39c78336
 EBUILD opensips-1.7.1.ebuild 3034 SHA256 c09954b484bd8fae5525b37c75f28245586cca29a61926caa7e554c540dd1367 SHA512 efd2b0fe991a852cb0cee45c5bd2016be38a27f416ca2cdea6ca54efd764634e0bf806d82d5bc5b7bade6c688ea69774605c212e863faa37791da7159a9daefd WHIRLPOOL b2ba9ab8edec2f488a4e04c8c71b04cef696fc40a39e4cf99f8f54e268b378d843aec662e17d963c73cd0fc9b0a28d7b1039dc886519de6f7e63ce176fbb097b
 EBUILD opensips-1.8.0.ebuild 3311 SHA256 fabf16768b2709a9a11e63b0bd15acd68e8ae1804808f3c7f9cc4fc23b2daaeb SHA512 2589bd748e043d171bab81cbfe0fbdb63c59273bd451f3fba34948005a3390c4a3eee1427713a79319d650d7c9de91935b5561f178657f40837eff56b84e474f WHIRLPOOL 75001d3e16fdeac740807b9e83b306c0a36510e686693c40dd3ad7bd59578bb8941b48a1687d9754ffda0d4fb080dfa43ef9dbf3da94e66bb601f5042aa33926
diff --git a/net-misc/opensips/opensips-1.11.4.ebuild b/net-misc/opensips/opensips-1.11.4.ebuild
new file mode 100644
index 0000000..eaa82d0
--- /dev/null
+++ b/net-misc/opensips/opensips-1.11.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+EAPI="3"
+inherit eutils
+
+MAGIC="latest"
+
+DESCRIPTION="OpenSIPS - flexible and robust SIP (RFC3261) server"
+HOMEPAGE="http://www.opensips.org/"
+MY_P="${P}_src"
+P2="${P}-tls"
+
+SRC_URI="http://opensips.org/pub/opensips/${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug ipv6 mysql postgres radius jabber ssl cpl unixodbc b2bua presence xmlrpc httpd json"
+
+RDEPEND="
+        json? ( dev-libs/json-c )
+        httpd? ( =net-libs/libmicrohttpd-0.9.22 )
+	mysql? ( >=dev-db/mariadb-4.1.20 )
+	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	postgres? ( >=dev-db/postgresql-8.0.8 )
+	jabber? ( dev-libs/expat )
+	ssl? ( dev-libs/openssl )
+	cpl? ( dev-libs/libxml2 )
+	b2bua? ( dev-libs/libxml2 )
+	presence? ( dev-libs/libxml2 )
+	xmlrpc? ( dev-libs/xmlrpc-c[abyss] )
+	unixodbc? ( >=dev-db/unixODBC-2.3.0 )"
+
+inc_mod=""
+make_options=""
+
+pkg_setup() {
+        use json && \
+                inc_mod="${inc_mod} json"
+
+        use httpd && \
+                inc_mod="${inc_mod} httpd"
+
+	use mysql && \
+		inc_mod="${inc_mod} db_mysql"
+
+	use postgres && \
+		inc_mod="${inc_mod} db_postgres"
+
+	use radius && \
+		inc_mod="${inc_mod} aaa_radius peering"
+
+	use jabber && \
+		inc_mod="${inc_mod} jabber"
+
+	use cpl && \
+		inc_mod="${inc_mod} cpl-c"
+
+	use b2bua && \
+		inc_mod="${inc_mod} b2b_entities b2bua_logic"
+
+	use presence && \
+		inc_mod="${inc_mod} presence presence_dialoginfo presence_mwi presence_xcapdiff presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client"
+
+	use unixodbc && \
+		inc_mod="${inc_mod} db_unixodbc"
+
+	use xmlrpc  && \
+                inc_mod="${inc_mod} mi_xmlrpc mi_xmlrpc_ng"
+
+	export inc_mod
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	mv ${P2} ${P}
+
+	cd ${S}
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
+	epatch ${FILESDIR}/Makefile-1.8.0.patch
+}
+
+src_compile() {
+	local compile_options
+
+	pkg_setup
+
+	# optimization can result in strange debuging symbols so omit it in case
+	if use debug; then
+		compile_options="${compile_options} mode=debug"
+	else
+		compile_options="${compile_options} CFLAGS=${CFLAGS}"
+	fi
+	
+	if use ssl; then
+		compile_options="TLS=1 ${compile_options}"
+	fi
+	emake all "${compile_options}" \
+		prefix=${ROOT}/ \
+		include_modules="${inc_mod}" \
+		cfg-prefix=${ROOT}/ \
+		cfg-target=${ROOT}/etc/opensips/ || die
+}
+
+src_install () {
+	local install_options
+	emake install \
+		prefix=${d}/ \
+		include_modules="${inc_mod}" \
+		bin-prefix=${d}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${d}/etc \
+		cfg-dir=opensips/ \
+		cfg-target=${d}/etc/opensips \
+		modules-prefix=${d}/usr/lib/opensips \
+		modules-dir=modules \
+		modules-target=${D}/usr/lib/opensips/modules \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${PF} \
+		data-prefix=${D}/usr || die
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/opensips.init opensips
+	newconfd ${FILESDIR}/opensips.default opensips
+	mv menuconfig/configure menuconfig/osipsconfig
+	dosbin menuconfig/osipsconfig 
+	# fix what the Makefile don't do
+	use mysql && \
+		rm ${D}/usr/sbin/opensips_mysql.sh
+}
+
+pkg_postinst() {
+	einfo "WARNING: If you upgraded from a previous OpenSIPS version"
+	einfo "please read the README, NEWS and INSTALL files in the"
+	einfo "documentation directory because the database and the"
+	einfo "configuration file of old OpenSIPS versions are incompatible"
+	einfo "with the current version."
+}
+
+pkg_prerm () {
+	${D}/etc/init.d/opensips stop >/dev/null
+}

From 48bc2bb1f2854e3f9f6eabd2afca15ded49c6660 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 8 Apr 2015 01:31:38 -0700
Subject: [PATCH 069/261] delete not support package

---
 .../Devel-Leak-Object-1.10.0.ebuild           | 21 -------------------
 dev-perl/Devel-Leak-Object/Manifest           |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 dev-perl/Devel-Leak-Object/Devel-Leak-Object-1.10.0.ebuild
 delete mode 100644 dev-perl/Devel-Leak-Object/Manifest

diff --git a/dev-perl/Devel-Leak-Object/Devel-Leak-Object-1.10.0.ebuild b/dev-perl/Devel-Leak-Object/Devel-Leak-Object-1.10.0.ebuild
deleted file mode 100644
index d0a683b..0000000
--- a/dev-perl/Devel-Leak-Object/Devel-Leak-Object-1.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION="1.01"
-inherit perl-module
-
-DESCRIPTION="Detect leaks of objects"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~x86"
-SRC_TEST="do"
-
-IUSE="test"
-RDEPEND=">=virtual/perl-Scalar-List-Utils-1.19"
-DEPEND="${RDEPEND}
-	test? ( >=virtual/perl-Test-Simple-0.42 )"
diff --git a/dev-perl/Devel-Leak-Object/Manifest b/dev-perl/Devel-Leak-Object/Manifest
deleted file mode 100644
index be0c2e3..0000000
--- a/dev-perl/Devel-Leak-Object/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Devel-Leak-Object-1.01.tar.gz 32470 SHA256 20b23ca7817b9a7cb44944b9e99b2d2627087b386a108b432a0064c0f2703a88 SHA512 2f766aa5f7a5c826f9ae80b34b812ae90c49e528df62854c6498208a5656fdd76b09e11d0886d03f1aa6bb8d636304f21cb134d890b8be54a1200faaced7827a WHIRLPOOL 2c192a39800ccb499bf5d5249a327540cd44270fa2ab9e0c59672d115a6e1adb43712f3b744db1d13965d5dd5d23e672ef5cbf8554cc42230020793e05060d56
-EBUILD Devel-Leak-Object-1.10.0.ebuild 433 SHA256 8f686ae3d8f9c56846aa14ab06fe961fef28ab3cd5ab1b1b7a08c806750ede37 SHA512 77f1cadd32949223f743835929c538f24394901c3b41dce179b6c7358a747db8bc67ea2ec678472427a27bbe1dcbfa0d3ed21d5219bf59a1a26716c02bd903de WHIRLPOOL 6e8bd0f7e1655dec362eaef38f786944b1ca35bcf4471f673caed4a50e2085f7d3661a63bb8a7c1393aa1d0411afd86bfd9b866e7445326236af79b3f32db1f9

From bd9407a366d011b017c36124ddaa865b79047c61 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 9 Apr 2015 19:29:07 -0700
Subject: [PATCH 070/261] missing manifest

---
 dev-db/percona-server/Manifest | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index f2be9e8..94c240a 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,2 +1,5 @@
-DIST percona-server-5.5.36-34.2.tar.gz 24206105 SHA256 62a0c4a45412e4c2eadf53d3a60977d33e27e650be32bf46bb13dff2b3e84fee SHA512 f6a072df53c85d170774e12d39e1b8d83db8d47daae370a915d9513e7c0224cd3afa64c84242aefbea98dd2e9f363bbe6bc454a3cfc1fbecdba274f550b724ae WHIRLPOOL d0bc8775a0618daa823f939339c875019b5c71400edf6401d4414d352e91d7a1963bc05bd4a81992cb915ae8ec6220df14dce066e11552575a496dfbe0721e88
+AUX my.cnf-5.5 4900 SHA256 63215c4ba3aae1f3369d01b43319838b24df6efa7b74a12a4d9b13626a4db576 SHA512 f134ae5d3508e601b0488b66ab87c870b795409396e270f27492c1b027d75442b16d02cd98e83596c555f400c756715f9784b4b1c5209cbae38a5a19621e4e6d WHIRLPOOL 024e1a92d3ac89432d7e6180aa20f576e01e9999d9390b19f2020cb644ee0ef04d8692c8231fdcf31521659c03e3eff33db4c7a1a972b8aeb28d7c09a9a0e889
+AUX my.cnf-5.6 5000 SHA256 ea119fee667ed963ad20b807a5102ad776035df4009f3bfc819b26a47bb0a3db SHA512 1265cf6d1fd3dfa9d0607eef0065409e4d6a8187e8e6882a45e69da7fc0a337a336c1fd3ef3bd66a8707f82818def70d30e66f487b57cd75f094acc4f467ef94 WHIRLPOOL 52abef494668f35d29241d5cb89b5f197671d1224465c25b05f59a265dc940b9a4797f13fa499279a649a84f1a7090db180ae7bec889d49914981773aa6f6198
 DIST percona-server-5.6.16-64.2.tar.gz 34455024 SHA256 841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d SHA512 c114d4267f4c917bd886d76d4d6dca3c71bfc33efc57a8cbac623ec52b87b8cf1aaa6bdef3df6db91a074206d3c2206997c39d316abc33e927584307b791fb5c WHIRLPOOL ed60be8ec2008f9893df408b4e883ecf7c459d4e81a6e302207595980ac88ad5879f32d842ae9de66e5470b00db5b5b7a3fc5cb200468019f574d0e00df539de
+EBUILD percona-server-5.6.16.64.2.ebuild 4790 SHA256 d9fb11d90888a2e3dc36141c9cf31822723400256b003813dbcbabad8ac87803 SHA512 bbd1768320b4bc65f3c7a5bbc936073545c6a23687e2c1c27ad259abe0010dec6cedd5eb3f52c2980bfa63b0d0805b12effe512e7220c2af230b1230e04fdbde WHIRLPOOL fe0ac0a50ba8b43d734a8c47c01149ba86019e1ffc7d37fb1bb74fd83e916d0a17f884e7f31b51bda41568e1cf5caefeaebe923abd1d2cea62e4fb446d5c8d31
+MISC metadata.xml 1088 SHA256 cc86c936f1bad3cfd435753a665dc928fc07700af3a77debecca068e3240abf7 SHA512 6663e5e9e9f4515e8410688113cc46a265b1499819a97a9c6fa83a87075017dd84bd026834e9d199d299d2f36d1f8555abf24e2a915aad4773b999f89a8029d0 WHIRLPOOL 7a7f8a8d15f101c0fd02ac3ad828ed988e66fd16933c4b7db8d4d356c0c46ec258c027be2a0cba098d8bc197f8a330d426b57ce5ef25694fd3acd328b7b866ac

From 5b8ecb5ec1847505f8917b734ba07eef19767a4b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 11 May 2015 20:54:14 -0700
Subject: [PATCH 071/261] need older support of pear

---
 dev-php/PEAR-DB/ChangeLog             | 287 ++++++++++++++++++++++++++
 dev-php/PEAR-DB/Manifest              |  14 ++
 dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild |  12 ++
 dev-php/PEAR-DB/metadata.xml          |   5 +
 4 files changed, 318 insertions(+)
 create mode 100644 dev-php/PEAR-DB/ChangeLog
 create mode 100644 dev-php/PEAR-DB/Manifest
 create mode 100644 dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild
 create mode 100644 dev-php/PEAR-DB/metadata.xml

diff --git a/dev-php/PEAR-DB/ChangeLog b/dev-php/PEAR-DB/ChangeLog
new file mode 100644
index 0000000..2573b53
--- /dev/null
+++ b/dev-php/PEAR-DB/ChangeLog
@@ -0,0 +1,287 @@
+# ChangeLog for dev-php/PEAR-DB
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/ChangeLog,v 1.76 2014/08/10 20:45:56 slyfox Exp $
+
+  10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  QA: drop trailing '.' from DESCRIPTION
+
+  26 Jan 2014; Ole Markus With <olemarkus@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  Removing stable keyword for sh/s390
+
+  18 Mar 2012; Matti Bickel <mabi@gentoo.org> -PEAR-DB-1.7.12.ebuild,
+  -PEAR-DB-1.7.14_rc1.ebuild:
+  remove old
+
+  18 Mar 2012; Raúl Porcel <armin76@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #402253
+
+  02 Mar 2012; Brent Baude <ranger@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  Marking PEAR-DB-1.7.14 ppc64 for bug 402253
+
+  16 Feb 2012; Markus Meier <maekke@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  arm stable, bug #402253
+
+  16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  x86 stable wrt bug #402253
+
+  15 Feb 2012; Brent Baude <ranger@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  Marking PEAR-DB-1.7.14 ppc for bug 402253
+
+  08 Feb 2012; Jeroen Roovers <jer@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  Stable for HPPA (bug #402253).
+
+  07 Feb 2012; Agostino Sarubbo <ago@gentoo.org> PEAR-DB-1.7.14.ebuild:
+  Stable for amd64, wrt bug #402253
+
+*PEAR-DB-1.7.14 (27 Dec 2011)
+
+  27 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +PEAR-DB-1.7.14.ebuild:
+  Version bump (bug 396229)
+
+  27 Apr 2010; Steve Dibb <beandog@gentoo.org> PEAR-DB-1.7.12.ebuild,
+  PEAR-DB-1.7.14_rc1.ebuild:
+  Fix PEAR deps
+
+  15 Feb 2010; Steve Dibb <beandog@gentoo.org> PEAR-DB-1.7.6-r1.ebuild,
+  PEAR-DB-1.7.12.ebuild, PEAR-DB-1.7.14_rc1.ebuild:
+  Fix deps, bug 303517
+
+  05 Dec 2007; Markus Ullmann <jokey@gentoo.org> PEAR-DB-1.7.6-r1.ebuild,
+  PEAR-DB-1.7.12.ebuild, -PEAR-DB-1.7.13.ebuild, PEAR-DB-1.7.14_rc1.ebuild:
+  LICENSE fix from project overlay
+
+  02 Dec 2007; Jakub Moc <jakub@gentoo.org>
+  PEAR-DB-1.7.6-r1.ebuild, PEAR-DB-1.7.12.ebuild,
+  PEAR-DB-1.7.14_rc1.ebuild:
+  Fix LICENSE
+
+*PEAR-DB-1.7.14_rc1 (29 Nov 2007)
+
+  29 Nov 2007; Markus Ullmann <jokey@gentoo.org> +PEAR-DB-1.7.14_rc1.ebuild:
+  Version bump from project overlay
+
+  28 Nov 2007; Jakub Moc <jakub@gentoo.org> +PEAR-DB-1.7.14_rc1.ebuild:
+  Version bump
+
+  22 Oct 2007; Raúl Porcel <armin76@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  ia64 stable wrt #192247
+
+*PEAR-DB-1.7.13 (14 Oct 2007)
+
+  14 Oct 2007; Anant Narayanan <anant@gentoo.org> +PEAR-DB-1.7.13.ebuild:
+  version bump
+
+  05 Oct 2007; Raúl Porcel <armin76@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  alpha/sparc stable wrt #192247
+
+  28 Sep 2007; Christoph Mende <angelos@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  Stable on amd64 wrt bug #192247
+
+  26 Sep 2007; Brent Baude <ranger@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  Marking PEAR-DB-1.7.12 ppc64 stable for bug 192247
+
+  25 Sep 2007; Lars Weiler <pylon@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  stable ppc, bug #192247
+
+  21 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  PEAR-DB-1.7.12.ebuild:
+  x86 stable, bug 192247
+
+  16 Sep 2007; Jeroen Roovers <jer@gentoo.org> PEAR-DB-1.7.12.ebuild:
+  Stable for HPPA (bug #192247).
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -PEAR-DB-1.7.10.ebuild:
+  Cleanup
+
+*PEAR-DB-1.7.12 (17 Aug 2007)
+
+  17 Aug 2007; Christian Hoffmann <hoffie@gentoo.org>
+  +PEAR-DB-1.7.12.ebuild:
+  version bump wrt bug 158633, thanks to Jakub Moc
+
+*PEAR-DB-1.7.10 (21 Mar 2007)
+
+  21 Mar 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  PEAR-DB-1.7.6-r1.ebuild, +PEAR-DB-1.7.10.ebuild:
+  Version bump.
+
+  21 May 2006; Luca Longinotti <chtekk@gentoo.org> -PEAR-DB-1.6.8.ebuild,
+  -PEAR-DB-1.7.6.ebuild:
+  Remove old-style PHP packages.
+
+  17 Feb 2006; Aron Griffis <agriffis@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Mark 1.7.6-r1 stable on alpha. #119722
+
+  27 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
+  PEAR-DB-1.7.6-r1.ebuild:
+  Stable on ppc.
+
+  27 Jan 2006; Jeroen Roovers <jer@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Marked hppa (bug #119722).
+
+  22 Jan 2006; Bryan Østergaard <kloeri@gentoo.org PEAR-DB-1.7.6-r1.ebuild:
+  Add ~ia64 keyword, bug 119722.
+
+  22 Jan 2006; Simon Stelling <blubb@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  stable on amd64 wrt bug 119722
+
+  22 Jan 2006; Jason Wever <weeve@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Stable on SPARC wrt bug #119722.
+
+  22 Jan 2006; Mark Loeser <halcy0n@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Stable on x86; bug #119722
+
+  21 Jan 2006; Markus Rothe <corsair@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Stable on ppc64; bug #119722
+
+  22 Nov 2005; Markus Rothe <corsair@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Added ~ppc64 keyword; bug #105385
+
+  21 Nov 2005; Joseph Jezak <josejx@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Marked ~ppc for bug #105385.
+
+  18 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Marked ~amd64.
+
+  11 Sep 2005; Jason Wever <weeve@gentoo.org> PEAR-DB-1.7.6-r1.ebuild:
+  Added ~sparc keyword.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> PEAR-DB-1.7.6.ebuild:
+  Mark 1.7.6 stable on alpha
+
+*PEAR-DB-1.7.6-r1 (08 Sep 2005)
+
+  08 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-DB-1.7.6-r1.ebuild:
+  Use new PEAR eclass.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> PEAR-DB-1.7.6.ebuild:
+  stable on ia64
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> PEAR-DB-1.7.6.ebuild:
+  Stable on hppa.
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  PEAR-DB-1.7.6.ebuild:
+  ppc stable
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> PEAR-DB-1.7.6.ebuild:
+  Stable on ppc64
+
+  04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> PEAR-DB-1.7.6.ebuild:
+  Stable on sparc
+
+  02 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  PEAR-DB-1.7.6.ebuild:
+  Stable on amd64 and x86.
+
+*PEAR-DB-1.7.6 (13 Jun 2005)
+
+  13 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-DB-1.7.6.ebuild:
+  Version bump.
+
+  16 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-DB-1.6.4.ebuild:
+  Remove old ebuild(s).
+
+  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Stable on sparc
+
+  07 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Stable on ppc.
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  stable on ia64
+
+  27 Mar 2005; Guy Martin <gmsoft@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Stable on hppa.
+
+  27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Stable on alpha.
+
+  12 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  PEAR-DB-1.6.8.ebuild:
+  Stable on x86 and amd64, see bug 84525.
+
+  09 Mar 2005; Markus Rothe <corsair@gentoo.org> PEAR-DB-1.6.8.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #84525
+
+  09 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  PEAR-DB-1.6.8.ebuild:
+  This package was previously bundled with www-apps/horde-pear. Mark unstable
+  for ARCHes that www-apps/horde-pear-r2 is marked stable for.
+
+  08 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-DB-1.3.ebuild, -PEAR-DB-1.5.0_rc2.ebuild, -PEAR-DB-1.6.1.ebuild,
+  -PEAR-DB-1.6.5.ebuild:
+  Remove old versions.
+
+*PEAR-DB-1.6.8 (12 Feb 2005)
+
+  12 Feb 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-DB-1.6.8.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Oct 2004; Jason Wever <weeve@gentoo.org> PEAR-DB-1.6.4.ebuild:
+  Stable on sparc.
+
+  03 Aug 2004; <agriffis@gentoo.org> PEAR-DB-1.6.4.ebuild,
+  PEAR-DB-1.6.5.ebuild:
+  Mark 1.6.4 stable on alpha, add ia64 keywords #56295
+
+*PEAR-DB-1.6.5 (30 Jul 2004)
+
+  30 Jul 2004; Tal Peer <coredumb@gentoo.org> +PEAR-DB-1.6.5.ebuild:
+  Version bump
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> PEAR-DB-1.6.4.ebuild:
+  stable.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> PEAR-DB-1.5.0_rc2.ebuild:
+  Stable on alpha.
+
+*PEAR-DB-1.6.4 (04 May 2004)
+
+  04 May 2004; Tal Peer <coredumb@gentoo.org> PEAR-DB-1.6.4.ebuild:
+  Version bump, bug #49719
+
+  18 Apr 2004; Jason Wever <weeve@gentoo.org> PEAR-DB-1.5.0_rc2.ebuild:
+  Stable on sparc.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> PEAR-DB-1.6.1.ebuild:
+  Added IUSE=
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> PEAR-DB-1.3.ebuild,
+  PEAR-DB-1.5.0_rc2.ebuild:
+  Added IUSE=.
+
+*PEAR-DB-1.6.1 (15 Mar 2004)
+
+  15 Mar 2004; Tal Peer <coredumb@gentoo.org> PEAR-DB-1.5.0_rc2.ebuild,
+  PEAR-DB-1.6.1.ebuild:
+  1.5.0_rc2 stable on x86, bumped version to 1.6.1
+
+  13 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+  11 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> PEAR-DB-1.3.ebuild:
+  fix bug #28168, move to stable
+
+*PEAR-DB-1.5.0_rc2 (23 Dec 2003)
+
+  23 Dec 2003; Tal Peer <coredumb@gentoo.org> PEAR-DB-1.5.0_rc2.ebuild:
+  Version bump.
+  Uses the new eclass.
+
+*PEAR-DB-1.3 (07 May 2003)
+
+  07 May 2003; Joshua Brindle <method@gentoo.org> Manifest,
+  PEAR-DB-1.3.ebuild:
+  Initial import, I needed this and it wasn't here...
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
new file mode 100644
index 0000000..abc77bb
--- /dev/null
+++ b/dev-php/PEAR-DB/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST DB-1.7.14.tgz 133103 SHA256 a574483fd5c4440a4bf08018e8bcdde7f4619e9b964de2b357bd60733ec5919c SHA512 d20c1c052409397a3ded1f498d979cc07e43d6c156b4b707ef941d5d1c8bfd2fa996e5e9a912495fdd01bc231656e990b8b37ea6373f6f0d2cea9f875131a6ac WHIRLPOOL 7e616069251ea8d8609feaf5d663262222c9fce73319b1d75ee9d91b73dd6523a1b9bf7d472d7e76c60210c7937ddee70c7429cb5fe13c7981e707fbd5a1dc1a
+EBUILD PEAR-DB-1.7.14.ebuild 392 SHA256 fd394904efc98bc7aacd116743197d68a0a613c52334d9bc0e6d454b317f44cd SHA512 586270cefd45524d66756a7641d358e4e22a41cb9458989cb3cf5081c948cc7eaf6d5e35ab62800940b591f5333324d95b705f87dee3580b22b6a127540ff308 WHIRLPOOL db57ae2095e637bc0528296be48329ab7ed76e5f224609e54223b5930264c036acbcfb842b53ded25a515109f7ade9cb01f36703347371f63665ab29fd9eb669
+MISC ChangeLog 9047 SHA256 6ddaa8a2acc4c4214157b304d3dbd54d3e135361e6dfa2295593494f0a6f2cca SHA512 18c8416e5e87ee5e8c5ea83bf4958c0af93e2ff1b4590adff41f64f8a1166c5ed0dcc96f97171c201485b07e988375d952ce13a7a77719d88b45eb4ef2035ab7 WHIRLPOOL 15c2ea1aaf1e921e21bd7ae68beaf3bf9d5fae69f49078deed8ebf934411344a09ad6362b1ff124f79535aed8fcaeb5029595eca5d61369f8ab2d3f6dba674e5
+MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPn2gUACgkQcaHudmEf86rU2QCdGzJ9hcsDILLBl/kUEqC0415U
+CFwAnRKuxUkxCvxi3Sdt6V1Qjd7FIp5I
+=ZKIw
+-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild
new file mode 100644
index 0000000..69ba5c6
--- /dev/null
+++ b/dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/PEAR-DB-1.7.14.ebuild,v 1.10 2014/08/10 20:45:56 slyfox Exp $
+
+inherit php-pear-r1
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/PEAR-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml
new file mode 100644
index 0000000..fd3dbe3
--- /dev/null
+++ b/dev-php/PEAR-DB/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+</pkgmetadata>

From 5bf0bcb8789fd5f66808b1d00ba31ec2153017d8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 23 Jun 2015 01:58:26 -0700
Subject: [PATCH 072/261] removed not needed asterisk versions and updated
 manifest

---
 net-misc/asterisk/Manifest                |   9 +-
 net-misc/asterisk/asterisk-11.10.0.ebuild | 322 ----------------------
 net-misc/asterisk/asterisk-11.6.0.ebuild  | 322 ----------------------
 net-misc/asterisk/asterisk-11.8.1.ebuild  | 320 ---------------------
 4 files changed, 1 insertion(+), 972 deletions(-)
 delete mode 100644 net-misc/asterisk/asterisk-11.10.0.ebuild
 delete mode 100644 net-misc/asterisk/asterisk-11.6.0.ebuild
 delete mode 100644 net-misc/asterisk/asterisk-11.8.1.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9c5b7da..321f46c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -88,14 +88,7 @@ AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278b
 AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
-DIST asterisk-11.10.0.tar.gz 34848342 SHA256 32fc29ab820c446206064d7a8f7d48b57f3269c55ac998cfe10bc61a9cca3a33 SHA512 2bcb270b65799f34c7dfa7d4010eeec8b4e3fb46611cc1ad92aaa6d540aa1e0ddc5a7c1fa5a4811df73f6d93899f11d605f065423c01c993f030ddc36aaab951 WHIRLPOOL 700f6e71bbf66f3631533cf5e6e799606212ceb11b94b3587db7f774e6d53b90d192d89482fd6857fe248cc9ae1eff19d5bfae64e56097419bcfddaf6b3f57d7
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-11.6.0.tar.gz 24828582 SHA256 c128ce24416b236fd73c403ad1e2da33c3816cf6db1beb6f97509659f8b281a0 SHA512 6a14d92d6a263edac0da23b091961adf54be9d5ff042117c5f1255241744a3f9a10cd851d46326f58c18932d5dfe8bff38bd760b4ca63aeae15d4eed222d6612 WHIRLPOOL eed712b55af394a2c4a9873bc39e8dee23b022530f290030bb08f2feb735188a1b6789067d6f149bf8065976af457b5795960259790fae8339e059a6eda0f117
-DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
-DIST asterisk-patchset.tar.gz 15840 SHA256 f0de33c50aff48ea090f85a8c993bb1439453082faa5d0ac2493b876edaba8de SHA512 bcdca6640d16385d9fd6e05cbc8f659efb7a8ec318d169d3a2af410024b03408a89f460cce1112b370bcdec08f0b45eb8f4f1d4c6d1ba1b8d3045f3b70cc217c WHIRLPOOL bc1ca700bdb915e39c80ae85ae61f3df053dc2d1be395ce8713ead076520964e75b674ad261944e269d055731c960a4473087bbd44c8fae4ef3f8ee5b65a4840
-DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
+DIST asterisk-patchset.tar.gz 16889 SHA256 845c3c009a6915162174e5d6da5f51ca1ea3999eec2c801a3dd726410f70928b SHA512 c30d0bb3c794220bc9018f8a1ef905269b503537cb86d8943ce0d466591987e29ea471adf995d077db973a7e21c7279f45f99b38d4dc10e0de8978ecb4bb9f72 WHIRLPOOL bbafb5e7bdfc175bdb14fdf8921498feb3af77c4dd0f8bc567cd8cafe5113552de85a8477b2390adc899ab18a837635aa94b5679c913f5921678db336fa4833d
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
-EBUILD asterisk-11.10.0.ebuild 9571 SHA256 9354bf11f69ecf36fd438bcda04a7f0950c30a88a8d4e138fc361ae536bcbf65 SHA512 2c7373f7bc54291b3f0bad39e23225bf733197642cfe08a1f7323ce4a1a3c7592dd13e41aeb7cd99ce73f647bbce04e53b22356d660b6fa8a51ac51a355934d5 WHIRLPOOL 2366705c63d7bbcecaaecb108161e81cf5283dcae904ef12bd97dfc62fb1d5bb0257e6301f75463ea4b34f3b511dcb58d3d2966bff4092c36cc7758a08b5e51e
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311
-EBUILD asterisk-11.6.0.ebuild 9501 SHA256 00ce68bfe742e929e4b8078db178db91e39572e7748ddc95871b275dca7a7d1d SHA512 f8775c265a54725fc3e7db586e60a333603c2d287c3da9f9f2ab36dbbd3842f2b09b4f475c9780209a1acfab232ffd64c66048a3843eb77aa3aeb4833c1dd72c WHIRLPOOL 0628f1c107439391f8480a43f6b666d1d669dfd6ce8ceb03ab6f2aded4d563d1298bf6a1f377031174791531fc0a1fc60e40183cdf6333e1b9a6dc0853bed40b
-EBUILD asterisk-11.8.1.ebuild 9502 SHA256 4305b03116e5198852dfcd04546684a81a07d9d547c76e3699fe6cf8f46b4f9e SHA512 21048ddb1e669e7c092921e3d9671640657f7547a2f6d78e8e7c4c0f525007d1a5eccd547e24697b38c63bff596ffe7bca6299c5122df91c9940da91cbb124be WHIRLPOOL 2de4f09270d24b42c23661eb9d9a4262f6cf2b3713252f376a820b807afa216eff4ef5bcfebd4310ec68f74760da2bcdda94c1edffe253fd15f557cb51ece3f4
diff --git a/net-misc/asterisk/asterisk-11.10.0.ebuild b/net-misc/asterisk/asterisk-11.10.0.ebuild
deleted file mode 100644
index c23516d..0000000
--- a/net-misc/asterisk/asterisk-11.10.0.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset"
-           "${FILESDIR}/11.10.0/patches/asterisk-11.10.0-dtls.patch"
-)
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	jabber? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua )
-	meetme? ( net-misc/dahdi )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select meetme		app_meetme
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-11.6.0.ebuild b/net-misc/asterisk/asterisk-11.6.0.ebuild
deleted file mode 100644
index 9732c61..0000000
--- a/net-misc/asterisk/asterisk-11.6.0.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-
-SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset"
-)
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	jabber? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua )
-	meetme? ( net-misc/dahdi )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select meetme		app_meetme
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-11.8.1.ebuild b/net-misc/asterisk/asterisk-11.8.1.ebuild
deleted file mode 100644
index ab0f3ea..0000000
--- a/net-misc/asterisk/asterisk-11.8.1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.4 2014/05/08 09:41:39 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.11.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua meetme mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	jabber? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua )
-	meetme? ( net-misc/dahdi )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select meetme		app_meetme
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}

From 7be5a2f68bb84d66ba009e5a0ec0f55d5d173df0 Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Thu, 2 Jul 2015 21:07:19 -0700
Subject: [PATCH 073/261] build a new package for the sangoma package

---
 net-misc/sangoma-nca/Manifest                 |   4 +
 net-misc/sangoma-nca/files/pax_fix.sh         |  13 ++
 net-misc/sangoma-nca/files/sangoma_initd_1    | 168 ++++++++++++++++++
 net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild |  77 ++++++++
 4 files changed, 262 insertions(+)
 create mode 100644 net-misc/sangoma-nca/Manifest
 create mode 100644 net-misc/sangoma-nca/files/pax_fix.sh
 create mode 100755 net-misc/sangoma-nca/files/sangoma_initd_1
 create mode 100644 net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild

diff --git a/net-misc/sangoma-nca/Manifest b/net-misc/sangoma-nca/Manifest
new file mode 100644
index 0000000..cfaf882
--- /dev/null
+++ b/net-misc/sangoma-nca/Manifest
@@ -0,0 +1,4 @@
+AUX pax_fix.sh 771 SHA256 c61024489d8f3d4033464213404a5792825a1526dda4c39f70fb6fd159e30311 SHA512 6aa15d5d0658d83f4fc53cf5a131ccaff57c91eaf1bbf3c0fd258b7d8dcf2643f5f99b497f0d2c34f0911978b6dc4fe3d39e5d5683eb5c97845917a993f6731c WHIRLPOOL 96119fa6b28b8348f4eb4807d18e883fc94a177dc60c5950d105771c2991c0350d79f5f77ceb1d27d8514b39259068b0b38bc4891f7a0b14459d677dfa601303
+AUX sangoma_initd_1 4040 SHA256 d5d12e3e2d196f8f233ec1fd7cae11b966f0bd98bc1e636e30dcf77aca1dbff6 SHA512 6fcc93a9f7cb94ee3b2d2074aa051074575a180acb9b185321d2640c3c2c604c02a17c1706f0f1d9126c2ab57bc3246266d5cc8413898c6dffdad69d294b892e WHIRLPOOL cca62bac4d9c66afe006c3e18758149ccf6f26193cc3363a7b7ce8a02190f6f487a7bab4ba4f5c7c64d38f8d2824378c0d6c9e7f6954dbf611e77d732a3df2ba
+DIST NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm 17698929 SHA256 c12fa08d46aeb7ff5c37b8fa9c92019d0a8a3abdcf6518062b26f222307fd5ec SHA512 4f449716a01100690d06e738fff54545ad79230815df97cbc1442fb32c28a5b7fb304783bba5828f58b7ab6ae23c705a456da210b9413701c9ff9cbb5cd40aee WHIRLPOOL 5c93183479e686084d8d3a3a81021fb5e5e5b5713a777a5d21a96706637dddc8a693eda6688980051a59457867f8dd465db23ce47cacdefdfd011f66410cbc88
+EBUILD sangoma-nca-2.0.6.ebuild 2747 SHA256 d16e35f0c57828fa65a69f6dff25d74823d6b71305da2df240728ab8d32f170a SHA512 b1aaf70515fb2a922ebd634e18edd33cf91535c5b3577015f4823fa948a0a6befa5a1b58d412c2ce305b680e2c79617db6fdb1ec7b3bbac1a8824b1169959a18 WHIRLPOOL 74b4507045f15edab6dc22af401326af61a9f66f5f51428a4282230d71e1586c2ab63175bbe71d8abf250c4f2a11f9a02cf7cb0b0da9a9baa255ad0395a8c7b1
diff --git a/net-misc/sangoma-nca/files/pax_fix.sh b/net-misc/sangoma-nca/files/pax_fix.sh
new file mode 100644
index 0000000..9706f58
--- /dev/null
+++ b/net-misc/sangoma-nca/files/pax_fix.sh
@@ -0,0 +1,13 @@
+echo "Creating Headers"
+paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
+paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
+paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
+paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
+paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
+
+echo "Disabling memory pax check"
+paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
+paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
+paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
+paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
+paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
diff --git a/net-misc/sangoma-nca/files/sangoma_initd_1 b/net-misc/sangoma-nca/files/sangoma_initd_1
new file mode 100755
index 0000000..161c2de
--- /dev/null
+++ b/net-misc/sangoma-nca/files/sangoma_initd_1
@@ -0,0 +1,168 @@
+#!/bin/bash
+#
+# Init file for Netborder Call Analyzer
+#
+# run levels: 2-5, start priority 95, stop priority 5
+#
+# chkconfig: 2345 95 5
+# description: Sangoma NetBorder Call Analyzer
+#
+# pidfile: /var/run/netborder-call-analyzer-service.pid
+# pidfile: /var/run/netborder-call-analyzer-engine.pid
+
+# source function library
+#. /etc/rc.d/init.d/functions
+
+INSTDIR=/opt/Sangoma_NetBorderCallAnalyzer
+
+#add our /lib to .so search path
+export LD_LIBRARY_PATH=$INSTDIR/lib:$LD_LIBRARY_PATH
+
+NCA_COMMON_OPTIONS="--start-service --putenv PARAXIP=$INSTDIR --putenv PARAXIP_BINDIR=$INSTDIR/bin --putenv PARAXIP_BRAND=netborder --putenv PARAXIP_INSTALLDIR=$INSTDIR --putenv PARAXIP_PLATFORM=x86_64-linux"
+
+# main service ("SIP hub")
+NCA_MAIN_SERVICE_NAME=netborder-call-analyzer-service
+NCA_MAIN_SERVICE_FULL_PATH=$INSTDIR/bin/$NCA_MAIN_SERVICE_NAME
+
+NCA_MAIN_SERVICE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-logging.properties --global-config $INSTDIR/config/call-analyzer-service.properties"
+  
+# engine process
+NCA_ENGINE_NAME=netborder-call-analyzer-engine
+NCA_ENGINE_FULL_PATH=$INSTDIR/bin/$NCA_ENGINE_NAME
+
+export LOGNAME=$NCA_ENGINE_NAME
+
+NCA_ENGINE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-engine-logging.properties --global-config $INSTDIR/config/call-analyzer-engine.properties"
+
+# Sets process priority to 'Realtime' (Highest priority available)
+# use as prefix before lauching the application
+PRIO_RT="chrt -r 99"
+
+RETVAL=0
+
+# arg 1: service process name
+# arg 2: cmd-line to launch service
+start()
+{
+  nca_service_pid=`pidof $1`
+  if [ ! -z "$nca_service_pid" ]
+  then
+    echo "Service $1 is already started"
+    #failure
+    exit 1
+  fi
+
+  # Check if effective user ID is superuser (bug 4523)
+  if [ "$EUID" != 0 ]; then
+    echo -n "Service must be started by user with root privileges"
+    #failure
+    exit 1
+  fi
+
+  echo -n $"Starting $1"
+  
+  # Setting wd to the installtion dir (some paths in config files are relative to it)
+  cd ${INSTDIR}
+  # arg 2 is cmd-line to launch service
+  $2 &> ${INSTDIR}/logs/stderr/$1.log
+
+  RETVAL=$?
+  [ "$RETVAL" = 0 ] && touch /var/lock/$1
+
+  # Only end the routine if we stop seeing the process (failure) or the pid file
+  # is created (success). If the pid file is never created by the app this script will
+  # hang forever (or more likely until the user stops us)
+  while true
+  do
+    nca_service_pid=`pidof $1`
+    if [ -z "$nca_service_pid" ]
+    then
+      rm -f /var/lock/$1
+      #failure
+      echo
+      echo "failure"
+      exit 1
+    fi
+    if [ -f /var/run/$1.pid ]
+    then
+      #success
+      echo
+      echo  "success"
+      break
+    fi
+    sleep 0.5
+  done
+}
+
+# arg 1: service name
+stop()
+{
+  nca_service_pid=`pidof $1`
+  if [ -z "$nca_service_pid" ]
+  then
+    echo -n "Service $1 is not started"
+    #failure
+    echo 
+    exit 1
+  fi
+
+  # Check if effective user ID is superuser (bug 4523)
+  if [ "$EUID" != 0 ]; then
+    echo -n "Service must be stopped by user with root privileges"
+    #failure
+    echo
+    exit 1
+  fi
+
+  echo -n $"Stopping $1"
+
+  # -15 is TERM
+  kill -15 $nca_service_pid
+  # Only end the routine if we stop seeing the process or the pid file
+  # is deleted. If the pid file is never deleted by the app this script will
+  # hang forever (or more likely until the user stops us)
+  while true
+  do
+    nca_service_pid=`pidof $1`
+    if [ -z "$nca_service_pid" ]
+    then
+      #success
+      break
+    fi
+    if [ ! -f /var/run/$1.pid ]
+    then
+      #success
+      break
+    fi
+   sleep 0.5
+  done
+  RETVAL=$?
+  [ "$RETVAL" = 0 ] && rm -f /var/lock/$1
+  echo 
+}
+
+case "$1" in
+
+	start)
+		start $NCA_MAIN_SERVICE_NAME "$NCA_MAIN_SERVICE_FULL_PATH $NCA_MAIN_SERVICE_OPTIONS"
+		start $NCA_ENGINE_NAME "$PRIO_RT $NCA_ENGINE_FULL_PATH $NCA_ENGINE_OPTIONS"
+		;;
+
+	stop)
+		stop $NCA_MAIN_SERVICE_NAME
+		stop $NCA_ENGINE_NAME
+		;;
+
+	status)
+		status $NCA_MAIN_SERVICE_NAME
+		status $NCA_ENGINE_NAME
+		RETVAL=$?
+		;;
+
+	*)
+		echo $"Usage: $0 {start|stop|status}"
+		RETVAL=1
+
+esac
+exit $RETVAL
+
diff --git a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
new file mode 100644
index 0000000..ba3d601
--- /dev/null
+++ b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+
+URI_PRE="http://mirrors.safesoft.us/gentoo/portage/net-misc/sangoma-nca/NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm"
+
+DESCRIPTION="The Lyra Asterisk software application from Sangoma software provides the most accurate and resilient Answer Machine Detection (AMD) engine, enabling fast and reliable real-time call classification and drives the efficiency and quality of automated calling applications to unmatched levels."
+HOMEPAGE="http://www.sangoma.com/"
+KEYWORDS="-* ~x86 ~amd64"
+SRC_URI="${URI_PRE}"
+
+SLOT="0"
+LICENSE="PMS-License"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="app-arch/rpm2targz"
+DEPEND="${RDEPEND}"
+
+INIT_SCRIPT="${ROOT}/etc/init.d/netborder-call-analyzer"
+
+#pkg_setup() {
+	#enewgroup plex
+	#enewuser plex -1 /bin/bash /var/lib/plexmediaserver "plex" --system
+#}
+
+pkg_preinst() {
+	einfo "unpacking RPM File"
+	cd ${DISTDIR}
+	rpm2targz NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm
+	# ar x ${DISTDIR}/${A}
+        mkdir data
+	tar -xzf *.tar.gz -C data
+
+	einfo "updating init script"
+	# replace debian specific init scripts with gentoo specific ones
+        rm data/etc/init.d/netborder-call-analyzer
+	cp "${FILESDIR}"/sangoma_initd_1 data/etc/init.d/netborder-call-analyzer
+        chmod 755 data/etc/init.d/netborder-call-analyzer
+
+        # as the patch doesn't seem to correctly set the permissions on new files do this now
+	# now copy to image directory for actual installation
+	cp -R data/* ${D}
+
+	einfo "Stopping running instances of Sangoma Netborder Call Analyzer"
+	if [ -e "${INIT_SCRIPT}" ]; then
+		${INIT_SCRIPT} stop
+	fi
+}
+
+pkg_prerm() {
+	einfo "Stopping running instances of Sangoma Netborder Call Analyzer"
+        if [ -e "${INIT_SCRIPT}" ]; then
+                ${INIT_SCRIPT} stop
+        fi
+}
+
+pkg_postinst() {
+        einfo ""
+        elog "Patching Sangoma binaries with pax headers"
+        sh "${FILESDIR}"/pax_fix.sh
+        elog "Sangoma binaries have been patched"
+        einfo ""
+
+	#einfo ""
+	#elog "Plex Media Server is now fully installed. Please check the configuration file in /etc/plex if the defaults please your needs."
+	#elog "To start please call '/etc/init.d/plex-media-server start'. You can manage your library afterwards by navigating to http://<ip>:32400/web/"
+	#einfo ""
+
+	#ewarn "Please note, that the URL to the library management has changed from http://<ip>:32400/manage to http://<ip>:32400/web!"
+	#ewarn "If the new management interface forces you to log into myPlex and afterwards gives you an error that you need to be a plex-pass subscriber please delete the folder WebClient.bundle inside the Plug-Ins folder found in your library!"
+}

From fc6e3644938bbee1e21524d08b8165ce5860d960 Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Thu, 2 Jul 2015 21:14:55 -0700
Subject: [PATCH 074/261] update path

---
 net-misc/sangoma-nca/Manifest                 |  6 +++---
 net-misc/sangoma-nca/files/pax_fix.sh         | 20 +++++++++----------
 net-misc/sangoma-nca/files/sangoma_initd_1    |  2 +-
 net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild |  2 ++
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/net-misc/sangoma-nca/Manifest b/net-misc/sangoma-nca/Manifest
index cfaf882..ed88372 100644
--- a/net-misc/sangoma-nca/Manifest
+++ b/net-misc/sangoma-nca/Manifest
@@ -1,4 +1,4 @@
-AUX pax_fix.sh 771 SHA256 c61024489d8f3d4033464213404a5792825a1526dda4c39f70fb6fd159e30311 SHA512 6aa15d5d0658d83f4fc53cf5a131ccaff57c91eaf1bbf3c0fd258b7d8dcf2643f5f99b497f0d2c34f0911978b6dc4fe3d39e5d5683eb5c97845917a993f6731c WHIRLPOOL 96119fa6b28b8348f4eb4807d18e883fc94a177dc60c5950d105771c2991c0350d79f5f77ceb1d27d8514b39259068b0b38bc4891f7a0b14459d677dfa601303
-AUX sangoma_initd_1 4040 SHA256 d5d12e3e2d196f8f233ec1fd7cae11b966f0bd98bc1e636e30dcf77aca1dbff6 SHA512 6fcc93a9f7cb94ee3b2d2074aa051074575a180acb9b185321d2640c3c2c604c02a17c1706f0f1d9126c2ab57bc3246266d5cc8413898c6dffdad69d294b892e WHIRLPOOL cca62bac4d9c66afe006c3e18758149ccf6f26193cc3363a7b7ce8a02190f6f487a7bab4ba4f5c7c64d38f8d2824378c0d6c9e7f6954dbf611e77d732a3df2ba
+AUX pax_fix.sh 851 SHA256 742040d39c67bff6f6bba85db4a47444bb4588a93e92571fbaeb2dffd5c178d8 SHA512 7317356f7f4c88b411966b0214db4261273e5547198f320b7b97b82d5b763bc6e0c7153e20fb983f2f8b8f2354035771eeaa83afc3166f2dd84067f3ba18f720 WHIRLPOOL c4e1ecbe1ce7153400aebcbbde25f0bce4f08c3eb55fcd21b80cb07d6da43b7a114a2f772d8c5f202455dd40aeb8a72f6bf0161c8050ba3f0be0f00993f2126b
+AUX sangoma_initd_1 4048 SHA256 6a0d6425af6dbb4672ea09ca79dc1da4ea5deee2035b5749a885f4f689492cb0 SHA512 d408acec71ae5938e78bfb70eb51fd7f4ee15d7fec1c1691ba6933d6fed85c4df6b9c56a4f96f3680454ed233af11f1ece86a3ddc9380b3391478c4417632519 WHIRLPOOL e57ae966286b5f1c26fcdc4e496f98dfa50297d48e9d508ea00522ae3fe1708dedfde282b1f570cab4b392a73420e5ee171bad120f30d6c3c3672532740fd47b
 DIST NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm 17698929 SHA256 c12fa08d46aeb7ff5c37b8fa9c92019d0a8a3abdcf6518062b26f222307fd5ec SHA512 4f449716a01100690d06e738fff54545ad79230815df97cbc1442fb32c28a5b7fb304783bba5828f58b7ab6ae23c705a456da210b9413701c9ff9cbb5cd40aee WHIRLPOOL 5c93183479e686084d8d3a3a81021fb5e5e5b5713a777a5d21a96706637dddc8a693eda6688980051a59457867f8dd465db23ce47cacdefdfd011f66410cbc88
-EBUILD sangoma-nca-2.0.6.ebuild 2747 SHA256 d16e35f0c57828fa65a69f6dff25d74823d6b71305da2df240728ab8d32f170a SHA512 b1aaf70515fb2a922ebd634e18edd33cf91535c5b3577015f4823fa948a0a6befa5a1b58d412c2ce305b680e2c79617db6fdb1ec7b3bbac1a8824b1169959a18 WHIRLPOOL 74b4507045f15edab6dc22af401326af61a9f66f5f51428a4282230d71e1586c2ab63175bbe71d8abf250c4f2a11f9a02cf7cb0b0da9a9baa255ad0395a8c7b1
+EBUILD sangoma-nca-2.0.6.ebuild 2827 SHA256 efbfc5705d2d54050120bbd5efe4b05c33031bcee2969149b5b735ce2ee4bbb7 SHA512 53b0ad2d2b88382f576153ea84a56cc605b128cc7c9facf0a811ba82e87c3d6f856dcd2cb85bc2020dc87eb1f7f14254149c7e5487c1e2dabbbdb39c70884221 WHIRLPOOL 6a34e0bae4d153b70638eaed80f1f9fa9b2852abd3f17718732f0e2c086dda71e3e21706ea893e2131a070c10b23b9c6b4eb55971bda6d60bf0ff504df18dfd4
diff --git a/net-misc/sangoma-nca/files/pax_fix.sh b/net-misc/sangoma-nca/files/pax_fix.sh
index 9706f58..ad63961 100644
--- a/net-misc/sangoma-nca/files/pax_fix.sh
+++ b/net-misc/sangoma-nca/files/pax_fix.sh
@@ -1,13 +1,13 @@
 echo "Creating Headers"
-paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
-paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
-paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
-paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
-paxctl -c /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
+paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
+paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
+paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
+paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
+paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
 
 echo "Disabling memory pax check"
-paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
-paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
-paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
-paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
-paxctl -m /opt/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
+paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
+paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
+paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
+paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
+paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
diff --git a/net-misc/sangoma-nca/files/sangoma_initd_1 b/net-misc/sangoma-nca/files/sangoma_initd_1
index 161c2de..76d4227 100755
--- a/net-misc/sangoma-nca/files/sangoma_initd_1
+++ b/net-misc/sangoma-nca/files/sangoma_initd_1
@@ -13,7 +13,7 @@
 # source function library
 #. /etc/rc.d/init.d/functions
 
-INSTDIR=/opt/Sangoma_NetBorderCallAnalyzer
+INSTDIR=/opt/sangoma/Sangoma_NetBorderCallAnalyzer
 
 #add our /lib to .so search path
 export LD_LIBRARY_PATH=$INSTDIR/lib:$LD_LIBRARY_PATH
diff --git a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
index ba3d601..baf047b 100644
--- a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
+++ b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
@@ -35,7 +35,9 @@ pkg_preinst() {
 	rpm2targz NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm
 	# ar x ${DISTDIR}/${A}
         mkdir data
+        mkdir data/sangoma
 	tar -xzf *.tar.gz -C data
+	mv data/Sangoma_NetBorderCallAnalyzer data/sangoma/
 
 	einfo "updating init script"
 	# replace debian specific init scripts with gentoo specific ones

From 361f638e987a4d5fc888f102b8715be73a43285d Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Thu, 2 Jul 2015 21:17:49 -0700
Subject: [PATCH 075/261] fixed path

---
 net-misc/sangoma-nca/Manifest                 | 2 +-
 net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/sangoma-nca/Manifest b/net-misc/sangoma-nca/Manifest
index ed88372..bad893f 100644
--- a/net-misc/sangoma-nca/Manifest
+++ b/net-misc/sangoma-nca/Manifest
@@ -1,4 +1,4 @@
 AUX pax_fix.sh 851 SHA256 742040d39c67bff6f6bba85db4a47444bb4588a93e92571fbaeb2dffd5c178d8 SHA512 7317356f7f4c88b411966b0214db4261273e5547198f320b7b97b82d5b763bc6e0c7153e20fb983f2f8b8f2354035771eeaa83afc3166f2dd84067f3ba18f720 WHIRLPOOL c4e1ecbe1ce7153400aebcbbde25f0bce4f08c3eb55fcd21b80cb07d6da43b7a114a2f772d8c5f202455dd40aeb8a72f6bf0161c8050ba3f0be0f00993f2126b
 AUX sangoma_initd_1 4048 SHA256 6a0d6425af6dbb4672ea09ca79dc1da4ea5deee2035b5749a885f4f689492cb0 SHA512 d408acec71ae5938e78bfb70eb51fd7f4ee15d7fec1c1691ba6933d6fed85c4df6b9c56a4f96f3680454ed233af11f1ece86a3ddc9380b3391478c4417632519 WHIRLPOOL e57ae966286b5f1c26fcdc4e496f98dfa50297d48e9d508ea00522ae3fe1708dedfde282b1f570cab4b392a73420e5ee171bad120f30d6c3c3672532740fd47b
 DIST NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm 17698929 SHA256 c12fa08d46aeb7ff5c37b8fa9c92019d0a8a3abdcf6518062b26f222307fd5ec SHA512 4f449716a01100690d06e738fff54545ad79230815df97cbc1442fb32c28a5b7fb304783bba5828f58b7ab6ae23c705a456da210b9413701c9ff9cbb5cd40aee WHIRLPOOL 5c93183479e686084d8d3a3a81021fb5e5e5b5713a777a5d21a96706637dddc8a693eda6688980051a59457867f8dd465db23ce47cacdefdfd011f66410cbc88
-EBUILD sangoma-nca-2.0.6.ebuild 2827 SHA256 efbfc5705d2d54050120bbd5efe4b05c33031bcee2969149b5b735ce2ee4bbb7 SHA512 53b0ad2d2b88382f576153ea84a56cc605b128cc7c9facf0a811ba82e87c3d6f856dcd2cb85bc2020dc87eb1f7f14254149c7e5487c1e2dabbbdb39c70884221 WHIRLPOOL 6a34e0bae4d153b70638eaed80f1f9fa9b2852abd3f17718732f0e2c086dda71e3e21706ea893e2131a070c10b23b9c6b4eb55971bda6d60bf0ff504df18dfd4
+EBUILD sangoma-nca-2.0.6.ebuild 2839 SHA256 468e3bdfb14cc86eca9bcfe909b472026d5fa7804a843d3606fdaaafba8e1dfe SHA512 15e00e158d4a079e04d883587e89cc0f7d2baa41fdbca2364c4183a89a7abafda1a4d45426db7be5b23f9041ea273acdb5edff52d437fdfa48fc040af4f177da WHIRLPOOL 057a10aa8bc6e7596eecca2a0da63b514afcd591139691a143bb1606816e97cb822f2c387f93ee4866c8f5ccac08d734fe84a17bc46c11cece0306039e7bca0f
diff --git a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
index baf047b..13c8e0c 100644
--- a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
+++ b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
@@ -35,9 +35,9 @@ pkg_preinst() {
 	rpm2targz NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm
 	# ar x ${DISTDIR}/${A}
         mkdir data
-        mkdir data/sangoma
 	tar -xzf *.tar.gz -C data
-	mv data/Sangoma_NetBorderCallAnalyzer data/sangoma/
+        mkdir data/opt/sangoma
+	mv data/opt/Sangoma_NetBorderCallAnalyzer data/opt/sangoma/
 
 	einfo "updating init script"
 	# replace debian specific init scripts with gentoo specific ones

From 068b2456c0fe633e16fc685c104a7036bf923077 Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Fri, 3 Jul 2015 00:54:57 -0700
Subject: [PATCH 076/261] updates to path

---
 net-misc/sangoma-nca/Manifest                 | 4 ++--
 net-misc/sangoma-nca/files/sangoma_initd_1    | 2 +-
 net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/sangoma-nca/Manifest b/net-misc/sangoma-nca/Manifest
index bad893f..cbc3b92 100644
--- a/net-misc/sangoma-nca/Manifest
+++ b/net-misc/sangoma-nca/Manifest
@@ -1,4 +1,4 @@
 AUX pax_fix.sh 851 SHA256 742040d39c67bff6f6bba85db4a47444bb4588a93e92571fbaeb2dffd5c178d8 SHA512 7317356f7f4c88b411966b0214db4261273e5547198f320b7b97b82d5b763bc6e0c7153e20fb983f2f8b8f2354035771eeaa83afc3166f2dd84067f3ba18f720 WHIRLPOOL c4e1ecbe1ce7153400aebcbbde25f0bce4f08c3eb55fcd21b80cb07d6da43b7a114a2f772d8c5f202455dd40aeb8a72f6bf0161c8050ba3f0be0f00993f2126b
-AUX sangoma_initd_1 4048 SHA256 6a0d6425af6dbb4672ea09ca79dc1da4ea5deee2035b5749a885f4f689492cb0 SHA512 d408acec71ae5938e78bfb70eb51fd7f4ee15d7fec1c1691ba6933d6fed85c4df6b9c56a4f96f3680454ed233af11f1ece86a3ddc9380b3391478c4417632519 WHIRLPOOL e57ae966286b5f1c26fcdc4e496f98dfa50297d48e9d508ea00522ae3fe1708dedfde282b1f570cab4b392a73420e5ee171bad120f30d6c3c3672532740fd47b
+AUX sangoma_initd_1 4023 SHA256 617a88ef565e5dea7d30d1293f80ce0bfba37f048738828cc3f569795ff793f2 SHA512 59cb0587a530a20084ef723bc2aaa1d2754aa4430be3bda32388fbce1aa215c60b7171d7908921af501b9480c8b85be701d74b899fd48ca5b10f8a829133ce88 WHIRLPOOL ae2a03e910dd4a3a66109c8563cb2b22f9258823751b6f729f61b7981ca37a25a61e60c65e94ee23135ae86a5ca7007bbc95dc9c47ca9ce2fe7201f3c3757d37
 DIST NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm 17698929 SHA256 c12fa08d46aeb7ff5c37b8fa9c92019d0a8a3abdcf6518062b26f222307fd5ec SHA512 4f449716a01100690d06e738fff54545ad79230815df97cbc1442fb32c28a5b7fb304783bba5828f58b7ab6ae23c705a456da210b9413701c9ff9cbb5cd40aee WHIRLPOOL 5c93183479e686084d8d3a3a81021fb5e5e5b5713a777a5d21a96706637dddc8a693eda6688980051a59457867f8dd465db23ce47cacdefdfd011f66410cbc88
-EBUILD sangoma-nca-2.0.6.ebuild 2839 SHA256 468e3bdfb14cc86eca9bcfe909b472026d5fa7804a843d3606fdaaafba8e1dfe SHA512 15e00e158d4a079e04d883587e89cc0f7d2baa41fdbca2364c4183a89a7abafda1a4d45426db7be5b23f9041ea273acdb5edff52d437fdfa48fc040af4f177da WHIRLPOOL 057a10aa8bc6e7596eecca2a0da63b514afcd591139691a143bb1606816e97cb822f2c387f93ee4866c8f5ccac08d734fe84a17bc46c11cece0306039e7bca0f
+EBUILD sangoma-nca-2.0.6.ebuild 2843 SHA256 8904742090f16a8a0f0f8e05086ff3692ca9d457a5183bc918ce1bd342fb4683 SHA512 9eb62889c0e33d1e5ec2962d32b9907169cbd8e119e2b5d3cccb95685a1b59ec273164eb60ee2d8f58c5fc632170b50149861d39f158b24ce553380a5e891a2c WHIRLPOOL d3ec12792403edac2dd5b98172497279188a46f65244b38010d294c5621391dcb0d79a16b357ca8406afcf8b2f4212332381d737727f14c61ef187484d22baaa
diff --git a/net-misc/sangoma-nca/files/sangoma_initd_1 b/net-misc/sangoma-nca/files/sangoma_initd_1
index 76d4227..65aa4ad 100755
--- a/net-misc/sangoma-nca/files/sangoma_initd_1
+++ b/net-misc/sangoma-nca/files/sangoma_initd_1
@@ -13,7 +13,7 @@
 # source function library
 #. /etc/rc.d/init.d/functions
 
-INSTDIR=/opt/sangoma/Sangoma_NetBorderCallAnalyzer
+INSTDIR=/opt/sangoma/nbca
 
 #add our /lib to .so search path
 export LD_LIBRARY_PATH=$INSTDIR/lib:$LD_LIBRARY_PATH
diff --git a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
index 13c8e0c..30a8670 100644
--- a/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
+++ b/net-misc/sangoma-nca/sangoma-nca-2.0.6.ebuild
@@ -37,7 +37,7 @@ pkg_preinst() {
         mkdir data
 	tar -xzf *.tar.gz -C data
         mkdir data/opt/sangoma
-	mv data/opt/Sangoma_NetBorderCallAnalyzer data/opt/sangoma/
+	mv data/opt/Sangoma_NetBorderCallAnalyzer data/opt/sangoma/nbca
 
 	einfo "updating init script"
 	# replace debian specific init scripts with gentoo specific ones

From 296313f498d8239470beb3d7400ee264d923dd3c Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Fri, 3 Jul 2015 00:56:58 -0700
Subject: [PATCH 077/261] fixed the pax

---
 net-misc/sangoma-nca/Manifest         |  2 +-
 net-misc/sangoma-nca/files/pax_fix.sh | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-misc/sangoma-nca/Manifest b/net-misc/sangoma-nca/Manifest
index cbc3b92..df774c2 100644
--- a/net-misc/sangoma-nca/Manifest
+++ b/net-misc/sangoma-nca/Manifest
@@ -1,4 +1,4 @@
-AUX pax_fix.sh 851 SHA256 742040d39c67bff6f6bba85db4a47444bb4588a93e92571fbaeb2dffd5c178d8 SHA512 7317356f7f4c88b411966b0214db4261273e5547198f320b7b97b82d5b763bc6e0c7153e20fb983f2f8b8f2354035771eeaa83afc3166f2dd84067f3ba18f720 WHIRLPOOL c4e1ecbe1ce7153400aebcbbde25f0bce4f08c3eb55fcd21b80cb07d6da43b7a114a2f772d8c5f202455dd40aeb8a72f6bf0161c8050ba3f0be0f00993f2126b
+AUX pax_fix.sh 601 SHA256 03004b94904fc4fbb1c4d73f3a6d96bc5c895a44544af24f3eadb05e5c6f381c SHA512 1c894b8858b18e26e8ecefd6821727cbb814ba2cf206859d8d6c91319d2273f8e5b75a9dc66313b69cc42fa39c33e88c92361bfd9de1ad707ae995b132da1770 WHIRLPOOL 36d43340a5eb5ff450731b60fa7bcfe217fa0cb464d5baf2cc528f0e72360ed3be00f78432bd39d31ee3a44e32476794cea197d1969b21346b2513eff5613d12
 AUX sangoma_initd_1 4023 SHA256 617a88ef565e5dea7d30d1293f80ce0bfba37f048738828cc3f569795ff793f2 SHA512 59cb0587a530a20084ef723bc2aaa1d2754aa4430be3bda32388fbce1aa215c60b7171d7908921af501b9480c8b85be701d74b899fd48ca5b10f8a829133ce88 WHIRLPOOL ae2a03e910dd4a3a66109c8563cb2b22f9258823751b6f729f61b7981ca37a25a61e60c65e94ee23135ae86a5ca7007bbc95dc9c47ca9ce2fe7201f3c3757d37
 DIST NetBorderCallAnalyzerSetup2.xLinux_2.0.6.rpm 17698929 SHA256 c12fa08d46aeb7ff5c37b8fa9c92019d0a8a3abdcf6518062b26f222307fd5ec SHA512 4f449716a01100690d06e738fff54545ad79230815df97cbc1442fb32c28a5b7fb304783bba5828f58b7ab6ae23c705a456da210b9413701c9ff9cbb5cd40aee WHIRLPOOL 5c93183479e686084d8d3a3a81021fb5e5e5b5713a777a5d21a96706637dddc8a693eda6688980051a59457867f8dd465db23ce47cacdefdfd011f66410cbc88
 EBUILD sangoma-nca-2.0.6.ebuild 2843 SHA256 8904742090f16a8a0f0f8e05086ff3692ca9d457a5183bc918ce1bd342fb4683 SHA512 9eb62889c0e33d1e5ec2962d32b9907169cbd8e119e2b5d3cccb95685a1b59ec273164eb60ee2d8f58c5fc632170b50149861d39f158b24ce553380a5e891a2c WHIRLPOOL d3ec12792403edac2dd5b98172497279188a46f65244b38010d294c5621391dcb0d79a16b357ca8406afcf8b2f4212332381d737727f14c61ef187484d22baaa
diff --git a/net-misc/sangoma-nca/files/pax_fix.sh b/net-misc/sangoma-nca/files/pax_fix.sh
index ad63961..4583ecc 100644
--- a/net-misc/sangoma-nca/files/pax_fix.sh
+++ b/net-misc/sangoma-nca/files/pax_fix.sh
@@ -1,13 +1,13 @@
 echo "Creating Headers"
-paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
-paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
-paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
-paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
-paxctl -c /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
+paxctl -c /opt/sangoma/nbca/bin/netborder-call-analyzer-engine
+paxctl -c /opt/sangoma/nbca/bin/netborder-call-analyzer-service
+paxctl -c /opt/sangoma/nbca/bin/netborder-oam-cmd
+paxctl -c /opt/sangoma/nbca/bin/netborder-python
+paxctl -c /opt/sangoma/nbca/bin/netborder-rm
 
 echo "Disabling memory pax check"
-paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-engine
-paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-call-analyzer-service
-paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-oam-cmd
-paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-python
-paxctl -m /opt/sangoma/Sangoma_NetBorderCallAnalyzer/bin/netborder-rm
+paxctl -m /opt/sangoma/nbca/bin/netborder-call-analyzer-engine
+paxctl -m /opt/sangoma/nbca/bin/netborder-call-analyzer-service
+paxctl -m /opt/sangoma/nbca/bin/netborder-oam-cmd
+paxctl -m /opt/sangoma/nbca/bin/netborder-python
+paxctl -m /opt/sangoma/nbca/bin/netborder-rm

From 998866033a439457e4310213345ac312b0610559 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 6 Jul 2015 15:44:15 -0700
Subject: [PATCH 078/261] updated manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 321f46c..9c8bc95 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 16889 SHA256 845c3c009a6915162174e5d6da5f51ca1ea3999eec2c801a3dd726410f70928b SHA512 c30d0bb3c794220bc9018f8a1ef905269b503537cb86d8943ce0d466591987e29ea471adf995d077db973a7e21c7279f45f99b38d4dc10e0de8978ecb4bb9f72 WHIRLPOOL bbafb5e7bdfc175bdb14fdf8921498feb3af77c4dd0f8bc567cd8cafe5113552de85a8477b2390adc899ab18a837635aa94b5679c913f5921678db336fa4833d
+DIST asterisk-patchset.tar.gz 16872 SHA256 3d1749a6cdf857d8f70f48a998806d4d57f7bf2d451dcca4c941cdb6707d900a SHA512 b3ff37e35f12ac78fb0761e0a0cd378731efb925659eae3696b24868e10443b515b96a59ceb50c82a898097af5daac14c25c7b818297ae5af06281802b81956f WHIRLPOOL b1fdedfb63322b258d3adc6ffea209b98f44054eb9fc094149f4a91ff29b6d52d9bd989cf568c18570f4ad84909c05873cf0cc585464d50e8bdeb0927ddbff39
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From 8189688a975949272df5bd47c1e996cb5b80eda2 Mon Sep 17 00:00:00 2001
From: root <root@mysqldb03-cluster06.safesoftsolutions.com>
Date: Thu, 30 Jul 2015 13:51:29 -0700
Subject: [PATCH 079/261] added syslog-ng 3.6.3

---
 app-admin/syslog-ng/ChangeLog                 | 1727 +++++++++++++++++
 app-admin/syslog-ng/Manifest                  |   24 +
 .../syslog-ng/files/3.4/syslog-ng.conf.gentoo |   37 +
 .../files/3.4/syslog-ng.conf.gentoo.fbsd      |   25 +
 .../files/3.4/syslog-ng.conf.gentoo.hardened  |  115 ++
 app-admin/syslog-ng/files/3.4/syslog-ng.confd |   42 +
 app-admin/syslog-ng/files/3.4/syslog-ng.rc6   |   59 +
 .../files/3.6/syslog-ng-3.6.2-redis.patch     |   29 +
 .../syslog-ng/files/3.6/syslog-ng.conf.gentoo |   37 +
 .../files/3.6/syslog-ng.conf.gentoo.fbsd      |   25 +
 .../files/3.6/syslog-ng.conf.gentoo.hardened  |  115 ++
 app-admin/syslog-ng/files/3.6/syslog-ng.confd |   42 +
 app-admin/syslog-ng/files/3.6/syslog-ng.rc6   |   59 +
 app-admin/syslog-ng/files/README.hardened     |   13 +
 app-admin/syslog-ng/files/syslog-ng.logrotate |   13 +
 .../files/syslog-ng.logrotate.hardened        |   76 +
 .../files/syslog-ng.logrotate.hardened.in     |   76 +
 .../syslog-ng/files/syslog-ng.logrotate.in    |   13 +
 app-admin/syslog-ng/metadata.xml              |   17 +
 app-admin/syslog-ng/syslog-ng-3.4.8.ebuild    |  120 ++
 app-admin/syslog-ng/syslog-ng-3.6.2.ebuild    |  124 ++
 app-admin/syslog-ng/syslog-ng-3.6.3.ebuild    |  124 ++
 22 files changed, 2912 insertions(+)
 create mode 100644 app-admin/syslog-ng/ChangeLog
 create mode 100644 app-admin/syslog-ng/Manifest
 create mode 100644 app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
 create mode 100644 app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
 create mode 100644 app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened
 create mode 100644 app-admin/syslog-ng/files/3.4/syslog-ng.confd
 create mode 100644 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng.confd
 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng.rc6
 create mode 100644 app-admin/syslog-ng/files/README.hardened
 create mode 100644 app-admin/syslog-ng/files/syslog-ng.logrotate
 create mode 100644 app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
 create mode 100644 app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
 create mode 100644 app-admin/syslog-ng/files/syslog-ng.logrotate.in
 create mode 100644 app-admin/syslog-ng/metadata.xml
 create mode 100644 app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
 create mode 100644 app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
 create mode 100644 app-admin/syslog-ng/syslog-ng-3.6.3.ebuild

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
new file mode 100644
index 0000000..a85b3b5
--- /dev/null
+++ b/app-admin/syslog-ng/ChangeLog
@@ -0,0 +1,1727 @@
+# ChangeLog for app-admin/syslog-ng
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.427 2015/04/25 18:38:50 jmorgan Exp $
+
+  25 Apr 2015; <jmorgan@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for sparc, wrt bug #543234
+
+  14 Apr 2015; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for ia64, wrt bug #543234
+
+  13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for alpha, wrt bug #543234
+
+  03 Apr 2015; Markus Meier <maekke@gentoo.org> syslog-ng-3.6.2.ebuild:
+  arm stable, bug #543234
+
+  31 Mar 2015; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for ppc64, wrt bug #543234
+
+  30 Mar 2015;  <tgall@gentoo.org> syslog-ng-3.6.2.ebuild:
+  stable on arm64
+
+  29 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> files/3.6/syslog-ng.rc6:
+  fix checkpath typo (bug #544748)
+
+  28 Mar 2015; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for ppc, wrt bug #543234
+
+  25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for x86, wrt bug #543234
+
+  23 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.6.2.ebuild:
+  add epatch_user for additional user control
+
+  23 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.6.2.ebuild:
+  use embedded crypto to avoid build issues (bug #543522)
+
+  19 Mar 2015; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.6.2.ebuild:
+  Stable for HPPA (bug #543234).
+
+  14 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> syslog-ng-3.6.2.ebuild:
+  amd64 stable wrt bug #543234
+
+  14 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.4/syslog-ng-3.4.2-autotools.patch,
+  -files/3.4/syslog-ng-3.4.2-compile.patch, -syslog-ng-3.4.7.ebuild:
+  old
+
+  19 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.6/syslog-ng-3.6.2-redis.patch, -files/3.5/syslog-ng.conf.gentoo,
+  -files/3.5/syslog-ng.conf.gentoo.fbsd,
+  -files/3.5/syslog-ng.conf.gentoo.hardened, -files/3.5/syslog-ng.confd,
+  -files/3.5/syslog-ng.rc6, syslog-ng-3.6.2.ebuild:
+  Add upstream patch to avoid memory leak with USE=redis
+
+  18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.6/syslog-ng-3.6.1-link-smtp.patch,
+  -files/3.6/syslog-ng-3.6.1-warnings.patch, -syslog-ng-3.6.1.ebuild:
+  old
+
+  18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  files/3.6/syslog-ng.confd, files/3.6/syslog-ng.rc6:
+  update to /run from /var/run (bug #531840)
+
+*syslog-ng-3.6.2 (18 Dec 2014)
+
+  18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.6.2.ebuild:
+  version bump
+
+  04 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.6/syslog-ng-3.6.1-warnings.patch, syslog-ng-3.6.1.ebuild:
+  Add upstream patch to suppress warnings at startup
+
+  02 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  update metadata (bug #531382)
+
+  10 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.6.1.ebuild:
+  fix upstream doc link and doc install - reported by Tomas Mozes via bug
+  #528788 and bug #528790
+
+  09 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.5.6.ebuild:
+  old
+
+*syslog-ng-3.6.1 (09 Nov 2014)
+
+  09 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.6/syslog-ng-3.6.1-link-smtp.patch, +files/3.6/syslog-ng.conf.gentoo,
+  +files/3.6/syslog-ng.conf.gentoo.fbsd,
+  +files/3.6/syslog-ng.conf.gentoo.hardened, +files/3.6/syslog-ng.confd,
+  +files/3.6/syslog-ng.rc6, +syslog-ng-3.6.1.ebuild, metadata.xml:
+  version bump to 3.6 series
+
+  02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.8.ebuild:
+  Stable for alpha, wrt bug #518404
+
+  07 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.5.5.ebuild:
+  old
+
+*syslog-ng-3.5.6 (06 Sep 2014)
+
+  06 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.5.6.ebuild:
+  version bump
+
+  10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.8.ebuild:
+  Stable for ia64, wrt bug #518404
+
+  03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.8.ebuild:
+  Stable for ppc, wrt bug #518404
+
+  03 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> syslog-ng-3.4.8.ebuild:
+  x86 stable wrt bug #518404
+
+  02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.8.ebuild:
+  Stable for ppc64, wrt bug #518404
+
+  01 Aug 2014; Markus Meier <maekke@gentoo.org> syslog-ng-3.4.8.ebuild:
+  arm stable, bug #518404
+
+  30 Jul 2014; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.4.8.ebuild:
+  Stable for HPPA (bug #518404).
+
+  28 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> syslog-ng-3.4.8.ebuild:
+  amd64 stable wrt bug #518404
+
+  28 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.5/syslog-ng-3.5.4.1-memleak.patch, -syslog-ng-3.5.4.1.ebuild:
+  old
+
+*syslog-ng-3.5.5 (21 Jul 2014)
+
+  21 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.5.5.ebuild:
+  3.5 branch version bump
+
+  08 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.8.ebuild:
+  add amqp use flag (bug #516704)
+
+  08 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+  syslog-ng-3.4.8.ebuild, syslog-ng-3.5.4.1.ebuild:
+  add support for reading Process Accounting files (EXPERIMENTAL, Linux only)
+  (bug #498884)
+
+  10 Jun 2014; Mike Frysinger <vapier@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Mark s390/sh stable.
+
+  09 Jun 2014; Mike Frysinger <vapier@gentoo.org> syslog-ng-3.4.7.ebuild,
+  syslog-ng-3.4.8.ebuild, syslog-ng-3.5.4.1.ebuild:
+  Add arm64 love.
+
+*syslog-ng-3.4.8 (06 Jun 2014)
+
+  06 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.4.8.ebuild:
+  version bump for 3.4 branch
+
+  17 May 2014; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.4.2.ebuild,
+  -syslog-ng-3.5.4.ebuild:
+  clean old
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for alpha, wrt bug #504348
+
+  14 May 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for sparc, wrt bug #504348
+
+  13 May 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for ia64, wrt bug #504348
+
+  20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for ppc64, wrt bug #504348
+
+  13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for ppc, wrt bug #504348
+
+  05 Apr 2014; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for x86, wrt bug #504348
+
+  03 Apr 2014; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+  syslog-ng-3.5.4.1.ebuild:
+  make the AMQP support optional for bug #506618
+
+  02 Apr 2014; Chema Alonso <nimiux@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for amd64 wrt bug #504348
+
+  28 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.5/syslog-ng-3.5.4.1-memleak.patch, syslog-ng-3.5.4.1.ebuild:
+  add upstream patch for to fix memory leak
+
+  26 Mar 2014; Markus Meier <maekke@gentoo.org> syslog-ng-3.4.7.ebuild:
+  arm stable, bug #504348
+
+  16 Mar 2014; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.4.7.ebuild:
+  Stable for HPPA (bug #504348).
+
+*syslog-ng-3.5.4.1 (13 Mar 2014)
+
+  13 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.5.4.1.ebuild:
+  version bump
+
+*syslog-ng-3.5.4 (12 Mar 2014)
+
+  12 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.5.4.ebuild,
+  -syslog-ng-3.5.3.ebuild:
+  version bump; clean old known-buggy version
+
+*syslog-ng-3.5.3 (22 Jan 2014)
+
+  22 Jan 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.5/syslog-ng.conf.gentoo, +files/3.5/syslog-ng.conf.gentoo.fbsd,
+  +files/3.5/syslog-ng.conf.gentoo.hardened, +files/3.5/syslog-ng.confd,
+  +files/3.5/syslog-ng.rc6, +files/syslog-ng.logrotate.hardened.in,
+  +files/syslog-ng.logrotate.in, +syslog-ng-3.5.3.ebuild,
+  syslog-ng-3.4.2.ebuild, syslog-ng-3.4.7.ebuild:
+  add first version from the 3.5 branch, currently masked; also fix bugs #497448
+  and #498038
+
+  31 Dec 2013; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.4.5.ebuild,
+  -syslog-ng-3.4.6.ebuild:
+  clean old
+
+*syslog-ng-3.4.7 (31 Dec 2013)
+
+  31 Dec 2013; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.4.7.ebuild:
+  version bump
+
+  23 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/syslog-ng.confd:
+  [QA] Remove unused files.
+
+*syslog-ng-3.4.6 (29 Nov 2013)
+
+  29 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.4.6.ebuild:
+  version bump
+
+  14 Nov 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
+  Remove unneeded useflag description from metadata.xml
+
+  13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng.conf.gentoo.3.2, -files/syslog-ng.conf.gentoo.fbsd.3.2,
+  -files/syslog-ng.conf.gentoo.hardened.3.2, -files/syslog-ng.rc6.3,
+  -syslog-ng-3.2.5.ebuild:
+  old
+
+  13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng-3.3.5-afsocket.patch, -files/syslog-ng-3.3.5-compile.patch,
+  -files/syslog-ng-3.3.5-gprocess.patch, -files/syslog-ng-3.3.5-include.patch,
+  -files/syslog-ng-3.3.5-threading.patch, -files/syslog-ng-3.3.5-utmpx.patch,
+  -files/syslog-ng.conf.gentoo.3.3, -files/syslog-ng.conf.gentoo.fbsd.3.3,
+  -files/syslog-ng.conf.gentoo.hardened.3.3, -files/syslog-ng.rc6.3.3,
+  -syslog-ng-3.3.5-r1.ebuild:
+  old
+
+  13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.2.ebuild:
+  add -j1 so stable users don't encounter the parallel make install bug
+
+  13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.4/syslog-ng-3.4.3-autotools.patch,
+  -files/3.4/syslog-ng-3.4.4-autotools.patch, -syslog-ng-3.4.3.ebuild,
+  -syslog-ng-3.4.4.ebuild:
+  old
+
+*syslog-ng-3.4.5 (04 Nov 2013)
+
+  04 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.4.5.ebuild:
+  version bump
+
+  18 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  files/3.4/syslog-ng-3.4.4-autotools.patch:
+  fix up the autotools patch (bug #488444)
+
+*syslog-ng-3.4.4 (17 Oct 2013)
+
+  17 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.4-autotools.patch, +syslog-ng-3.4.4.ebuild:
+  version bump
+
+  14 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.3.ebuild:
+  better systemd support (bug #487996)
+
+  06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for sparc, wrt bug #475884
+
+  31 Aug 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6:
+  set full path to syslog-ng for bug #483142
+
+*syslog-ng-3.4.3 (13 Aug 2013)
+
+  13 Aug 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.3-autotools.patch, +syslog-ng-3.4.3.ebuild:
+  version bump
+
+  06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for s390, wrt bug #475884
+
+  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for ppc64, wrt bug #475884
+
+  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for ppc, wrt bug #475884
+
+  11 Jul 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.4/syslog-ng-3.4.1-autotools.patch,
+  -files/3.4/syslog-ng-3.4.1-rollup.patch, -syslog-ng-3.4.1-r1.ebuild:
+  old
+
+  08 Jul 2013; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for HPPA (bug #475884).
+
+  07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for ia64, wrt bug #475884
+
+  07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for arm, wrt bug #475884
+
+  06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for alpha, wrt bug #475884
+
+  06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for x86, wrt bug #475884
+
+  06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.4.2.ebuild:
+  Stable for amd64, wrt bug #475884
+
+*syslog-ng-3.4.2 (03 Jun 2013)
+
+  03 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.2-autotools.patch,
+  +files/3.4/syslog-ng-3.4.2-compile.patch, +syslog-ng-3.4.2.ebuild,
+  files/3.4/syslog-ng-3.4.1-autotools.patch,
+  files/3.4/syslog-ng-3.4.1-rollup.patch:
+  version bump
+
+*syslog-ng-3.4.1-r1 (02 Jun 2013)
+
+  02 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> +files/README.hardened,
+  +syslog-ng-3.4.1-r1.ebuild, -syslog-ng-3.4.1.ebuild,
+  files/3.4/syslog-ng.conf.gentoo, files/3.4/syslog-ng.conf.gentoo.fbsd:
+  rev bump to force out default config changes (bug #471836) restrict tests
+  again (bug #471988) remove hardened and selinux use flags (bug #375853)
+
+  28 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  create default statedir for people willing to settle for systemd (bug #470994)
+
+  19 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  Use the latest version of geoip (bug #470060)
+
+  16 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  add geoip use flag for bug #470060
+
+  10 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  sql -> dbi use flag (bug #410829)
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.3.5-r1.ebuild:
+  whitespace
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  add missing net-libs/libesmtp dep (bug #469012)
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6:
+  correct mode on statefile directory (bug #469004)
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.1-autotools.patch, syslog-ng-3.4.1.ebuild:
+  use patch instead of set for autotools fix
+
+  08 May 2013; Patrick Lauer <patrick@gentoo.org> syslog-ng-3.3.5-r1.ebuild,
+  syslog-ng-3.4.1.ebuild:
+  Automake-1.13 fix for #467096
+
+  04 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
+  add back arm and s390 since libesmtp is keyworded
+
+  29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6:
+  no need for config line in depend()
+
+  29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6:
+  use required_* runscript variables; STATEFILE_DIR typo
+
+  29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6:
+  depend() shouldn't talk to the user
+
+  28 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6.3:
+  add after bootmisc for the 3.2 version as well
+
+*syslog-ng-3.4.1 (28 Apr 2013)
+
+  28 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.1-rollup.patch, +files/3.4/syslog-ng.conf.gentoo,
+  +files/3.4/syslog-ng.conf.gentoo.fbsd,
+  +files/3.4/syslog-ng.conf.gentoo.hardened, +files/3.4/syslog-ng.confd,
+  +files/3.4/syslog-ng.rc6, +syslog-ng-3.4.1.ebuild, files/syslog-ng.rc6.3.3,
+  metadata.xml:
+  masked bump to next version series
+
+  01 Oct 2012; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.3.5.ebuild:
+  old
+
+*syslog-ng-3.3.5-r1 (08 Jun 2012)
+
+  08 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.3.5-r1.ebuild, +files/syslog-ng-3.3.5-threading.patch,
+  +files/syslog-ng-3.3.5-utmpx.patch:
+  Add a couple of upstream patches
+
+  29 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng-3.3.4-compile.patch, -files/syslog-ng-3.3.4-memleak.patch,
+  -syslog-ng-3.2.4.ebuild, -syslog-ng-3.3.4.ebuild:
+  old
+
+  03 May 2012; Jeff Horelick <jdhore@gentoo.org> syslog-ng-3.2.4.ebuild,
+  syslog-ng-3.2.5.ebuild, syslog-ng-3.3.4.ebuild, syslog-ng-3.3.5.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  30 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng-3.3.5-include.patch, syslog-ng-3.3.5.ebuild:
+  add upstream patch for mips
+
+*syslog-ng-3.3.5 (23 Apr 2012)
+
+  23 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.3.5.ebuild,
+  +files/syslog-ng-3.3.5-afsocket.patch, +files/syslog-ng-3.3.5-compile.patch,
+  +files/syslog-ng-3.3.5-gprocess.patch:
+  version bump
+
+  22 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild,
+  +files/syslog-ng-3.3.4-memleak.patch:
+  add upstream patch for memory leak caused by messages that couldn't be
+  flushed right away.
+
+  21 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild:
+  adjust for newer glib static lib building (bug #409217)
+
+  04 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild:
+  work around underlinking with gold linker (bug #405381)
+
+  03 Mar 2012; Brent Baude <ranger@gentoo.org> syslog-ng-3.2.5.ebuild:
+  Marking syslog-ng-3.2.5 ppc64 for bug 394621
+
+  06 Feb 2012; Brent Baude <ranger@gentoo.org> syslog-ng-3.2.5.ebuild:
+  Marking syslog-ng-3.2.5 ppc for bug 394621
+
+*syslog-ng-3.3.4 (21 Jan 2012)
+
+  21 Jan 2012; Michael Sterrett <mr_bones_@gentoo.org> -syslog-ng-3.3.1.ebuild,
+  -files/syslog-ng-3.3.1-filter.patch, -files/syslog-ng-3.3.1-ssl.patch,
+  -syslog-ng-3.3.3.ebuild, +syslog-ng-3.3.4.ebuild,
+  +files/syslog-ng-3.3.4-compile.patch:
+  masked 3.3 series version bump
+
+  18 Dec 2011; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.2.5.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #394621
+
+  16 Dec 2011; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.2.5.ebuild:
+  Stable for HPPA (bug #394621).
+
+  15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> syslog-ng-3.2.5.ebuild:
+  Stable for X86/AMD64, wrt bug #394621
+
+  14 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.2.5.ebuild:
+  remove upstream-unsupported static linking (bug #394703)
+
+  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/syslog-ng.rc6.3:
+  move reload to extra_started_commands in 3.2 init script
+
+*syslog-ng-3.3.3 (28 Nov 2011)
+
+  28 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.3.3.ebuild:
+  masked 3.3 series version bump
+
+  09 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild:
+  add a note about the upstream documentation
+
+*syslog-ng-3.2.5 (07 Nov 2011)
+
+  07 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.2.5.ebuild:
+  3.2 series version bump
+
+  24 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
+  +files/syslog-ng-3.3.1-filter.patch:
+  add upstream patch to fix filter function
+
+  19 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6.3.3:
+  move reload to extra_started_commands
+
+  18 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
+  +files/syslog-ng.rc6.3.3:
+  add patch from Marcel Pennewiß to improve flexibility (bug #373583)
+
+  07 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
+  +files/syslog-ng-3.3.1-ssl.patch:
+  Add upstream patch for USE="-ssl sql" case
+
+  04 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.conf.gentoo.3.3, files/syslog-ng.conf.gentoo.fbsd.3.3,
+  files/syslog-ng.conf.gentoo.hardened.3.3:
+  Turn on threading in default config per upstream
+
+*syslog-ng-3.3.1 (04 Oct 2011)
+
+  04 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-3.3.0_beta2.ebuild, +syslog-ng-3.3.1.ebuild:
+  version bump
+
+*syslog-ng-3.3.0_beta2 (29 Sep 2011)
+
+  29 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.3.0_beta2.ebuild, +files/syslog-ng.conf.gentoo.3.3,
+  +files/syslog-ng.conf.gentoo.fbsd.3.3,
+  +files/syslog-ng.conf.gentoo.hardened.3.3:
+  masked version bump for ebuild testing
+
+  22 Sep 2011; Christian Ruppert <idl0r@gentoo.org> files/syslog-ng.rc6.3:
+  Whitespace. Don't use --stop for reload().
+
+  22 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +syslog-ng-3.2.4-r1.ebuild:
+  Add revision to actually propagate changes in the init scripts. This is QA
+  commit and if you want to revert it ask QA for permission first.
+
+*syslog-ng-3.2.4-r1 (22 Sep 2011)
+
+  22 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +syslog-ng-3.2.4-r1.ebuild:
+  Add revision to actually propagate changes in the init scripts.
+
+  21 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6.3:
+  remove deprecated --oknodo argument from init script (bug #374719)
+
+  05 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6.3:
+  opts => extra_commands for init script (bug #381881)
+
+  09 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-3.0.10.ebuild, -syslog-ng-3.1.4.ebuild, -syslog-ng-3.2.2.ebuild,
+  -files/syslog-ng.conf.gentoo.3, -files/syslog-ng.conf.gentoo.fbsd.3,
+  -files/syslog-ng.conf.gentoo.hardened.3:
+  clean out old, vulnerable versions (bug #369069)
+
+  09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> syslog-ng-3.2.4.ebuild:
+  ppc64 stable wrt #370845
+
+  25 Jun 2011; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.2.4.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #370845
+
+  23 Jun 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.2.4.ebuild:
+  Marking syslog-ng-3.2.4 ppc for bug 370845
+
+  19 Jun 2011; Markus Meier <maekke@gentoo.org> syslog-ng-3.2.4.ebuild:
+  arm stable, bug #370845
+
+  18 Jun 2011; Markos Chandras <hwoarang@gentoo.org> syslog-ng-3.2.4.ebuild:
+  Stable on amd64 wrt bug #370845
+
+  15 Jun 2011; Christian Ruppert <idl0r@gentoo.org> syslog-ng-3.2.4.ebuild:
+  Fix eventlog dependency, bug 371737.
+
+  12 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> syslog-ng-3.2.4.ebuild:
+  x86 stable wrt bug #370845
+
+  10 Jun 2011; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.2.4.ebuild:
+  Stable for HPPA (bug #370845).
+
+*syslog-ng-3.2.4 (07 May 2011)
+
+  07 May 2011; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.2.4.ebuild:
+  version bump; move syslog-ng.persist file (bug #357267); quiet suggestion
+  about installing logrotate if logrotate is already installed (bug #355257)
+
+  07 Apr 2011; Ultrabug <ultrabug@gentoo.org> syslog-ng-3.0.10.ebuild,
+  syslog-ng-3.1.4.ebuild, syslog-ng-3.2.2.ebuild:
+  migrate ebuilds to new-style virtual, wrt #358881
+
+  31 Mar 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-3.0.8.ebuild, -syslog-ng-3.0.9.ebuild, -syslog-ng-3.1.2.ebuild,
+  -syslog-ng-3.1.3.ebuild:
+  clean old versions
+
+  22 Mar 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.2.2.ebuild:
+  add multilib support patch from Olivier Huber for bug #359985
+
+  01 Mar 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.4.ebuild:
+  stable ppc64, bug 355101
+
+  01 Mar 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.0.10.ebuild:
+  stable ppc64, bug 355099
+
+  01 Mar 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.3.ebuild:
+  stable ppc64, bug 350410
+
+  01 Mar 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.0.9.ebuild:
+  stable ppc64, bug 350408
+
+  28 Feb 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.0.10.ebuild:
+  stable ppc, bug 355099
+
+  28 Feb 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.4.ebuild:
+  stable ppc, bug 355101
+
+  26 Feb 2011; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.10.ebuild,
+  syslog-ng-3.1.4.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #355101 and #355099
+
+  21 Feb 2011; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.1.4.ebuild:
+  Stable for HPPA (bug #355101).
+
+  21 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  syslog-ng-3.0.10.ebuild:
+  x86 stable wrt bug #355099
+
+  21 Feb 2011; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.10.ebuild:
+  Stable for HPPA (bug #355099).
+
+  20 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  syslog-ng-3.1.4.ebuild:
+  x86 stable wrt bug #355101
+
+  16 Feb 2011; Markos Chandras <hwoarang@gentoo.org> syslog-ng-3.0.10.ebuild,
+  syslog-ng-3.1.4.ebuild:
+  Stable on amd64 wrt bug #355101 and bug #355099
+
+  21 Jan 2011; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.9.ebuild,
+  syslog-ng-3.1.3.ebuild:
+  Stable for HPPA (bug #350408).
+
+*syslog-ng-3.2.2 (18 Jan 2011)
+
+  18 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.2.2.ebuild, +files/syslog-ng.conf.gentoo.3.2,
+  +files/syslog-ng.conf.gentoo.fbsd.3.2,
+  +files/syslog-ng.conf.gentoo.hardened.3.2:
+  new series - 3.2 version bump
+
+*syslog-ng-3.1.4 (14 Jan 2011)
+*syslog-ng-3.0.10 (14 Jan 2011)
+
+  14 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.10.ebuild, +syslog-ng-3.1.4.ebuild:
+  version bumps for 3.0 and 3.1
+
+  09 Jan 2011; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.9.ebuild,
+  syslog-ng-3.1.3.ebuild:
+  alpha/ia64/s390/sh/x86 stable wrt #350408 and #350410
+
+  09 Jan 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.3.ebuild:
+  stable ppc, bug 350410
+
+  09 Jan 2011; Brent Baude <ranger@gentoo.org> syslog-ng-3.0.9.ebuild:
+  stable ppc, bug 350408
+
+  07 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+  syslog-ng-3.1.3.ebuild:
+  stable x86, bug 350410
+
+  04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> syslog-ng-3.0.9.ebuild,
+  syslog-ng-3.1.3.ebuild:
+  Stable on amd64 wrt bug #350410 and bug #350408
+
+  03 Jan 2011; Michael Weber <xmw@gentoo.org> syslog-ng-3.0.9.ebuild:
+  arm/sparc stable (bug 350408)
+
+  03 Jan 2011; Michael Weber <xmw@gentoo.org> syslog-ng-3.1.3.ebuild:
+  arm/sparc stable (bug 350410)
+
+  02 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-2.0.10.ebuild, -syslog-ng-2.1.4.ebuild, syslog-ng-3.1.3.ebuild,
+  -files/syslog-ng.conf.debian, -files/syslog-ng.conf.gentoo,
+  -files/syslog-ng.conf.gentoo.3.0, -files/syslog-ng.conf.gentoo.fbsd,
+  -files/syslog-ng.conf.gentoo.fbsd.3.0,
+  -files/syslog-ng.conf.gentoo.hardened,
+  -files/syslog-ng.conf.gentoo.hardened.3.0, -files/syslog-ng.rc6-r1,
+  -files/syslog-ng.rc6.3.0, -files/syslog-ng.rc6.3.0-r1:
+  punt old ebuilds and files
+
+*syslog-ng-3.0.9 (28 Nov 2010)
+
+  28 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.9.ebuild:
+  3.0 version bump
+
+*syslog-ng-3.1.3 (28 Nov 2010)
+
+  28 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.1.3.ebuild:
+  version bump (bug #346735)
+
+  20 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.0.8.ebuild, syslog-ng-3.1.2.ebuild:
+  Turn on the pcre use flag by default as requested by upstream (bug
+  #341867)
+
+  15 Oct 2010; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.1.2.ebuild:
+  Stable for HPPA (bug #335825).
+
+  19 Sep 2010; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.1.2.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #335825
+
+  13 Sep 2010; Joseph Jezak <josejx@gentoo.org> syslog-ng-3.1.2.ebuild:
+  Marked ppc stable for bug #335825.
+
+  13 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.1.4.ebuild, -syslog-ng-3.0.4.ebuild, -syslog-ng-3.0.6.ebuild,
+  syslog-ng-3.0.8.ebuild, syslog-ng-3.1.1.ebuild, syslog-ng-3.1.2.ebuild:
+  make sure people wanting a static build have the necessary library (bug
+  #336516); clean old
+
+  12 Sep 2010; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.8.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #332335
+
+  06 Sep 2010; Markos Chandras <hwoarang@gentoo.org> syslog-ng-3.1.2.ebuild:
+  Stable on amd64 wrt bug #335825
+
+  06 Sep 2010; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.2.ebuild:
+  Marking syslog-ng-3.1.2 ppc64 for bug 335825
+
+  06 Sep 2010; Brent Baude <ranger@gentoo.org> syslog-ng-3.1.1.ebuild:
+  Marking syslog-ng-3.1.1 ppc64 for bug 320299
+
+  06 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  syslog-ng-3.1.2.ebuild:
+  x86 stable wrt bug #335825
+
+  23 Aug 2010; Markus Meier <maekke@gentoo.org> syslog-ng-3.0.8.ebuild:
+  arm stable, bug #332335
+
+  17 Aug 2010; Markos Chandras <hwoarang@gentoo.org> syslog-ng-3.0.8.ebuild:
+  Stable on amd64 wrt bug #332335
+
+  13 Aug 2010; Joseph Jezak <josejx@gentoo.org> syslog-ng-3.0.8.ebuild:
+  Marked ppc/ppc64 stable for bug #332335.
+
+  12 Aug 2010; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.8.ebuild:
+  Stable for HPPA (bug #332335).
+
+  12 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
+  syslog-ng-3.0.8.ebuild:
+  stable x86, bug 332335
+
+*syslog-ng-3.1.2 (04 Aug 2010)
+
+  04 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.1.2.ebuild:
+  version bump
+
+  28 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-3.0.7.ebuild:
+  clean out known-broken version
+
+*syslog-ng-3.0.8 (09 Jul 2010)
+
+  09 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.8.ebuild:
+  3.0 series version bump
+
+  03 Jul 2010; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.1.1.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #320299
+
+*syslog-ng-3.0.7 (11 Jun 2010)
+
+  11 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.7.ebuild:
+  version bump for 3.0 series
+
+  11 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  syslog-ng-3.1.1.ebuild:
+  x86 stable wrt bug #320299
+
+  30 May 2010; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.6.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #320297
+
+  28 May 2010; Markus Meier <maekke@gentoo.org> syslog-ng-3.0.6.ebuild:
+  arm/x86 stable, bug #320297
+
+  25 May 2010; Pacho Ramos <pacho@gentoo.org> syslog-ng-3.1.1.ebuild:
+  stable amd64, bug 320299
+
+  20 May 2010; Peter Volkov <pva@gentoo.org> syslog-ng-3.0.6.ebuild:
+  amd64 stable, bug 320297.
+
+  19 May 2010; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.1.1.ebuild:
+  Stable for HPPA PPC (bug #320299).
+
+  19 May 2010; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.6.ebuild:
+  Stable for PPC (bug #320297).
+
+  19 May 2010; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.6.ebuild:
+  Stable for HPPA (bug #320297).
+
+*syslog-ng-3.1.1 (13 Apr 2010)
+*syslog-ng-3.0.6 (13 Apr 2010)
+
+  13 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-3.0.5.ebuild, -syslog-ng-3.0.5-r1.ebuild,
+  +syslog-ng-3.0.6.ebuild, -syslog-ng-3.1.0.ebuild, +syslog-ng-3.1.1.ebuild:
+  version bumps for 3.0 and 3.1; clean old
+
+  07 Apr 2010; <zorry@gentoo.org> +files/syslog-ng.conf.gentoo.hardened.3:
+  Missing file syslog-ng.conf.gentoo.hardened.3 #313675
+
+*syslog-ng-3.1.0 (06 Apr 2010)
+
+  06 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.0.5-r1.ebuild, +syslog-ng-3.1.0.ebuild,
+  +files/syslog-ng.conf.gentoo.3, +files/syslog-ng.conf.gentoo.fbsd.3,
+  +files/syslog-ng.rc6.3:
+  syslog-ng 3.x version bump; updated files/ to be generic for 3.x
+
+  06 Apr 2010; Magnus Granberg <zorry@gentoo.org>
+  +syslog-ng-3.0.5-r1 syslog-ng.conf.gentoo.hardened
+  syslog-ng.logrotate.hardened:
+  Fix bug #284669 #232847 #291259 Thank you all
+
+*syslog-ng-3.0.5-r1 (06 Apr 2010)
+  
+  02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.0.4.ebuild, syslog-ng-3.0.5.ebuild:
+  skip trying to install the non-existing reference (bug #299079)
+
+  30 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6.3.0-r1:
+  give start-stop-daemon the pidfile so multiple syslog-ng processes can be
+  run (bug #295394)
+
+*syslog-ng-3.0.5 (22 Dec 2009)
+
+  22 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.5.ebuild, +files/syslog-ng.rc6.3.0-r1:
+  version bump; also addresses bug #293126
+
+  02 Dec 2009; Raúl Porcel <armin76@gentoo.org> syslog-ng-3.0.4.ebuild:
+  ia64/s390/sh/sparc stable wrt #289960
+
+  18 Nov 2009; Brent Baude <ranger@gentoo.org> syslog-ng-3.0.4.ebuild:
+  Marking syslog-ng-3.0.4 ppc64 for bug 289960
+
+  16 Nov 2009; Markus Meier <maekke@gentoo.org> syslog-ng-3.0.4.ebuild:
+  arm stable, bug #289960
+
+  08 Nov 2009; Tobias Klausmann <klausman@gentoo.org>
+  syslog-ng-3.0.4.ebuild:
+  Stable on alpha, bug #289960
+
+  06 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6-r1, files/syslog-ng.rc6.3.0:
+  remove the --quiet option to start-stop-daemon so config errors are
+  obvious (bug #291346)
+
+  30 Oct 2009; Markus Meier <maekke@gentoo.org> syslog-ng-3.0.4.ebuild:
+  amd64/x86 stable, bug #289960
+
+  24 Oct 2009; nixnut <nixnut@gentoo.org> syslog-ng-3.0.4.ebuild:
+  ppc stable #289960
+
+  21 Oct 2009; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.0.4.ebuild:
+  Stable for HPPA (bug #289960).
+
+  06 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.0.4.ebuild:
+  test suite is fairly broken unless run on upstream's development platform
+  (bug #283717)
+
+
+*syslog-ng-3.0.4 (08 Aug 2009)
+
+  08 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.0.4.ebuild:
+  version bump
+
+  01 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng-2.1.3-nonstatic.patch, -syslog-ng-2.0.9.ebuild,
+  -syslog-ng-2.1.3.ebuild:
+  clean old ebuilds and files
+
+  31 May 2009; Markus Meier <maekke@gentoo.org> syslog-ng-2.1.4.ebuild:
+  amd64 stable, bug #270863
+
+  31 May 2009; Markus Meier <maekke@gentoo.org> syslog-ng-2.0.10.ebuild:
+  amd64 stable, bug #270862
+
+  28 May 2009; Raúl Porcel <armin76@gentoo.org> syslog-ng-2.0.10.ebuild,
+  syslog-ng-2.1.4.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #270863 and #270862
+
+  25 May 2009; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.0.10.ebuild:
+  Stable for HPPA (bug #270862).
+
+  25 May 2009; Brent Baude <ranger@gentoo.org> syslog-ng-2.0.10.ebuild,
+  syslog-ng-2.1.4.ebuild:
+  Marking -2.1.4 and -2.0.10 ppc64 for bugs  270863 and 270862 respectively
+
+  25 May 2009; Christian Faulhammer <fauli@gentoo.org>
+  syslog-ng-2.0.10.ebuild:
+  stable x86, bug 270862
+
+  25 May 2009; Christian Faulhammer <fauli@gentoo.org>
+  syslog-ng-2.1.4.ebuild:
+  stable x86, bug 270863
+
+*syslog-ng-3.0.2 (25 May 2009)
+
+  25 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng-3.0.2-ipv6.patch, +files/syslog-ng.conf.gentoo.3.0,
+  +files/syslog-ng.conf.gentoo.fbsd.3.0,
+  +files/syslog-ng.conf.gentoo.hardened.3.0, +files/syslog-ng.rc6.3.0,
+  +syslog-ng-3.0.2.ebuild:
+  version bump
+
+  23 May 2009; nixnut <nixnut@gentoo.org> syslog-ng-2.0.10.ebuild,
+  syslog-ng-2.1.4.ebuild:
+  ppc stable #270862
+
+  22 May 2009; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.1.4.ebuild:
+  Stable for HPPA (bug #270863).
+
+*syslog-ng-2.0.10 (17 Apr 2009)
+
+  17 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.10.ebuild:
+  2.0 version bump for people having issues with 2.1
+
+*syslog-ng-2.1.4 (18 Mar 2009)
+
+  18 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.1.4.ebuild:
+  version bump
+
+  24 Feb 2009; Raúl Porcel <armin76@gentoo.org> syslog-ng-2.1.3.ebuild:
+  arm/s390/sh stable
+
+  15 Feb 2009; Brent Baude <ranger@gentoo.org> syslog-ng-2.1.3.ebuild:
+  stable ppc, bug 256132
+
+  07 Feb 2009; Raúl Porcel <armin76@gentoo.org> syslog-ng-2.1.3.ebuild:
+  ia64 stable wrt #256132
+
+  26 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.1.3.ebuild:
+  run eautoreconf after touching configure.in (bug #256455)
+
+  25 Jan 2009; Tobias Klausmann <klausman@gentoo.org>
+  syslog-ng-2.1.3.ebuild:
+  Stable on alpha, bug #256132
+
+  25 Jan 2009; Markus Meier <maekke@gentoo.org> syslog-ng-2.1.3.ebuild:
+  amd64/x86 stable, bug #256132
+
+  25 Jan 2009; Ferris McCormick <fmccor@gentoo.org> syslog-ng-2.1.3.ebuild:
+  Sparc stable, Bug #256132.
+
+  25 Jan 2009; Brent Baude <ranger@gentoo.org> syslog-ng-2.1.3.ebuild:
+  stable ppc64, bug 256132
+
+  23 Jan 2009; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.1.3.ebuild:
+  Stable for HPPA (bug #256132).
+
+  08 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng-2.1.3-nonstatic.patch, syslog-ng-2.1.3.ebuild:
+  add patch from mastamind@users.sourceforge.net to avoid always trying to link
+  glib statically (bug #250242)
+
+  02 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-2.0.6.ebuild, -syslog-ng-2.1.1.ebuild:
+  clean out old versions
+
+*syslog-ng-2.1.3 (02 Dec 2008)
+
+  02 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.1.3.ebuild:
+  version bump
+
+  15 Oct 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.logrotate:
+  allow /var/log/messages to be missing (patch from  Edoceo via bug #242260)
+
+  13 Oct 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.1.1.ebuild:
+  fix up magic sql support
+
+*syslog-ng-2.1.1 (13 Oct 2008)
+
+  13 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +syslog-ng-2.1.1.ebuild:
+  Version bump because I want the suppress-repeats functionality for infra.
+
+  17 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  add GLEP 56 USE flag desc from use.local.desc
+
+  25 May 2008; Markus Rothe <corsair@gentoo.org> syslog-ng-2.0.9.ebuild:
+  Stable on ppc64; bug #223241
+
+  24 May 2008; nixnut <nixnut@gentoo.org> syslog-ng-2.0.9.ebuild:
+  Stable on ppc wrt bug 223241
+
+  24 May 2008; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.0.9.ebuild:
+  Stable for HPPA (bug #223241).
+
+  23 May 2008; Raúl Porcel <armin76@gentoo.org> syslog-ng-2.0.9.ebuild:
+  alpha/ia64/sparc stable wrt #223241
+
+  22 May 2008; Markus Meier <maekke@gentoo.org> syslog-ng-2.0.9.ebuild:
+  amd64/x86 stable, bug #223241
+
+*syslog-ng-2.0.9 (26 Mar 2008)
+
+  26 Mar 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.9.ebuild:
+  version bump
+
+*syslog-ng-2.0.8 (31 Jan 2008)
+
+  31 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.8.ebuild:
+  version bump
+
+  16 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> -files/syslog-ng.rc6,
+  -syslog-ng-1.6.11-r1.ebuild:
+  clean out 1.x series
+
+  16 Jan 2008; Joshua Kinard <kumba@gentoo.org> syslog-ng-2.0.6.ebuild:
+  Stable on mips.
+
+  10 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.0.6.ebuild:
+  add dev-util/pkgconfig dep (bug #205013)
+
+  21 Dec 2007; Samuli Suominen <drac@gentoo.org> syslog-ng-2.0.6.ebuild:
+  amd64 stable wrt security #202718
+
+  19 Dec 2007; Raúl Porcel <armin76@gentoo.org> syslog-ng-2.0.6.ebuild:
+  alpha/ia64 stable wrt security #202718
+
+  19 Dec 2007; Brent Baude <ranger@gentoo.org> syslog-ng-2.0.6.ebuild:
+  Marking syslog-ng-2.0.6 ppc & ppc64 stable for 202718 (also marked eventlog
+  for ppc dep)
+
+  18 Dec 2007; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.0.6.ebuild:
+  Stable for HPPA (bug #202718).
+
+  18 Dec 2007; Ferris McCormick <fmccor@gentoo.org> syslog-ng-2.0.6.ebuild:
+  Sparc stable, security Bug #202718, all tests good and it still starts up.
+
+  18 Dec 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-2.0.6.ebuild:
+  stablize x86 for security bug #202718
+
+*syslog-ng-2.0.6 (29 Nov 2007)
+
+  29 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.6.ebuild:
+  version bump
+
+  04 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6-r1:
+  Add a use stunnel for the networked case for bug #198003
+
+  30 Oct 2007; <solar@gentoo.org> files/syslog-ng.conf.gentoo.hardened:
+  - update syslog-ng.conf for hardened
+
+  11 Oct 2007; Tom Gall <tgall@gentoo.org> syslog-ng-2.0.5.ebuild:
+  stable on ppc64
+
+  09 Oct 2007; Jeroen Roovers <jer@gentoo.org> syslog-ng-2.0.5.ebuild:
+  Stable for HPPA (bug #159494).
+
+  02 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6-r1:
+  add a kludgy workaround for baselayout-1 and baselayout-2 support (bug
+  #188725)
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.conf.gentoo:
+  use file() for kmsg for correctness (bug #187232)
+
+*syslog-ng-2.0.5 (25 Jul 2007)
+
+  25 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng.logrotate.hardened, +syslog-ng-2.0.5.ebuild:
+  version bump; all add logrotate file for hardened (bug #186136)
+
+  12 Jun 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.conf.gentoo:
+  set max-connections to 256 per upstream (bug #181661)
+
+  07 Jun 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-1.6.9.ebuild, -syslog-ng-2.0.3.ebuild, syslog-ng-2.0.4.ebuild:
+  clean out older ebuilds
+
+  07 Jun 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
+  modified ChangeLog to meet common standards
+
+*syslog-ng-2.0.4 (21 May 2007)
+
+  21 May 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.4.ebuild:
+  version bump
+
+  19 May 2007; Peter Weller <welp@gentoo.org> syslog-ng-2.0.3.ebuild:
+  Keyworded ~x86-fbsd wrt bug 176930
+
+  05 May 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6-r1:
+  revert back to previous version of rc script since that feature is available
+  via the SSD_NICELEVEL env. variable.
+
+  24 Apr 2007; Alexander Færøy <eroyf@gentoo.org>
+  syslog-ng-1.6.11-r1.ebuild:
+  Stable on MIPS.
+
+  24 Apr 2007; Thilo Bangert <bangert@gentoo.org> Manifest:
+  fix manifest (bug #175804)
+
+  24 Apr 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.rc6-r1:
+  add patch from Mike Mattie to support starting syslog-ng with a nice value
+  (bug #175639)
+
+*syslog-ng-2.0.3 (27 Mar 2007)
+
+  27 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng.conf.gentoo.fbsd, -syslog-ng-2.0.2.ebuild,
+  +syslog-ng-2.0.3.ebuild:
+  masked version bump; clean out older masked version; add fbsd support for bug
+  #156519; add spoof-source support for bug #172320
+
+*syslog-ng-1.6.12-r1 (14 Mar 2007)
+
+  14 Mar 2007; Roy Marples <uberlord@gentoo.org> files/syslog-ng.rc6-r1,
+  +syslog-ng-1.6.12-r1.ebuild:
+  init script now works on non bash shells.
+
+  16 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.11-r1.ebuild, syslog-ng-1.6.12.ebuild:
+  remove ROOT use in src_compile (bug #167240)
+
+*syslog-ng-1.6.12 (07 Feb 2007)
+
+  07 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.12.ebuild:
+  version bump
+
+  04 Feb 2007; Steve Dibb <beandog@gentoo.org> syslog-ng-1.6.11-r1.ebuild:
+  amd64 stable, bug 164942
+
+  04 Feb 2007; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.11-r1.ebuild:
+  Stable on ppc64; bug #164942
+
+  02 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.11-r1.ebuild:
+  stable on x86
+
+  23 Jan 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.9.ebuild, syslog-ng-1.6.11-r1.ebuild:
+  remove portage dep (bug #163507)
+
+  15 Jan 2007; Roy Marples <uberlord@gentoo.org> Manifest:
+  Fix Manifest
+
+  15 Jan 2007; Roy Marples <uberlord@gentoo.org> files/syslog-ng.rc6-r1:
+  need localmount
+  So we can go from single user to multi user.
+
+*syslog-ng-2.0.1 (30 Dec 2006)
+
+  30 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-2.0.1.ebuild:
+  masked version bump
+
+  24 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  syslog-ng-1.6.11-r1.ebuild:
+  Stable on ppc.
+
+  18 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  syslog-ng-1.6.11-r1.ebuild:
+  Stable on sparc
+
+  06 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-1.6.11.ebuild, syslog-ng-1.6.11-r1.ebuild:
+  clean up an errant rev bump
+
+  06 Dec 2006; Jeroen Roovers <jer@gentoo.org> syslog-ng-1.6.11-r1.ebuild:
+  Stable for HPPA.
+
+*syslog-ng-2.0.0-r1 (29 Nov 2006)
+*syslog-ng-1.6.11-r1 (29 Nov 2006)
+
+  29 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/syslog-ng.rc6-r1, +syslog-ng-1.6.11-r1.ebuild,
+  -syslog-ng-2.0.0.ebuild, +syslog-ng-2.0.0-r1.ebuild:
+  Fixed bug #156585 where the init.d script could call eend twice with only
+  one ebegin.
+
+*syslog-ng-2.0.0 (02 Nov 2006)
+
+  02 Nov 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng.confd, files/syslog-ng.rc6, +syslog-ng-2.0.0.ebuild:
+  new code base version bump; includes initial conf.d support for bug #101387
+  with modified patch from Miguel Sousa Filipe
+
+  02 Nov 2006; Joel Martin <kanaka@gentoo.org> syslog-ng-1.6.11.ebuild:
+  Add ROOT to with-libol configure switch.
+
+  21 Oct 2006; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.11.ebuild:
+  Mark 1.6.11 stable on alpha/ia64
+
+  17 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.9.ebuild, syslog-ng-1.6.11.ebuild:
+  no need for prepallman (bug #140697)
+
+  12 Jul 2006; <solar@gentoo.org> files/syslog-ng.conf.gentoo.hardened:
+  - use correct facility for uucp log filter. bug #140168
+
+*syslog-ng-1.6.11 (08 May 2006)
+
+  08 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.11.ebuild:
+  version bump
+
+*syslog-ng-1.6.10 (23 Apr 2006)
+
+  23 Apr 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.10.ebuild:
+  version bump
+
+  20 Feb 2006; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.9.ebuild:
+  Marked stable on mips.
+
+  06 Feb 2006; Simon Stelling <blubb@gentoo.org> syslog-ng-1.6.9.ebuild:
+  stable on amd64
+
+  31 Jan 2006; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.9.ebuild:
+  Mark 1.6.9 stable on alpha
+
+  27 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
+  syslog-ng-1.6.9.ebuild:
+  Stable on ppc.
+
+  26 Jan 2006; Jeroen Roovers <jer@gentoo.org> syslog-ng-1.6.9.ebuild:
+  Stable on hppa.
+
+  22 Jan 2006; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.9.ebuild:
+  Stable on ppc64
+
+  22 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  syslog-ng-1.6.9.ebuild:
+  Stable on sparc
+
+  22 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.9.ebuild:
+  stable for x86
+
+  25 Dec 2005; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.8-r1.ebuild:
+  Marked stable on mips.
+
+*syslog-ng-1.6.9 (03 Dec 2005)
+
+  03 Dec 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.9.ebuild:
+  version bump
+
+  30 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-1.6.5-r2.ebuild, -syslog-ng-1.6.6.ebuild,
+  -syslog-ng-1.6.7.ebuild:
+  clean old versions
+
+  30 Nov 2005; Bryan Østergaard <kloeri@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  Stable on alpha.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.8-r1.ebuild:
+  Stable on ppc64
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  Stable on ppc.
+
+  30 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  Stable on ia64.
+
+  26 Oct 2005; Luis Medinas <metalgod@gentoo.org> syslog-ng-1.6.8-r1.ebuild:
+  Marked Stable on amd64.
+
+  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  Stable on sparc
+
+  23 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  stable for x86
+
+  02 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.8-r1.ebuild:
+  fix another bad bit of autotooling related to --with-libol (bug #104538)
+
+*syslog-ng-1.6.8-r1 (02 Sep 2005)
+
+  02 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.8-r1.ebuild:
+  rev bump to fix missing dep on sys-apps/which (bug #104475)
+
+  01 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.8.ebuild:
+  inherit fixheadtails to fix bug #104475
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.8.ebuild:
+  stable on ia64
+
+  06 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> syslog-ng-1.6.8.ebuild:
+  Stable on mips.
+
+  28 Jul 2005; Simon Stelling <blubb@gentoo.org> syslog-ng-1.6.8.ebuild:
+  stable on amd64
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> syslog-ng-1.6.8.ebuild:
+  Stable on alpha.
+
+  19 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> syslog-ng-1.6.8.ebuild:
+  Stable on sh.
+
+  09 Jul 2005; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.8.ebuild:
+  Stable on ppc64
+
+  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> syslog-ng-1.6.8.ebuild:
+  Marked stable on ppc.
+
+  08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  syslog-ng-1.6.8.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  syslog-ng-1.6.8.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.8.ebuild:
+  stable for x86
+
+*syslog-ng-1.6.8 (26 May 2005)
+
+  26 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.8.ebuild:
+  version bump
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.7.ebuild:
+  Stable on ppc64
+
+  15 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  syslog-ng-1.6.7.ebuild:
+  Stable on hppa
+
+  13 May 2005; Fernando J. Pereda <ferdy@gentoo.org> syslog-ng-1.6.7.ebuild:
+  1.6.7 alpha stable
+
+  12 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  files/syslog-ng.conf.debian, files/syslog-ng.conf.gentoo,
+  files/syslog-ng.conf.gentoo.hardened:
+  fix up config files (bug #92330)
+
+  11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> syslog-ng-1.6.7.ebuild:
+  Stable on amd64.
+
+  09 May 2005; Lars Weiler <pylon@gentoo.org> syslog-ng-1.6.7.ebuild:
+  Stable on ppc.
+
+  09 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.7.ebuild:
+  install the stock config files as well (bug #91995)
+
+  09 May 2005; Jeffrey Forman <jforman@gentoo.org> syslog-ng-1.6.7.ebuild:
+  stable on sparc
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.7.ebuild:
+  stable on ia64
+
+  08 May 2005; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.7.ebuild:
+  Marked stable on mips.
+
+  08 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.7.ebuild:
+  stable for x86
+
+  16 Apr 2005; Stephen Bennett <spb@gentoo.org>
+  files/syslog-ng.conf.gentoo.hardened:
+  Changed hardened config so as to open /proc/kmsg ro instead of rw.
+
+*syslog-ng-1.6.7 (09 Apr 2005)
+
+  09 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.7.ebuild:
+  version bump
+
+  05 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.6.ebuild:
+  Add support for hardened-specified config file
+
+  05 Apr 2005; <solar@gentoo.org> +files/syslog-ng.conf.gentoo.hardened:
+  - added example hardened syslog-ng conf used by hardened profiles.
+
+*syslog-ng-1.6.6 (26 Feb 2005)
+
+  26 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.6.ebuild:
+  version bump
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*syslog-ng-1.6.5-r2 (14 Dec 2004)
+
+  14 Dec 2004; Aron Griffis <agriffis@gentoo.org> files/syslog-ng.rc6,
+  -syslog-ng-1.6.5-r1.ebuild, +syslog-ng-1.6.5-r2.ebuild:
+  Fix syslog-ng.conf net dependency again #74428
+
+  01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng.conf.sample, syslog-ng-1.6.5-r1.ebuild:
+  added syslog.conf from Debian as a sample (from bug #67267)
+
+  01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-1.6.2.ebuild, -syslog-ng-1.6.4.ebuild:
+  clean older versions (fixes bug #71546)
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.5-r1.ebuild:
+  stable on ia64
+
+  18 Nov 2004; Markus Rothe <corsair@gentoo.org> syslog-ng-1.6.5-r1.ebuild:
+  stable on ppc64; bug #71613
+
+  13 Oct 2004; Travis Tilley <lv@gentoo.org> syslog-ng-1.6.5-r1.ebuild:
+  stable on amd64
+
+  02 Oct 2004; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.5-r1.ebuild:
+  Marked stable on mips.
+
+*syslog-ng-1.6.5-r1 (02 Oct 2004)
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> syslog-ng-1.6.5-r1.ebuild:
+  Stable on alpha.
+
+  28 Sep 2004; Aron Griffis <agriffis@gentoo.org> files/syslog-ng.rc6,
+  -syslog-ng-1.6.5.ebuild:
+  Don't use xargs to concatenate lines; it breaks on uneven quoting #65520
+
+  25 Sep 2004; Jason Wever <weeve@gentoo.org> syslog-ng-1.6.5.ebuild:
+  Stable on sparc.
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-1.6.5.ebuild:
+  stable on x86
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> files/syslog-ng.rc6:
+  Add xargs into the init-script to make parsing conf file more robust #60487
+
+*syslog-ng-1.6.5 (16 Aug 2004)
+
+  16 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-1.6.5.ebuild:
+  version bump (bug #60271)
+
+  08 Aug 2004; Luca Barbato <lu_zero@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Marked ppc
+
+  08 Aug 2004; <agriffis@gentoo.org> syslog-ng-1.6.4.ebuild:
+  stable on ia64
+
+  04 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6:
+  checkconfig before reload to catch mis-config earlier.  Patch from Eldad
+  Zack via bug #58216
+
+  05 Jul 2004; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Marked stable on mips.
+
+  25 Jun 2004; Tom Gall <tgall@gentoo.org> syslog-ng-1.6.4.ebuild:
+  stable on ppc64, bug #54848
+
+  25 Jun 2004; Guy Martin <gmsoft@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Marked stable on hppa.
+
+  22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Stable on sparc
+
+  22 Jun 2004; <malc@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Mark stable on amd64
+
+  22 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-1.6.4.ebuild:
+  stable for x86
+
+  16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> syslog-ng-1.6.4.ebuild:
+  Stable on alpha.
+
+  05 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-1.6.4.ebuild:
+  inherit flag-o-matic for append-ldflags; add use static support; dep fix for
+  libol; tidy compile
+
+*syslog-ng-1.6.4 (29 May 2004)
+
+  29 May 2004; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-1.6.4.ebuild:
+  version bump
+
+  29 May 2004; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-1.6.2.ebuild:
+  tidy
+
+  12 May 2004; Michael McCabe <randy@gentoo.org> syslog-ng-1.6.2.ebuild:
+  Added s390 keywords
+
+  26 Apr 2004; Tom Gall <tgall@gentoo.org> syslog-ng-1.6.2.ebuild:
+  stable on ppc64 (bug 49104)
+
+  17 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.4.16-r2.ebuild, syslog-ng-1.6.0_rc1-r2.ebuild:
+  clean out older versions
+
+*syslog-ng-1.6.2 (14 Feb 2004)
+
+  14 Feb 2004; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.2.ebuild,
+  files/syslog-ng.rc6:
+  Fix bug 38475 by adding conditional dep on network in initscript. Didn't bump
+  the rev since I don't think a lot of people care about this change. Also
+  bumped the version to 1.6.2 for testing.
+
+  05 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  mark stable on amd64
+
+  30 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  The upstream source moved on us (bug 36394)
+
+  11 Nov 2003; Aron Griffis <agriffis@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  Mark stable on ia64
+
+  11 Nov 2003; Aron Griffis <agriffis@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  Add ~ia64
+
+  22 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  add metadata.xml
+
+  05 Oct 2003; Brad House <brad_mssw@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  add ~amd64 flag
+
+  03 Oct 2003; Aron Griffis <agriffis@gentoo.org>
+  syslog-ng-1.6.0_rc3-r1.ebuild:
+  Stable on alpha
+
+*syslog-ng-1.6.0_rc3-r1 (17 Sep 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.0_rc3-r1.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+
+*syslog-ng-1.6.0_rc1-r2 (17 Sep 2003)
+
+  17 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  syslog-ng-1.4.16-r1.ebuild, syslog-ng-1.4.16-r2.ebuild,
+  syslog-ng-1.6.0_rc1-r1.ebuild, syslog-ng-1.6.0_rc1-r2.ebuild,
+  syslog-ng-1.6.0_rc3-r1.ebuild, syslog-ng-1.6.0_rc3.ebuild:
+  version bump to provide virtual/logger
+
+*syslog-ng-1.4.16-r2 (17 Sep 2003)
+
+*syslog-ng-1.4.16-r1 (12 Mar 2003)
+
+  29 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  31 May 2003; Seemant Kulleen <seemant@gentoo.org>
+  syslog-ng-1.6.0_rc3.ebuild:
+  slight fix for dohtml -- finally closing the bug
+
+*syslog-ng-1.6.0_rc3 (18 May 2003)
+
+  16 Jul 2003; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.0_rc3.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  02 Jul 2003; Guy Martin <gmsoft@gentoo.org> syslog-ng-1.6.0_rc3.ebuild :
+  Marked stable on hppa.
+
+  18 May 2003; Seemant Kulleen <seemant@gentoo.org>
+  syslog-ng-1.6.0_rc1-r1.ebuild, syslog-ng-1.6.0_rc3.ebuild:
+  html docs fix and version bump thanks to: Andy Dustman
+  <andy-gentoo.54e552@dustman.net> in bug #19156
+
+*syslog-ng-1.6.0_rc1-r1 (10 Mar 2003)
+
+  14 May 2003; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.0_rc1-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  01 May 2003; <msterret@gentoo.org> files/syslog-ng.conf.gentoo:
+  updated files/syslog-ng.conf.gentoo with a user-uncommentable option
+  for logging to address http://bugs.gentoo.org/show_bug.cgi?id=19824.
+
+  14 Apr 2003; Guy Martin <gmsoft@gentoo.org> syslog-ng-1.6.0_rc1-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  syslog-ng-1.6.0_rc1-r1.ebuild:
+  doc fixes for html docs, thanks to: Andy Dustman
+  <andy-gentoo.54e552@dustman.net> in bug #19156
+
+  28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> syslog-ng-1.6.0_rc1-r1
+  Moved to stable on ppc
+
+  11 Mar 2003; Aron Griffis <agriffis@gentoo.org> files/syslog-ng.conf.gentoo:
+  Minor update to default configuration; added stats(43200)
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org>
+  syslog-ng-1.6.0_rc1-r1.ebuild, files/syslog-ng.conf.gentoo,
+  files/syslog-ng.logrotate:
+  Bump revision to pick up new default configuration and logrotate snippet, both
+  contributed by Michael Sterrett. This relates to bug #7144. Also mark stable
+  on x86 and alpha since this is the version recommended for production use by
+  the web page.
+
+*syslog-ng-1.6.0_rc1 (05 Mar 2003)
+
+  05 Mar 2003; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.0_rc1.ebuild:
+  Update to latest stable release candidate for bug #14335
+
+*syslog-ng-1.5.26-r1 (27 Feb 2003)
+
+  27 Feb 2003; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.5.26-r1.ebuild,
+  files/syslog-ng.rc6:
+  Fix bug 16308 by adding a reload() function to the init script. Bumped the
+  masked revision to pick up the change. Thanks to Michael Sterrett for his
+  work debugging and providing the patch.  Also added ~alpha to KEYWORDS.
+
+*syslog-ng-1.5.26 (09 Feb 2003)
+
+  09 Feb 2003; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.5.26.ebuild:
+  Version Bump
+
+  09 Feb 2003; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.4.16-r1.ebuild,
+  syslog-ng-1.4.17.ebuild:
+  Removed message about syslog2ng script which is only found in 1.5.x
+
+  21 Jan 2003; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.4.16-r1.ebuild:
+  Revision bump to pick up new initscript on the stable package.
+
+  21 Jan 2003; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.5.24-r1.ebuild
+  files/syslog-ng.rc6 :
+  Add a pause after stopping syslog-ng to allow it to stop, particularly in
+  case it's restarting.  This is particularly important when using logrotate.
+  Bumped the revision to get the new initscript installed.  Closes #14310
+
+*syslog-ng-1.5.24 (26 Dec 2002)
+
+  26 Dec 2002 Martin Holzer <mholzer@gentoo.org> syslog-ng-1.5.24.ebuild
+  files/digest-syslog-ng-1.5.24 ChangeLog :
+  Version Pumped. Closes #12714.
+ 
+*syslog-ng-1.4.17 (05 Nov 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*syslog-ng-1.4.16 (25 Oct 2002)
+
+  04 Nov 2002; Seemant Kulleen <Seemant@gentoo.org> *.ebuild :
+  Added sys-devel/flex to DEPENDS. Closes bug #10185 by lordvan@lordvan.com
+  (Thomas Raschbacher)
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Arrgh.  This is the *stable version of syslog-ng, and according to our
+  friends on #9278, the only branch currently with working UDP/TCP support.
+  I've marked the development versions with ~, and this one stable :/
+
+*syslog-ng-1.5.22 (23 Oct 2002)
+
+  23 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Bug fix release.  Thanks rkilgore@hotpop.com, wylie@geekasylum.org; #9278.
+
+*syslog-ng-1.5.21 (12 Oct 2002)
+
+  12 Oct 2002; Seemant Kulleen <seemant@gentoo.org> syslog-ng-1.5.21.ebuild :
+  Works on sparcs
+
+  12 Oct 2002; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.5.21.ebuild,
+  files/syslog-ng.conf.sample:
+  Version bump and older versions removed due to security issue.  "kernsrc"
+  line in example configuration file fixed. (Bugs #7951 and #7996)
+
+*syslog-ng-1.5.19 (17 Aug 2002)
+
+  14 Sep 2002; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.5.19.ebuild:
+  Fixed bug introduced with previous fix (#7757)
+
+  17 Aug 2002; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.5.19.ebuild:
+  Updated ebuild contributed by mw@teamzone.de (Markus Wagner) plus
+  -lwrap buglet fix
+  
+*syslog-ng-1.5.17 (21 May 2002)
+
+  14 Aug 2002; Jack Morgan <jmorgan@gentoo.org> syslog-ng-1.4.15.ebuild,
+  syslog-ng-1.5.17.ebuild:
+  Added sparc64 to KEYWORDS.
+
+*syslog-ng-1.5.17 (21 May 2002)
+
+  30 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> syslog-ng-1.5.17.ebuild :
+  Added -ppc to KEYWORDS.
+
+  21 May 2002; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.5.17.ebuild :
+  New development branch version... a pain to compile and is masked out
+
+*syslog-ng-1.4.15 (21 May 2002)
+
+  21 May 2002; Bruce A. Locke <blocke@shivan.org> syslog-ng-1.4.15.ebuild :
+  New Version
+
+*syslog-ng-1.4.12-r9 (3 May 2002)
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Add LICENSE, SLOT, $Headers.
+
+*syslog-ng-1.4.12-r8 (11 Mar 2002)
+
+  11 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
+  Updated rc-script to provide "logger".
+
+*syslog-ng-1.4.12-r7 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
new file mode 100644
index 0000000..e930bff
--- /dev/null
+++ b/app-admin/syslog-ng/Manifest
@@ -0,0 +1,24 @@
+AUX 3.4/syslog-ng.conf.gentoo 1332 SHA256 949c0f2a9f4351be23249ba1b7763b5d4ff9ab4907c1211cc3e92b6bc9705c8e SHA512 bdbcfa27368ed75daac153d91c50555bea892f492639a2448e47a6f38a9b84808eedd35db09347a385c70725ab8349798f624aa5e2f730fb99b2986d05afb1a4 WHIRLPOOL d639db780aa07438e1a33b85cf3f388782f84fe884b95303605ccd58bf95232e5e013c5d491b44034e7d90121064b9c749d91c2fa6352ccb44db90d12d792d82
+AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931c3386eb94145f8e7495d9eb8ece0fc SHA512 a8f94d3cd4f120c3cb69f4e938877f62e87f7a6a3f422575e130b49ed3fa37effc6dc0c53398031602f9bcf26a1ce3b5267701483f045829960796098e843fb0 WHIRLPOOL 37ceec9bb7a1cc829b1eeb1aa8e9af162b67e90e03d862bc215150e011ad8be433270d658029fd72963d2486c72f5046e9d6e007a62f170c1295d61d68b62ca4
+AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098
+AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
+AUX 3.4/syslog-ng.rc6 2052 SHA256 f2a180881e061963b1cb85aef0b06e54141158009ca8770d6e7a4832a451052f SHA512 f90e205391c716dc19ceae02b410e134a3763426dc7df22058d2624f43f474139e7771f7e38fb1aa3072de7da5e2cac91fc8270c8ae2967c392d56a9bd3bec96 WHIRLPOOL 2d448a7dfea10f25e82954adfe4b77c80a1017a89a3f701384074d5daced1ff44e81d877e71063ee20a230565b64b199b03541bb0d10065634f3130a05122331
+AUX 3.6/syslog-ng-3.6.2-redis.patch 853 SHA256 0645bb613776a653b844e8c3bb96ee85cecc9446c073b8646c29cd6428bc4c82 SHA512 fea621e66185509d79bd33ec440a8122faeadaff610c8823d428a6485563f4f83534c5ed40012a4d6818256e278a5bf0cc0d90caa00e60ce3a91561b549ce828 WHIRLPOOL 6eb24eca6c369e25ee3263216b20313e1332c6af13202a8b036ee6d7155adddc912083539a44ed7b3f330a895dddd4d98bb45e1d748a18749f06e31bf5c78ba6
+AUX 3.6/syslog-ng.conf.gentoo 1332 SHA256 3e51ccba31ca55d7428e7c01373e3c6700936c115aa165f6a1fc9428500c7f9e SHA512 a39b4baee4a60b252a866e423c4cbeffb7f23d8d6446c40169894d5f45c4ef0e98b14e02e63ce1623e9d08a6e1f4037987bfe9453d3bf65f5315c70583a21d08 WHIRLPOOL 0aba4311cc95303aed2fe51332476bd9cabf3a6f57edfb52e28cf4d76db1a45bcfdb0417a42e30f45ad056a2c4c2675170686817d1d5e985d0c7f5352a6e3d0c
+AUX 3.6/syslog-ng.conf.gentoo.fbsd 727 SHA256 7f33666d6cf0772e1afa8a09658cb7799aa0278c20c1adb33018c1bc5bef4bcc SHA512 a571d28d4d8f49e204601526b70cce0690f4a5dab61a33c1cd46af1e4199bb2427fc5a0f69257a3f439197abf1177ae26826b0a4cc7762a4acbd0978275eb9ae WHIRLPOOL 332a13c2b7cd25a8826d424fc4ed782d36f37211aeef714913d3d50f3f26332e02b819f06842fbdbcc9a8149ff2f44a3a26df7a37408bf4a1b8d7f963e449973
+AUX 3.6/syslog-ng.conf.gentoo.hardened 4658 SHA256 e566c3758b71255bc51bd72fa0a4b7d039c448b3f8fb85ff36b7eff541537e6b SHA512 06988cf6192e498b8f8845de2d192d5495f72bb7ac58276252e77a4593cea04cb6e3d18b9d77f9ea2e3fb18680b2d14799b6bf226f1a1ae1ca6c9f97cf5c1812 WHIRLPOOL f42ef0a3bb28dd066f7cc9b7337e5710b91de6141ee6a94ca81f6c9dd230c6baad9b4cf1e4e4ed4c6c2b7ebcb38be5993fec94c0f907dc35f1a88fa69fbb76a2
+AUX 3.6/syslog-ng.confd 1492 SHA256 b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0 WHIRLPOOL 11fd5a62c3fbb66ebc84844ce091e7cb5dbace790d20273b6cfb21e99bd935b13dc5da1b13fa17a4038c3a2ea3d6b3fd80227034e3db87e0ef890caa0beaadb3
+AUX 3.6/syslog-ng.rc6 2039 SHA256 aa027dac0d145bc342728864cd432a0cf3c25dd6cb66880e7b70df1a9d5a66cf SHA512 de969bb359df12fac283b95be3522f50986ab89e9020d8edda6ebbf804d8d1f6d30f11dabbe11b3ac4d8f4b8c9aee792387b6168ac2c77c81938de3cd402e1cf WHIRLPOOL ff1e3eb1ba5ac1e7f96d408005f4b675a6468ebddb22c44b003231a757100f52c336fa42d886691c8f89f47bd1149b340b0597aca280a1bd3acb643459e7b945
+AUX README.hardened 358 SHA256 712e5bb70d79e416237ccd69a73e0b8deaf7d9bfbb92a0c85554a12bebbaf6bc SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e WHIRLPOOL 7980551efe131b736c2542f7d066e2442201be3e541dc0036e92de1c5379d945148164b628b47ec5c5379c1e50ead7120f653c63ab78feefe69c5753998c0295
+AUX syslog-ng.logrotate 354 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd1423bf2ae7bffee8ca3 SHA512 c3dc48bd0525947d728c51ac79faa05b481d5ad7dc4f52ed69d2f5a4344fe71c3e06591fe058ef5dcb8ea6cf089954e9a312d510e129727b35a6e32d8e9ec5e8 WHIRLPOOL 34e5efedceed29fadfc99165a70407a2bd64e4df05818f8da831840bf16e287c2e54c47cdb81393f581e14c84407137dc18b5a17b840eb0587877803e8b8be41
+AUX syslog-ng.logrotate.hardened 1742 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f SHA512 2f751bc34e2de833b764f4fc1ccb2fc0337c1d3f84bd30194897972270ef6fc502ff3822912921a15479bea273bc0aa4eeec8c68d672ce1edcdcb5cfed70926a WHIRLPOOL b80fe444f140f842677dc59cef7d19e777429e2983a808c264bed1436f505052bc239f8238ad5d739d50eb21e1f36b5f52d45010d6b3b3ae8fd296a7c4939608
+AUX syslog-ng.logrotate.hardened.in 1653 SHA256 78e3db0f0a75dfc74d9a34cd865cd02c97e37c0eb505968700faf9b6c154ac46 SHA512 a2e2e9175fc32a4c717629526940dcc6f323147e40833118ceffbd44413bfb320f94e07fdef0b99a64f72c5e7f7aa00447f81d85f8c716982636dd3241f7f955 WHIRLPOOL 03f691e64a1184526acfeaeb6187443becc7816f558774faeb1d5ee785cc09fd35f444bf79451bd91754c558b4e17caa10c69430ae3e10aed4458b108cc80c93
+AUX syslog-ng.logrotate.in 345 SHA256 7e854cbac5b376b3d1d6906fed4cff794e17998c04c647239da4245f112cf97f SHA512 d729111944527fc269e884c12fc628b95a9b83757c756a18c2e45355a7df6ed7802d1bfc0d1af37e3d5b07deaad6f42a38c70dc899835d659dd12917204b15ae WHIRLPOOL 4ae7fbe448e346265117c0fa407b6632d698cab4514937f699195306228a7b81b70cecc23937f336f808fe35fbeeaec4ec97cba8684897dcf06ffa6eecd4ea4b
+DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
+DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
+DIST syslog-ng_3.6.3.tar.gz 3276189 SHA256 1a2fc8bc513c3ee2f96b22f1bfc6e33077a6d0eb2a3c2915747345a085836174 SHA512 887fefd10193c525e02914f7de1fa903d5173bf745b0dd7575b757100fe56536dc2dfd2f468cf70a4cbface8c6536f2d5f93de89359f95f3db3b07487e9bf42c WHIRLPOOL 3c3eab5b8a7523fa4263b75f77f2b45c6ca6741e00ea1312aa2427aeec616296048b4324db627f45d3ab92e4dc11cc09acea3258f8ba9e6bc1e1a82f8b0d75d7
+EBUILD syslog-ng-3.4.8.ebuild 3588 SHA256 2bf7cb39b5486e7a6b95834ad87ec19a0d00e93126fc57dd826b6bebc3e9e844 SHA512 32eadb10f65970756a30d852dcb14bf0296425e5c256182956d3cc42b8571c46df3a293da40a9ff730046252a3e078413e11543176c39586d5dbcea970e41939 WHIRLPOOL ebbb2b786c6061017d0a69878fb6811d7b97495f948e5c46d8dff695281b864e6f8a8d177f71c7a75652905f4f511c479e26868ccebb7838c211a8dda8ecfc9d
+EBUILD syslog-ng-3.6.2.ebuild 3787 SHA256 2b4b37f81da09542962ec9f88e55387e1988551e4cbc6e86836a03bd6f9c49c5 SHA512 6361a58feea7f230aadde01beb1aa0c94a0dd5579f910fa05ec161ad7cb33196446d90d7c325043b3e688afb705aad64d867dc5d55a0b6fe6809ef23a9de203e WHIRLPOOL 04532d59ad797616db33469026ede44c202e1b57957fa3d1e0b67796d521340b4ab6d880427a05f31c75628d97dff57dc6ee70d460f09d42d79f05eb682fe427
+EBUILD syslog-ng-3.6.3.ebuild 3787 SHA256 91f0c173ffa8376b4813e40bfe3b671f582b354048e7fbb690c9449dacb63cb4 SHA512 5815037cd7d73e3955bfe7b5a0b163985bacfe672d5aeb51bc782919644a17f5e46772913db7a3b9881822d08b07272607f7328e88ddf9c4bdd8d5cfcfb51c82 WHIRLPOOL 7f3259d81e1956fae747a515250713882100c69f500a73d92c3b134ae4d36277d9089a55ff603cff2366e52ab6104c1177d940c85c8fe73741708c6dbaec3044
+MISC ChangeLog 59816 SHA256 9413d22e298ba9af2e93d1c385f9db9837a0b2c2f614e734f3e6a1704c606fa0 SHA512 5bfa8d9924d0f2059fc86eebe55a7b06a24be01508dd5fcc4cb9fd9112002806d43c31b36417c92a22d9d99ae62f34cc60e1fc8aab2f640a9363b267f91833b3 WHIRLPOOL 9aacb90a7eaedcf58b0f8219f3d29f1af808754e11517eec0e57b239d86853583d3d1c8822500a73c3951aa9bd4c4a2f85de3e980263e66d897a439433dfeeea
+MISC metadata.xml 792 SHA256 9116bcafb5bc0f8cb3e27e43b474bb387de0467f47fe81f2a2da462cd1438834 SHA512 d81f3f86da8fa594eca1b2224ffe4e07c467f63aee77273b91df7b91256d54653c70b1a3c6543f1a6ce51594f75fdb4245d4ad6766d687275efe7b1811b317a4 WHIRLPOOL efc50cd99fe30a65e83b180794e3d9f58e09f6680c14ea038e09746f414b83c5ba3380d0c6796cca254a4ab81ce676f9dbdefb577abc5a39a26281a8ef9010d2
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
new file mode 100644
index 0000000..e8d3b4f
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
@@ -0,0 +1,37 @@
+@version: 3.4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options { 
+	threaded(yes);
+	chain_hostnames(no); 
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 0000000..66130be
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,25 @@
+@version: 3.4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 0000000..3df0808
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,115 @@
+@version: 3.4
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    unix-dgram("/dev/log");
+    internal();
+};
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.confd b/app-admin/syslog-ng/files/3.4/syslog-ng.confd
new file mode 100644
index 0000000..6a437d1
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/var/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6
new file mode 100644
index 0000000..eb28bb8
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.6 2013/08/31 17:44:03 mr_bones_ Exp $
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+    checkconfig || return 1
+    checkpath \
+	-d \
+	--mode 0700 \
+	--owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
+	"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+    [ "$RC_CMD" = restart ] && sleep 1
+    return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
new file mode 100644
index 0000000..aa00c3b
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
@@ -0,0 +1,29 @@
+From 0e51c69056a93bd2b95341f005b8b1fdceec2b10 Mon Sep 17 00:00:00 2001
+From: Tibor Benke <ihrwein@gmail.com>
+Date: Wed, 17 Dec 2014 23:52:41 +0100
+Subject: [PATCH] redis: free reply object after a succesful ping
+
+---
+ modules/redis/redis.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules/redis/redis.c b/modules/redis/redis.c
+index 46a5b6b..9114324 100644
+--- a/modules/redis/redis.c
++++ b/modules/redis/redis.c
+@@ -132,9 +132,14 @@ redis_dd_format_persist_name(LogThrDestDriver *d)
+ static gboolean
+ redis_dd_connect(RedisDriver *self, gboolean reconnect)
+ {
++  redisReply *reply;
++  
+   if (reconnect && (self->c != NULL))
+     {
+-      redisCommand(self->c, "ping");
++      reply = redisCommand(self->c, "ping");
++
++      if (reply)
++        freeReplyObject(reply);
+ 
+       if (!self->c->err)
+         return TRUE;
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo
new file mode 100644
index 0000000..fed10b1
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo
@@ -0,0 +1,37 @@
+@version: 3.6
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options { 
+	threaded(yes);
+	chain_hostnames(no); 
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 0000000..309e831
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,25 @@
+@version: 3.6
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 0000000..243d9a4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,115 @@
+@version: 3.6
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    unix-dgram("/dev/log");
+    internal();
+};
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.confd b/app-admin/syslog-ng/files/3.6/syslog-ng.confd
new file mode 100644
index 0000000..42fa26a
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
new file mode 100644
index 0000000..75e558b
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.3 2015/03/29 07:27:06 mr_bones_ Exp $
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "$RC_CMD" = restart ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened
new file mode 100644
index 0000000..dcb0fc3
--- /dev/null
+++ b/app-admin/syslog-ng/files/README.hardened
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+If you intend to use syslog-ng together with the systemd journal,
+please be sure to configure it to listen accordingly, e.g. replace
+
+    unix-dgram("/dev/log");
+
+with
+
+    unix-dgram("/run/systemd/journal/syslog");
+
+in /etc/syslog-ng/syslog-ng.conf
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
new file mode 100644
index 0000000..e982686
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate,v 1.3 2008/10/15 20:46:12 mr_bones_ Exp $
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+    missingok
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
new file mode 100644
index 0000000..b743b14
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
@@ -0,0 +1,76 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened,v 1.3 2010/04/05 22:19:33 zorry Exp $
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# User log
+/var/log/user.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Authentication
+/var/log/auth.log {
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# the rest
+/var/log/messages {
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
new file mode 100644
index 0000000..86b3bfa
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -0,0 +1,76 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# User log
+/var/log/user.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Authentication
+/var/log/auth.log {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# the rest
+/var/log/messages {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
new file mode 100644
index 0000000..acd48ec
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+    missingok
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
new file mode 100644
index 0000000..db015d1
--- /dev/null
+++ b/app-admin/syslog-ng/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>mr_bones_@gentoo.org</email>
+	<name>Michael Sterrett</name>
+</maintainer>
+<use>
+	<flag name='amqp'>Enable support for AMQP destinations</flag>
+	<flag name='smtp'>Enable support for SMTP destinations</flag>
+	<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
+	<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
+	<flag name='mongodb'>Enable support for mongodb destinations</flag>
+	<flag name='pacct'>Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
+	<flag name='redis'>Enable support for Redis destinations</flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
new file mode 100644
index 0000000..3c76cdf
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild,v 1.12 2014/11/02 09:01:28 ago Exp $
+
+EAPI=5
+inherit eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct +pcre smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	smtp? ( net-libs/libesmtp )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-c-0.9 )
+	caps? ( sys-libs/libcap )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable pcre) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
new file mode 100644
index 0000000..6647e26
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.14 2015/04/25 18:38:50 jmorgan Exp $
+
+EAPI=5
+inherit eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	json? ( >=dev-libs/json-c-0.9 )
+	redis? ( dev-libs/hiredis )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/libpcre
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--with-embedded-crypto \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild
new file mode 100644
index 0000000..c30b7ce
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild,v 1.14 2015/04/25 18:38:50 jmorgan Exp $
+
+EAPI=5
+inherit eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	json? ( >=dev-libs/json-c-0.9 )
+	redis? ( dev-libs/hiredis )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/libpcre
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--with-embedded-crypto \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}

From 90f8fbb8a5ad5533bd24710b0b8f744f0a10343a Mon Sep 17 00:00:00 2001
From: root <root@mysqldb03-cluster06.safesoftsolutions.com>
Date: Thu, 30 Jul 2015 14:02:17 -0700
Subject: [PATCH 080/261] remove redish patch

---
 app-admin/syslog-ng/Manifest               | 2 +-
 app-admin/syslog-ng/syslog-ng-3.6.3.ebuild | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e930bff..db52294 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -19,6 +19,6 @@ DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d
 DIST syslog-ng_3.6.3.tar.gz 3276189 SHA256 1a2fc8bc513c3ee2f96b22f1bfc6e33077a6d0eb2a3c2915747345a085836174 SHA512 887fefd10193c525e02914f7de1fa903d5173bf745b0dd7575b757100fe56536dc2dfd2f468cf70a4cbface8c6536f2d5f93de89359f95f3db3b07487e9bf42c WHIRLPOOL 3c3eab5b8a7523fa4263b75f77f2b45c6ca6741e00ea1312aa2427aeec616296048b4324db627f45d3ab92e4dc11cc09acea3258f8ba9e6bc1e1a82f8b0d75d7
 EBUILD syslog-ng-3.4.8.ebuild 3588 SHA256 2bf7cb39b5486e7a6b95834ad87ec19a0d00e93126fc57dd826b6bebc3e9e844 SHA512 32eadb10f65970756a30d852dcb14bf0296425e5c256182956d3cc42b8571c46df3a293da40a9ff730046252a3e078413e11543176c39586d5dbcea970e41939 WHIRLPOOL ebbb2b786c6061017d0a69878fb6811d7b97495f948e5c46d8dff695281b864e6f8a8d177f71c7a75652905f4f511c479e26868ccebb7838c211a8dda8ecfc9d
 EBUILD syslog-ng-3.6.2.ebuild 3787 SHA256 2b4b37f81da09542962ec9f88e55387e1988551e4cbc6e86836a03bd6f9c49c5 SHA512 6361a58feea7f230aadde01beb1aa0c94a0dd5579f910fa05ec161ad7cb33196446d90d7c325043b3e688afb705aad64d867dc5d55a0b6fe6809ef23a9de203e WHIRLPOOL 04532d59ad797616db33469026ede44c202e1b57957fa3d1e0b67796d521340b4ab6d880427a05f31c75628d97dff57dc6ee70d460f09d42d79f05eb682fe427
-EBUILD syslog-ng-3.6.3.ebuild 3787 SHA256 91f0c173ffa8376b4813e40bfe3b671f582b354048e7fbb690c9449dacb63cb4 SHA512 5815037cd7d73e3955bfe7b5a0b163985bacfe672d5aeb51bc782919644a17f5e46772913db7a3b9881822d08b07272607f7328e88ddf9c4bdd8d5cfcfb51c82 WHIRLPOOL 7f3259d81e1956fae747a515250713882100c69f500a73d92c3b134ae4d36277d9089a55ff603cff2366e52ab6104c1177d940c85c8fe73741708c6dbaec3044
+EBUILD syslog-ng-3.6.3.ebuild 3736 SHA256 67e06d39455a8a6932227f6925413a60aff215f74fd44d8b91f4e3990f5b4845 SHA512 61952ae1e89942d73a78a6b0486784b2ee951ba500011f54ac679c5185cbcb74e81a326848c640f00ede3f126ca3c3e767b50f96984fff030aa2aeb3cecc645d WHIRLPOOL 5126ec0dfc164c33421ebe91c8cf37c831b2928d6fbe146d1fb4e99533072b5719036ca2032dde80218c61a9e314de93aff386a46670583c5597079685dd9be0
 MISC ChangeLog 59816 SHA256 9413d22e298ba9af2e93d1c385f9db9837a0b2c2f614e734f3e6a1704c606fa0 SHA512 5bfa8d9924d0f2059fc86eebe55a7b06a24be01508dd5fcc4cb9fd9112002806d43c31b36417c92a22d9d99ae62f34cc60e1fc8aab2f640a9363b267f91833b3 WHIRLPOOL 9aacb90a7eaedcf58b0f8219f3d29f1af808754e11517eec0e57b239d86853583d3d1c8822500a73c3951aa9bd4c4a2f85de3e980263e66d897a439433dfeeea
 MISC metadata.xml 792 SHA256 9116bcafb5bc0f8cb3e27e43b474bb387de0467f47fe81f2a2da462cd1438834 SHA512 d81f3f86da8fa594eca1b2224ffe4e07c467f63aee77273b91df7b91256d54653c70b1a3c6543f1a6ce51594f75fdb4245d4ad6766d687275efe7b1811b317a4 WHIRLPOOL efc50cd99fe30a65e83b180794e3d9f58e09f6680c14ea038e09746f414b83c5ba3380d0c6796cca254a4ab81ce676f9dbdefb577abc5a39a26281a8ef9010d2
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild
index c30b7ce..68b8762 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.3.ebuild
@@ -38,7 +38,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
 	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
 	cd "${TMPDIR}" || die
 

From 541c16a4e57487bc187b44c2fffd43ad4ef2dc30 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 5 Aug 2015 15:38:05 -0700
Subject: [PATCH 081/261] remove bad ebuild

---
 dev-php/pecl-apc/Manifest                 |  2 -
 dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild | 61 -----------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild

diff --git a/dev-php/pecl-apc/Manifest b/dev-php/pecl-apc/Manifest
index 62dbd17..5c0951a 100644
--- a/dev-php/pecl-apc/Manifest
+++ b/dev-php/pecl-apc/Manifest
@@ -4,9 +4,7 @@ AUX pecl-apc.ini 233 SHA256 1529ee803ce25a13bd303c9b40a32b238daf21aa0a993d8e66ae
 DIST APC-3.1.11.tgz 157478 SHA256 478ae91c735087dda4f02d03399fb06ceba4355125ad8fd532b187c93004ebc7 SHA512 9882f3b2c9b26dbe1626ef389b7de43e711ab48546773dcfd13c9ad1e894ffc0067c0997ffa89783a816c4391201559e5fcc32cf9fbd54fd89221727107422d3 WHIRLPOOL ad7615f46132b0823071ec95a86e8e1a3023569b014c6a7ac653466bed01ea46a5f716efd5e13a015d96b5d9c443b0fdc64abcd18b91635ba5f17d15256346b4
 DIST APC-3.1.12.tgz 170655 SHA256 d41879b2ba08ca861bd6b59605e2544c039a9982d3d92a811fc5f6c85afe9ed2 SHA512 bcfe37aae8b07525094d7babfa5579dbab5a10c7f5ea2448c388128129029a57724715a08826f29bf3003c1b4bb4e61cdcdd3d0461c8b2c7055fed4dd5883c7d WHIRLPOOL 58b4c2c23e3441976560b24606afcdc24327d5528d19be6770e1ace1b4425fcdb21944272e30a223cd4e978d58b4dd37ad18fd37eb0a981b886f682903dc63ff
 DIST APC-3.1.13.tgz 171591 SHA256 5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd SHA512 4ccfa12a61a9276be207c9b70b108b725cf2faa3ed805bab8c9a39b04039fd16a8da6919ab7d5a84592f7b4a7827dcd9adeb154c6a04d208e7071be22268b332 WHIRLPOOL 335020f6ec44ec188b9544fb4132d2c1c62c4d342c3e07f3bfb0266c3827c311316c95ec08517946481724350314a06e7f3b49b13c0cedf2a2dcd1ca5d38149e
-DIST APC-3.1.9.tgz 155540 SHA256 47def118d9da1a68521e1c9b3dd6660cf94be638ebecad010bdd7d7ca482d671 SHA512 dd4ab9e1d130e757117bb5a43eb2155dcd58d7e15f94add85834d2d488de9a2f8cacd4d5bee222302a2e651f17ecd750b227dd2d4ae7102932208bbc24a132f0 WHIRLPOOL 63354d4c6836378a211f3f22110dcbd452b58a13431b9d2fe227fd5d0c950ec764420922968d75cb43f4d085c21f7dc26245f1a14a30eb88534df6f6cf128a36
 EBUILD pecl-apc-3.1.11.ebuild 1520 SHA256 11fb2884ef371870476cbe139d2531d870ee9d9c7c805643b33a33840d6f4eee SHA512 17190076efd952bfcb8c6cdb8b5afe99531e60a0534f7906a688c4d8d11976c3bcd1964a1fffeaf211ccceba9fcfec67fd09d3ecb9abcada812dbbb107077ed5 WHIRLPOOL 0b92f984de608e564da3b50a55c35939ad247b9a51876f4085fcbad3193ff0875a394a4e5116389b94b272144a80c9d6cd7e1ec44c904c3790dbc0c5abac1922
 EBUILD pecl-apc-3.1.12.ebuild 1520 SHA256 3fc76c76f0dadb50380d54305a0782f255bab3d857ac2d15c98bc93cbbd40b06 SHA512 1c60eb85c252c2e8b8247a74b159b17cd9ac55f4013ab9eb2c16a46834c32bf2b68a109f0906532a12c926501b3f7e96f6b072481b54417f8bed2d4dce450676 WHIRLPOOL 06dccbf727883475ae0b24e91e1e3c5c460c56a9d93abe3f60bbefec0b3cf3a91af995a4a89dcc9c7b2318793c65bb879405fa7fe5970c3c58479c891728a52a
 EBUILD pecl-apc-3.1.13.ebuild 1520 SHA256 add069b6d9fe530e3f63631a1409ca01602dc696ae9690559957e2898dd1fe8e SHA512 a83224153f53be912f3b6301b267f460fc70443d2d91c980d7c2bc698a73d204478dde7778880ff70f57a9edc2068dccf48fb1878fe95cc34f9807addb323d04 WHIRLPOOL 361d42b1597c023a74fc982ed6593216ade509940e470c69645623c8c1e3480331f5ee854870b3ecc1cf6ea1afc4c0d7bfd0a124f72bd282c2dff003d4f986f0
-EBUILD pecl-apc-3.1.9-r2.ebuild 1488 SHA256 95e6bb17a7546ad9f2d61d6816c60462b5358124fbd85638710e9c0267384b54 SHA512 17053e7bacd6d896693fb99df8bea2de51e614a90f343d5799fc12b6e22b7acf0da1548c374b39f214d0c9fef1b320cd43b4de8c67d4c0722fc647afa1558ebb WHIRLPOOL 69d59ed09f676f6d04c3d71e8427ae9c537e4b098d4222e8911af8b460cd0723656ccf4594a992d054b7440daf28d06ab2b3e26a94469bb551fea842a5a751c1
 MISC metadata.xml 458 SHA256 9dbd7d8b0b8072cf8504510a566265a44932457a08d31eb2937840c70da9ff4e SHA512 65905ceeabae80e81e0cdb13220706c887e6569d307adb79a026c0626f6b27f98955e4e4b56f6ea9bd4d3095084279c4fb9fab21d43c46f66f5db67431e14f4a WHIRLPOOL 6c5ebf7dea5771b561e53898bb65282349974636a6f8ca6d14df0dcc444d1b4c93992f86aed331e35521417400fa878e19dca52c04db565170da4d93459ca122
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
deleted file mode 100644
index 12175bd..0000000
--- a/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild,v 1.7 2012/09/04 12:29:31 olemarkus Exp $
-
-EAPI=4
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-PHP_EXT_INIFILE="${PN}.ini"
-
-inherit php-ext-pecl-r2 confutils eutils
-
-KEYWORDS="amd64 ppc ~ppc64 x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="mmap"
-
-DEPEND="!dev-php/eaccelerator !dev-php/xcache"
-RDEPEND="${DEPEND}"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_configure() {
-	my_conf="--enable-apc"
-	enable_extension_enable "apc-mmap" "mmap" 0
-
-	enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
-	enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
-	enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
-	enable_extension_enable "apc-sem" "lock_semaphore" 0
-
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r2_src_install
-
-	dodir "${PHP_EXT_SHARED_DIR}"
-	insinto "${PHP_EXT_SHARED_DIR}"
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of PECL-APC was"
-	elog "installed into ${PHP_EXT_SHARED_DIR}/."
-}

From 6083314287e238ba077482a4855e5b0becfb0000 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Aug 2015 01:49:49 -0700
Subject: [PATCH 082/261] add old version of dbi for vicidial

---
 dev-perl/DBI/DBI-1.623.0.ebuild | 37 +++++++++++++++++++++++++++++++++
 dev-perl/DBI/Manifest           |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 dev-perl/DBI/DBI-1.623.0.ebuild
 create mode 100644 dev-perl/DBI/Manifest

diff --git a/dev-perl/DBI/DBI-1.623.0.ebuild b/dev-perl/DBI/DBI-1.623.0.ebuild
new file mode 100644
index 0000000..1ecff49
--- /dev/null
+++ b/dev-perl/DBI/DBI-1.623.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.628.0.ebuild,v 1.12 2015/04/05 02:19:09 vapier Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=TIMB
+MODULE_VERSION=1.628
+inherit perl-module eutils
+
+DESCRIPTION="The Perl DBI Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/PlRPC-0.200.0
+	>=virtual/perl-Sys-Syslog-0.170.0
+	virtual/perl-File-Spec
+	!<=dev-perl/SQL-Statement-1.330.0
+"
+#	!<=dev-perl/DBD-Amazon-0.100.0
+#	!<=dev-perl/DBD-AnyData-0.110.0
+#	!<=dev-perl/DBD-CSV-0.360.0
+#	!<=dev-perl/DBD-Google-0.510.0
+#	!<=dev-perl/DBD-PO-2.100.0
+#	!<=dev-perl/DBD-RAM-0.72.0
+DEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
+
+SRC_TEST="do"
+mydoc="ToDo"
+MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
new file mode 100644
index 0000000..db7746b
--- /dev/null
+++ b/dev-perl/DBI/Manifest
@@ -0,0 +1,2 @@
+DIST DBI-1.628.tar.gz 586733 SHA256 46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52 SHA512 34bb50ba7c0364e064fd5a05ea5415e43e40d082ed299503beccf2cba7b2ddd8f1e79e96606f35f9da279175ac16531da96d3762a71e9e63570f6db7b683f3a1 WHIRLPOOL 95b72f418c5957dcc4051a889363ce020d6dfb4fcd30216d88c61e8ec66ed30822432343409418e342c62c67dabb91ab464338b14fe316ab20a38350b86f48a4
+EBUILD DBI-1.623.0.ebuild 1055 SHA256 de348876b1b6247d6a5924e3e160e025e75ce1e8d6f2560f8563c23f26ee1e87 SHA512 84e988ecd16ae853e8fb30776798bd01d70aec9aca88736493a7482f2fa7cb2b1272504a16997c1fb6ce8480fb3e18702f81022f5c4518b3f99fa4f0cafed3d6 WHIRLPOOL 93269aaad2bb43940dc2546670daf89596ceb119d81305c6bd1a07f640e37072619149482bcc9bcee14b30ecd9b33f3f0a3558403c6bf154fce43c3be4ff8a3d

From 3960ec18a41f20bf89981b500bfc1d265384245c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 27 Aug 2015 21:05:14 -0700
Subject: [PATCH 083/261] update manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9c8bc95..4a9c8f0 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 16872 SHA256 3d1749a6cdf857d8f70f48a998806d4d57f7bf2d451dcca4c941cdb6707d900a SHA512 b3ff37e35f12ac78fb0761e0a0cd378731efb925659eae3696b24868e10443b515b96a59ceb50c82a898097af5daac14c25c7b818297ae5af06281802b81956f WHIRLPOOL b1fdedfb63322b258d3adc6ffea209b98f44054eb9fc094149f4a91ff29b6d52d9bd989cf568c18570f4ad84909c05873cf0cc585464d50e8bdeb0927ddbff39
+DIST asterisk-patchset.tar.gz 26339 SHA256 7064a1ce734ff1626fa55f591c71ee9c2b61d02383d71372412611966b0eaaee SHA512 577021dd99ceb80e64d1e4deed72ad53a5c773bca9ea983cf52b485374250d732ba9c105ce72c1c8eb67970fcb94f5c06a2a49ab3ac6ad1f4cd448fece35ecfe WHIRLPOOL 8331c4322912906483d2224639bb0081647a83fab350582fc5733b3c2d1f7f53aeef48b10e6d18b46e3ff24d3a4432e0b383d094a333750369519a88691bc40e
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From 99b00589439a4e518cb482b46969a1762b2f772a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 27 Aug 2015 21:10:18 -0700
Subject: [PATCH 084/261] manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4a9c8f0..6ded50c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 26339 SHA256 7064a1ce734ff1626fa55f591c71ee9c2b61d02383d71372412611966b0eaaee SHA512 577021dd99ceb80e64d1e4deed72ad53a5c773bca9ea983cf52b485374250d732ba9c105ce72c1c8eb67970fcb94f5c06a2a49ab3ac6ad1f4cd448fece35ecfe WHIRLPOOL 8331c4322912906483d2224639bb0081647a83fab350582fc5733b3c2d1f7f53aeef48b10e6d18b46e3ff24d3a4432e0b383d094a333750369519a88691bc40e
+DIST asterisk-patchset.tar.gz 26321 SHA256 b5c9bdb665dd3236778b8e98376ebf9caa0e5b9dc0859699e40385a01dd22e6e SHA512 eafa880b00463ec92c8a2303457312fd4e93d8fec9ab10d2197209e975df988d1f06d022cfe7799dbed430cb9c6f3e115afdc3c5fd722c3232b9d0cd53fd4a75 WHIRLPOOL 4439bd1ca25f60c142d67b70bb4747ab136e5642a9ed6010183ae9bb469908a3cff0a292f2e0cd9ff174309e4be33369b6e67e321217502136112c6d296465d5
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From 00c78c31287921d0bd78c21bb6d05085bb958d0b Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Sun, 30 Aug 2015 01:12:04 -0700
Subject: [PATCH 085/261] sphinx4

---
 app-accessibility/sphinx4/Manifest            |  2 ++
 .../sphinx4/sphinx4-1.0_alpha_pre5.ebuild     | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 app-accessibility/sphinx4/Manifest
 create mode 100644 app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild

diff --git a/app-accessibility/sphinx4/Manifest b/app-accessibility/sphinx4/Manifest
new file mode 100644
index 0000000..6a1a070
--- /dev/null
+++ b/app-accessibility/sphinx4/Manifest
@@ -0,0 +1,2 @@
+DIST sphinx4-5prealpha-src.zip 43405118 SHA256 998e2e89f34bd539e6566823b9346a6406b2e02e4460b71ee556d199040f18d3 SHA512 a4a70775c748231d7517f28c6eb20d89701a764bf8ac3abc2917e8949bef7a2a2c0ca7e9509760dc60c84aaebf826b71bf0fac5c2d44bd59b186600835961018 WHIRLPOOL 0c2bd6d2ef1e709e02cddc97c3509694e87da6b78e4affa938be7235f7c5d5f79df37e7844b38832b3af655ccdc3fccf15e9c6376dacb32c0ec5fe99d7dd60aa
+EBUILD sphinx4-1.0_alpha_pre5.ebuild 767 SHA256 8f4bbaf13146171f84802b1d1497ecde3d7c6b3b475d4b2d9be2b05b5ffc7850 SHA512 d731a1995f01b3320524ed63c1476c80a2321fa6429294148dffff61b9faa3fa326b49de63e1c161f1d354325e7475aae37fea88c2973ec7937a6f7cb4091e67 WHIRLPOOL 8473785803d3ec642d23807faa30fe8c1a9eca7e92cd6ffa24c6ec5110ca2a8b87ed8fbcc2aec8ffc20c45626db780a3975d2cd9ffa31830ce9e83ffdb64d15f
diff --git a/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild b/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild
new file mode 100644
index 0000000..e7e6913
--- /dev/null
+++ b/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV1=$(get_version_component_range '3')
+MY_PV2=$(get_version_component_range '4' | sed -r 's/([a-zA-Z]+)([0-9]+)/\2\1/g')
+MY_PV=${MY_PV2}${MY_PV1}
+
+DESCRIPTION="A speech recognizer written entirely in the Java programming language"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="http://sourceforge.net/projects/cmusphinx/files/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="demo"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="all"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	java-pkg_dojar "lib/${PN}.jar"
+}

From 1c0bd60b232273bfc429cb02aea3eac3cc64359c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 2 Oct 2015 11:46:06 -0700
Subject: [PATCH 086/261] new manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6ded50c..74c1d07 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 26321 SHA256 b5c9bdb665dd3236778b8e98376ebf9caa0e5b9dc0859699e40385a01dd22e6e SHA512 eafa880b00463ec92c8a2303457312fd4e93d8fec9ab10d2197209e975df988d1f06d022cfe7799dbed430cb9c6f3e115afdc3c5fd722c3232b9d0cd53fd4a75 WHIRLPOOL 4439bd1ca25f60c142d67b70bb4747ab136e5642a9ed6010183ae9bb469908a3cff0a292f2e0cd9ff174309e4be33369b6e67e321217502136112c6d296465d5
+DIST asterisk-patchset.tar.gz 26417 SHA256 63ed24360cccf75e540a79efac4ff716fd72d672716ce32e1d66d3f6113d13e2 SHA512 bf69e068e457178bed1cf7362651d7f333ec0085f3fc28e6308d1fd10b1975e3ce55bc28b4a49f68863d6433b1ee16b15f2e1aba9a6603c41974d08472d117dc WHIRLPOOL 4c3abee752741ceabffa4d2f16a6c6a3f27718d13008ab4759cab6191e4b5ac8c2ce545532a7f0ce09a61e32d18dcfc4a00354534f30c076f2a5df3e2b5e5332
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From 2ed25df48741d229685d585ead2e3bfeba058e1c Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Fri, 2 Oct 2015 12:20:34 -0700
Subject: [PATCH 087/261] updates

---
 app-accessibility/sphinx4/Manifest                      | 2 +-
 app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild | 3 ++-
 net-misc/asterisk/Manifest                              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-accessibility/sphinx4/Manifest b/app-accessibility/sphinx4/Manifest
index 6a1a070..411ced4 100644
--- a/app-accessibility/sphinx4/Manifest
+++ b/app-accessibility/sphinx4/Manifest
@@ -1,2 +1,2 @@
 DIST sphinx4-5prealpha-src.zip 43405118 SHA256 998e2e89f34bd539e6566823b9346a6406b2e02e4460b71ee556d199040f18d3 SHA512 a4a70775c748231d7517f28c6eb20d89701a764bf8ac3abc2917e8949bef7a2a2c0ca7e9509760dc60c84aaebf826b71bf0fac5c2d44bd59b186600835961018 WHIRLPOOL 0c2bd6d2ef1e709e02cddc97c3509694e87da6b78e4affa938be7235f7c5d5f79df37e7844b38832b3af655ccdc3fccf15e9c6376dacb32c0ec5fe99d7dd60aa
-EBUILD sphinx4-1.0_alpha_pre5.ebuild 767 SHA256 8f4bbaf13146171f84802b1d1497ecde3d7c6b3b475d4b2d9be2b05b5ffc7850 SHA512 d731a1995f01b3320524ed63c1476c80a2321fa6429294148dffff61b9faa3fa326b49de63e1c161f1d354325e7475aae37fea88c2973ec7937a6f7cb4091e67 WHIRLPOOL 8473785803d3ec642d23807faa30fe8c1a9eca7e92cd6ffa24c6ec5110ca2a8b87ed8fbcc2aec8ffc20c45626db780a3975d2cd9ffa31830ce9e83ffdb64d15f
+EBUILD sphinx4-1.0_alpha_pre5.ebuild 872 SHA256 f5ad8d968808044168fc66a9838c23969a26de6d8edd652d0f041ee8cc20c10c SHA512 2fc8e0ce822a3f7549d5d3117f7d38910df1d5556c1acac7ff7a1a2e66f3e247b3ddbc880bebf072595da47ac69bbeb6ada449d5186f8143ab9a7df7503ab2bd WHIRLPOOL 56e5a20d3d4ef5000d06bc64da43017f5cb6b5912332c18147fa0a1d3e098ba025e24f67e2dd79e46d7160bdb49f0652c9720764f00792c883d35f92dbca7749
diff --git a/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild b/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild
index e7e6913..50a6a41 100644
--- a/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild
+++ b/app-accessibility/sphinx4/sphinx4-1.0_alpha_pre5.ebuild
@@ -12,7 +12,8 @@ MY_PV=${MY_PV2}${MY_PV1}
 
 DESCRIPTION="A speech recognizer written entirely in the Java programming language"
 HOMEPAGE="http://cmusphinx.sourceforge.net/"
-SRC_URI="http://sourceforge.net/projects/cmusphinx/files/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
+#SRC_URI="http://sourceforge.net/projects/cmusphinx/files/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/app-accessibility/sphinx4/sphinx4-5prealpha-src.zip"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 74c1d07..4522f6b 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 26417 SHA256 63ed24360cccf75e540a79efac4ff716fd72d672716ce32e1d66d3f6113d13e2 SHA512 bf69e068e457178bed1cf7362651d7f333ec0085f3fc28e6308d1fd10b1975e3ce55bc28b4a49f68863d6433b1ee16b15f2e1aba9a6603c41974d08472d117dc WHIRLPOOL 4c3abee752741ceabffa4d2f16a6c6a3f27718d13008ab4759cab6191e4b5ac8c2ce545532a7f0ce09a61e32d18dcfc4a00354534f30c076f2a5df3e2b5e5332
+DIST asterisk-patchset.tar.gz 26416 SHA256 9c8db639b7096481b3d0aa6a31e93f7836607dec67a8626dee04946c8f56e448 SHA512 3b10dad771fa23c27d3be079de1821e892997f3cf10b32ffb2c61a6aa46b6ba5ccda80d71b2cb837be5f47efcaf4863edc0a022ef47d943021395a2a7ee96dab WHIRLPOOL d75c9f1dfcd5240ec75bf47f4133f79e769d17fc69b8d621bdd38912859d3e14b6776b317932b8eecc132a67b11e14c1156dcf548516c2d98695ee31bfc80eb2
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From 3d380827b0da2e2d9dafa907e6766c8a136e5ce8 Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Fri, 2 Oct 2015 12:34:44 -0700
Subject: [PATCH 088/261] updated manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4522f6b..e10afc6 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,6 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-patchset.tar.gz 26416 SHA256 9c8db639b7096481b3d0aa6a31e93f7836607dec67a8626dee04946c8f56e448 SHA512 3b10dad771fa23c27d3be079de1821e892997f3cf10b32ffb2c61a6aa46b6ba5ccda80d71b2cb837be5f47efcaf4863edc0a022ef47d943021395a2a7ee96dab WHIRLPOOL d75c9f1dfcd5240ec75bf47f4133f79e769d17fc69b8d621bdd38912859d3e14b6776b317932b8eecc132a67b11e14c1156dcf548516c2d98695ee31bfc80eb2
+DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311

From ce86c33dbe6cc2b759557aeb744fddd79128f50c Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Mon, 5 Oct 2015 19:45:00 -0700
Subject: [PATCH 089/261] added stable ast version

---
 net-misc/asterisk/Manifest                   |   4 +-
 net-misc/asterisk/asterisk-11.15.0-r1.ebuild |   2 +-
 net-misc/asterisk/asterisk-11.17.1.ebuild    | 324 +++++++++++++++++++
 3 files changed, 328 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/asterisk/asterisk-11.17.1.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e10afc6..2f6265e 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -89,6 +89,8 @@ AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
+DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
-EBUILD asterisk-11.15.0-r1.ebuild 9708 SHA256 0d84622e5a6f33734813448466142acf96da72e984f484ded94180db41c0f0ae SHA512 a459fe078cc037d252e34176e5ac428f86fba17048d5845882c6b4746d2cf0d86e04ffbc5b923ac26d8a8bd7d3af4ecbf341adac55c03b5c28cf7f8f66b4c209 WHIRLPOOL dee52fdfe6971cb5692d037441694571098ecf62e8e4c31ba02d6fb127039c3c72d4e3c13b63ea153647fb7a866aea6a3232f1166f25124eb23c29fe0147c311
+EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
+EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
diff --git a/net-misc/asterisk/asterisk-11.15.0-r1.ebuild b/net-misc/asterisk/asterisk-11.15.0-r1.ebuild
index 210f59f..df41439 100644
--- a/net-misc/asterisk/asterisk-11.15.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-11.15.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset.tar.gz"
+	 http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-1.0/asterisk-patchset.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/net-misc/asterisk/asterisk-11.17.1.ebuild b/net-misc/asterisk/asterisk-11.17.1.ebuild
new file mode 100644
index 0000000..c28a3fb
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.17.1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-2.0/asterisk-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From a406461fb2b749e1aed4dcc6f658e7e75e83b26e Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Mon, 5 Oct 2015 19:47:31 -0700
Subject: [PATCH 090/261] update manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2f6265e..05c48b7 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -90,7 +90,7 @@ AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb7527575
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
-DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
+DIST asterisk-patchset.tar.gz 26161 SHA256 ae0d3a119096658cffc84780be4440f22e593404b384b12ecda668f1b5584c43 SHA512 981147f29331add047dc0e89baaa3fb8008b5094e0e82e51a92a4e1f08c919cc43c8edd462fe6a55e83f22875f31fe11cc5c575ffe3296475e6792f1dedd3a7c WHIRLPOOL 0477bda186e2c9e265fde0c7288ae789c9bb6a91a67de93adbc89360119f0cf22c56199659f81cbfd9e2e462ce7d10bc48bc60c9762d228905684eac8c227e72
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d

From 6cfe060ba0aa0fbc973ffc45268a36cb31f1bcc6 Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Mon, 5 Oct 2015 19:51:02 -0700
Subject: [PATCH 091/261] booboo

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 05c48b7..6d7ecfb 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -90,7 +90,7 @@ AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb7527575
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
-DIST asterisk-patchset.tar.gz 26161 SHA256 ae0d3a119096658cffc84780be4440f22e593404b384b12ecda668f1b5584c43 SHA512 981147f29331add047dc0e89baaa3fb8008b5094e0e82e51a92a4e1f08c919cc43c8edd462fe6a55e83f22875f31fe11cc5c575ffe3296475e6792f1dedd3a7c WHIRLPOOL 0477bda186e2c9e265fde0c7288ae789c9bb6a91a67de93adbc89360119f0cf22c56199659f81cbfd9e2e462ce7d10bc48bc60c9762d228905684eac8c227e72
+DIST asterisk-patchset.tar.gz 26156 SHA256 182c84e488791977a47f31737c93d712f61ad4ad89fc068ac0e5716de5e2e756 SHA512 848fe19fde4f2a641cf54fdbbaf13300a02f8743b751e29754aa9200e568440d1498572448cc7504dc85e87e5b8fa2254770314dc435e203f4c5fa4b0c553027 WHIRLPOOL a886cf3b288fdd52acebf202ee3432c1b902b72cf499fd07fb8720bf502b39d6c4714c4475d9a401559dcc30c67e2bcbbbdea5f8ae70d0ad0a26da4e48a18e3a
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d

From 7a12bce9216c02598a9b4567652bdf7a5440ffe1 Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Thu, 15 Oct 2015 12:28:34 -0700
Subject: [PATCH 092/261] update manifest

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6d7ecfb..b91df9d 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -90,7 +90,7 @@ AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb7527575
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
-DIST asterisk-patchset.tar.gz 26156 SHA256 182c84e488791977a47f31737c93d712f61ad4ad89fc068ac0e5716de5e2e756 SHA512 848fe19fde4f2a641cf54fdbbaf13300a02f8743b751e29754aa9200e568440d1498572448cc7504dc85e87e5b8fa2254770314dc435e203f4c5fa4b0c553027 WHIRLPOOL a886cf3b288fdd52acebf202ee3432c1b902b72cf499fd07fb8720bf502b39d6c4714c4475d9a401559dcc30c67e2bcbbbdea5f8ae70d0ad0a26da4e48a18e3a
+DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d

From cb31cf48d13416b45672c668faa5709398b8fb6c Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Tue, 20 Oct 2015 20:23:42 -0700
Subject: [PATCH 093/261] new ast version

---
 net-misc/asterisk/Manifest                |   2 +
 net-misc/asterisk/asterisk-11.20.0.ebuild | 324 ++++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.20.0.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index b91df9d..894bc4c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -90,7 +90,9 @@ AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb7527575
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
+DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
+EBUILD asterisk-11.20.0.ebuild 9627 SHA256 eb45fa569c07a1645b5e133ccf90ea65428f35bb82c98690b4f89da129a0da19 SHA512 b7594311b0dbacaf74b8fc021efd1ed655b8a3633f7615acd36e19654234dc3c43a9c4f0d36024989d34ea592ecd6b3e9f19ae81f4b06c96ad55e8eda8f70ff1 WHIRLPOOL 5b2d8e086c5368feaf8a4949ab7a9b87b3f9561ee19e401b64e432cc87aeef5af3c94f23bfe014302075402de624bc94ed0f32fde383e1b889976140417763e2
diff --git a/net-misc/asterisk/asterisk-11.20.0.ebuild b/net-misc/asterisk/asterisk-11.20.0.ebuild
new file mode 100644
index 0000000..a9ad4f8
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.20.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 507e38b77df375428b38f1fe17b6721e3924e83f Mon Sep 17 00:00:00 2001
From: = <vreg07-01@safesoft.io>
Date: Mon, 26 Oct 2015 17:26:43 -0700
Subject: [PATCH 094/261] update Manifest

---
 net-misc/asterisk/Manifest                | 3 ++-
 net-misc/asterisk/asterisk-11.20.0.ebuild | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 894bc4c..250cde9 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -91,8 +91,9 @@ DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
+DIST asterisk-patchset-3.0.tar.gz 6429 SHA256 0a2b2cad40e6815b393e9b3fe79a73611e0a0f2d8dfab9233c3867fa174ae55e SHA512 70c64326b8b4956ad77c852c7ce83d566c61c258ebb602877309ffe8370474ae0ed53bcc2c0db5ab07f159a14b263772a5c1b17263590461d5334c979afa2ad7 WHIRLPOOL e492adab4c3b0f6cf60f30e34f0da13c25024103c6d20d3fe4df118e4cc8fb507c629708beff3e8add1ae0eabd2b773071572e722729c7a29079a2e255c22943
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
-EBUILD asterisk-11.20.0.ebuild 9627 SHA256 eb45fa569c07a1645b5e133ccf90ea65428f35bb82c98690b4f89da129a0da19 SHA512 b7594311b0dbacaf74b8fc021efd1ed655b8a3633f7615acd36e19654234dc3c43a9c4f0d36024989d34ea592ecd6b3e9f19ae81f4b06c96ad55e8eda8f70ff1 WHIRLPOOL 5b2d8e086c5368feaf8a4949ab7a9b87b3f9561ee19e401b64e432cc87aeef5af3c94f23bfe014302075402de624bc94ed0f32fde383e1b889976140417763e2
+EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
diff --git a/net-misc/asterisk/asterisk-11.20.0.ebuild b/net-misc/asterisk/asterisk-11.20.0.ebuild
index a9ad4f8..5cdcf40 100644
--- a/net-misc/asterisk/asterisk-11.20.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.20.0.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset.tar.gz"
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"

From 8d331ba39e70ee6d9ecde4d6ad1fc770c55a7d97 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 30 Oct 2015 14:41:08 -0700
Subject: [PATCH 095/261] add hhvm support

---
 dev-php/hhvm/Manifest                        |  37 +++
 dev-php/hhvm/files/config.hdf.dist           | 261 +++++++++++++++++++
 dev-php/hhvm/files/config.hdf.dist-r3        | 238 +++++++++++++++++
 dev-php/hhvm/files/hhvm                      |   4 +
 dev-php/hhvm/files/hhvm.confd                |  58 +++++
 dev-php/hhvm/files/hhvm.confd-r3             |  55 ++++
 dev-php/hhvm/files/hhvm.confd-r4             |  58 +++++
 dev-php/hhvm/files/hhvm.initd                | 101 +++++++
 dev-php/hhvm/files/hhvm.initd-r3             | 104 ++++++++
 dev-php/hhvm/files/hhvm.initd-r4             | 117 +++++++++
 dev-php/hhvm/files/hhvm.rc                   |  46 ++++
 dev-php/hhvm/files/php.ini                   |  63 +++++
 dev-php/hhvm/files/server.ini                |  13 +
 dev-php/hhvm/files/support-curl-7.31.0.patch |  17 ++
 dev-php/hhvm/hhvm-2.2.0.ebuild               | 160 ++++++++++++
 dev-php/hhvm/hhvm-2.3.0.ebuild               | 133 ++++++++++
 dev-php/hhvm/hhvm-2.3.1.ebuild               | 133 ++++++++++
 dev-php/hhvm/hhvm-2.3.2.ebuild               | 133 ++++++++++
 dev-php/hhvm/hhvm-2.3.3.ebuild               | 133 ++++++++++
 dev-php/hhvm/hhvm-2.4.0.ebuild               | 132 ++++++++++
 dev-php/hhvm/hhvm-2.4.1.ebuild               | 132 ++++++++++
 dev-php/hhvm/hhvm-2.4.2.ebuild               | 140 ++++++++++
 dev-php/hhvm/hhvm-3.0.0.ebuild               | 111 ++++++++
 dev-php/hhvm/hhvm-3.0.1.ebuild               | 112 ++++++++
 dev-php/hhvm/hhvm-3.1.0.ebuild               | 120 +++++++++
 dev-php/hhvm/hhvm-3.2.0.ebuild               | 141 ++++++++++
 dev-php/hhvm/hhvm-3.3.3.ebuild               | 141 ++++++++++
 dev-php/hhvm/hhvm-3.4.2.ebuild               | 141 ++++++++++
 dev-php/hhvm/hhvm-3.5.0.ebuild               | 141 ++++++++++
 dev-php/hhvm/hhvm-3.5.1.ebuild               | 141 ++++++++++
 dev-php/hhvm/hhvm-3.6.0.ebuild               | 147 +++++++++++
 dev-php/hhvm/hhvm-3.6.1.ebuild               | 147 +++++++++++
 dev-php/hhvm/hhvm-3.6.2.ebuild               | 147 +++++++++++
 dev-php/hhvm/hhvm-3.7.0.ebuild               | 147 +++++++++++
 dev-php/hhvm/hhvm-9999.ebuild                | 147 +++++++++++
 35 files changed, 4051 insertions(+)
 create mode 100644 dev-php/hhvm/Manifest
 create mode 100644 dev-php/hhvm/files/config.hdf.dist
 create mode 100644 dev-php/hhvm/files/config.hdf.dist-r3
 create mode 100644 dev-php/hhvm/files/hhvm
 create mode 100644 dev-php/hhvm/files/hhvm.confd
 create mode 100644 dev-php/hhvm/files/hhvm.confd-r3
 create mode 100644 dev-php/hhvm/files/hhvm.confd-r4
 create mode 100644 dev-php/hhvm/files/hhvm.initd
 create mode 100644 dev-php/hhvm/files/hhvm.initd-r3
 create mode 100644 dev-php/hhvm/files/hhvm.initd-r4
 create mode 100644 dev-php/hhvm/files/hhvm.rc
 create mode 100644 dev-php/hhvm/files/php.ini
 create mode 100644 dev-php/hhvm/files/server.ini
 create mode 100644 dev-php/hhvm/files/support-curl-7.31.0.patch
 create mode 100644 dev-php/hhvm/hhvm-2.2.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.3.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.3.1.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.3.2.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.3.3.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.4.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.4.1.ebuild
 create mode 100644 dev-php/hhvm/hhvm-2.4.2.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.0.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.0.1.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.1.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.2.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.3.3.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.4.2.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.5.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.5.1.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.6.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.6.1.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.6.2.ebuild
 create mode 100644 dev-php/hhvm/hhvm-3.7.0.ebuild
 create mode 100644 dev-php/hhvm/hhvm-9999.ebuild

diff --git a/dev-php/hhvm/Manifest b/dev-php/hhvm/Manifest
new file mode 100644
index 0000000..dd7f7f3
--- /dev/null
+++ b/dev-php/hhvm/Manifest
@@ -0,0 +1,37 @@
+AUX config.hdf.dist 7653 SHA256 6efb672ad0c40d90504ffa6c21b1b7c4c33defd65cbc34fd594de48159fae6ed SHA512 870aad5725f68a1aac79f0b19c847e0f45d5a26a242fa970fc03a3a3b2583a9d65da56059102c7ca921aae29dab9abb85966d0191b31992f7b7c4927f1796cc0 WHIRLPOOL 049806fb6faf6917e7c1956953cdb257c978053fa2a7111ef8e47a1d905d0765ed18517faa1067249cdcbaa967076735d951b949511ef564c25b8220ef26c11a
+AUX config.hdf.dist-r3 7180 SHA256 b409edafa837647110e1e6ace949289d9bf2e11a868b88488b6ebdba472fc4f3 SHA512 516993104f5e91a72dcf96500b595c996fb4ebf4baa3d5af5f1519231632411ef5e45096e888793930f4ff5acda27645f2a44751d15ddfd9cedaf56ce56d71e9 WHIRLPOOL 9ca9f09ab50c066a3bccb82a443372f0ea01404d421f3604bc796a504b9045781dd720533f9c8a8fb31845b97ca30ac2a039f2d3f308a63170fa021d9b0a5ddf
+AUX hhvm 111 SHA256 5d8dce0d9c85aecb86ced7b4153b7881406904a6667069c3050b7c5df728d4cb SHA512 2f1d7c9f023a7331b6f0f5c5cc58555ffd33786aba35b1ccef528fe6d09af829f9d95c4d1855f48b53155df5d2c35f43245511a9048e4d9cc05682389a8ffc15 WHIRLPOOL 98525211956c406b1a06fa242c2265f2050ff9754b29723015cc0e4c0c2c62360379ea948ae5b1a6e583de0e13cd645c1a9dfe90aaa7e9e6fde37ecd54a4a3fb
+AUX hhvm.confd 1017 SHA256 0b53b30188cef3b177385f3aebbf92e50d741aba0caa3416d1a39355d2a0655d SHA512 80bc550d5b0a763cd343051bd07be5cd2c8af04c83337983fa72abd3647f55fd6efabb3dc2b4e62a201e3226a2c344530e136d82b999e43c32a65ec3ae760369 WHIRLPOOL 3183db423131d999a9f7c9ba3d27d0be331c94654ea23c68d4e38d3eae6abc7c156945cc406238a60a6f66300f26ab00c7625815cd8b5f3f30a1cb66121e6626
+AUX hhvm.confd-r3 962 SHA256 ac5333d1a59164d35eae11f1b8d79b0b43c21f84503b2e6ebdb187d5a12bc371 SHA512 75585c5613c1ed7c3ca1324301412bc8df64604a3ae28495843d146fbd05aa7ac7dfc89630b83c78c215daa43e5ac2e2ee85373bbabd8c91783e40e972dba3cd WHIRLPOOL dda0e6281eba4c924082708259b7e172cd7279d603349d359cd4f39664ae3b81407cc52a2fb68c26db81636c5e21bbd6efa22ad5889310def23077e5a367a58b
+AUX hhvm.confd-r4 1024 SHA256 53bfbbcbd90719d58e5c1ff483213d4f218816d0d9e3a29612eee95194209c06 SHA512 459d749db56fe03630bc5e8996c8b3b10dc083e092b86e0912d7172de09b2ea673fd67f57c1c2362270e965cc48539e256b8191fbeb9f1771197b4a9bbb55188 WHIRLPOOL e1fcb4914f2573bb1e78f8069ba4691cc7a2f4cac8bc6e8ce2c125004ae70dda609ea5a57d129e7094a810faf3387a45cc1769ab86ad98176da68191f2ab919c
+AUX hhvm.initd 2840 SHA256 7a9814deb56e5ffc24144d6dd2949d36bf60bec239614de3d22f9fedfb6b6466 SHA512 b437677b20c6a00d620c4e18b2116b59caaaa9eeeee53ad38b393a14f8465de1ac45d285c721b78a7a7bd54b4106b79f0932626664989ef6e6a61ffec3745b98 WHIRLPOOL afe784eb0bfc8d103abcbbc421f31ce065a1f697c83589a64c165a3a56044931689b549bda407ed41173c3ff100d37fba2a2e6d3bcf6329bf5ef699ff266ef9c
+AUX hhvm.initd-r3 2685 SHA256 612eec92a5682ee31b177d4543d6157bca749911c5a6aa92491aab3b4426081f SHA512 c379a6c546a0251207c5cbd80ae6309b02fee7408b27a6a20d488016f8cca9c24f52bf547324b1909b3694374f65d9e4edf00e2e73bd757e7db0d594f631b1ca WHIRLPOOL 220289a2d8bc8a35ac8188f5ae3e7ccfe581365cecc7cb81d347f98b95bf87dc0a0784c03154e9872aafef2a04cf2957109833d6d4af1cec7a28bf5a5176b398
+AUX hhvm.initd-r4 3044 SHA256 399a9c8f67321dcd9381cf683f65116ed9d6bb4470ca19671e42315d466cb9b2 SHA512 3dcbd35e5b872e5d2d4357d32f41e48e8f3af9077372867290eb59c8c7cf57431b46b9f306ff187268c4d0c8470901c1c655c42b68983cb4bd667eab5926574f WHIRLPOOL 6fd8fbae0bbd87c7758c9503728945b2f75f2ad195a68aaf237576ac9582f36b938edb6876566f3e99aa53a5763f438eb74354c4caa3d68d091e6cc75e4365da
+AUX hhvm.rc 1060 SHA256 36a106b5003c90f68b401394619c5a829f7c5c2502d4383287497c4bd4d20d50 SHA512 9e8625c56fa57dbca005b7462a0dac216d6cf573c7136d8b496640dbaf6712147239c3ad5c2d7a1711795412208f90719b5587df760ce14cddcc0b38cccd0f7e WHIRLPOOL 7bcab0b6309714c9305966727f60b45093c901af916c9102a78469086232fdcb584a7fe9c8f6a974cb5480c246f59e17d79ce12aeceddf0962de055f2fbb3231
+AUX php.ini 1701 SHA256 f758dae7cd5374bd415d573a9e3ce859fd4f0e8d5910cb105138a591147fd5c2 SHA512 a91dc3073da4ea1c54af9bcd23c8356b32c2660943ab9a04ef3a3296767a0e33f1f586978ed139009fc14ed84771d544f39ef968f0ffac366898bb181999074f WHIRLPOOL 194feb161cc808b519a9981b5b098b3f8f6605855ef0d13e01c9316b0414c96c80c945edd8e60ec36e306167e940286e2cd8cc7936765b6e896ad935e2f7e083
+AUX server.ini 296 SHA256 1deba06d5533178f026993d7f41703b19df2ba88ce623d675802a9cb7e8f8d77 SHA512 88682f8e903256db0bdea362e86e56d9d34f0a27ac5a269adaaf2efff0f2ca1c0275c039ad40de0a8489a6e3ca7e6e78cab27d3e87ab0ed1bb0029884129678c WHIRLPOOL 350f6d67f8847e31e2289d4ee5deec20cb88c23f56659de8cbe4573a66f809f3be4206d1d19694276f43b99ac43a8c09f2bbc5ed5598dfa6cebfb26f4b036182
+AUX support-curl-7.31.0.patch 561 SHA256 c10f8d63f0eae3a2f07eb1badecb2e1b970fc1b48c359f76a50e3bbe6236df8f SHA512 a6ced847c8815b87e4fca3b5ff0371273f56dd20cbd2fbf4aa0fc4fa4852d6e140d03a9e30ad4b7bbd7f7c91d6eaa7ff11d9824e2e423f05ad48d404abae6812 WHIRLPOOL 8f6c28e5a3d8579f469f62399da1073dbc04621758cca70bf3d609b30b121dfe90ff4d0a8340551b2667632e814d4c4cc1f06795c5c13efda6dc425633c04556
+DIST curl-7.31.0.tar.bz2 2679209 SHA256 a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08 SHA512 56b69cf5ec6e4de2b38280fe03ce97dfad33f3f88d2147a0334dab5cd6cde30aef2f4d09761b1dc8d515b448b5c149aff7f15c6ccd235cdf951f3c021b360200 WHIRLPOOL a7b2fcab8c65edd83d89addf2c7fa3ea334d8554a4d69efe8ff40790e41d0dbe3bda0c471130f3401e39a79c1c264f141fd1843abfa588c2b58036474bc7d385
+DIST jemalloc-3.0.0.tar.bz2 245192 SHA256 cce16f18dd1dc7a087d37d33ae4ca507b5bcba64dabefa228ba801d1a78e4554 SHA512 631fec886a0fcf04fa3945de49e84bbab3399f59bcf818a77634e60497647da87b3c3c0ed8eb3b9b050958abc98681aed2530adac707bb0e68ec09b20530d74f WHIRLPOOL 0c54174aa70bf28076a92f0a83ab31c4133db01fafaa232708e79f3f68889e286d5324c8e76c48f45462fd6f13f5da9c695f63fdfd6236db2cb5566a2563461e
+DIST libevent-1.4.14b-stable.tar.gz 474874 SHA256 afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301 SHA512 a385d8d6c11cdb8fe7f477928de2401bc7f80f5952f2a542220be9f18413cd760a7c03c6fe7c83b4e6feef534cb1688ae8112a1e3a879fc5e301cfcbba5b4385 WHIRLPOOL 732267e4458054abed4afc62a346ef207e171ed922957a0d31dae2978edd1f300f5e930a26e880fb08167ebf4adc4c8699ba1593441f2739458082f16637523d
+EBUILD hhvm-2.2.0.ebuild 3441 SHA256 3173f32fb4f172bc2d57f8e6fa67db12e47967fafbc71f286d34f10ff183382a SHA512 117c3a69afac5a89c4700329f498602a666476bf39d4c41a94e656779ce0263f1d76a4395faef02568b33b85b99c5af288be43df847c6fde8bcafaa7d214631a WHIRLPOOL 36e91662815aca2e70ae67c696cdc51f1f117a65a655dcc79f9e4cde9a2109aaa3813aa4274a3b745586bfaa9f75645ea6c477c90120c44630c6a6726523fabd
+EBUILD hhvm-2.3.0.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
+EBUILD hhvm-2.3.1.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
+EBUILD hhvm-2.3.2.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
+EBUILD hhvm-2.3.3.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
+EBUILD hhvm-2.4.0.ebuild 2750 SHA256 d151acc85e6b72b4993f219d6319f4fb50982bc9d4484fe761293c42440691b7 SHA512 8c8812da59f4ac759db4e0c4b95ca70be48dcdfeee94bb5f3c81f39ccd84f8a7c36b8715eb7d1bd773d144c74818f55892ec3bc67dc280892ddef97c12dfb6e9 WHIRLPOOL e629afe70c77e5e1fb56d663635a2bc64e3f2ba39a55c456fe7702385daf9e45e98b6318db6943998e56703fdd3b002eb7e34dffd0851f77b52ed7bef1243eef
+EBUILD hhvm-2.4.1.ebuild 2750 SHA256 d151acc85e6b72b4993f219d6319f4fb50982bc9d4484fe761293c42440691b7 SHA512 8c8812da59f4ac759db4e0c4b95ca70be48dcdfeee94bb5f3c81f39ccd84f8a7c36b8715eb7d1bd773d144c74818f55892ec3bc67dc280892ddef97c12dfb6e9 WHIRLPOOL e629afe70c77e5e1fb56d663635a2bc64e3f2ba39a55c456fe7702385daf9e45e98b6318db6943998e56703fdd3b002eb7e34dffd0851f77b52ed7bef1243eef
+EBUILD hhvm-2.4.2.ebuild 2936 SHA256 dea4df35571aacb3e8a30cdc60e3ea9105bf6739b3c9ddca6278c6465dac2212 SHA512 fce8a71e50e56b37e7428276de03446a2b543e4ba262a5db42a12c2b4babed02ff18a124ddd69ed4d501e2d394acb874d7f074fcaa093dbc8d6c1e80f4b601d6 WHIRLPOOL 003311a744dc0cf70a02165921fcb208a37cf8de5ee454e33ac86ef896a19b0815064197a660ba6dd3ce2c937e7593928ff8a76329f6553d36f3dcdb5554eafb
+EBUILD hhvm-3.0.0.ebuild 2234 SHA256 40611b65449dca636d846d9bce395adab00b5c82d64f181524fe743bf769d54a SHA512 2bb24a9e50daa36968776b49042392440cdd6027832d867ab8478358f722772dff53ed7ce24fb6dc492d2631f7ec624dd23dba68922e3a78f44a2e4af72ae6a4 WHIRLPOOL 2fa8c12e7feb5bed4890625ced97735187b4db4771755d5bc240fb31f032f0816b405ba59f6f5e6eeca8bd35d144afecac990202736d742f6a9f45f40e3e0368
+EBUILD hhvm-3.0.1.ebuild 2293 SHA256 d8517630d0b02c24556839b3af0319eb07f3a7e8271f0bb7ec882cd7d1d17100 SHA512 b93355be9c4dbd5a213ac34bfb22ee561a1e4ce4ec07001fbf09e81f9e724cac542d3c88d7576010d0fa32bc01c66ed7fc028e254cd02971bb0a3607261a5445 WHIRLPOOL e3456982fc9ef45a2355cc9e592079abe3a9d4783a1c888f922dbf99ecb9ac02b4e1a7ee9fef1c38fce16589e67f379e6bb3a91f6ac96c42bd88c04782a0725c
+EBUILD hhvm-3.1.0.ebuild 2523 SHA256 e0cbb3b4fa6ba211d472fc69d60404a226f89114a91df4df18556c2b279dc07b SHA512 450c7b76b853ebd696852556744ae7c0e7cf5f42190f710623405a2a6cb8173a3642ffc6b8f72078b0dcbad9f69d767c49d672a0fab17e07b55de4f4315846ce WHIRLPOOL 4841970386bd3758d47aeca358ed8f0f36e3effe0927396ba8e07495850f38899ba263aab56aa0b63d5424cb634bafff11b036f723ff187290f19f35cb0161e2
+EBUILD hhvm-3.2.0.ebuild 2983 SHA256 786adee047717e91d9fa6e311b395f66a5462a2508cdec7375aeb94d4e841823 SHA512 d6c4b86704e72c5cbb724040aebd178bff7e739095116171a73422a5c0bd2e66eeec3d390d960e4dd8e1e1efbb95a364de45eead1e75f283c6cdeb3d54321118 WHIRLPOOL b6f710d8f05985a8f12060a068e8722fae696854d34da4e988fd95b50f9115f0b57bf44f03e552b10eaabb11fee7378653b9951d742001c3be9552bc5e6561c8
+EBUILD hhvm-3.3.3.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
+EBUILD hhvm-3.4.2.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
+EBUILD hhvm-3.5.0.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
+EBUILD hhvm-3.5.1.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
+EBUILD hhvm-3.6.0.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
+EBUILD hhvm-3.6.1.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
+EBUILD hhvm-3.6.2.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
+EBUILD hhvm-3.7.0.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
+EBUILD hhvm-9999.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
diff --git a/dev-php/hhvm/files/config.hdf.dist b/dev-php/hhvm/files/config.hdf.dist
new file mode 100644
index 0000000..01ba38b
--- /dev/null
+++ b/dev-php/hhvm/files/config.hdf.dist
@@ -0,0 +1,261 @@
+PidFile = /var/run/hhvm/hhvm.pid
+
+Log {
+    Level = Info
+    Header = true
+
+    UseLogFile = true
+    File = /var/log/hhvm/hhvm_error.log
+
+    Access {
+        * {
+            File = /var/log/hhvm/access.log
+        }
+    }
+}
+
+Server {
+    #Host = domain.tld
+    IP = 127.0.0.1
+    Port = 4247
+    ThreadCount = 10
+
+    SourceRoot = /var/www/localhost
+    IncludeSearchPaths {
+        #symfony = /var/www/symfony-1.4
+    }
+
+    RequestTimeoutSeconds = 30
+    RequestMemoryMaxBytes = 67108864
+
+    # If ServerName is not specified for a virtual host, use prefix + this
+    # suffix to compose one
+    #DefaultServerNameSuffix = default_domain.com
+    # Forcing $_SERVER['SERVER_NAME'] to come from request header
+    ForceServerNameToHeader = false
+
+    ### startup options
+    # TakeoverFilename = filename   # for port takeover between server instances
+    # DefaultDocument = index.php
+    # StartupDocument = filename
+    # WarmupDocument = filename
+    # RequestInitFunction = function_name
+    # ThreadDocuments {
+    #     * = somedoc.php
+    #     * = another.php
+    # }
+    ErrorDocument404 = 404.php
+    FatalErrorMessage = Something went terribly wrong... Check back :)
+
+    ### shutdown options
+
+    # Graceful shutdown will try admin /stop command and it waits for number
+    # of seconds specified by GracefulShutdownWait.
+    #GracefulShutdownWait = 0   # in seconds
+
+    # Harsh shutdown looks for pid file and try to kill that process.
+    #HarshShutdown = true
+
+    # Evil shutdown kills anything listening on the server port it’s trying to grab.
+    #EvilShutdown = true
+
+    # How long to wait for dangling server to respond.
+    #DanglingWait = 0
+
+    ### HTTP settings
+
+    #GzipCompressionLevel = 3
+    #EnableMagicQuotesGpc = false
+    #EnableKeepAlive = true
+
+    # EnableEarlyFlush allows chunked encoding responses, and
+    # ForceChunkedEncoding will only send chunked encoding responses,
+    # unless client doesn’t understand.
+    #EnableEarlyFlush = true
+    #ForceChunkedEncoding = false
+
+    MaxPostSize = 65  # in MB
+
+    # LibEventSyncSend allows response packets to be sent directly from worker
+    # thread, normally resulting in faster server responses.
+    #LibEventSyncSend = true
+
+    # ResponseQueueCount specifies how many response queues to use for sending.
+    #ResponseQueueCount = 0
+
+    ### static contents
+
+    # A static content cache creates one single file from all static contents,
+    # including css, js, html, images and any other non-PHP files (or even PHP
+    # files, if CachePHPFile is turned on for compiler options). Normally this
+    # is prepared by compiler at compilation time, but it can also be prepared
+    # at run-time, if SourceRoot points to real file directory and
+    # EnableStaticContentFromDisk is true. Otherwise, use FileCache to point
+    # to the static content cache file created by the compiler.
+    #FileCache = filename
+    #EnableStaticContentCache = true
+    #EnableStaticContentFromDisk = true
+    #ExpiresActive = true
+    #ExpiresDefault = 2592000
+    #DefaultCharsetName = UTF-8
+
+    ### file access control
+
+    #SafeFileAccess = false
+    #FontPath = where to look for font files
+    #AllowedDirectories {
+    #    * = /tmp
+    #}
+    #AllowedFiles {
+    #    * = specific file to allow
+    #}
+
+    APC {
+        EnableApc = true
+
+        # There is a way to prepare APC items in dry format, serialized in
+        # binary files, and these files can be loaded (or “primed”) extremely
+        # fast at startup time. To prepare these .cpp files, check
+        # bin/apc_sample_serializer.php for one way of doing it. Once prepared,
+        # we can compiled them into .so that can be loaded through PrimeLibrary
+        # option. The loading can be done in parallel with LoadThread count of
+        # threads. Once loading is done, it can write to APC with some specified
+        # keys in CompletionKeys to tell web application about priming.
+        #PrimeLibrary = filename
+        #LoadThread = 2
+        #CompletionKeys {
+        #    * = key name
+        #}
+
+        # Recommend to use “concurrent”, the fastest with least locking.
+        # “lfu” is experimental for now and it may have bugs.
+        # When “concurrent”, LockType doesn’t matter.
+        # UseLockedRefs uses mutexes than atomic numbers for APC item’s reference
+        # counting, so it’s recommended to turn off.
+        #TableType = hash          # hash (default) | lfu | concurrent
+        #LockType = readwritelock        # readwritelock | mutex
+        #UseLockedRefs = false
+
+        # ExpireOnSets turns on item purging on expiration, and it’s only done
+        # once per PurgeFrequency of sets.
+        #ExpireOnSets = false
+        #PurgeFrequency = 4096
+
+        # These are experimental LFU settings.
+        #KeyMaturityThreshold = 20
+        #MaximumCapacity = 0
+        #KeyFrequencyUpdatePeriod = 1000  # in number of accesses
+    }
+
+    # DNS cache
+    DnsCache {
+        Enable = false
+        TTL = 600   # in seconds
+        KeyMaturityThreshold = 20
+        MaximumCapacity = 0
+        KeyFrequencyUpdatePeriod = 1000
+    }
+
+    # Light process has very little forking cost, because they are pre-forked
+    # Recommend to turn it on for faster shell command execution.
+    #LightProcessFilePrefix = ./lightprocess
+    #LightProcessCount = 0
+
+    # RTTI profiling settings. Experimental.
+    #RTTIDirectory = /tmp/
+    #EnableCliRTTI = false
+}
+
+
+VirtualHost {
+    default {
+        Disabled = false
+        #Prefix = prefix.
+        #Pattern = .*
+        #PathTranslation = htdocs/
+        #ServerName =
+        #ServerVariables {
+        #    name = value
+        #}
+
+        RewriteRules {
+            backend {
+                pattern = .*
+                to = index.php
+                qsa = true
+                #redirect = 0   #(default: off) | 302 | 301 | other status code
+            }
+        }
+    }
+}
+
+### Administration Server
+#AdminServer {
+#    Port = 8088
+#    ThreadCount = 1
+#    Password =
+#}
+
+### Static Content
+# In addition to Static Content Cache, we also support Dynamic Content Cache.
+# If static_resource.php generates identical files given the same HTTP input,
+# it can be listed under Generators, so its generated content can be cached
+# for next requests.
+#StaticFile {
+#    Extensions {
+#        bmp = image/bmp
+#    }
+#    Generators {
+#        * = static_resource.php
+#    }
+#}
+
+### Stats
+Stats = false
+Stats {
+    Web = false
+    Memory = false
+    SQL = false
+
+    #XSL = xsl filename
+    #XSLProxy = url to get the xsl file
+
+    #SlotDuration = 600  # in seconds
+    #MaxSlot = 72        # 10 minutes x 72 = 12 hours
+}
+
+### MySQL
+MySQL {
+    ReadOnly = false
+    ConnectTimeout = 1000      # in ms
+    ReadTimeout = 4000         # in ms
+    SlowQueryThreshold = 2000  # in ms, log slow queries as errors
+    # When a query takes a long time to execute on server, client has a chance
+    # to kill it to avoid extra server cost by turning on KillOnTimeout.
+    KillOnTimeout = false
+}
+
+### HTTP Monitoring
+Http {
+    DefaultTimeout = 30         # in seconds
+    SlowQueryThreshold = 5000   # in ms, log slow HTTP requests as errors
+}
+
+### Mail
+Mail {
+    SendmailPath = sendmail -t -i
+    ForceExtraParameters =
+}
+
+### Tier overwrites
+# This feature allows a machine to overwrite configurations just by matching
+# machine names with specified regex pattern. This block of configuration can
+# appear at any location of the file, even at top.
+#Tiers {
+#    * {
+#        machine = /regex pattern/
+#        overwrite {
+#            # any config settings described in this documentation
+#        }
+#    }
+#}
diff --git a/dev-php/hhvm/files/config.hdf.dist-r3 b/dev-php/hhvm/files/config.hdf.dist-r3
new file mode 100644
index 0000000..d0c48bb
--- /dev/null
+++ b/dev-php/hhvm/files/config.hdf.dist-r3
@@ -0,0 +1,238 @@
+PidFile = /var/run/hhvm/hhvm.pid
+
+Log {
+    Level = Info
+    Header = true
+
+    UseLogFile = true
+    File = /var/log/hhvm/hhvm_error.log
+
+    Access {
+        * {
+            File = /var/log/hhvm/access.log
+        }
+    }
+}
+
+Server {
+    IP = 127.0.0.1
+    Port = 9000
+    Type = fastcgi
+    ThreadCount = 10
+
+    SourceRoot = /var/www/localhost
+    IncludeSearchPaths {
+        #symfony = /var/www/symfony-1.4
+    }
+
+    RequestTimeoutSeconds = 30
+    RequestMemoryMaxBytes = 67108864
+
+    # If ServerName is not specified for a virtual host, use prefix + this
+    # suffix to compose one
+    #DefaultServerNameSuffix = default_domain.com
+    # Forcing $_SERVER['SERVER_NAME'] to come from request header
+    ForceServerNameToHeader = false
+
+    ### startup options
+    # TakeoverFilename = filename   # for port takeover between server instances
+    # DefaultDocument = index.php
+    # StartupDocument = filename
+    # WarmupDocument = filename
+    # RequestInitFunction = function_name
+    # ThreadDocuments {
+    #     * = somedoc.php
+    #     * = another.php
+    # }
+    ErrorDocument404 = 404.php
+    FatalErrorMessage = Something went terribly wrong... Check back :)
+
+    ### shutdown options
+
+    # Graceful shutdown will try admin /stop command and it waits for number
+    # of seconds specified by GracefulShutdownWait.
+    #GracefulShutdownWait = 0   # in seconds
+
+    # Harsh shutdown looks for pid file and try to kill that process.
+    #HarshShutdown = true
+
+    # Evil shutdown kills anything listening on the server port it’s trying to grab.
+    #EvilShutdown = true
+
+    # How long to wait for dangling server to respond.
+    #DanglingWait = 0
+
+    ### HTTP settings
+
+    #GzipCompressionLevel = 3
+    #EnableMagicQuotesGpc = false
+    #EnableKeepAlive = true
+
+    # EnableEarlyFlush allows chunked encoding responses, and
+    # ForceChunkedEncoding will only send chunked encoding responses,
+    # unless client doesn’t understand.
+    #EnableEarlyFlush = true
+    #ForceChunkedEncoding = false
+
+    MaxPostSize = 65  # in MB
+
+    # LibEventSyncSend allows response packets to be sent directly from worker
+    # thread, normally resulting in faster server responses.
+    #LibEventSyncSend = true
+
+    # ResponseQueueCount specifies how many response queues to use for sending.
+    #ResponseQueueCount = 0
+
+    ### static contents
+
+    # A static content cache creates one single file from all static contents,
+    # including css, js, html, images and any other non-PHP files (or even PHP
+    # files, if CachePHPFile is turned on for compiler options). Normally this
+    # is prepared by compiler at compilation time, but it can also be prepared
+    # at run-time, if SourceRoot points to real file directory and
+    # EnableStaticContentFromDisk is true. Otherwise, use FileCache to point
+    # to the static content cache file created by the compiler.
+    #FileCache = filename
+    #EnableStaticContentCache = true
+    #EnableStaticContentFromDisk = true
+    #ExpiresActive = true
+    #ExpiresDefault = 2592000
+    #DefaultCharsetName = UTF-8
+
+    ### file access control
+
+    #SafeFileAccess = false
+    #FontPath = where to look for font files
+    #AllowedDirectories {
+    #    * = /tmp
+    #}
+    #AllowedFiles {
+    #    * = specific file to allow
+    #}
+
+    APC {
+        EnableApc = true
+
+        # There is a way to prepare APC items in dry format, serialized in
+        # binary files, and these files can be loaded (or “primed”) extremely
+        # fast at startup time. To prepare these .cpp files, check
+        # bin/apc_sample_serializer.php for one way of doing it. Once prepared,
+        # we can compiled them into .so that can be loaded through PrimeLibrary
+        # option. The loading can be done in parallel with LoadThread count of
+        # threads. Once loading is done, it can write to APC with some specified
+        # keys in CompletionKeys to tell web application about priming.
+        #PrimeLibrary = filename
+        #LoadThread = 2
+        #CompletionKeys {
+        #    * = key name
+        #}
+
+        # Recommend to use “concurrent”, the fastest with least locking.
+        # “lfu” is experimental for now and it may have bugs.
+        # When “concurrent”, LockType doesn’t matter.
+        # UseLockedRefs uses mutexes than atomic numbers for APC item’s reference
+        # counting, so it’s recommended to turn off.
+        #TableType = hash          # hash (default) | lfu | concurrent
+        #LockType = readwritelock        # readwritelock | mutex
+        #UseLockedRefs = false
+
+        # ExpireOnSets turns on item purging on expiration, and it’s only done
+        # once per PurgeFrequency of sets.
+        #ExpireOnSets = false
+        #PurgeFrequency = 4096
+
+        # These are experimental LFU settings.
+        #KeyMaturityThreshold = 20
+        #MaximumCapacity = 0
+        #KeyFrequencyUpdatePeriod = 1000  # in number of accesses
+    }
+
+    # DNS cache
+    DnsCache {
+        Enable = false
+        TTL = 600   # in seconds
+        KeyMaturityThreshold = 20
+        MaximumCapacity = 0
+        KeyFrequencyUpdatePeriod = 1000
+    }
+
+    # Light process has very little forking cost, because they are pre-forked
+    # Recommend to turn it on for faster shell command execution.
+    #LightProcessFilePrefix = ./lightprocess
+    #LightProcessCount = 0
+
+    # RTTI profiling settings. Experimental.
+    #RTTIDirectory = /tmp/
+    #EnableCliRTTI = false
+}
+
+### Administration Server
+#AdminServer {
+#    Port = 8088
+#    ThreadCount = 1
+#    Password =
+#}
+
+### Static Content
+# In addition to Static Content Cache, we also support Dynamic Content Cache.
+# If static_resource.php generates identical files given the same HTTP input,
+# it can be listed under Generators, so its generated content can be cached
+# for next requests.
+#StaticFile {
+#    Extensions {
+#        bmp = image/bmp
+#    }
+#    Generators {
+#        * = static_resource.php
+#    }
+#}
+
+### Stats
+Stats = false
+Stats {
+    Web = false
+    Memory = false
+    SQL = false
+
+    #XSL = xsl filename
+    #XSLProxy = url to get the xsl file
+
+    #SlotDuration = 600  # in seconds
+    #MaxSlot = 72        # 10 minutes x 72 = 12 hours
+}
+
+### MySQL
+MySQL {
+    ReadOnly = false
+    ConnectTimeout = 1000      # in ms
+    ReadTimeout = 4000         # in ms
+    SlowQueryThreshold = 2000  # in ms, log slow queries as errors
+    # When a query takes a long time to execute on server, client has a chance
+    # to kill it to avoid extra server cost by turning on KillOnTimeout.
+    KillOnTimeout = false
+}
+
+### HTTP Monitoring
+Http {
+    DefaultTimeout = 30         # in seconds
+    SlowQueryThreshold = 5000   # in ms, log slow HTTP requests as errors
+}
+
+### Mail
+Mail {
+    SendmailPath = sendmail -t -i
+    ForceExtraParameters =
+}
+
+### Tier overwrites
+# This feature allows a machine to overwrite configurations just by matching
+# machine names with specified regex pattern. This block of configuration can
+# appear at any location of the file, even at top.
+#Tiers {
+#    * {
+#        machine = /regex pattern/
+#        overwrite {
+#            # any config settings described in this documentation
+#        }
+#    }
+#}
diff --git a/dev-php/hhvm/files/hhvm b/dev-php/hhvm/files/hhvm
new file mode 100644
index 0000000..64ed5f9
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export HPHP_HOME="/usr/lib/hhvm/lib/"
+LD_LIBRARY_PATH=/usr/lib/hhvm/lib /usr/lib/hhvm/bin/hhvm "$@"
diff --git a/dev-php/hhvm/files/hhvm.confd b/dev-php/hhvm/files/hhvm.confd
new file mode 100644
index 0000000..8a3357c
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.confd
@@ -0,0 +1,58 @@
+# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
+
+# Config file
+#HHVM_CONFIG="/etc/hhvm/config.hdf"
+
+# Base directory
+#HHVM_DIR="/usr/lib/hhvm"
+
+# Lib directory
+#HHVM_LIB="${HHVM_DIR}/lib"
+
+# Binary file
+#HHVM_BIN="${HHVM_DIR}/bin/hhvm"
+
+# Run HHVM as user
+#HHVM_USER="hhvm"
+
+# Run HHVM as group
+#HHVM_GROUP="hhvm"
+
+# Data directory
+#HHVM_DATADIR="/var/lib/hhvm"
+
+# Repository filename
+#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
+
+# PID directory
+#HHVM_PIDDIR="/var/run/hhvm"
+
+# PID filename
+#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
+
+# Log directory
+#HHVM_LOGDIR="/var/log/hhvm"
+
+# Log filename
+#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
+
+# Stop timeout
+#HHVM_TIMEOUT=15
+
+# Any additional options passed to HHVM when starting
+#HHVM_OPTS=""
+
+# Server type: libevent (http), fastcgi
+#SERVER_TYPE="libevent"
+
+# Server IP
+#SERVER_IP="127.0.0.1"
+
+# Server port: 4247 (http), 9000 (fastcgi)
+#SERVER_PORT=4247
+
+# Server threads count
+#SERVER_THREADCOUNT=10
+
+# Server source root
+#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.confd-r3 b/dev-php/hhvm/files/hhvm.confd-r3
new file mode 100644
index 0000000..f98f4a8
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.confd-r3
@@ -0,0 +1,55 @@
+# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
+
+# Config file
+#HHVM_CONFIG="/etc/hhvm/config.hdf"
+
+# Binary file
+#HHVM_BIN="/usr/bin/hhvm"
+
+# Run HHVM as user
+#HHVM_USER="hhvm"
+
+# Run HHVM as group
+#HHVM_GROUP="hhvm"
+
+# Data directory
+#HHVM_DATADIR="/var/lib/hhvm"
+
+# Repository filename
+#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
+
+# PID directory
+#HHVM_PIDDIR="/var/run/hhvm"
+
+# PID filename
+#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
+
+# Log directory
+#HHVM_LOGDIR="/var/log/hhvm"
+
+# Log filename
+#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
+
+# Stop timeout
+#HHVM_TIMEOUT=15
+
+# Any additional options passed to HHVM when starting
+#HHVM_OPTS=""
+
+# Server type: fastcgi
+#SERVER_TYPE="fastcgi"
+
+# Server socket
+#SERVER_SOCKET="${HHVM_PIDDIR}/hhvm.sock"
+
+# Server IP
+#SERVER_IP="127.0.0.1"
+
+# Server port: 4247 (http), 9000 (fastcgi)
+#SERVER_PORT=9000
+
+# Server threads count
+#SERVER_THREADCOUNT=10
+
+# Server source root
+#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.confd-r4 b/dev-php/hhvm/files/hhvm.confd-r4
new file mode 100644
index 0000000..90b712f
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.confd-r4
@@ -0,0 +1,58 @@
+# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
+
+# Config file
+#HHVM_CONFIG="/etc/hhvm/server.ini"
+
+# System config file
+#HHVM_SYSTEM_CONFIG="/etc/hhvm/php.ini"
+
+# Binary file
+#HHVM_BIN="/usr/bin/hhvm"
+
+# Run HHVM as user
+#HHVM_USER="hhvm"
+
+# Run HHVM as group
+#HHVM_GROUP="hhvm"
+
+# Data directory
+#HHVM_DATADIR="/var/lib/hhvm"
+
+# Repository filename
+#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
+
+# PID directory
+#HHVM_PIDDIR="/var/run/hhvm"
+
+# PID filename
+#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
+
+# Log directory
+#HHVM_LOGDIR="/var/log/hhvm"
+
+# Log filename
+#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
+
+# Stop timeout
+#HHVM_TIMEOUT=15
+
+# Any additional options passed to HHVM when starting
+#HHVM_OPTS=""
+
+# Server type: fastcgi
+#SERVER_TYPE="fastcgi"
+
+# Server socket
+#SERVER_SOCKET="${HHVM_PIDDIR}/hhvm.sock"
+
+# Server IP
+#SERVER_IP="127.0.0.1"
+
+# Server port: 4247 (http), 9000 (fastcgi)
+#SERVER_PORT=9000
+
+# Server threads count
+#SERVER_THREADCOUNT=10
+
+# Server source root
+#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.initd b/dev-php/hhvm/files/hhvm.initd
new file mode 100644
index 0000000..db6d262
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.initd
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+
+description="Virtual Machine, Runtime, and JIT for PHP"
+description_configtest="Run syntax tests for configuration files."
+
+HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/config.hdf}
+HHVM_DIR=${HHVM_DIR:-/usr/lib/hhvm}
+HHVM_LIB=${HHVM_LIB:-${HHVM_DIR}/lib}
+HHVM_BIN=${HHVM_BIN:-${HHVM_DIR}/bin/hhvm}
+HHVM_USER=${HHVM_USER:-hhvm}
+HHVM_GROUP=${HHVM_GROUP:-hhvm}
+HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
+HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
+HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
+HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
+HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
+HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
+HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
+
+depend() {
+	need net localmount
+	use dns logger
+	after bootmisc
+}
+
+checkconfig() {
+	if [ ! -f "${HHVM_CONFIG}" ] ; then
+		eerror "Please create ${HHVM_CONFIG}"
+		eerror "Sample conf: /etc/hhvm/config.hdf.dist"
+		return 1
+	fi
+
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
+
+	export HPHP_HOME="${HHVM_LIB}"
+	LD_LIBRARY_PATH="${HHVM_LIB}" ${HHVM_BIN} -c "${HHVM_CONFIG}" /dev/null >/dev/null 2>&1
+	ret=$?
+
+	if [ $ret -ne 0 ]; then
+		LD_LIBRARY_PATH="${HHVM_LIB}" ${HHVM_BIN} -c "${HHVM_CONFIG}" /dev/null
+	fi
+
+	return $ret
+}
+
+start() {
+	checkconfig || return $?
+
+	local OPTS=""
+	if [[ -n "${SERVER_TYPE}" ]]; then
+		OPTS+=" -vServer.Type=${SERVER_TYPE}"
+	fi
+	if [[ -n "${SERVER_IP}" ]]; then
+		OPTS+=" -vServer.IP=${SERVER_IP}"
+	fi
+	if [[ -n "${SERVER_PORT}" ]]; then
+		OPTS+=" -vServer.Port=${SERVER_PORT}"
+	fi
+	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
+		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
+	fi
+	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
+		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	LD_LIBRARY_PATH="${HHVM_LIB}" start-stop-daemon --start --background \
+		--exec "${HHVM_BIN}" \
+		--pidfile "${HHVM_PIDFILE}" \
+		--user "${HHVM_USER}:${HHVM_GROUP}" \
+		--stdout "${HHVM_LOGFILE}" \
+		--stderr "${HHVM_LOGFILE}" \
+		--env HPHP_HOME="${HHVM_LIB}/" \
+		-- -m server \
+		-c "${HHVM_CONFIG}" \
+		-u "${HHVM_USER}" \
+		-vPidFile=${HHVM_PIDFILE} \
+		-vLog.File=${HHVM_LOGFILE} \
+		-vRepo.Central.Path=${HHVM_REPOFILE} \
+		${OPTS} \
+		${HHVM_OPTS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $? "failed, please correct errors above"
+}
diff --git a/dev-php/hhvm/files/hhvm.initd-r3 b/dev-php/hhvm/files/hhvm.initd-r3
new file mode 100644
index 0000000..b6a706d
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.initd-r3
@@ -0,0 +1,104 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+
+description="Virtual Machine, Runtime, and JIT for PHP"
+description_configtest="Run syntax tests for configuration files."
+
+HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/config.hdf}
+HHVM_BIN=${HHVM_BIN:-/usr/bin/hhvm}
+HHVM_USER=${HHVM_USER:-hhvm}
+HHVM_GROUP=${HHVM_GROUP:-hhvm}
+HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
+HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
+HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
+HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
+HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
+HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
+HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
+
+depend() {
+	need net localmount
+	use dns logger
+	after bootmisc
+}
+
+checkconfig() {
+	if [ ! -f "${HHVM_CONFIG}" ] ; then
+		eerror "Please create ${HHVM_CONFIG}"
+		eerror "Sample conf: /etc/hhvm/config.hdf.dist"
+		return 1
+	fi
+
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
+
+	buildopts
+
+	${HHVM_BIN} ${OPTS} /dev/null >/dev/null 2>&1
+	ret=$?
+
+	if [ $ret -ne 0 ]; then
+		${HHVM_BIN} ${OPTS} /dev/null
+	fi
+
+	return $ret
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --background \
+		--exec "${HHVM_BIN}" \
+		--pidfile "${HHVM_PIDFILE}" \
+		--user "${HHVM_USER}:${HHVM_GROUP}" \
+		--stdout "${HHVM_LOGFILE}" \
+		--stderr "${HHVM_LOGFILE}" \
+		-- -m server ${OPTS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $? "failed, please correct errors above"
+}
+
+buildopts() {
+	OPTS="-c ${HHVM_CONFIG} \
+		-u ${HHVM_USER} \
+		-vPidFile=${HHVM_PIDFILE} \
+		-vLog.File=${HHVM_LOGFILE} \
+		-vRepo.Central.Path=${HHVM_REPOFILE}"
+
+	if [[ -n "${SERVER_TYPE}" ]]; then
+		OPTS+=" -vServer.Type=${SERVER_TYPE}"
+	fi
+	if [[ -n "${SERVER_SOCKET}" ]]; then
+		OPTS+=" -vServer.FileSocket=${SERVER_SOCKET}"
+	fi
+	if [[ -n "${SERVER_IP}" ]]; then
+		OPTS+=" -vServer.IP=${SERVER_IP}"
+	fi
+	if [[ -n "${SERVER_PORT}" ]]; then
+		OPTS+=" -vServer.Port=${SERVER_PORT}"
+	fi
+	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
+		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
+	fi
+	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
+		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
+	fi
+
+	OPTS+=" ${HHVM_OPTS}"
+}
diff --git a/dev-php/hhvm/files/hhvm.initd-r4 b/dev-php/hhvm/files/hhvm.initd-r4
new file mode 100644
index 0000000..91c04bd
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.initd-r4
@@ -0,0 +1,117 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+
+description="HHVM FastCGI Daemon"
+description_configtest="Run syntax tests for configuration files."
+
+HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/server.ini}
+HHVM_SYSTEM_CONFIG=${HHVM_SYSTEM_CONFIG:-/etc/hhvm/php.ini}
+HHVM_BIN=${HHVM_BIN:-/usr/bin/hhvm}
+HHVM_USER=${HHVM_USER:-hhvm}
+HHVM_GROUP=${HHVM_GROUP:-hhvm}
+HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
+HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
+HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
+HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
+HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
+HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
+HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
+
+depend() {
+	need net localmount
+	use dns logger
+	after bootmisc
+}
+
+checkconfig() {
+	if [ ! -f "${HHVM_CONFIG}" ] ; then
+		eerror "Please create ${HHVM_CONFIG}"
+		eerror "Sample conf: /etc/hhvm/server.ini.dist"
+		return 1
+	fi
+
+	if [ ! -f "${HHVM_SYSTEM_CONFIG}" ] ; then
+		eerror "Please create ${HHVM_SYSTEM_CONFIG}"
+		eerror "Sample conf: /etc/hhvm/php.ini.dist"
+		return 1
+	fi
+
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
+	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
+
+	buildopts
+
+	touch "${HHVM_PIDFILE}"
+	chown "${HHVM_USER}:${HHVM_GROUP}" "${HHVM_PIDFILE}"
+
+	${HHVM_BIN} ${OPTS} /dev/null >/dev/null 2>&1
+	ret=$?
+
+	if [ $ret -ne 0 ]; then
+		${HHVM_BIN} ${OPTS} /dev/null
+	fi
+
+	chown -R "${HHVM_USER}:${HHVM_GROUP}" "${HHVM_DATADIR}"
+
+	return $ret
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --background \
+		--exec "${HHVM_BIN}" \
+		--pidfile "${HHVM_PIDFILE}" \
+		--user "${HHVM_USER}:${HHVM_GROUP}" \
+		--stdout "${HHVM_LOGFILE}" \
+		--stderr "${HHVM_LOGFILE}" \
+		-- -m server ${OPTS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $? "failed, please correct errors above"
+}
+
+buildopts() {
+	OPTS="-c ${HHVM_SYSTEM_CONFIG} \
+		-c ${HHVM_CONFIG} \
+		-u ${HHVM_USER} \
+		-vPidFile=${HHVM_PIDFILE} \
+		-vLog.File=${HHVM_LOGFILE} \
+		-vRepo.Central.Path=${HHVM_REPOFILE}"
+
+	if [[ -n "${SERVER_TYPE}" ]]; then
+		OPTS+=" -vServer.Type=${SERVER_TYPE}"
+	fi
+	if [[ -n "${SERVER_SOCKET}" ]]; then
+		OPTS+=" -vServer.FileSocket=${SERVER_SOCKET}"
+	fi
+	if [[ -n "${SERVER_IP}" ]]; then
+		OPTS+=" -vServer.IP=${SERVER_IP}"
+	fi
+	if [[ -n "${SERVER_PORT}" ]]; then
+		OPTS+=" -vServer.Port=${SERVER_PORT}"
+	fi
+	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
+		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
+	fi
+	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
+		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
+	fi
+
+	OPTS+=" ${HHVM_OPTS}"
+}
diff --git a/dev-php/hhvm/files/hhvm.rc b/dev-php/hhvm/files/hhvm.rc
new file mode 100644
index 0000000..b42c52a
--- /dev/null
+++ b/dev-php/hhvm/files/hhvm.rc
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Virtual Machine, Runtime, and JIT for PHP"
+
+hhvm_config=${hhvm_config:-/etc/hhvm/config.hdf}
+
+hhvm_lib="/usr/lib/hhvm/lib"
+command="/usr/lib/hhvm/bin/hhvm"
+pidfile=${pidfile:-/var/run/hhvm.pid}
+logfile=${logfile:-/var/log/hhvm_server.log}
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "${hhvm_config}" ] ; then
+		eerror "Please create ${hhvm_config}"
+		eerror "Sample conf: ${hhvm_config}.dist"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting HipHop VM"
+	LD_LIBRARY_PATH="${hhvm_lib}" start-stop-daemon --start --background \
+		--exec "${command}" \
+		--pidfile "${pidfile}" \
+		--stdout "${logfile}" \
+		--stderr "${logfile}" \
+		--env HPHP_HOME="${hhvm_lib}/" \
+		-- -m server -c "${hhvm_config}"
+	eend $? "Failed to start HipHop VM"
+}
+
+stop() {
+	ebegin "Stopping HipHop VM"
+	start-stop-daemon --stop --pidfile "${pidfile}"
+	eend $? "Failed to stop HipHop VM"
+}
diff --git a/dev-php/hhvm/files/php.ini b/dev-php/hhvm/files/php.ini
new file mode 100644
index 0000000..bde1aa1
--- /dev/null
+++ b/dev-php/hhvm/files/php.ini
@@ -0,0 +1,63 @@
+; php options
+
+;max_execution_time = 30
+;memory_limit = 128M
+;include_path = ".:/usr/share/php5:/usr/share/php"
+;open_basedir =
+;error_reporting = E_ALL
+;display_errors = On
+;log_errors = On
+;error_log = /var/log/hhvm/error.log
+;post_max_size = 100M
+;file_uploads = On
+;upload_tmp_dir = /tmp
+;upload_max_filesize = 100M
+;allow_url_fopen = On
+;default_socket_timeout = 5
+;bcmath.scale = 0
+;date.timezone = Europe/Kiev
+;date.default_latitude = 31.7667
+;date.default_longitude = 35.2333
+;date.sunset_zenith = 90.583333
+;date.sunrise_zenith = 90.583333
+;highlight.string = #DD0000
+;highlight.comment = #FF8000
+;highlight.keyword = #007700
+;highlight.default = #0000BB
+;highlight.html = #000000
+;intl.default_locale =
+;imagick.locale_fix = 0
+;imagick.progress_monitor = 0
+;memcache.hash_strategy = standard
+;memcache.hash_function = crc32
+;pcre.backtrack_limit = 1000000
+;pcre.recursion_limit = 100000
+;session.save_path =
+;session.name = PHPSESSID
+;session.save_handler = files
+;session.auto_start = 0
+;session.gc_probability = 1
+;session.gc_divisor = 100
+;session.gc_maxlifetime = 1440
+;session.serialize_handler = php
+;session.cookie_lifetime = 0
+;session.cookie_path = /
+;session.cookie_domain =
+;session.cookie_secure =
+;session.cookie_httponly =
+;session.use_cookies = 1
+;session.use_only_cookies = 1
+;session.referer_check =
+;session.entropy_file =
+;session.entropy_length = 0
+;session.cache_limiter = nocache
+;session.cache_expire = 180
+;session.use_trans_sid = 0
+;session.hash_function = 0
+;session.hash_bits_per_character = 4
+
+; hhvm specific 
+hhvm.log.level = Warning
+hhvm.log.always_log_unhandled_exceptions = true
+hhvm.log.runtime_error_reporting_level = 8191
+hhvm.mysql.typed_results = false
diff --git a/dev-php/hhvm/files/server.ini b/dev-php/hhvm/files/server.ini
new file mode 100644
index 0000000..38fecf0
--- /dev/null
+++ b/dev-php/hhvm/files/server.ini
@@ -0,0 +1,13 @@
+; php options
+
+pid = /var/run/hhvm/hhvm.pid
+
+; hhvm specific 
+
+hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.php
+hhvm.log.use_log_file = true
+hhvm.log.header = true
+hhvm.log.file = /var/log/hhvm/error.log
+hhvm.repo.central.path = /var/lib/hhvm/hhvm.hhbc
diff --git a/dev-php/hhvm/files/support-curl-7.31.0.patch b/dev-php/hhvm/files/support-curl-7.31.0.patch
new file mode 100644
index 0000000..106b502
--- /dev/null
+++ b/dev-php/hhvm/files/support-curl-7.31.0.patch
@@ -0,0 +1,17 @@
+--- a/hphp/third_party/libcurl.fb-changes.diff	2013-08-22 12:53:28.002201916 +0300
++++ b/hphp/third_party/libcurl.fb-changes.diff	2013-08-22 13:03:19.629264831 +0300
+@@ -32,14 +32,6 @@
+ diff -u -r1.210 multi.c
+ --- curl-old/lib/multi.c	28 Jan 2010 15:34:18 -0000	1.210
+ +++ curl-new/lib/multi.c	29 Jan 2010 23:45:19 -0000
+-@@ -42,6 +42,7 @@
+- #include "sendf.h"
+- #include "timeval.h"
+- #include "http.h"
+-+#include "select.h"
+- 
+- #define _MPRINTF_REPLACE /* use our functions only */
+- #include <curl/mprintf.h>
+ @@ -900,6 +901,80 @@
+    return CURLM_OK;
+  }
diff --git a/dev-php/hhvm/hhvm-2.2.0.ebuild b/dev-php/hhvm/hhvm-2.2.0.ebuild
new file mode 100644
index 0000000..416f6f2
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.2.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_BRANCH="HHVM-2.2"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+JEMALLOC_P="jemalloc-3.0.0"
+GOOGLE_GLOG_P="google-glog"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz
+         jemalloc? ( http://www.canonware.com/download/jemalloc/${JEMALLOC_P}.tar.bz2 )"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.37
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	dev-db/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/libdwarf
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.6
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/cmake
+	dev-vcs/git
+	dev-vcs/subversion
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building Google glog"
+	pushd "${WORKDIR}" > /dev/null
+	svn checkout http://google-glog.googlecode.com/svn/trunk/ ${GOOGLE_GLOG_P}
+	cd ${GOOGLE_GLOG_P}
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	if use jemalloc; then
+		einfo "Building jemalloc"
+		pushd "${WORKDIR}/${JEMALLOC_P}" > /dev/null
+		./configure --prefix="${CMAKE_PREFIX_PATH}"
+		emake
+		emake -j1 install
+		popd > /dev/null
+	fi
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${JEMALLOC_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${GOOGLE_GLOG_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.3.0.ebuild b/dev-php/hhvm/hhvm-2.3.0.ebuild
new file mode 100644
index 0000000..46338db
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.3.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	=dev-libs/libdwarf-20120410
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	dev-vcs/git
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.3.1.ebuild b/dev-php/hhvm/hhvm-2.3.1.ebuild
new file mode 100644
index 0000000..46338db
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.3.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	=dev-libs/libdwarf-20120410
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	dev-vcs/git
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.3.2.ebuild b/dev-php/hhvm/hhvm-2.3.2.ebuild
new file mode 100644
index 0000000..46338db
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.3.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	=dev-libs/libdwarf-20120410
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	dev-vcs/git
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.3.3.ebuild b/dev-php/hhvm/hhvm-2.3.3.ebuild
new file mode 100644
index 0000000..46338db
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.3.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	=dev-libs/libdwarf-20120410
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	dev-vcs/git
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.4.0.ebuild b/dev-php/hhvm/hhvm-2.4.0.ebuild
new file mode 100644
index 0000000..f872610
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.4.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/libdwarf
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.4.1.ebuild b/dev-php/hhvm/hhvm-2.4.1.ebuild
new file mode 100644
index 0000000..f872610
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.4.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/libdwarf
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.rc hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-2.4.2.ebuild b/dev-php/hhvm/hhvm-2.4.2.ebuild
new file mode 100644
index 0000000..b270172
--- /dev/null
+++ b/dev-php/hhvm/hhvm-2.4.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="+jemalloc devel debug"
+
+CURL_P="curl-7.31.0"
+LIBEVENT_P="libevent-1.4.14b-stable"
+
+SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
+         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	>=dev-libs/boost-1.48
+	sys-devel/flex
+	sys-devel/bison
+	dev-util/re2c
+	virtual/mysql
+	dev-libs/libxml2
+	dev-libs/libmcrypt
+	dev-libs/icu
+	dev-libs/openssl
+	sys-libs/libcap
+	media-libs/gd
+	sys-libs/zlib
+	dev-cpp/tbb
+	dev-libs/oniguruma
+	dev-libs/libpcre
+	dev-libs/expat
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/libmemcached
+	net-nds/openldap
+	net-libs/c-client[kerberos]
+	dev-util/google-perftools
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/libdwarf
+	app-arch/bzip2
+	sys-devel/binutils
+	>=sys-devel/gcc-4.7
+	dev-cpp/glog
+	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
+	media-libs/libvpx
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule init
+	git submodule update
+
+	epatch "${FILESDIR}/support-curl-7.31.0.patch"
+
+	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
+
+	einfo "Building custom libevent"
+	export EPATCH_SOURCE="${S}/hphp/third_party"
+	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	./autogen.sh
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	einfo "Building custom curl"
+	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	./buildconf
+	./configure --prefix="${CMAKE_PREFIX_PATH}"
+	emake
+	emake -j1 install
+	popd > /dev/null
+
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+	export CMAKE_BUILD_TYPE
+}
+
+src_configure()
+{
+	export HPHP_HOME="${S}"
+	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	pushd "${WORKDIR}/${CURL_P}" > /dev/null
+	emake -j1 install
+	popd > /dev/null
+
+	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
+	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
+	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
+
+	exeinto "/usr/lib/hhvm/bin"
+	doexe hphp/hhvm/hhvm
+
+	if use devel; then
+		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+	fi
+
+	dobin "${FILESDIR}/hhvm"
+	newinitd "${FILESDIR}"/hhvm.initd hhvm
+	newconfd "${FILESDIR}"/hhvm.confd hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.0.0.ebuild b/dev-php/hhvm/hhvm-3.0.0.ebuild
new file mode 100644
index 0000000..e0d7f80
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.0.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="debug hack xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	>=sys-devel/gcc-4.7
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	dobin hphp/hhvm/hhvm
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r3 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r3 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist-r3 config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.0.1.ebuild b/dev-php/hhvm/hhvm-3.0.1.ebuild
new file mode 100644
index 0000000..499b9fb
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.0.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="debug hack xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	>=sys-devel/gcc-4.7
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	dobin hphp/hhvm/hhvm
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r3 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r3 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/config.hdf.dist-r3 config.hdf.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.1.0.ebuild b/dev-php/hhvm/hhvm-3.1.0.ebuild
new file mode 100644
index 0000000..a3e67ef
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.1.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	>=sys-devel/gcc-4.7
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+KEYWORDS="amd64"
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	dobin hphp/hhvm/hhvm
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.2.0.ebuild b/dev-php/hhvm/hhvm-3.2.0.ebuild
new file mode 100644
index 0000000..6608eb8
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.2.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.3.3.ebuild b/dev-php/hhvm/hhvm-3.3.3.ebuild
new file mode 100644
index 0000000..2576286
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.3.3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.4.2.ebuild b/dev-php/hhvm/hhvm-3.4.2.ebuild
new file mode 100644
index 0000000..2576286
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.4.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.5.0.ebuild b/dev-php/hhvm/hhvm-3.5.0.ebuild
new file mode 100644
index 0000000..2576286
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.5.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.5.1.ebuild b/dev-php/hhvm/hhvm-3.5.1.ebuild
new file mode 100644
index 0000000..2576286
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.5.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.6.0.ebuild b/dev-php/hhvm/hhvm-3.6.0.ebuild
new file mode 100644
index 0000000..c237705
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.6.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen +zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49[context]
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	else
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/h2tp
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_format
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		doman hphp/hack/man/*.1
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	doman hphp/doc/man/*.1
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.6.1.ebuild b/dev-php/hhvm/hhvm-3.6.1.ebuild
new file mode 100644
index 0000000..c237705
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.6.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen +zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49[context]
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	else
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/h2tp
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_format
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		doman hphp/hack/man/*.1
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	doman hphp/doc/man/*.1
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.6.2.ebuild b/dev-php/hhvm/hhvm-3.6.2.ebuild
new file mode 100644
index 0000000..c237705
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.6.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen +zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49[context]
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	else
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/h2tp
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_format
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		doman hphp/hack/man/*.1
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	doman hphp/doc/man/*.1
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-3.7.0.ebuild b/dev-php/hhvm/hhvm-3.7.0.ebuild
new file mode 100644
index 0000000..c237705
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.7.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen +zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49[context]
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	else
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/h2tp
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_format
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		doman hphp/hack/man/*.1
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	doman hphp/doc/man/*.1
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}
diff --git a/dev-php/hhvm/hhvm-9999.ebuild b/dev-php/hhvm/hhvm-9999.ebuild
new file mode 100644
index 0000000..c237705
--- /dev/null
+++ b/dev-php/hhvm/hhvm-9999.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils git-2 user
+
+EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
+
+case ${PV} in
+9999)
+	EGIT_BRANCH="master"
+	KEYWORDS="~amd64"
+	;;
+*)
+	# For now, git is the only way to fetch releases
+	# https://github.com/facebook/hhvm/issues/2806
+	EGIT_COMMIT="HHVM-${PV}"
+	KEYWORDS="amd64"
+	;;
+esac
+
+IUSE="debug hack jsonc xen +zend-compat"
+
+DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
+HOMEPAGE="https://github.com/facebook/hhvm"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-cpp/glog
+	dev-cpp/tbb
+	dev-db/sqlite
+	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+	>=dev-libs/boost-1.49[context]
+	dev-libs/cloog
+	dev-libs/elfutils
+	dev-libs/expat
+	dev-libs/icu
+	>=dev-libs/jemalloc-3.0.0[stats]
+	jsonc? ( dev-libs/json-c )
+	dev-libs/libdwarf
+	>=dev-libs/libevent-2.0.9
+	dev-libs/libmcrypt
+	dev-libs/libmemcached
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/libzip-0.11.0
+	dev-libs/oniguruma
+	dev-libs/openssl
+	media-gfx/imagemagick
+	media-libs/freetype
+	media-libs/gd[jpeg,png]
+	net-libs/c-client[kerberos]
+	>=net-misc/curl-7.28.0
+	net-nds/openldap
+	sys-libs/libcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	virtual/mysql
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-2.8.7
+	sys-devel/binutils[static-libs]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+SLOT="0"
+LICENSE="PHP-3"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
+			; then
+		eerror "${PN} needs to be built with gcc-4.8 or later."
+		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
+		die
+	fi
+}
+
+pkg_setup() {
+	ebegin "Creating hhvm user and group"
+	enewgroup hhvm
+	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+	eend $?
+}
+
+src_prepare()
+{
+	git submodule update --init --recursive
+}
+
+src_configure()
+{
+	CMAKE_BUILD_TYPE="Release"
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	if use jsonc; then
+		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
+	fi
+
+	if use xen; then
+		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
+	fi
+
+	if use zend-compat; then
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
+	else
+		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
+	fi
+
+	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
+}
+
+src_install()
+{
+	emake install DESTDIR=${D}
+
+	if use hack; then
+		dobin hphp/hack/bin/h2tp
+		dobin hphp/hack/bin/hh_client
+		dobin hphp/hack/bin/hh_format
+		dobin hphp/hack/bin/hh_server
+		dobin hphp/hack/bin/hh_single_type_check
+		doman hphp/hack/man/*.1
+		dodir "/usr/share/hhvm/hack"
+		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
+		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+	fi
+
+	doman hphp/doc/man/*.1
+
+	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+	dodir "/etc/hhvm"
+	insinto /etc/hhvm
+	newins "${FILESDIR}"/php.ini php.ini
+	newins "${FILESDIR}"/php.ini php.ini.dist
+	newins "${FILESDIR}"/server.ini server.ini
+	newins "${FILESDIR}"/server.ini server.ini.dist
+}

From 6d6216439eacffe62c6e1d99f5d43d913ed248ff Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 30 Oct 2015 14:44:07 -0700
Subject: [PATCH 096/261] added missing requirement for hhvm

---
 dev-libs/libdwarf/Manifest                 |  2 ++
 dev-libs/libdwarf/libdwarf-20120410.ebuild | 39 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 dev-libs/libdwarf/Manifest
 create mode 100644 dev-libs/libdwarf/libdwarf-20120410.ebuild

diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest
new file mode 100644
index 0000000..e6fdaa1
--- /dev/null
+++ b/dev-libs/libdwarf/Manifest
@@ -0,0 +1,2 @@
+DIST libdwarf-20120410.tar.gz 1465839 SHA256 ad148f07f0937689e6c8265beca09c74c92fad039900967eb9340a4c46a10b6c SHA512 6b6e3008c5ef829c01257930863c793e7fe2317a041240b0d40367f5c9c08d2bb9eb8330faeb2dde4a1556397e7afa07a73d5d5709783804c2fcbc6c037a2172 WHIRLPOOL 2468b7afe82ca13cf97f468c47f900e5200b519e229ee7fc0919704dacdb05707020188f32ef500795327af68076693ba8a3d8466d177ca7b8f6b4924e3c2f13
+EBUILD libdwarf-20120410.ebuild 710 SHA256 2433bacaa07f0e157659d6239f8f62739d4d7f49acbfd02855bea01dc80af14f SHA512 0549b89c180290d0d91227bc816cf04d86a885da54bd7778526b2e79f926e5befdf22bb9d6243d4621b9b60f9e0f6cb4abc8ca933194431e0e8456f285e3959b WHIRLPOOL 7ef60789a6299461abb25829e6d2a694db1d3690741d48bf075fc73979b2b86044242065a444d1f73e6d93093f54472d16326dbfde5680c0e96cd9873fd17c82
diff --git a/dev-libs/libdwarf/libdwarf-20120410.ebuild b/dev-libs/libdwarf/libdwarf-20120410.ebuild
new file mode 100644
index 0000000..806a693
--- /dev/null
+++ b/dev-libs/libdwarf/libdwarf-20120410.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit flag-o-matic
+
+DESCRIPTION="Library to deal with DWARF Debugging Information Format"
+HOMEPAGE="http://reality.sgiweb.org/davea/dwarf.html"
+SRC_URI="http://gentoo.skyfms.com/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/dwarf-${PV}/${PN}
+
+src_prepare() {
+	append-cflags -fPIC || die
+}
+
+src_configure() {
+	econf --enable-shared
+}
+
+src_install() {
+	dolib.a libdwarf.a || die
+	dolib.so libdwarf.so || die
+
+	insinto /usr/include
+	doins libdwarf.h || die
+
+	dodoc NEWS README CHANGES || die
+}

From 5822e34db797ff9f5deed0dd2248707183b8bed8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 02:25:20 -0800
Subject: [PATCH 097/261] first wokring ebuild

---
 net-misc/webrtc2sip/Manifest                |  2 +
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 76 +++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 net-misc/webrtc2sip/Manifest
 create mode 100644 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
new file mode 100644
index 0000000..2e93edd
--- /dev/null
+++ b/net-misc/webrtc2sip/Manifest
@@ -0,0 +1,2 @@
+DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 7efea6d00814f8e144e77ce0f2386c61b5fe89cba118a12410392b3b225f0015 SHA512 0768d4a0b7f90e10d716ec76b7b23b9fbd21ee417affe59f671c25ec9ea626821d12ce1284fab0839c9b7dfd456e0cd96cda443ba984986ebb86d2c3aafa441b WHIRLPOOL 7dd10e18f871ef5ceed26ebd7ecd5b70bfe1f49d04cc6274b9b849437b7f329c099df093527c120e47c41cc103e9c678f00c43a8913a3494b9530fa0e609b424
+EBUILD webrtc2sip-2.0.0.ebuild 1760 SHA256 7b17a1b249a691fcf2162bce58895cb7b28bdf656d7b0bb95fdb009db61cb2c0 SHA512 8fa6f66329ccbcddd4e7e4e1cdfe74ec97b2d5d1710f76bd215926a7fb4d63e23b42e88062fd62b9fba4824144f265669cb18b6fd8d6267b996d6c26e58de6a2 WHIRLPOOL 095aaaf88c216dc64ea1fa66bbd99993d062ed82da59c8eb07c52b76ffb2b0c0966f16d7419723a38de803c3deda5458318f198209528e7a5fa84c7dc47a1882
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
new file mode 100644
index 0000000..b998c7a
--- /dev/null
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Webrtc2sip: Smart SIP and Media Gateway to connect WebRTC endpoints"
+HOMEPAGE="http://www.webrtc2sip.org/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/webrtc2sip/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
+
+S="${WORKDIR}/webrtc2sip"
+
+src_prepare() {
+#	export LDFLAGS="-ldl -lpthread"
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+	export LDFLAGS="-ldl -lpthread"
+	export CFLAGS="-lpthread"
+
+	econf \
+		-prefix=/opt/webrtc2sip \
+		-with-doubango=/usr/local
+}
+
+src_compile() {
+	export LDFLAGS="-ldl -lpthread"
+	export PREFIX="/opt/webrtc2sip"
+
+	emake -ldl -lpthread \
+		PREFIX="/opt/webrtc2sip"
+}
+
+src_install() {
+	export LDFLAGS="-ldl -lpthread"
+
+	mkdir -p "${D}/opt/webrtc2sip"
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+

From 474d3ab563d1bef6f3f1fa0e897397344ba82cde Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 08:50:45 -0800
Subject: [PATCH 098/261] added doubango ebuild

---
 net-misc/doubango/Manifest                  |  2 +
 net-misc/doubango/doubango-2.0.0.ebuild     | 51 +++++++++++++++++++++
 net-misc/webrtc2sip/Manifest                |  4 +-
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 21 ---------
 4 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100644 net-misc/doubango/Manifest
 create mode 100644 net-misc/doubango/doubango-2.0.0.ebuild

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
new file mode 100644
index 0000000..16bd9d0
--- /dev/null
+++ b/net-misc/doubango/Manifest
@@ -0,0 +1,2 @@
+DIST doubango-2.0.0.tar.gz 540813569 SHA256 0671f6cb77b818c78ae04b4753800d257707123480bc0ea4d8715a2ffd3a7254 SHA512 7c83eef155a707ab9acf0347dbdb6829e4fddceddf8eb5e945858825cc0e119b4aa6cb7f0b928559ca0b2a305d94ace9301167770e5d0c99deff36a782e195bd WHIRLPOOL 378542a1bbad72243579acaffbc6401bfd30b5f0930b3056f22a009f7a01be98729e7d7cb7a0b7446f49be980dd4b0ca3b591adffd3c49e01489cd9fa68562a5
+EBUILD doubango-2.0.0.ebuild 993 SHA256 c064360ad94588d44b657fa41bdedd43df76ead007b37fc50391d492b7b478e5 SHA512 626f526355c87392f3937d75b61390df1c206ccadaa45b2562cbf58401333b158c46a63a5203b05fd90dfc8856422d5ddda60e0cb078c1ec33bb86caf06f8870 WHIRLPOOL 94f88e76a58d2d2eadf7e3456e9b9cf828dbce2656238f13259bb67b9b3227483364f707605f1aeec53c70b29b21706eeb2e6aef0c1f2c7b77e4d01e0720f6a8
diff --git a/net-misc/doubango/doubango-2.0.0.ebuild b/net-misc/doubango/doubango-2.0.0.ebuild
new file mode 100644
index 0000000..8118c77
--- /dev/null
+++ b/net-misc/doubango/doubango-2.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Doubango: Doubango Telecom Libraries"
+HOMEPAGE="http://www.doubango.org/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/doubango/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
+
+S="${WORKDIR}/doubango"
+
+src_prepare() {
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+	export LDFLAGS="-ldl"
+
+	econf \
+		-with-srtp=/usr/include/srtp/ \
+		-with-ssl=/usr/include/openssl
+
+}
+
+src_compile() {
+	export LDFLAGS="-ldl"
+
+	emake
+}
+
+src_install() {
+	export LDFLAGS="-ldl"
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+}
+
diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 2e93edd..b9a25e9 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
-DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 7efea6d00814f8e144e77ce0f2386c61b5fe89cba118a12410392b3b225f0015 SHA512 0768d4a0b7f90e10d716ec76b7b23b9fbd21ee417affe59f671c25ec9ea626821d12ce1284fab0839c9b7dfd456e0cd96cda443ba984986ebb86d2c3aafa441b WHIRLPOOL 7dd10e18f871ef5ceed26ebd7ecd5b70bfe1f49d04cc6274b9b849437b7f329c099df093527c120e47c41cc103e9c678f00c43a8913a3494b9530fa0e609b424
-EBUILD webrtc2sip-2.0.0.ebuild 1760 SHA256 7b17a1b249a691fcf2162bce58895cb7b28bdf656d7b0bb95fdb009db61cb2c0 SHA512 8fa6f66329ccbcddd4e7e4e1cdfe74ec97b2d5d1710f76bd215926a7fb4d63e23b42e88062fd62b9fba4824144f265669cb18b6fd8d6267b996d6c26e58de6a2 WHIRLPOOL 095aaaf88c216dc64ea1fa66bbd99993d062ed82da59c8eb07c52b76ffb2b0c0966f16d7419723a38de803c3deda5458318f198209528e7a5fa84c7dc47a1882
+DIST webrtc2sip-2.0.0.tar.gz 10258486 SHA256 76cbb213e2bf93f600c02995acfea6d4ab820ca1b4a71f465b43626daccd49bb SHA512 b53c8186417d458e2d860ff06f1d48fee2ff8b4f66786cb10fc2f90b8f034eba2e4747e0d688504103a5cf173b1bb19501d28153d03f0aa7d8705c689abd04d7 WHIRLPOOL 5eff2a8e3a4372f67befcd416fc7d1fd2657ffe10ea0a66b251f8d14cdd5054551859dd8eb7cd8ac60a3a1fa1cf13f482533ee71e12c7067fe526774b8cffc27
+EBUILD webrtc2sip-2.0.0.ebuild 1185 SHA256 9dadb16906f5edf8dd7fa03ebd2c9d40ec17036940c63a507b9b817830e55277 SHA512 dba8e4d36b1c64f732d58c2066aafcbcfe2592047c2fc7c02859c0eabebd4895f8cc60d21bcf3e9d741dcf83368aed1d300110f7d9aa00fbb270565c8c7052d9 WHIRLPOOL b6dea829bedcecfc3a7431f03bb0b25f2169e2064bc5384239a29b5a2716066f4948e25759b1463a1e6061996ceb796b93d89a6cdf81b24d82b0916e022053cb
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index b998c7a..29b5beb 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -20,7 +20,6 @@ CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
 S="${WORKDIR}/webrtc2sip"
 
 src_prepare() {
-#	export LDFLAGS="-ldl -lpthread"
         ./autogen.sh || die "Autogen script failed"
 }
 
@@ -54,23 +53,3 @@ src_install() {
 
 }
 
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-

From a8017a6b60e4e483c71aea9898b082682cbdef66 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 10:40:42 -0800
Subject: [PATCH 099/261] fixed both ebuild all done for webrtc2sip

---
 net-misc/doubango/Manifest                  |  4 ++--
 net-misc/doubango/doubango-2.0.0.ebuild     | 17 +++++++++++++++--
 net-misc/webrtc2sip/Manifest                |  2 +-
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild |  3 ++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
index 16bd9d0..9acadcc 100644
--- a/net-misc/doubango/Manifest
+++ b/net-misc/doubango/Manifest
@@ -1,2 +1,2 @@
-DIST doubango-2.0.0.tar.gz 540813569 SHA256 0671f6cb77b818c78ae04b4753800d257707123480bc0ea4d8715a2ffd3a7254 SHA512 7c83eef155a707ab9acf0347dbdb6829e4fddceddf8eb5e945858825cc0e119b4aa6cb7f0b928559ca0b2a305d94ace9301167770e5d0c99deff36a782e195bd WHIRLPOOL 378542a1bbad72243579acaffbc6401bfd30b5f0930b3056f22a009f7a01be98729e7d7cb7a0b7446f49be980dd4b0ca3b591adffd3c49e01489cd9fa68562a5
-EBUILD doubango-2.0.0.ebuild 993 SHA256 c064360ad94588d44b657fa41bdedd43df76ead007b37fc50391d492b7b478e5 SHA512 626f526355c87392f3937d75b61390df1c206ccadaa45b2562cbf58401333b158c46a63a5203b05fd90dfc8856422d5ddda60e0cb078c1ec33bb86caf06f8870 WHIRLPOOL 94f88e76a58d2d2eadf7e3456e9b9cf828dbce2656238f13259bb67b9b3227483364f707605f1aeec53c70b29b21706eeb2e6aef0c1f2c7b77e4d01e0720f6a8
+DIST doubango-2.0.0.tar.gz 540812106 SHA256 d4f6284719e8f98f2366cb5a3cbd75d08ad9b5c77906c27b4e939a03db1cbcd0 SHA512 f954e9abd0f0acaed23910cff09f09907e583396312dd57125a7ec1764bc5ed8dc1df65bdb784fbff1906af265335a94b977413d1304dee29e3e359f5d7abd5a WHIRLPOOL 0637a1a98565a8582a77ff63bd99847cb2b4dfc11334efb719eea2afd96995c2ae396f70039169c0270c4439f0f9e5d4502c347a02bc4bdf74d8d1edf499e312
+EBUILD doubango-2.0.0.ebuild 1216 SHA256 80e024875f7b1272a18c89b2ff84ec015f1295f38521dea6ed883b9e9099bfea SHA512 2ce31aa80b79284a26f6cf49c3e5b83c8eaac2a85b03d6935538a3fca321a784919652b812df52c2a6e45bbed0f17b9e2bb90ebdcda4e2d28b9b1ade953ff7d2 WHIRLPOOL 05cb1a26efa16f194d4626a004385a6f82eb1673e4d02e07fe0a303d62552a3a651e95985f7789291985af45ffdfd460f7b084608768fe95026d6647511a2f1d
diff --git a/net-misc/doubango/doubango-2.0.0.ebuild b/net-misc/doubango/doubango-2.0.0.ebuild
index 8118c77..509da70 100644
--- a/net-misc/doubango/doubango-2.0.0.ebuild
+++ b/net-misc/doubango/doubango-2.0.0.ebuild
@@ -20,6 +20,10 @@ CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
 S="${WORKDIR}/doubango"
 
 src_prepare() {
+        sed -i Makefile.am \
+                -e 's/\<ldconfig\>//g' \
+                || die "sed Makefile.am"
+
         ./autogen.sh || die "Autogen script failed"
 }
 
@@ -44,8 +48,17 @@ src_compile() {
 src_install() {
 	export LDFLAGS="-ldl"
 
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" installdirs || die "failed" 
+	emake DESTDIR="${D}" install || die "failed" 
 
 }
 
+
+
+pkg_postinst() {
+        is_crosscompile && return 0
+
+        ldconfig
+}
+
+
diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index b9a25e9..1d1abf5 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
 DIST webrtc2sip-2.0.0.tar.gz 10258486 SHA256 76cbb213e2bf93f600c02995acfea6d4ab820ca1b4a71f465b43626daccd49bb SHA512 b53c8186417d458e2d860ff06f1d48fee2ff8b4f66786cb10fc2f90b8f034eba2e4747e0d688504103a5cf173b1bb19501d28153d03f0aa7d8705c689abd04d7 WHIRLPOOL 5eff2a8e3a4372f67befcd416fc7d1fd2657ffe10ea0a66b251f8d14cdd5054551859dd8eb7cd8ac60a3a1fa1cf13f482533ee71e12c7067fe526774b8cffc27
-EBUILD webrtc2sip-2.0.0.ebuild 1185 SHA256 9dadb16906f5edf8dd7fa03ebd2c9d40ec17036940c63a507b9b817830e55277 SHA512 dba8e4d36b1c64f732d58c2066aafcbcfe2592047c2fc7c02859c0eabebd4895f8cc60d21bcf3e9d741dcf83368aed1d300110f7d9aa00fbb270565c8c7052d9 WHIRLPOOL b6dea829bedcecfc3a7431f03bb0b25f2169e2064bc5384239a29b5a2716066f4948e25759b1463a1e6061996ceb796b93d89a6cdf81b24d82b0916e022053cb
+EBUILD webrtc2sip-2.0.0.ebuild 1225 SHA256 5854f408ccfeae2d85abac26c0d819c438b86d5d0936689d9524e348bf8deed1 SHA512 094e10f1ae8f95a316cf19f53946280ab1b5012e0ef8249b0f2b2d5e3a9e1c3c1102466af4713c39d055488eb67196cfe3496ff8a5ece5d02663dfc8562c5666 WHIRLPOOL 547b2d87df968c3f2f60b7ef99d589dee296d356df99da7442ba8dae4cdf7ff4e2d2c804e3ce27a6f25061e2d064fcd393e199c9f68ed1c654af3e518a112a5d
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 29b5beb..596ea6e 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -15,7 +15,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
+CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )
+doubango? ( >=net-misc/doubango-2.0.0 )"
 
 S="${WORKDIR}/webrtc2sip"
 

From d2cf1a685708b3e6a29cc97b47aa01c8f67171d6 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 10:45:42 -0800
Subject: [PATCH 100/261] updated manifest

---
 net-misc/webrtc2sip/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 1d1abf5..8ae8cc8 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
-DIST webrtc2sip-2.0.0.tar.gz 10258486 SHA256 76cbb213e2bf93f600c02995acfea6d4ab820ca1b4a71f465b43626daccd49bb SHA512 b53c8186417d458e2d860ff06f1d48fee2ff8b4f66786cb10fc2f90b8f034eba2e4747e0d688504103a5cf173b1bb19501d28153d03f0aa7d8705c689abd04d7 WHIRLPOOL 5eff2a8e3a4372f67befcd416fc7d1fd2657ffe10ea0a66b251f8d14cdd5054551859dd8eb7cd8ac60a3a1fa1cf13f482533ee71e12c7067fe526774b8cffc27
+DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
 EBUILD webrtc2sip-2.0.0.ebuild 1225 SHA256 5854f408ccfeae2d85abac26c0d819c438b86d5d0936689d9524e348bf8deed1 SHA512 094e10f1ae8f95a316cf19f53946280ab1b5012e0ef8249b0f2b2d5e3a9e1c3c1102466af4713c39d055488eb67196cfe3496ff8a5ece5d02663dfc8562c5666 WHIRLPOOL 547b2d87df968c3f2f60b7ef99d589dee296d356df99da7442ba8dae4cdf7ff4e2d2c804e3ce27a6f25061e2d064fcd393e199c9f68ed1c654af3e518a112a5d

From a8a5de874374544b3c35232480966b735ea96ff4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 10:50:34 -0800
Subject: [PATCH 101/261] updated manifest

---
 net-misc/webrtc2sip/Manifest                | 2 +-
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 8ae8cc8..f599cdd 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1225 SHA256 5854f408ccfeae2d85abac26c0d819c438b86d5d0936689d9524e348bf8deed1 SHA512 094e10f1ae8f95a316cf19f53946280ab1b5012e0ef8249b0f2b2d5e3a9e1c3c1102466af4713c39d055488eb67196cfe3496ff8a5ece5d02663dfc8562c5666 WHIRLPOOL 547b2d87df968c3f2f60b7ef99d589dee296d356df99da7442ba8dae4cdf7ff4e2d2c804e3ce27a6f25061e2d064fcd393e199c9f68ed1c654af3e518a112a5d
+EBUILD webrtc2sip-2.0.0.ebuild 1200 SHA256 2fab1f50cdc467ee83050cbaab9ffd3bedba5b8f5521e5134313d5c7a29fcd12 SHA512 dc5d98f902fbac2f4c5d661e7582add5c89f2fdb3a3478e74b882c3811b09cda812df9513c2ad32028bdd4ff6512160b68187fa17ec7deefddb33cd046bb1885 WHIRLPOOL 8a6e1ee27752eea3029e581bb4d9a2cdff828f60a5d3eb5e8cefadcaf609fd772eba083280df82d5e3126d60bd27ea28afaf652696a38d1a4385c0028b0445ef
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 596ea6e..ebcea46 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -15,8 +15,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )
-doubango? ( >=net-misc/doubango-2.0.0 )"
+DEPEND=" >=net-libs/libsrtp-1.5.2-r1
+	 >=net-misc/doubango-2.0.0"
 
 S="${WORKDIR}/webrtc2sip"
 

From 666fd73766568cbfb718c21591550ddcc7ee4002 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 10:51:47 -0800
Subject: [PATCH 102/261] updated manifest

---
 net-misc/doubango/Manifest              | 2 +-
 net-misc/doubango/doubango-2.0.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
index 9acadcc..c01ec61 100644
--- a/net-misc/doubango/Manifest
+++ b/net-misc/doubango/Manifest
@@ -1,2 +1,2 @@
 DIST doubango-2.0.0.tar.gz 540812106 SHA256 d4f6284719e8f98f2366cb5a3cbd75d08ad9b5c77906c27b4e939a03db1cbcd0 SHA512 f954e9abd0f0acaed23910cff09f09907e583396312dd57125a7ec1764bc5ed8dc1df65bdb784fbff1906af265335a94b977413d1304dee29e3e359f5d7abd5a WHIRLPOOL 0637a1a98565a8582a77ff63bd99847cb2b4dfc11334efb719eea2afd96995c2ae396f70039169c0270c4439f0f9e5d4502c347a02bc4bdf74d8d1edf499e312
-EBUILD doubango-2.0.0.ebuild 1216 SHA256 80e024875f7b1272a18c89b2ff84ec015f1295f38521dea6ed883b9e9099bfea SHA512 2ce31aa80b79284a26f6cf49c3e5b83c8eaac2a85b03d6935538a3fca321a784919652b812df52c2a6e45bbed0f17b9e2bb90ebdcda4e2d28b9b1ade953ff7d2 WHIRLPOOL 05cb1a26efa16f194d4626a004385a6f82eb1673e4d02e07fe0a303d62552a3a651e95985f7789291985af45ffdfd460f7b084608768fe95026d6647511a2f1d
+EBUILD doubango-2.0.0.ebuild 1202 SHA256 ce336406ce854a0fe9fe166374f1b4f046ce06d5b299d307ec55fe1c3e7a9e4b SHA512 ed371def018e078223fc2a8647dd12f07016f38af311f0567c8df4d6d13c72dc35e2bcfc67363f1569fe4194c816d964cf54fc8ccf99f6741301d530199c5dac WHIRLPOOL ff3976129cc402654b87dd060fdab1c396e7e73234cb02c1f1d8b33ca27437018d5d511c8049d9fff4bea6813e40144cd6466b45240f08e35a4db5d91a1df7e1
diff --git a/net-misc/doubango/doubango-2.0.0.ebuild b/net-misc/doubango/doubango-2.0.0.ebuild
index 509da70..6ffdce0 100644
--- a/net-misc/doubango/doubango-2.0.0.ebuild
+++ b/net-misc/doubango/doubango-2.0.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-CDEPEND="libsrtp? ( >=net-libs/libsrtp-1.5.2-r1 )"
+DEPEND=">=net-libs/libsrtp-1.5.2-r1"
 
 S="${WORKDIR}/doubango"
 

From 56ee7d9720caf635a0fedf88c89ac82aae576640 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 11:07:26 -0800
Subject: [PATCH 103/261] updated manifest

---
 net-misc/webrtc2sip/Manifest                | 2 +-
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index f599cdd..12f1be0 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1200 SHA256 2fab1f50cdc467ee83050cbaab9ffd3bedba5b8f5521e5134313d5c7a29fcd12 SHA512 dc5d98f902fbac2f4c5d661e7582add5c89f2fdb3a3478e74b882c3811b09cda812df9513c2ad32028bdd4ff6512160b68187fa17ec7deefddb33cd046bb1885 WHIRLPOOL 8a6e1ee27752eea3029e581bb4d9a2cdff828f60a5d3eb5e8cefadcaf609fd772eba083280df82d5e3126d60bd27ea28afaf652696a38d1a4385c0028b0445ef
+EBUILD webrtc2sip-2.0.0.ebuild 1179 SHA256 7139b7acea131e0339099e82516a94b4be7c82e5082422f1cc9ffe6e290a2455 SHA512 bf3ab0a633ba9256dc283b64e92d73e4956f29afb538f6641767a859ed1c51c170eddbc3448e6937f5d0f493e75d47c97513b427ff42eacc6a553fcb9fc34d3c WHIRLPOOL 1f84e861082e0379b539ea5bfec2939d0d53b2bcc0eeec71152368a7dbd7c146005432b0d4f34c1faa9396022bcf273937362d60830fee39e8ecd8b1b4c89cca
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index ebcea46..fd88e9c 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -38,16 +38,16 @@ src_configure() {
 
 src_compile() {
 	export LDFLAGS="-ldl -lpthread"
-	export PREFIX="/opt/webrtc2sip"
+	export PREFIX="/usr"
 
 	emake -ldl -lpthread \
-		PREFIX="/opt/webrtc2sip"
+		PREFIX="/usr"
 }
 
 src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
-	mkdir -p "${D}/opt/webrtc2sip"
+	#mkdir -p "${D}/opt/webrtc2sip"
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install

From 00f8dd08df03db95969e8d40547e66c71c0c1b30 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 11:14:51 -0800
Subject: [PATCH 104/261] updated manifest

---
 net-misc/webrtc2sip/Manifest                | 2 +-
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 12f1be0..00ad0bd 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,2 @@
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1179 SHA256 7139b7acea131e0339099e82516a94b4be7c82e5082422f1cc9ffe6e290a2455 SHA512 bf3ab0a633ba9256dc283b64e92d73e4956f29afb538f6641767a859ed1c51c170eddbc3448e6937f5d0f493e75d47c97513b427ff42eacc6a553fcb9fc34d3c WHIRLPOOL 1f84e861082e0379b539ea5bfec2939d0d53b2bcc0eeec71152368a7dbd7c146005432b0d4f34c1faa9396022bcf273937362d60830fee39e8ecd8b1b4c89cca
+EBUILD webrtc2sip-2.0.0.ebuild 1134 SHA256 ae2106ee43f0b044a9fcda1760df3a600c47f725cbaeb438fe321db2e8278353 SHA512 3043763d9faaa48fd5cba1aac17d71be2a7d2a4ef16fc8a18a9d111d4e8330012521c032c4be87da87887ff6acaa3a178c9bc8134629abddeb60eca5fb8571c1 WHIRLPOOL c8b82f74b1568bab67dec969f5964d59d1b0839c8d64c35d70842529a1981328bc1ee68ead673b955f534ab395fe7b8b828ad053e48caa3244b6fe07bb353840
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index fd88e9c..90a47b4 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -32,7 +32,7 @@ src_configure() {
 	export CFLAGS="-lpthread"
 
 	econf \
-		-prefix=/opt/webrtc2sip \
+		-prefix=/usr \
 		-with-doubango=/usr/local
 }
 
@@ -47,8 +47,6 @@ src_compile() {
 src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
-	#mkdir -p "${D}/opt/webrtc2sip"
-
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install
 

From 8e4974178c977aa60a5a9dc1accda90f88991015 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 18:12:55 -0800
Subject: [PATCH 105/261] add more package files

---
 net-misc/webrtc2sip/Manifest                  |   5 +-
 net-misc/webrtc2sip/files/index.php           |  17 ++
 net-misc/webrtc2sip/files/webrtc2sip-x.xml    |  37 ++++
 net-misc/webrtc2sip/files/webrtc2sip.instance | 184 ++++++++++++++++++
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild   |  10 +-
 5 files changed, 251 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/webrtc2sip/files/index.php
 create mode 100644 net-misc/webrtc2sip/files/webrtc2sip-x.xml
 create mode 100755 net-misc/webrtc2sip/files/webrtc2sip.instance

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 00ad0bd..32cd979 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,2 +1,5 @@
+AUX index.php 542 SHA256 641e913cb88bb322ba0171aadfa341edab04e4de0b0322434feb27daefaca82e SHA512 d7ee84897f1d94e67c832802350152ce85ab890ae4f4391da9a69e30000aca55311a29230f1ee3059e4aac9b61ec6e20444d87f0be07c0ab907a755797a2dbac WHIRLPOOL 017ffbc20d07b81bcb679dabf02e116bee126c4afb51ac9d733dc3425404aa81c786fc50ef1d7c527a9b47219bcd591e3cc1186ae6db9859a1ddda2e285fe229
+AUX webrtc2sip-X.xml 993 SHA256 4af165c2ea46547118790294b73b7de6ee94ee888e86a0f61efa6749c0dcc2b3 SHA512 c5e8f4940cb8f1f8c0204ed892aa558d251d6be62585f3586568a39169245f90dc4b1147125448c832864ecd36e8c14cf4c9a248de37a73a773acb7ac9acf6a1 WHIRLPOOL dd21e80354f5aaadaec4e2c1de4cd3e0c44c9e97dc851a91679ff2ec0176987cf7277fd78870ade5421b78600085ec7d1d8ff02a7232aafbb42805858128a336
+AUX webrtc2sip.instance 4326 SHA256 80a52a2887a03ea29a281a1673a76943ad1b885bc22febd790d983d95d307f1b SHA512 88fa608f353dd6082e3e98138ee5bf235f3a5783f16654d23da5543a855ec59655b198b2314ab198812e859fb913cc91b07adc35d5dca5f837cbec5fcaa90735 WHIRLPOOL e1665c01ce79c9b54f778d58328cbc029f388ea99029cb5853c51c654f3ea26e0d6803f62b8d0221cf4439eb6c2faad24e885bc69c8ba9c9040d2cc78410ca2c
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1134 SHA256 ae2106ee43f0b044a9fcda1760df3a600c47f725cbaeb438fe321db2e8278353 SHA512 3043763d9faaa48fd5cba1aac17d71be2a7d2a4ef16fc8a18a9d111d4e8330012521c032c4be87da87887ff6acaa3a178c9bc8134629abddeb60eca5fb8571c1 WHIRLPOOL c8b82f74b1568bab67dec969f5964d59d1b0839c8d64c35d70842529a1981328bc1ee68ead673b955f534ab395fe7b8b828ad053e48caa3244b6fe07bb353840
+EBUILD webrtc2sip-2.0.0.ebuild 1367 SHA256 554c8b988779e4ef036d1d23e71c19ffa2d4308b108dae794197c6d433f40e60 SHA512 e58ca87364fbb772747b1cf147de617220a35bce2e5fd2d7f8ef615369bf8765d00fc9b4493d2b3ac49ecb4c474ebece55125d4356c5157036b011f31e019684 WHIRLPOOL 620e34bf20cb05b0f2d62385e25de9f874a6a4a8462cb55438902c00dc7350342403528799cf3efbd182dba486218a4cb9fbba8cb4ee42ede7bf49f471a72f9c
diff --git a/net-misc/webrtc2sip/files/index.php b/net-misc/webrtc2sip/files/index.php
new file mode 100644
index 0000000..d7c25e6
--- /dev/null
+++ b/net-misc/webrtc2sip/files/index.php
@@ -0,0 +1,17 @@
+<?php
+// this will get a count of the number of time waits, or close waits, and report down if they are too high
+$timeMax = 10;
+$closeMax = 10;
+$ip = "x.x.x.x";
+
+// is service running
+$listening = shell_exec("netstat -lnp|grep $ip|grep 10062|wc -l");
+
+$timeWait = shell_exec("netstat -n |grep $ip|grep 10062|grep TIME_WAIT| wc -l");
+$closeWait = shell_exec("netstat -n |grep $ip|grep 10062|grep CLOSE_WAIT| wc -l");
+
+if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
+        echo "down";
+} else {
+        echo "up";
+}
diff --git a/net-misc/webrtc2sip/files/webrtc2sip-x.xml b/net-misc/webrtc2sip/files/webrtc2sip-x.xml
new file mode 100644
index 0000000..4020823
--- /dev/null
+++ b/net-misc/webrtc2sip/files/webrtc2sip-x.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Please check the technical guide (http://webrtc2sip.org/technical-guide-1.0.pdf) for more information on how to adjust this file -->
+<config>
+
+<debug-level>ERROR</debug-level>
+
+<transport>udp;x.x.x.x;10060</transport>
+<transport>wss;x.x.x.x;10062</transport>
+
+<enable-rtp-symetric>yes</enable-rtp-symetric>
+<enable-100rel>no</enable-100rel>
+<enable-media-coder>yes</enable-media-coder>
+<enable-videojb>yes</enable-videojb>
+<video-size-pref>vga</video-size-pref>
+<rtp-buffsize>65535</rtp-buffsize>
+<avpf-tail-length>100;400</avpf-tail-length>
+<srtp-mode>optional</srtp-mode>
+<srtp-type>dtls</srtp-type>
+<dtmf-type>rfc4733</dtmf-type>
+
+<codecs>pcmu</codecs>
+
+<stun-server>stun.l.google.com;19302;stun-user@doubango.org;stun-password</stun-server>
+<enable-icestun>yes</enable-icestun>
+
+<max-fds>-1</max-fds>
+
+<nameserver>8.8.8.8</nameserver>
+
+<ssl-certificates>
+/etc/ssl/safesoft.io.key;
+/etc/ssl/safesoft.io.crt;
+*;
+no
+</ssl-certificates>
+
+</config>
diff --git a/net-misc/webrtc2sip/files/webrtc2sip.instance b/net-misc/webrtc2sip/files/webrtc2sip.instance
new file mode 100755
index 0000000..1fc6ff7
--- /dev/null
+++ b/net-misc/webrtc2sip/files/webrtc2sip.instance
@@ -0,0 +1,184 @@
+#!/bin/bash
+#
+# Init file for Webrtc2sip
+#
+# run levels: 2-5, start priority 95, stop priority 5
+#
+# chkconfig: 2345 95 5
+# description: Doubango webrtc2sip startup
+#
+# pidfile: /var/run/netborder-call-analyzer-service.pid
+# pidfile: /var/run/netborder-call-analyzer-engine.pid
+
+# source function library
+#. /etc/rc.d/init.d/functions
+
+
+SVCNAME=`basename "$0"` 
+INSTANCENUMBER=${SVCNAME##*.}
+
+INSTANCE=sangoma.$INSTANCENUMBER
+INSTDIR=/opt/$INSTANCE/nbca
+
+#add our /lib to .so search path
+export LD_LIBRARY_PATH=$INSTDIR/lib:$LD_LIBRARY_PATH
+
+NCA_COMMON_OPTIONS="--start-service --putenv PARAXIP=$INSTDIR --putenv PARAXIP_BINDIR=$INSTDIR/bin --putenv PARAXIP_BRAND=netborder --putenv PARAXIP_INSTALLDIR=$INSTDIR --putenv PARAXIP_PLATFORM=x86_64-linux"
+
+# main service ("SIP hub")
+NCA_MAIN_SERVICE_NAME=netborder-call-analyzer-service
+NCA_MAIN_SERVICE_FULL_PATH=$INSTDIR/bin/$NCA_MAIN_SERVICE_NAME
+
+NCA_MAIN_SERVICE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-logging.properties --global-config $INSTDIR/config/call-analyzer-service.properties"
+  
+# engine process
+NCA_ENGINE_NAME=netborder-call-analyzer-engine
+NCA_ENGINE_FULL_PATH=$INSTDIR/bin/$NCA_ENGINE_NAME
+
+export LOGNAME=$NCA_ENGINE_NAME
+
+NCA_ENGINE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-engine-logging.properties --global-config $INSTDIR/config/call-analyzer-engine.properties"
+
+# Sets process priority to 'Realtime' (Highest priority available)
+# use as prefix before lauching the application
+PRIO_RT="chrt -r 99"
+
+RETVAL=0
+
+
+# arg 1: service process name
+# arg 2: cmd-line to launch service
+start()
+{
+
+
+
+  echo "Starting " 
+
+  nca_service_pid=`pidof $INSTDIR/bin/$1`
+  if [ ! -z "$nca_service_pid" ]
+  then
+    echo "Service $1 is already started"
+    #failure
+    exit 1
+  fi
+
+  # Check if effective user ID is superuser (bug 4523)
+  if [ "$EUID" != 0 ]; then
+    echo -n "Service must be started by user with root privileges"
+    #failure
+    exit 1
+  fi
+
+  echo -n $"Starting $1"
+  
+  # Setting wd to the installtion dir (some paths in config files are relative to it)
+  cd ${INSTDIR}
+  # arg 2 is cmd-line to launch service
+  $2 &> ${INSTDIR}/logs/stderr/$1.log
+
+  RETVAL=$?
+  [ "$RETVAL" = 0 ] && touch /var/lock/$1.$INSTANCE
+
+  # Only end the routine if we stop seeing the process (failure) or the pid file
+  # is created (success). If the pid file is never created by the app this script will
+  # hang forever (or more likely until the user stops us)
+  while true
+  do
+    nca_service_pid=`pidof $INSTDIR/bin/$1`
+    if [ -z "$nca_service_pid" ]
+    then
+      rm -f /var/lock/$1.$INSTANCE
+      #failure
+      echo
+      echo "failure"
+      exit 1
+    fi
+
+    #if [ -f /var/run/$1$INSTANCE.pid ]
+    if [ ! -z "$nca_service_pid" ]
+    then
+      #success
+      echo
+      echo  "success"
+      break
+    fi
+    sleep 0.5
+  done
+}
+
+# arg 1: service name
+stop()
+{
+
+echo "pidof $INSTDIR/bin/$1"
+  nca_service_pid=`pidof $INSTDIR/bin/$1`
+  if [ -z "$nca_service_pid" ]
+  then
+    echo -n "Service $1 is not started"
+    #failure
+    echo 
+    exit 1
+  fi
+
+  # Check if effective user ID is superuser (bug 4523)
+  if [ "$EUID" != 0 ]; then
+    echo -n "Service must be stopped by user with root privileges"
+    #failure
+    echo
+    exit 1
+  fi
+
+  echo -n $"Stopping $1"
+
+  # -15 is TERM
+  kill -15 $nca_service_pid
+  # Only end the routine if we stop seeing the process or the pid file
+  # is deleted. If the pid file is never deleted by the app this script will
+  # hang forever (or more likely until the user stops us)
+  while true
+  do
+    nca_service_pid=`pidof $INSTDIR/bin/$1`
+    if [ -z "$nca_service_pid" ]
+    then
+      #success
+      break
+    fi
+#    if [ ! -f /var/run/$1$INSTANCE.pid ]
+    if [ ! -z "$nca_service_pid" ]
+    then
+      #success
+      break
+    fi
+   sleep 0.5
+  done
+  RETVAL=$?
+  [ "$RETVAL" = 0 ] && rm -f /var/lock/$1.$INSTANCE
+  echo 
+}
+
+case "$1" in
+
+	start)
+		start $NCA_MAIN_SERVICE_NAME "$NCA_MAIN_SERVICE_FULL_PATH $NCA_MAIN_SERVICE_OPTIONS"
+		start $NCA_ENGINE_NAME "$PRIO_RT $NCA_ENGINE_FULL_PATH $NCA_ENGINE_OPTIONS"
+		;;
+
+	stop)
+		stop $NCA_MAIN_SERVICE_NAME
+		stop $NCA_ENGINE_NAME
+		;;
+
+	status)
+		status $NCA_MAIN_SERVICE_NAME
+		status $NCA_ENGINE_NAME
+		RETVAL=$?
+		;;
+
+	*)
+		echo $"Usage: $0 {start|stop|status}"
+		RETVAL=1
+
+esac
+exit $RETVAL
+
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 90a47b4..0e054e5 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 DEPEND=" >=net-libs/libsrtp-1.5.2-r1
-	 >=net-misc/doubango-2.0.0"
+	 >=net-misc/doubango-2.0.0
+	app-misc/screen"
 
 S="${WORKDIR}/webrtc2sip"
 
@@ -47,6 +48,13 @@ src_compile() {
 src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
+        keepdir /etc/webrtc2sip
+        keepdir /etc/webrtc2sip/www
+        keepdir /etc/webrtc2sip/www/x
+
+	cp "${FILESDIR}"/webrtc2sip-x.xml /etc/webrtc2sip
+	cp "${FILESDIR}"/webrtc2sip-x.xml /etc/webrtc2sip/www/x
+
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install
 

From 5eb167857d66c34234e6dcdd5bac8a2c9ee32c19 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 4 Nov 2015 23:31:28 -0800
Subject: [PATCH 106/261] cool stuff multi instance baby

---
 net-misc/webrtc2sip/Manifest                  |   4 +-
 net-misc/webrtc2sip/files/index.php           |  12 +-
 net-misc/webrtc2sip/files/w2s                 | 169 ++++++++++++++++
 net-misc/webrtc2sip/files/webrtc2sip-x.xml    |  37 ----
 net-misc/webrtc2sip/files/webrtc2sip.instance | 184 ------------------
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild   |   9 +-
 6 files changed, 183 insertions(+), 232 deletions(-)
 create mode 100755 net-misc/webrtc2sip/files/w2s
 delete mode 100644 net-misc/webrtc2sip/files/webrtc2sip-x.xml
 delete mode 100755 net-misc/webrtc2sip/files/webrtc2sip.instance

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 32cd979..28cba32 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,5 +1,5 @@
 AUX index.php 542 SHA256 641e913cb88bb322ba0171aadfa341edab04e4de0b0322434feb27daefaca82e SHA512 d7ee84897f1d94e67c832802350152ce85ab890ae4f4391da9a69e30000aca55311a29230f1ee3059e4aac9b61ec6e20444d87f0be07c0ab907a755797a2dbac WHIRLPOOL 017ffbc20d07b81bcb679dabf02e116bee126c4afb51ac9d733dc3425404aa81c786fc50ef1d7c527a9b47219bcd591e3cc1186ae6db9859a1ddda2e285fe229
-AUX webrtc2sip-X.xml 993 SHA256 4af165c2ea46547118790294b73b7de6ee94ee888e86a0f61efa6749c0dcc2b3 SHA512 c5e8f4940cb8f1f8c0204ed892aa558d251d6be62585f3586568a39169245f90dc4b1147125448c832864ecd36e8c14cf4c9a248de37a73a773acb7ac9acf6a1 WHIRLPOOL dd21e80354f5aaadaec4e2c1de4cd3e0c44c9e97dc851a91679ff2ec0176987cf7277fd78870ade5421b78600085ec7d1d8ff02a7232aafbb42805858128a336
+AUX webrtc2sip-x.xml 993 SHA256 4af165c2ea46547118790294b73b7de6ee94ee888e86a0f61efa6749c0dcc2b3 SHA512 c5e8f4940cb8f1f8c0204ed892aa558d251d6be62585f3586568a39169245f90dc4b1147125448c832864ecd36e8c14cf4c9a248de37a73a773acb7ac9acf6a1 WHIRLPOOL dd21e80354f5aaadaec4e2c1de4cd3e0c44c9e97dc851a91679ff2ec0176987cf7277fd78870ade5421b78600085ec7d1d8ff02a7232aafbb42805858128a336
 AUX webrtc2sip.instance 4326 SHA256 80a52a2887a03ea29a281a1673a76943ad1b885bc22febd790d983d95d307f1b SHA512 88fa608f353dd6082e3e98138ee5bf235f3a5783f16654d23da5543a855ec59655b198b2314ab198812e859fb913cc91b07adc35d5dca5f837cbec5fcaa90735 WHIRLPOOL e1665c01ce79c9b54f778d58328cbc029f388ea99029cb5853c51c654f3ea26e0d6803f62b8d0221cf4439eb6c2faad24e885bc69c8ba9c9040d2cc78410ca2c
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1367 SHA256 554c8b988779e4ef036d1d23e71c19ffa2d4308b108dae794197c6d433f40e60 SHA512 e58ca87364fbb772747b1cf147de617220a35bce2e5fd2d7f8ef615369bf8765d00fc9b4493d2b3ac49ecb4c474ebece55125d4356c5157036b011f31e019684 WHIRLPOOL 620e34bf20cb05b0f2d62385e25de9f874a6a4a8462cb55438902c00dc7350342403528799cf3efbd182dba486218a4cb9fbba8cb4ee42ede7bf49f471a72f9c
+EBUILD webrtc2sip-2.0.0.ebuild 1400 SHA256 78bfdf548846a690fe5509dd4d8402735d77caf3c60c872eac6f483c79179a08 SHA512 6dc63017a2e6c0fa6afa177dc9337aad6a37676f42a2521f0192968478a0e3a157b16f4269b3249f3f0089e9442b4da95d76af0765554ba763480396886526e3 WHIRLPOOL 25a7bc4e05dbe8ef7d60e49b18fe964a32d8deb76110e29b149134af10a3b261af17d3b45b6756dad14aea10a7023707782f0e10d2b23ddb6347fa4a4aa5c357
diff --git a/net-misc/webrtc2sip/files/index.php b/net-misc/webrtc2sip/files/index.php
index d7c25e6..58abd10 100644
--- a/net-misc/webrtc2sip/files/index.php
+++ b/net-misc/webrtc2sip/files/index.php
@@ -1,17 +1,21 @@
+
 <?php
 // this will get a count of the number of time waits, or close waits, and report down if they are too high
 $timeMax = 10;
 $closeMax = 10;
-$ip = "x.x.x.x";
+$ip = $_SERVER['SERVER_NAME'];
+$port = $_SERVER['SERVER_PORT'] - 10000;
 
 // is service running
-$listening = shell_exec("netstat -lnp|grep $ip|grep 10062|wc -l");
+$listening = shell_exec("netstat -lnp|grep $ip|grep $port|wc -l");
 
-$timeWait = shell_exec("netstat -n |grep $ip|grep 10062|grep TIME_WAIT| wc -l");
-$closeWait = shell_exec("netstat -n |grep $ip|grep 10062|grep CLOSE_WAIT| wc -l");
+$timeWait = shell_exec("netstat -n |grep $ip|grep $port|grep TIME_WAIT| wc -l");
+$closeWait = shell_exec("netstat -n |grep $ip|grep $port|grep CLOSE_WAIT| wc -l");
 
 if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
         echo "down";
 } else {
         echo "up";
 }
+
+
diff --git a/net-misc/webrtc2sip/files/w2s b/net-misc/webrtc2sip/files/w2s
new file mode 100755
index 0000000..9579a62
--- /dev/null
+++ b/net-misc/webrtc2sip/files/w2s
@@ -0,0 +1,169 @@
+#!/usr/bin/php
+<?php
+
+$state = "";
+$instance = false;
+
+if(isset($argv[1]))$state = strtolower($argv[1]);
+if(isset($argv[2]))$instance = $argv[2];
+
+process($state,$instance);
+
+function start($instance) {
+
+        $ports = get_ports($instance);
+        $wss = $ports['wss'];
+        $monitor = $ports['monitor'];
+
+	$check_webrtc_running = trim(`netstat -npa | grep ':$wss' | awk '{print \$7}'`);
+	
+	if(strlen($check_webrtc_running) <= 0) {
+
+		$config = "/etc/webrtc2sip/instance_".$instance.".xml";
+
+		file_put_contents($config, gen_config($instance));
+
+		//print "/usr/bin/screen -dm -S webrtc2sip$instance bash -c 'ulimit -n 65535; /usr/sbin/webrtc2sip --config=$config >> /var/log/webrtc2sip$instance.log 2>&1; exec sh'\n";
+
+		`/usr/bin/screen -dm -S webrtc2sip$instance bash -c 'ulimit -n 65535; /usr/sbin/webrtc2sip --config=$config >> /var/log/webrtc2sip$instance.log 2>&1; exec sh'`;
+
+	} else {
+		print "Instance $instance already Running!\n";
+	}
+
+
+	$check_monitor_running = trim(`netstat -npa | grep ':$monitor' | awk '{print \$7}'`);
+	
+	if(strlen($check_monitor_running) <= 0) {
+
+		`screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /opt/webrtc2sip/www; php -S 0.0.0.0:$monitor'`;
+
+	} else {
+		print "Instance $instance monitor already Running!\n";
+	}
+
+
+}
+
+function stop($instance) {
+
+	$ports = get_ports($instance);
+	$wss = $ports['wss'];
+	$monitor = $ports['monitor'];
+
+        $check_running = trim(`netstat -npa | grep ':$wss' | awk '{print \$7}'`);
+	if(strlen($check_running) > 0) {
+		$pid_array = explode("/", $check_running);
+		$pid = $pid_array[0];
+		if(is_numeric($pid)) {
+			print "Process $pid stopped!\n";
+			posix_kill($pid, 9);
+		} else {
+			print "pid not found!\n";
+		}
+	}
+
+	$check_monitor_running = trim(`netstat -npa | grep ':$monitor' | awk '{print \$7}'`);
+	if(strlen($check_monitor_running) > 0) {
+		$pid_array = explode("/", $check_monitor_running);
+		$pid = $pid_array[0];
+		if(is_numeric($pid)) {
+			print "Monitor $pid stopped!\n";
+			posix_kill($pid, 9);
+		} else {
+			print "pid not found!\n";
+		}
+	}
+
+
+}
+
+
+function process($state, $instance) {
+ 
+	if($state == "start") {
+
+		if(!$instance) {
+	
+			for ($x = 1; $x <= 10; $x++) {
+				start($x);
+			}
+
+		} else if($instance) {
+			start($instance);
+		}
+
+	} else if($state == "stop") {
+
+		if(!$instance) {
+	
+			for ($x = 1; $x <= 10; $x++) {
+				stop($x);
+			}
+	
+		} else if($instance) {
+			stop($instance);
+		}
+
+	}
+
+}
+
+function get_ports($instance) {
+
+	$udp = "10000" + ($instance * 10);
+	$wss = $udp+1;
+	$monitor = $wss + 10000;
+
+	return array('udp' => $udp, 'wss' => $wss, 'monitor' => $monitor);
+}
+
+function gen_config($instance) {
+
+	$ports = get_ports($instance);
+
+	$udp = $ports['udp'];
+	$wss = $ports['wss'];
+
+return "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<!-- Please check the technical guide (http://webrtc2sip.org/technical-guide-1.0.pdf) for more information on how to adjust this file -->
+<config>
+
+<debug-level>ERROR</debug-level>
+
+<transport>udp;*;$udp</transport>
+<transport>wss;*;$wss</transport>
+
+<enable-rtp-symetric>yes</enable-rtp-symetric>
+<enable-100rel>no</enable-100rel>
+<enable-media-coder>yes</enable-media-coder>
+<enable-videojb>yes</enable-videojb>
+<video-size-pref>vga</video-size-pref>
+<rtp-buffsize>65535</rtp-buffsize>
+<avpf-tail-length>100;400</avpf-tail-length>
+<srtp-mode>optional</srtp-mode>
+<srtp-type>dtls</srtp-type>
+<dtmf-type>rfc4733</dtmf-type>
+
+<codecs>pcmu</codecs>
+
+<stun-server>stun.l.google.com;19302</stun-server>
+<enable-icestun>yes</enable-icestun>
+
+<max-fds>-1</max-fds>
+
+<nameserver>8.8.8.8</nameserver>
+
+<ssl-certificates>
+/etc/ssl/safesoft.io.key;
+/etc/ssl/safesoft.io.crt;
+*;
+no
+</ssl-certificates>
+
+</config>
+
+";
+
+}
+
diff --git a/net-misc/webrtc2sip/files/webrtc2sip-x.xml b/net-misc/webrtc2sip/files/webrtc2sip-x.xml
deleted file mode 100644
index 4020823..0000000
--- a/net-misc/webrtc2sip/files/webrtc2sip-x.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Please check the technical guide (http://webrtc2sip.org/technical-guide-1.0.pdf) for more information on how to adjust this file -->
-<config>
-
-<debug-level>ERROR</debug-level>
-
-<transport>udp;x.x.x.x;10060</transport>
-<transport>wss;x.x.x.x;10062</transport>
-
-<enable-rtp-symetric>yes</enable-rtp-symetric>
-<enable-100rel>no</enable-100rel>
-<enable-media-coder>yes</enable-media-coder>
-<enable-videojb>yes</enable-videojb>
-<video-size-pref>vga</video-size-pref>
-<rtp-buffsize>65535</rtp-buffsize>
-<avpf-tail-length>100;400</avpf-tail-length>
-<srtp-mode>optional</srtp-mode>
-<srtp-type>dtls</srtp-type>
-<dtmf-type>rfc4733</dtmf-type>
-
-<codecs>pcmu</codecs>
-
-<stun-server>stun.l.google.com;19302;stun-user@doubango.org;stun-password</stun-server>
-<enable-icestun>yes</enable-icestun>
-
-<max-fds>-1</max-fds>
-
-<nameserver>8.8.8.8</nameserver>
-
-<ssl-certificates>
-/etc/ssl/safesoft.io.key;
-/etc/ssl/safesoft.io.crt;
-*;
-no
-</ssl-certificates>
-
-</config>
diff --git a/net-misc/webrtc2sip/files/webrtc2sip.instance b/net-misc/webrtc2sip/files/webrtc2sip.instance
deleted file mode 100755
index 1fc6ff7..0000000
--- a/net-misc/webrtc2sip/files/webrtc2sip.instance
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-#
-# Init file for Webrtc2sip
-#
-# run levels: 2-5, start priority 95, stop priority 5
-#
-# chkconfig: 2345 95 5
-# description: Doubango webrtc2sip startup
-#
-# pidfile: /var/run/netborder-call-analyzer-service.pid
-# pidfile: /var/run/netborder-call-analyzer-engine.pid
-
-# source function library
-#. /etc/rc.d/init.d/functions
-
-
-SVCNAME=`basename "$0"` 
-INSTANCENUMBER=${SVCNAME##*.}
-
-INSTANCE=sangoma.$INSTANCENUMBER
-INSTDIR=/opt/$INSTANCE/nbca
-
-#add our /lib to .so search path
-export LD_LIBRARY_PATH=$INSTDIR/lib:$LD_LIBRARY_PATH
-
-NCA_COMMON_OPTIONS="--start-service --putenv PARAXIP=$INSTDIR --putenv PARAXIP_BINDIR=$INSTDIR/bin --putenv PARAXIP_BRAND=netborder --putenv PARAXIP_INSTALLDIR=$INSTDIR --putenv PARAXIP_PLATFORM=x86_64-linux"
-
-# main service ("SIP hub")
-NCA_MAIN_SERVICE_NAME=netborder-call-analyzer-service
-NCA_MAIN_SERVICE_FULL_PATH=$INSTDIR/bin/$NCA_MAIN_SERVICE_NAME
-
-NCA_MAIN_SERVICE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-logging.properties --global-config $INSTDIR/config/call-analyzer-service.properties"
-  
-# engine process
-NCA_ENGINE_NAME=netborder-call-analyzer-engine
-NCA_ENGINE_FULL_PATH=$INSTDIR/bin/$NCA_ENGINE_NAME
-
-export LOGNAME=$NCA_ENGINE_NAME
-
-NCA_ENGINE_OPTIONS="$NCA_COMMON_OPTIONS --global-config $INSTDIR/config/call-analyzer-engine-logging.properties --global-config $INSTDIR/config/call-analyzer-engine.properties"
-
-# Sets process priority to 'Realtime' (Highest priority available)
-# use as prefix before lauching the application
-PRIO_RT="chrt -r 99"
-
-RETVAL=0
-
-
-# arg 1: service process name
-# arg 2: cmd-line to launch service
-start()
-{
-
-
-
-  echo "Starting " 
-
-  nca_service_pid=`pidof $INSTDIR/bin/$1`
-  if [ ! -z "$nca_service_pid" ]
-  then
-    echo "Service $1 is already started"
-    #failure
-    exit 1
-  fi
-
-  # Check if effective user ID is superuser (bug 4523)
-  if [ "$EUID" != 0 ]; then
-    echo -n "Service must be started by user with root privileges"
-    #failure
-    exit 1
-  fi
-
-  echo -n $"Starting $1"
-  
-  # Setting wd to the installtion dir (some paths in config files are relative to it)
-  cd ${INSTDIR}
-  # arg 2 is cmd-line to launch service
-  $2 &> ${INSTDIR}/logs/stderr/$1.log
-
-  RETVAL=$?
-  [ "$RETVAL" = 0 ] && touch /var/lock/$1.$INSTANCE
-
-  # Only end the routine if we stop seeing the process (failure) or the pid file
-  # is created (success). If the pid file is never created by the app this script will
-  # hang forever (or more likely until the user stops us)
-  while true
-  do
-    nca_service_pid=`pidof $INSTDIR/bin/$1`
-    if [ -z "$nca_service_pid" ]
-    then
-      rm -f /var/lock/$1.$INSTANCE
-      #failure
-      echo
-      echo "failure"
-      exit 1
-    fi
-
-    #if [ -f /var/run/$1$INSTANCE.pid ]
-    if [ ! -z "$nca_service_pid" ]
-    then
-      #success
-      echo
-      echo  "success"
-      break
-    fi
-    sleep 0.5
-  done
-}
-
-# arg 1: service name
-stop()
-{
-
-echo "pidof $INSTDIR/bin/$1"
-  nca_service_pid=`pidof $INSTDIR/bin/$1`
-  if [ -z "$nca_service_pid" ]
-  then
-    echo -n "Service $1 is not started"
-    #failure
-    echo 
-    exit 1
-  fi
-
-  # Check if effective user ID is superuser (bug 4523)
-  if [ "$EUID" != 0 ]; then
-    echo -n "Service must be stopped by user with root privileges"
-    #failure
-    echo
-    exit 1
-  fi
-
-  echo -n $"Stopping $1"
-
-  # -15 is TERM
-  kill -15 $nca_service_pid
-  # Only end the routine if we stop seeing the process or the pid file
-  # is deleted. If the pid file is never deleted by the app this script will
-  # hang forever (or more likely until the user stops us)
-  while true
-  do
-    nca_service_pid=`pidof $INSTDIR/bin/$1`
-    if [ -z "$nca_service_pid" ]
-    then
-      #success
-      break
-    fi
-#    if [ ! -f /var/run/$1$INSTANCE.pid ]
-    if [ ! -z "$nca_service_pid" ]
-    then
-      #success
-      break
-    fi
-   sleep 0.5
-  done
-  RETVAL=$?
-  [ "$RETVAL" = 0 ] && rm -f /var/lock/$1.$INSTANCE
-  echo 
-}
-
-case "$1" in
-
-	start)
-		start $NCA_MAIN_SERVICE_NAME "$NCA_MAIN_SERVICE_FULL_PATH $NCA_MAIN_SERVICE_OPTIONS"
-		start $NCA_ENGINE_NAME "$PRIO_RT $NCA_ENGINE_FULL_PATH $NCA_ENGINE_OPTIONS"
-		;;
-
-	stop)
-		stop $NCA_MAIN_SERVICE_NAME
-		stop $NCA_ENGINE_NAME
-		;;
-
-	status)
-		status $NCA_MAIN_SERVICE_NAME
-		status $NCA_ENGINE_NAME
-		RETVAL=$?
-		;;
-
-	*)
-		echo $"Usage: $0 {start|stop|status}"
-		RETVAL=1
-
-esac
-exit $RETVAL
-
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 0e054e5..12e9afd 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -48,12 +48,11 @@ src_compile() {
 src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
-        keepdir /etc/webrtc2sip
-        keepdir /etc/webrtc2sip/www
-        keepdir /etc/webrtc2sip/www/x
+        mkdir -p "${D}/etc/webrtc2sip"
+        mkdir -p "${D}/etc/webrtc2sip/www"
 
-	cp "${FILESDIR}"/webrtc2sip-x.xml /etc/webrtc2sip
-	cp "${FILESDIR}"/webrtc2sip-x.xml /etc/webrtc2sip/www/x
+	//cp "${FILESDIR}"/webrtc2sip-x.xml "${D}/etc/webrtc2sip"
+	cp "${FILESDIR}"/index.php "${D}/etc/webrtc2sip/www/"
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install

From 8099261cef4d51d5b47e135b9a53b4d1c03f6000 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 16:25:06 -0800
Subject: [PATCH 107/261] fully functonal with startup scriot

---
 net-misc/webrtc2sip/Manifest                |   7 +-
 net-misc/webrtc2sip/files/index.php         |  50 ++++++---
 net-misc/webrtc2sip/files/w2s               | 108 ++++++++++++++++++--
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild |   2 +
 4 files changed, 144 insertions(+), 23 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 28cba32..574ff39 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,5 +1,4 @@
-AUX index.php 542 SHA256 641e913cb88bb322ba0171aadfa341edab04e4de0b0322434feb27daefaca82e SHA512 d7ee84897f1d94e67c832802350152ce85ab890ae4f4391da9a69e30000aca55311a29230f1ee3059e4aac9b61ec6e20444d87f0be07c0ab907a755797a2dbac WHIRLPOOL 017ffbc20d07b81bcb679dabf02e116bee126c4afb51ac9d733dc3425404aa81c786fc50ef1d7c527a9b47219bcd591e3cc1186ae6db9859a1ddda2e285fe229
-AUX webrtc2sip-x.xml 993 SHA256 4af165c2ea46547118790294b73b7de6ee94ee888e86a0f61efa6749c0dcc2b3 SHA512 c5e8f4940cb8f1f8c0204ed892aa558d251d6be62585f3586568a39169245f90dc4b1147125448c832864ecd36e8c14cf4c9a248de37a73a773acb7ac9acf6a1 WHIRLPOOL dd21e80354f5aaadaec4e2c1de4cd3e0c44c9e97dc851a91679ff2ec0176987cf7277fd78870ade5421b78600085ec7d1d8ff02a7232aafbb42805858128a336
-AUX webrtc2sip.instance 4326 SHA256 80a52a2887a03ea29a281a1673a76943ad1b885bc22febd790d983d95d307f1b SHA512 88fa608f353dd6082e3e98138ee5bf235f3a5783f16654d23da5543a855ec59655b198b2314ab198812e859fb913cc91b07adc35d5dca5f837cbec5fcaa90735 WHIRLPOOL e1665c01ce79c9b54f778d58328cbc029f388ea99029cb5853c51c654f3ea26e0d6803f62b8d0221cf4439eb6c2faad24e885bc69c8ba9c9040d2cc78410ca2c
+AUX index.php 1177 SHA256 970b06d85ae5471c29b4017371e26b3dae700c979f798a881f659446ded5daaa SHA512 220af0c135b103fd1c2e8b06104c23fa673f4bebe3e285cea8864c970aa8eb0afd1fe17750c3898a071b0916436fc61aa5b75c9babef46ca5ddb4addb63815cf WHIRLPOOL cec5d5f46f739c3eaa74fdf4f0e3414ccb0a58bfc46dfc1eeeafd59e14d8cc03ba5944148605700700a5f7ca9c78f6d2cf255ec7081b51f8814bd457f8146357
+AUX w2s 5123 SHA256 885736d868a5b8341dfe7d3289bdc52909127c658d56fbfc06e6ea5b61a79155 SHA512 e0b36b356f64f353980e323b0ce90a292bf9698799e73bdb98d4aa5aeff352bb5feb008261aeded8fde88b19e2a9a83254d260f531566733166fc71c9c232ee3 WHIRLPOOL 423aeca1738e2e114756a03ed3f628aecc2bb20ff5476a1b3f0c7c261ca4ac687efc4646b6461b226cf21b8b765d50a58b0bff7982eb7968a0f465c5f5e42290
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1400 SHA256 78bfdf548846a690fe5509dd4d8402735d77caf3c60c872eac6f483c79179a08 SHA512 6dc63017a2e6c0fa6afa177dc9337aad6a37676f42a2521f0192968478a0e3a157b16f4269b3249f3f0089e9442b4da95d76af0765554ba763480396886526e3 WHIRLPOOL 25a7bc4e05dbe8ef7d60e49b18fe964a32d8deb76110e29b149134af10a3b261af17d3b45b6756dad14aea10a7023707782f0e10d2b23ddb6347fa4a4aa5c357
+EBUILD webrtc2sip-2.0.0.ebuild 1389 SHA256 3065f2ce6bd0eb10e2dfc7531f3111e006fde9412a8915d78be28757f2ce2240 SHA512 48514ccf25117c951f1f187ecf8739870fb1717b5ac530f86a8533a21c33e68b33233740a4edca1436b8f16ce9a202346f0bc09ddce072c38f9c0f21780db125 WHIRLPOOL 18640f8cb32c0bca283501f1155c0dd44bdfd3bd04c4942ada572653febfb129f079cd4d7d0cda1436e2b7c80833de22d6978b1c979cbcd78d38bdc4318f8d5c
diff --git a/net-misc/webrtc2sip/files/index.php b/net-misc/webrtc2sip/files/index.php
index 58abd10..58b2631 100644
--- a/net-misc/webrtc2sip/files/index.php
+++ b/net-misc/webrtc2sip/files/index.php
@@ -1,21 +1,45 @@
-
 <?php
-// this will get a count of the number of time waits, or close waits, and report down if they are too high
+
 $timeMax = 10;
 $closeMax = 10;
-$ip = $_SERVER['SERVER_NAME'];
-$port = $_SERVER['SERVER_PORT'] - 10000;
-
-// is service running
-$listening = shell_exec("netstat -lnp|grep $ip|grep $port|wc -l");
+$port = $argv[1] - 10000;
+$monitor_port = $argv[1];
 
-$timeWait = shell_exec("netstat -n |grep $ip|grep $port|grep TIME_WAIT| wc -l");
-$closeWait = shell_exec("netstat -n |grep $ip|grep $port|grep CLOSE_WAIT| wc -l");
+date_default_timezone_set('America/Los_Angeles');
+set_time_limit(0);
+$socket = stream_socket_server("tcp://0.0.0.0:$monitor_port", $errno, $errstr);
 
-if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
-        echo "down";
+if (!$socket) {
+	echo "$errstr ($errno) \n";
 } else {
-        echo "up";
-}
 
+	$i=0;
+
+	while ($conn = stream_socket_accept($socket,9999999999999)) {
+
+		$i++;
+		if($i==1) {
 
+	                $listening = shell_exec("netstat -lnp|grep webrtc2sip|grep ':$port'|wc -l");
+	                $timeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep TIME_WAIT| wc -l");
+	                $closeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep CLOSE_WAIT| wc -l");
+
+			print "Fetch Data: ".date('l jS \of F Y h:i:s A')." listening: $listening, timeWait: $timeWait, closeWait: $closeWait\n";
+
+		} else if ($i==16) {
+			$i=0;
+		}
+
+                if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
+			print "down\n";
+                        fputs ($conn, "down\n");
+                } else {
+			print "up\n";
+                        fputs ($conn, "up\n");
+                }
+
+		fclose ($conn);
+	}
+	fclose($socket);
+}
+?>
diff --git a/net-misc/webrtc2sip/files/w2s b/net-misc/webrtc2sip/files/w2s
index 9579a62..0ab2ecf 100755
--- a/net-misc/webrtc2sip/files/w2s
+++ b/net-misc/webrtc2sip/files/w2s
@@ -3,6 +3,8 @@
 
 $state = "";
 $instance = false;
+$instance_count = 10;
+$DEBUG = false;
 
 if(isset($argv[1]))$state = strtolower($argv[1]);
 if(isset($argv[2]))$instance = $argv[2];
@@ -11,6 +13,8 @@ process($state,$instance);
 
 function start($instance) {
 
+	global $DEBUG;
+
         $ports = get_ports($instance);
         $wss = $ports['wss'];
         $monitor = $ports['monitor'];
@@ -28,7 +32,7 @@ function start($instance) {
 		`/usr/bin/screen -dm -S webrtc2sip$instance bash -c 'ulimit -n 65535; /usr/sbin/webrtc2sip --config=$config >> /var/log/webrtc2sip$instance.log 2>&1; exec sh'`;
 
 	} else {
-		print "Instance $instance already Running!\n";
+		if($DEBUG)print "Instance $instance already Running!\n";
 	}
 
 
@@ -36,10 +40,10 @@ function start($instance) {
 	
 	if(strlen($check_monitor_running) <= 0) {
 
-		`screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /opt/webrtc2sip/www; php -S 0.0.0.0:$monitor'`;
+		`/usr/bin/screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /etc/webrtc2sip/www; php index.php $monitor'`;
 
 	} else {
-		print "Instance $instance monitor already Running!\n";
+		if($DEBUG)print "Instance $instance monitor already Running!\n";
 	}
 
 
@@ -63,6 +67,25 @@ function stop($instance) {
 		}
 	}
 
+        $check_screen_running = `ps ax | grep -i /usr/bin/SCREEN | grep webrtc2sip$instance | grep -iv grep | awk '{print \$1}'`;
+	$screen_list = explode("\n", $check_screen_running);
+
+	if(!is_array($screen_list)) {
+		$screen_list = array($screen_list);
+	}
+
+	foreach($screen_list as $screen_pid) {	
+
+		if(strlen($screen_pid) > 0) {
+			if(is_numeric($screen_pid)) {
+				print "Screen $screen_pid stopped!\n";
+				posix_kill($screen_pid, 9);
+			} else {
+				print "screen pid not found!\n";
+			}
+		}
+	}	
+
 	$check_monitor_running = trim(`netstat -npa | grep ':$monitor' | awk '{print \$7}'`);
 	if(strlen($check_monitor_running) > 0) {
 		$pid_array = explode("/", $check_monitor_running);
@@ -81,32 +104,81 @@ function stop($instance) {
 
 function process($state, $instance) {
  
+	global $instance_count;
+
 	if($state == "start") {
 
 		if(!$instance) {
 	
-			for ($x = 1; $x <= 10; $x++) {
+			print "Starting all instances\n";
+
+			for ($x = 1; $x <= $instance_count; $x++) {
 				start($x);
 			}
 
+			start_safe();
+
 		} else if($instance) {
+
+			print "Stopping instance $instance\n";
+
 			start($instance);
 		}
 
 	} else if($state == "stop") {
 
 		if(!$instance) {
-	
-			for ($x = 1; $x <= 10; $x++) {
+
+			print "Stopping all instances\n";	
+
+			for ($x = 1; $x <= $instance_count; $x++) {
 				stop($x);
 			}
 	
+			stop_safe();
+
 		} else if($instance) {
+			
+			print "Stopping instance $instance\n";
+			
 			stop($instance);
 		}
 
+	} else if($state == "safe") {
+		
+		global $DEBUG;
+		$DEBUG = false;
+
+		set_time_limit(0);
+		become_daemon();
+		while(1) {
+                        for ($x = 1; $x <= $instance_count; $x++) {
+                                start($x);
+                        }
+			sleep(10);
+		}
+	}
+
+}
+
+function stop_safe() {
+
+	$safe_pid = get_safe_pid();
+	if($safe_pid) {
+		posix_kill($safe_pid, 9);
+	}	
+}
+
+
+function start_safe() {
+	$safe_pid = get_safe_pid();
+	if(!$safe_pid) {
+		`/usr/bin/screen -dm -S webrtc2sipSafe /etc/init.d/w2s safe`;
 	}
+}
 
+function get_safe_pid() {
+	return trim(`ps ax | grep 'w2s safe' | grep -iv grep | awk '{print \$1}'`);
 }
 
 function get_ports($instance) {
@@ -118,6 +190,30 @@ function get_ports($instance) {
 	return array('udp' => $udp, 'wss' => $wss, 'monitor' => $monitor);
 }
 
+
+/**
+  * Become a daemon by forking and closing the parent
+  */
+function become_daemon()
+{
+	$pid = pcntl_fork();
+
+	if ($pid == -1) {
+		/* fork failed */
+		echo "fork failure!\n";
+		exit();
+	} else if ($pid) {
+		/* close the parent */        
+		exit();
+	} else {
+		/* child becomes our daemon */
+		posix_setsid();
+		chdir('/');
+		umask(0);
+		return posix_getpid();
+	}
+}
+
 function gen_config($instance) {
 
 	$ports = get_ports($instance);
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 12e9afd..d6ff510 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -54,6 +54,8 @@ src_install() {
 	//cp "${FILESDIR}"/webrtc2sip-x.xml "${D}/etc/webrtc2sip"
 	cp "${FILESDIR}"/index.php "${D}/etc/webrtc2sip/www/"
 
+        newinitd "${FILESDIR}"/w2s w2s
+
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install
 

From fc250b1b9a2f3d657bd4dc90f7fa7641e99e0e0a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 19:28:12 -0800
Subject: [PATCH 108/261] add init.d wrapper

---
 net-misc/webrtc2sip/Manifest                  |  7 +++--
 .../webrtc2sip/files/{index.php => monitor}   |  1 +
 net-misc/webrtc2sip/files/{w2s => w2scmd}     |  6 ++--
 net-misc/webrtc2sip/files/webrtc2sip          | 29 +++++++++++++++++++
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild   | 12 ++++----
 5 files changed, 44 insertions(+), 11 deletions(-)
 rename net-misc/webrtc2sip/files/{index.php => monitor} (98%)
 mode change 100644 => 100755
 rename net-misc/webrtc2sip/files/{w2s => w2scmd} (96%)
 create mode 100755 net-misc/webrtc2sip/files/webrtc2sip

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 574ff39..c5f98de 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,4 +1,5 @@
-AUX index.php 1177 SHA256 970b06d85ae5471c29b4017371e26b3dae700c979f798a881f659446ded5daaa SHA512 220af0c135b103fd1c2e8b06104c23fa673f4bebe3e285cea8864c970aa8eb0afd1fe17750c3898a071b0916436fc61aa5b75c9babef46ca5ddb4addb63815cf WHIRLPOOL cec5d5f46f739c3eaa74fdf4f0e3414ccb0a58bfc46dfc1eeeafd59e14d8cc03ba5944148605700700a5f7ca9c78f6d2cf255ec7081b51f8814bd457f8146357
-AUX w2s 5123 SHA256 885736d868a5b8341dfe7d3289bdc52909127c658d56fbfc06e6ea5b61a79155 SHA512 e0b36b356f64f353980e323b0ce90a292bf9698799e73bdb98d4aa5aeff352bb5feb008261aeded8fde88b19e2a9a83254d260f531566733166fc71c9c232ee3 WHIRLPOOL 423aeca1738e2e114756a03ed3f628aecc2bb20ff5476a1b3f0c7c261ca4ac687efc4646b6461b226cf21b8b765d50a58b0bff7982eb7968a0f465c5f5e42290
+AUX monitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
+AUX w2scmd 5509 SHA256 f227a4307b3540ffeaf6474cc709a6c65520eaf6905fa85bb7de99cbf4bde9f6 SHA512 fc27f25cc3dffbc1c9c6708a06f7adeb4a7d5d6e4792d8208b7dc6c39b14ea2ff198fe9e78d5babf4e1a6458654ce85a665fd19d20e3eeb98121e3ad5792d575 WHIRLPOOL e022cd15a11530be1f6b65a638af532881e243d2d7cdfd016af8b743167071f5e6cfc2156461f3bfe979217f7b5cfebbd6911e6ee967f334ec0104a5adb7c768
+AUX webrtc2sip 655 SHA256 fca93e451fb067fef60d58dbbaf9e60555de71b35148fd8cdbd22b257c16bdb1 SHA512 c65ed13d5dd5d80fecbe9c58cbeb05730362c141b60cd384b65098487772a3d1127e2a445a1ae3fb1ce59d1c1df691caa14ee01e08cea0fcdf8936c4e1464aaa WHIRLPOOL afc95624e9eb3a1a81f426e68ac60365b14d6788f153bff9b03d6b256c4dce936a5d15058b26b375c605360041853984919d708e235b016de7c723017935c70c
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1389 SHA256 3065f2ce6bd0eb10e2dfc7531f3111e006fde9412a8915d78be28757f2ce2240 SHA512 48514ccf25117c951f1f187ecf8739870fb1717b5ac530f86a8533a21c33e68b33233740a4edca1436b8f16ce9a202346f0bc09ddce072c38f9c0f21780db125 WHIRLPOOL 18640f8cb32c0bca283501f1155c0dd44bdfd3bd04c4942ada572653febfb129f079cd4d7d0cda1436e2b7c80833de22d6978b1c979cbcd78d38bdc4318f8d5c
+EBUILD webrtc2sip-2.0.0.ebuild 1363 SHA256 0b847e8a6a7079ba0bff3117f71f835a4de5b963bf77586f1c3f1d8541a275db SHA512 2e9292a5f114299da54696b1b432e9206f258d35a35619d5ca7b658d7da7aaf41872e92aa08d0d06d7644d9115cce9466040ad7ed92be6aa329186d1030a0bb0 WHIRLPOOL 4cdcc647fb447797e4039a3c4713469725610072944d78325a9220bc452ef42d6a9606d26e4587beb449a7810b383aef9bd4b8dc94abd73a262ebcb0e2082c0c
diff --git a/net-misc/webrtc2sip/files/index.php b/net-misc/webrtc2sip/files/monitor
old mode 100644
new mode 100755
similarity index 98%
rename from net-misc/webrtc2sip/files/index.php
rename to net-misc/webrtc2sip/files/monitor
index 58b2631..3e90b49
--- a/net-misc/webrtc2sip/files/index.php
+++ b/net-misc/webrtc2sip/files/monitor
@@ -1,3 +1,4 @@
+#!/usr/bin/php
 <?php
 
 $timeMax = 10;
diff --git a/net-misc/webrtc2sip/files/w2s b/net-misc/webrtc2sip/files/w2scmd
similarity index 96%
rename from net-misc/webrtc2sip/files/w2s
rename to net-misc/webrtc2sip/files/w2scmd
index 0ab2ecf..8d16526 100755
--- a/net-misc/webrtc2sip/files/w2s
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -40,7 +40,7 @@ function start($instance) {
 	
 	if(strlen($check_monitor_running) <= 0) {
 
-		`/usr/bin/screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /etc/webrtc2sip/www; php index.php $monitor'`;
+		`/usr/bin/screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /etc/webrtc2sip; php monitor $monitor'`;
 
 	} else {
 		if($DEBUG)print "Instance $instance monitor already Running!\n";
@@ -173,12 +173,12 @@ function stop_safe() {
 function start_safe() {
 	$safe_pid = get_safe_pid();
 	if(!$safe_pid) {
-		`/usr/bin/screen -dm -S webrtc2sipSafe /etc/init.d/w2s safe`;
+		`/usr/bin/screen -dm -S webrtc2sipSafe /etc/webrtc2sip/w2scmd safe`;
 	}
 }
 
 function get_safe_pid() {
-	return trim(`ps ax | grep 'w2s safe' | grep -iv grep | awk '{print \$1}'`);
+	return trim(`ps ax | grep 'w2scmd safe' | grep -iv grep | awk '{print \$1}'`);
 }
 
 function get_ports($instance) {
diff --git a/net-misc/webrtc2sip/files/webrtc2sip b/net-misc/webrtc2sip/files/webrtc2sip
new file mode 100755
index 0000000..aef8539
--- /dev/null
+++ b/net-misc/webrtc2sip/files/webrtc2sip
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="killall"
+
+pid_file="/run/w2s.pid"
+
+start() {
+        ebegin "Starting all webrtc2sip instances"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--exec /etc/webrtc2sip/w2scmd start
+	eend $?
+}
+
+stop() {
+        ebegin "Stopping all webrtc2sip instances"
+	/etc/webrtc2sip/w2scmd stop
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
+
+killall() {
+        ebegin "Force topping all webrtc2sip instances"
+	/etc/webrtc2sip/w2scmd stop
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
+
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index d6ff510..0bbd61a 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="amd64 x86"
 
 DEPEND=" >=net-libs/libsrtp-1.5.2-r1
 	 >=net-misc/doubango-2.0.0
-	app-misc/screen"
+	app-misc/screen
+	dev-lang/php"
 
 S="${WORKDIR}/webrtc2sip"
 
@@ -49,15 +50,16 @@ src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
         mkdir -p "${D}/etc/webrtc2sip"
-        mkdir -p "${D}/etc/webrtc2sip/www"
 
-	//cp "${FILESDIR}"/webrtc2sip-x.xml "${D}/etc/webrtc2sip"
-	cp "${FILESDIR}"/index.php "${D}/etc/webrtc2sip/www/"
+	cp "${FILESDIR}"/monitor "${D}/etc/webrtc2sip"
+	cp "${FILESDIR}"/w2scmd "${D}/etc/webrtc2sip"
 
-        newinitd "${FILESDIR}"/w2s w2s
+	doinitd "${FILESDIR}"/webrtc2sip || die "doinitd failed" 
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install
 
+
 }
 
+

From 17020561aa7b032affd22e9cba36091e6d885328 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 20:03:57 -0800
Subject: [PATCH 109/261] version 1 released

---
 net-misc/webrtc2sip/Manifest                |  8 ++--
 net-misc/webrtc2sip/files/monitor           | 46 ---------------------
 net-misc/webrtc2sip/files/w2scmd            |  6 +--
 net-misc/webrtc2sip/files/webrtc2sip        | 29 -------------
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild | 12 ++++--
 5 files changed, 15 insertions(+), 86 deletions(-)
 delete mode 100755 net-misc/webrtc2sip/files/monitor
 delete mode 100755 net-misc/webrtc2sip/files/webrtc2sip

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index c5f98de..bc6d72a 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,5 +1,5 @@
-AUX monitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
-AUX w2scmd 5509 SHA256 f227a4307b3540ffeaf6474cc709a6c65520eaf6905fa85bb7de99cbf4bde9f6 SHA512 fc27f25cc3dffbc1c9c6708a06f7adeb4a7d5d6e4792d8208b7dc6c39b14ea2ff198fe9e78d5babf4e1a6458654ce85a665fd19d20e3eeb98121e3ad5792d575 WHIRLPOOL e022cd15a11530be1f6b65a638af532881e243d2d7cdfd016af8b743167071f5e6cfc2156461f3bfe979217f7b5cfebbd6911e6ee967f334ec0104a5adb7c768
-AUX webrtc2sip 655 SHA256 fca93e451fb067fef60d58dbbaf9e60555de71b35148fd8cdbd22b257c16bdb1 SHA512 c65ed13d5dd5d80fecbe9c58cbeb05730362c141b60cd384b65098487772a3d1127e2a445a1ae3fb1ce59d1c1df691caa14ee01e08cea0fcdf8936c4e1464aaa WHIRLPOOL afc95624e9eb3a1a81f426e68ac60365b14d6788f153bff9b03d6b256c4dce936a5d15058b26b375c605360041853984919d708e235b016de7c723017935c70c
+AUX w2scmd 5483 SHA256 093145bfbe33d276318e1f5fc2cefd5236155a3e811af33b72377f902489d532 SHA512 b126e0aa3d0149807516416c8ccabed1b4f03454320cf04b0332a61ddd6cf1bbe8512cb9797c0abc1f0c49ee87c74570c6ff133e89254f859b12f9671ad28c73 WHIRLPOOL ad50e216537ab0b63bcb21baa7a1f1abdf995665e43d5f42ed8d834e4ce4f49426d18070c1156102bcab0be4c7b99ea66dfcaf92743c7972f1c5d9935c1182f2
+AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
+AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1363 SHA256 0b847e8a6a7079ba0bff3117f71f835a4de5b963bf77586f1c3f1d8541a275db SHA512 2e9292a5f114299da54696b1b432e9206f258d35a35619d5ca7b658d7da7aaf41872e92aa08d0d06d7644d9115cce9466040ad7ed92be6aa329186d1030a0bb0 WHIRLPOOL 4cdcc647fb447797e4039a3c4713469725610072944d78325a9220bc452ef42d6a9606d26e4587beb449a7810b383aef9bd4b8dc94abd73a262ebcb0e2082c0c
+EBUILD webrtc2sip-2.0.0.ebuild 1648 SHA256 a5ec413b6c0beb86d9067d665be350422c11ffd3a7bc587f66aee084294d45f1 SHA512 7807116a1cddc8495b478ccb2ab0da4350b1fb5de43d524c7dec2fc3b63ced90945549cc54d5361b353ac54e7193e1d1df245be0b83aff165a69de66278ae02f WHIRLPOOL 6b0064450e1a2f097aa58dbe23dfbaa5a5f8cd042e7c44b13d3e07934c025d1d7922e3d6acee5e643856cf1e2673ffb0402d933cec2f62d58d0c043db39dcf8b
diff --git a/net-misc/webrtc2sip/files/monitor b/net-misc/webrtc2sip/files/monitor
deleted file mode 100755
index 3e90b49..0000000
--- a/net-misc/webrtc2sip/files/monitor
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/php
-<?php
-
-$timeMax = 10;
-$closeMax = 10;
-$port = $argv[1] - 10000;
-$monitor_port = $argv[1];
-
-date_default_timezone_set('America/Los_Angeles');
-set_time_limit(0);
-$socket = stream_socket_server("tcp://0.0.0.0:$monitor_port", $errno, $errstr);
-
-if (!$socket) {
-	echo "$errstr ($errno) \n";
-} else {
-
-	$i=0;
-
-	while ($conn = stream_socket_accept($socket,9999999999999)) {
-
-		$i++;
-		if($i==1) {
-
-	                $listening = shell_exec("netstat -lnp|grep webrtc2sip|grep ':$port'|wc -l");
-	                $timeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep TIME_WAIT| wc -l");
-	                $closeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep CLOSE_WAIT| wc -l");
-
-			print "Fetch Data: ".date('l jS \of F Y h:i:s A')." listening: $listening, timeWait: $timeWait, closeWait: $closeWait\n";
-
-		} else if ($i==16) {
-			$i=0;
-		}
-
-                if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
-			print "down\n";
-                        fputs ($conn, "down\n");
-                } else {
-			print "up\n";
-                        fputs ($conn, "up\n");
-                }
-
-		fclose ($conn);
-	}
-	fclose($socket);
-}
-?>
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index 8d16526..9d9cdfb 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -40,7 +40,7 @@ function start($instance) {
 	
 	if(strlen($check_monitor_running) <= 0) {
 
-		`/usr/bin/screen -dm -S webrtc2sipMonitor$instance bash -c 'cd /etc/webrtc2sip; php monitor $monitor'`;
+		`/usr/bin/screen -dm -S webrtc2sipMonitor$instance bash -c 'w2smonitor $monitor'`;
 
 	} else {
 		if($DEBUG)print "Instance $instance monitor already Running!\n";
@@ -150,7 +150,7 @@ function process($state, $instance) {
 		$DEBUG = false;
 
 		set_time_limit(0);
-		become_daemon();
+		#become_daemon();
 		while(1) {
                         for ($x = 1; $x <= $instance_count; $x++) {
                                 start($x);
@@ -173,7 +173,7 @@ function stop_safe() {
 function start_safe() {
 	$safe_pid = get_safe_pid();
 	if(!$safe_pid) {
-		`/usr/bin/screen -dm -S webrtc2sipSafe /etc/webrtc2sip/w2scmd safe`;
+		`/usr/bin/screen -dm -S webrtc2sipSafe /usr/sbin/w2scmd safe`;
 	}
 }
 
diff --git a/net-misc/webrtc2sip/files/webrtc2sip b/net-misc/webrtc2sip/files/webrtc2sip
deleted file mode 100755
index aef8539..0000000
--- a/net-misc/webrtc2sip/files/webrtc2sip
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="killall"
-
-pid_file="/run/w2s.pid"
-
-start() {
-        ebegin "Starting all webrtc2sip instances"
-	start-stop-daemon --start --pidfile ${pid_file} \
-		--exec /etc/webrtc2sip/w2scmd start
-	eend $?
-}
-
-stop() {
-        ebegin "Stopping all webrtc2sip instances"
-	/etc/webrtc2sip/w2scmd stop
-	start-stop-daemon  --stop --pidfile ${pid_file}
-	eend $?
-}
-
-killall() {
-        ebegin "Force topping all webrtc2sip instances"
-	/etc/webrtc2sip/w2scmd stop
-	start-stop-daemon  --stop --pidfile ${pid_file}
-	eend $?
-}
-
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 0bbd61a..6399ad1 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -49,12 +49,16 @@ src_compile() {
 src_install() {
 	export LDFLAGS="-ldl -lpthread"
 
-        mkdir -p "${D}/etc/webrtc2sip"
+        mkdir -p "${D}"/etc/webrtc2sip
 
-	cp "${FILESDIR}"/monitor "${D}/etc/webrtc2sip"
-	cp "${FILESDIR}"/w2scmd "${D}/etc/webrtc2sip"
+        dodir /usr/sbin
+        cp "${FILESDIR}"/w2smonitor "${D}"/usr/sbin/ || die "monitor failed to install"
+        cp "${FILESDIR}"/w2scmd "${D}"/usr/sbin/ || die "w2scmd failed to install"
 
-	doinitd "${FILESDIR}"/webrtc2sip || die "doinitd failed" 
+	#cp "${FILESDIR}"/monitor "${D}"/etc/webrtc2sip || die "monitor failed to install"
+	#cp "${FILESDIR}"/w2scmd "${D}"/etc/webrtc2sip || die "w2scmd failed to install"
+
+	newinitd "${FILESDIR}"/webrtc2sip-initd webrtc2sip || die "doinitd failed" 
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install

From 7fadd57eaea40808853b76e3c76a8e40ad293f15 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 20:13:30 -0800
Subject: [PATCH 110/261] missing files

---
 net-misc/webrtc2sip/Manifest               |  2 +-
 net-misc/webrtc2sip/files/w2scmd           |  2 +
 net-misc/webrtc2sip/files/w2smonitor       | 46 ++++++++++++++++++++++
 net-misc/webrtc2sip/files/webrtc2sip-initd | 29 ++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100755 net-misc/webrtc2sip/files/w2smonitor
 create mode 100755 net-misc/webrtc2sip/files/webrtc2sip-initd

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index bc6d72a..2fceefd 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,4 +1,4 @@
-AUX w2scmd 5483 SHA256 093145bfbe33d276318e1f5fc2cefd5236155a3e811af33b72377f902489d532 SHA512 b126e0aa3d0149807516416c8ccabed1b4f03454320cf04b0332a61ddd6cf1bbe8512cb9797c0abc1f0c49ee87c74570c6ff133e89254f859b12f9671ad28c73 WHIRLPOOL ad50e216537ab0b63bcb21baa7a1f1abdf995665e43d5f42ed8d834e4ce4f49426d18070c1156102bcab0be4c7b99ea66dfcaf92743c7972f1c5d9935c1182f2
+AUX w2scmd 5534 SHA256 d522e4b39440c62153b16e3a3d58509f93b50fd9be7042bbfa8b742869c5a50e SHA512 06692eb5e444ff23b7e67bf8e47a1a244fe1977bf6b51f4fe973bda5ebc868d2902cd117c53759dcf016557a6e3edb5bb484ef43e4f0fbb56aee7a9692e4c897 WHIRLPOOL 274826a7fef40f9960e3725fea9b4813e881ada5c9f560ecfe51b2c4e876796e689458a93948a70aeb944b138c084ea1f4257ebab0499a463d3fcd5370e01df7
 AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index 9d9cdfb..1f5ca43 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -108,6 +108,8 @@ function process($state, $instance) {
 
 	if($state == "start") {
 
+		`echo 15 > /proc/sys/net/ipv4/tcp_fin_timeout`;
+
 		if(!$instance) {
 	
 			print "Starting all instances\n";
diff --git a/net-misc/webrtc2sip/files/w2smonitor b/net-misc/webrtc2sip/files/w2smonitor
new file mode 100755
index 0000000..3e90b49
--- /dev/null
+++ b/net-misc/webrtc2sip/files/w2smonitor
@@ -0,0 +1,46 @@
+#!/usr/bin/php
+<?php
+
+$timeMax = 10;
+$closeMax = 10;
+$port = $argv[1] - 10000;
+$monitor_port = $argv[1];
+
+date_default_timezone_set('America/Los_Angeles');
+set_time_limit(0);
+$socket = stream_socket_server("tcp://0.0.0.0:$monitor_port", $errno, $errstr);
+
+if (!$socket) {
+	echo "$errstr ($errno) \n";
+} else {
+
+	$i=0;
+
+	while ($conn = stream_socket_accept($socket,9999999999999)) {
+
+		$i++;
+		if($i==1) {
+
+	                $listening = shell_exec("netstat -lnp|grep webrtc2sip|grep ':$port'|wc -l");
+	                $timeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep TIME_WAIT| wc -l");
+	                $closeWait = shell_exec("netstat -n |grep webrtc2sip|grep ':$port'|grep CLOSE_WAIT| wc -l");
+
+			print "Fetch Data: ".date('l jS \of F Y h:i:s A')." listening: $listening, timeWait: $timeWait, closeWait: $closeWait\n";
+
+		} else if ($i==16) {
+			$i=0;
+		}
+
+                if ($listening == 0 || $closeWait > $closeMax || $timeWait > $timeMax ) {
+			print "down\n";
+                        fputs ($conn, "down\n");
+                } else {
+			print "up\n";
+                        fputs ($conn, "up\n");
+                }
+
+		fclose ($conn);
+	}
+	fclose($socket);
+}
+?>
diff --git a/net-misc/webrtc2sip/files/webrtc2sip-initd b/net-misc/webrtc2sip/files/webrtc2sip-initd
new file mode 100755
index 0000000..1a5f0a2
--- /dev/null
+++ b/net-misc/webrtc2sip/files/webrtc2sip-initd
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="killall"
+
+pid_file="/run/w2s.pid"
+
+start() {
+        ebegin "Starting all webrtc2sip instances"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--exec /usr/sbin/w2scmd start
+	eend $?
+}
+
+stop() {
+        ebegin "Stopping all webrtc2sip instances"
+	/usr/sbin/w2scmd stop
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
+
+killall() {
+        ebegin "Force topping all webrtc2sip instances"
+	/usr/sbin/w2scmd stop
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
+

From 04e419ef3329c98000204a2bf7ace1303bce8398 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 20:15:05 -0800
Subject: [PATCH 111/261] dont rebuild config if already there incase its
 customized

---
 net-misc/webrtc2sip/Manifest     | 2 +-
 net-misc/webrtc2sip/files/w2scmd | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 2fceefd..24ae533 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,4 +1,4 @@
-AUX w2scmd 5534 SHA256 d522e4b39440c62153b16e3a3d58509f93b50fd9be7042bbfa8b742869c5a50e SHA512 06692eb5e444ff23b7e67bf8e47a1a244fe1977bf6b51f4fe973bda5ebc868d2902cd117c53759dcf016557a6e3edb5bb484ef43e4f0fbb56aee7a9692e4c897 WHIRLPOOL 274826a7fef40f9960e3725fea9b4813e881ada5c9f560ecfe51b2c4e876796e689458a93948a70aeb944b138c084ea1f4257ebab0499a463d3fcd5370e01df7
+AUX w2scmd 5571 SHA256 a97eba61c6e3c9032b13eaee9da0cec866e331d5f6b4b8f65ad36d6001e24bde SHA512 21174cce43088efdaf49c3f8968d17852b08cd70cceb03c2f45e8e05fc2ac1856a1a9af823ed6c5aaf097fe1d1752b5d9f2c18af4d876ad11b9609dc0b58a163 WHIRLPOOL bf965544f09fa27ceabcdd14208e98498e8000692e9e13da0378e154796b11939db262597e68d634a5455a20d0b213c9608cf00fac1392dae36580618ddaf9b0
 AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index 1f5ca43..6f82a85 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -25,7 +25,11 @@ function start($instance) {
 
 		$config = "/etc/webrtc2sip/instance_".$instance.".xml";
 
-		file_put_contents($config, gen_config($instance));
+		if(!file_exists($config)) {
+
+			file_put_contents($config, gen_config($instance));
+
+		}
 
 		//print "/usr/bin/screen -dm -S webrtc2sip$instance bash -c 'ulimit -n 65535; /usr/sbin/webrtc2sip --config=$config >> /var/log/webrtc2sip$instance.log 2>&1; exec sh'\n";
 

From 3455b7ad909daeb18c5381d45d84a7c3fc3192a7 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 5 Nov 2015 23:42:17 -0800
Subject: [PATCH 112/261] update the config

---
 net-misc/webrtc2sip/Manifest     | 2 +-
 net-misc/webrtc2sip/files/w2scmd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 24ae533..5d0b9ef 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,4 +1,4 @@
-AUX w2scmd 5571 SHA256 a97eba61c6e3c9032b13eaee9da0cec866e331d5f6b4b8f65ad36d6001e24bde SHA512 21174cce43088efdaf49c3f8968d17852b08cd70cceb03c2f45e8e05fc2ac1856a1a9af823ed6c5aaf097fe1d1752b5d9f2c18af4d876ad11b9609dc0b58a163 WHIRLPOOL bf965544f09fa27ceabcdd14208e98498e8000692e9e13da0378e154796b11939db262597e68d634a5455a20d0b213c9608cf00fac1392dae36580618ddaf9b0
+AUX w2scmd 5580 SHA256 bad03e7c06b36a1fbe97e35d7b7ed4ca90300cca75174a51dbe2d75a6931435c SHA512 69f55d56d918891f14c628ca44b65c477d700ed99c6d59c1c4c76e82394e15744edfb4c9066946f842f177867f7c1f08eb9def6607f217f803a5dd4fc02e9223 WHIRLPOOL 8536d395afe6c73e99d4ff992d1980b3fd7962abc61a88cb539ec98a53b6951c64bf82a21fbb31cb5c7e468d77ef04c3e46149bd86e5e8c7b82b14f649db0970
 AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index 6f82a85..8b817cb 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -257,8 +257,8 @@ return "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <nameserver>8.8.8.8</nameserver>
 
 <ssl-certificates>
-/etc/ssl/safesoft.io.key;
-/etc/ssl/safesoft.io.crt;
+/etc/ssl/safesoft-io-priv.pem;
+/etc/ssl/safesoft-io-pub.pem;
 *;
 no
 </ssl-certificates>

From a7eb60ccfe1597d05fe420ed6e5ce2bd9953e042 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 01:16:40 -0800
Subject: [PATCH 113/261] small tweak

---
 net-misc/webrtc2sip/Manifest     | 2 +-
 net-misc/webrtc2sip/files/w2scmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 5d0b9ef..8fe509f 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,4 +1,4 @@
-AUX w2scmd 5580 SHA256 bad03e7c06b36a1fbe97e35d7b7ed4ca90300cca75174a51dbe2d75a6931435c SHA512 69f55d56d918891f14c628ca44b65c477d700ed99c6d59c1c4c76e82394e15744edfb4c9066946f842f177867f7c1f08eb9def6607f217f803a5dd4fc02e9223 WHIRLPOOL 8536d395afe6c73e99d4ff992d1980b3fd7962abc61a88cb539ec98a53b6951c64bf82a21fbb31cb5c7e468d77ef04c3e46149bd86e5e8c7b82b14f649db0970
+AUX w2scmd 5598 SHA256 f52b7b5c40742139de362d52a0bf2fa5908c827797da85e4c7ebfb8c2f48696f SHA512 262709a9ce4cd49e2967c0ff7e15038e688b8bbdd6e0675b55d321871d2b7d1b988abd91bcb29222df94863769f9d5d7b0e6189352d756f4d0b95f636272a3cf WHIRLPOOL 88d4d2753ec1268532886f0b2632cfb1adf25fb40162cdfbee98b16a63be81c99c833c0f3e116dae2ea570e634e915b5d5771a6a6420f7b6897959fd691fd225
 AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index 8b817cb..b849974 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -184,7 +184,7 @@ function start_safe() {
 }
 
 function get_safe_pid() {
-	return trim(`ps ax | grep 'w2scmd safe' | grep -iv grep | awk '{print \$1}'`);
+	return trim(`ps ax | grep 'w2scmd safe' | grep -iv grep | grep -iv screen | awk '{print \$1}'`);
 }
 
 function get_ports($instance) {

From feb401c197caa7063a8041106ef8c02d4f61a884 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 03:21:20 -0800
Subject: [PATCH 114/261] update manifest

---
 net-misc/doubango/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
index c01ec61..a2ca272 100644
--- a/net-misc/doubango/Manifest
+++ b/net-misc/doubango/Manifest
@@ -1,2 +1,2 @@
-DIST doubango-2.0.0.tar.gz 540812106 SHA256 d4f6284719e8f98f2366cb5a3cbd75d08ad9b5c77906c27b4e939a03db1cbcd0 SHA512 f954e9abd0f0acaed23910cff09f09907e583396312dd57125a7ec1764bc5ed8dc1df65bdb784fbff1906af265335a94b977413d1304dee29e3e359f5d7abd5a WHIRLPOOL 0637a1a98565a8582a77ff63bd99847cb2b4dfc11334efb719eea2afd96995c2ae396f70039169c0270c4439f0f9e5d4502c347a02bc4bdf74d8d1edf499e312
+DIST doubango-2.0.0.tar.gz 158482432 SHA256 cb001d2cb31c35c87f7fbd537557d10801fcc705e90e481fbae75e234f986bf7 SHA512 a04133ec71c7dc17590d8922efc9828d2185d859f7a1274adc8b59cfe4c1dec0c0debe8e6c0ad7c95b1e62d44dd8d37842d57d2ae1770e2c025d62faa4a0e549 WHIRLPOOL dec44aa5167c9a312930f24bbd928cf8cb7f6083ec5aaed5cdee5f0de005a200decae5cbff840b44fdcf4fb938aa5710b114cf3b498aee11fa5c0b65ef8dabb6
 EBUILD doubango-2.0.0.ebuild 1202 SHA256 ce336406ce854a0fe9fe166374f1b4f046ce06d5b299d307ec55fe1c3e7a9e4b SHA512 ed371def018e078223fc2a8647dd12f07016f38af311f0567c8df4d6d13c72dc35e2bcfc67363f1569fe4194c816d964cf54fc8ccf99f6741301d530199c5dac WHIRLPOOL ff3976129cc402654b87dd060fdab1c396e7e73234cb02c1f1d8b33ca27437018d5d511c8049d9fff4bea6813e40144cd6466b45240f08e35a4db5d91a1df7e1

From 97eee1b83882cf51dfafc881367662804c14f40d Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 03:23:36 -0800
Subject: [PATCH 115/261] ugh bad update

---
 net-misc/doubango/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
index a2ca272..9265403 100644
--- a/net-misc/doubango/Manifest
+++ b/net-misc/doubango/Manifest
@@ -1,2 +1,2 @@
-DIST doubango-2.0.0.tar.gz 158482432 SHA256 cb001d2cb31c35c87f7fbd537557d10801fcc705e90e481fbae75e234f986bf7 SHA512 a04133ec71c7dc17590d8922efc9828d2185d859f7a1274adc8b59cfe4c1dec0c0debe8e6c0ad7c95b1e62d44dd8d37842d57d2ae1770e2c025d62faa4a0e549 WHIRLPOOL dec44aa5167c9a312930f24bbd928cf8cb7f6083ec5aaed5cdee5f0de005a200decae5cbff840b44fdcf4fb938aa5710b114cf3b498aee11fa5c0b65ef8dabb6
+DIST doubango-2.0.0.tar.gz 540813281 SHA256 a19296c1098c35a0489aa1e8225736e23645cb96dc38a2c2e97ffba3b6475c81 SHA512 bd37fff33d054bab247739be1259ef01f32349adc641d95203446d69a7b3db76d9b9888479594a90319f84f21b581be6aec000ee0243c7a7c1a2052c04523a3f WHIRLPOOL 33951bf95230c3e2644f73144fb0007cdf89023c8ab8317eed19e79f665d96dc80261dcb6332bf493eca6061280f77d2c85652d4113076dc74efc944d4f006e4
 EBUILD doubango-2.0.0.ebuild 1202 SHA256 ce336406ce854a0fe9fe166374f1b4f046ce06d5b299d307ec55fe1c3e7a9e4b SHA512 ed371def018e078223fc2a8647dd12f07016f38af311f0567c8df4d6d13c72dc35e2bcfc67363f1569fe4194c816d964cf54fc8ccf99f6741301d530199c5dac WHIRLPOOL ff3976129cc402654b87dd060fdab1c396e7e73234cb02c1f1d8b33ca27437018d5d511c8049d9fff4bea6813e40144cd6466b45240f08e35a4db5d91a1df7e1

From 34c13969d0a39219900b5e873a98b4a62d3c2c01 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 12:24:47 -0800
Subject: [PATCH 116/261] update puppy

---
 net-misc/doubango/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/doubango/Manifest b/net-misc/doubango/Manifest
index 9265403..5063939 100644
--- a/net-misc/doubango/Manifest
+++ b/net-misc/doubango/Manifest
@@ -1,2 +1,2 @@
-DIST doubango-2.0.0.tar.gz 540813281 SHA256 a19296c1098c35a0489aa1e8225736e23645cb96dc38a2c2e97ffba3b6475c81 SHA512 bd37fff33d054bab247739be1259ef01f32349adc641d95203446d69a7b3db76d9b9888479594a90319f84f21b581be6aec000ee0243c7a7c1a2052c04523a3f WHIRLPOOL 33951bf95230c3e2644f73144fb0007cdf89023c8ab8317eed19e79f665d96dc80261dcb6332bf493eca6061280f77d2c85652d4113076dc74efc944d4f006e4
+DIST doubango-2.0.0.tar.gz 540814915 SHA256 5b7a8e7117b6aa3835e654e864fd1fc1ef1e60ff3325b59facabae5c4495305b SHA512 af3a66d074a9f20cb6e1c1e358a3668d8c517d5a5f5696a0eb919b8b70411240e2c5db6b2f4526a3b53fa4a5f33f38c3138172850a5ea2512ca931fb6d7601e5 WHIRLPOOL 8b10b9cab93026fbf19fd933242b8393fe35b727c2b62d7e368b72c09929cbbf12f62ae54b02f3ff3e49f98e1648e4921f01053174f6f64a530ab4df4958cdac
 EBUILD doubango-2.0.0.ebuild 1202 SHA256 ce336406ce854a0fe9fe166374f1b4f046ce06d5b299d307ec55fe1c3e7a9e4b SHA512 ed371def018e078223fc2a8647dd12f07016f38af311f0567c8df4d6d13c72dc35e2bcfc67363f1569fe4194c816d964cf54fc8ccf99f6741301d530199c5dac WHIRLPOOL ff3976129cc402654b87dd060fdab1c396e7e73234cb02c1f1d8b33ca27437018d5d511c8049d9fff4bea6813e40144cd6466b45240f08e35a4db5d91a1df7e1

From 283187afda71f682a93cda20cda523efc548ec9f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 13:23:20 -0800
Subject: [PATCH 117/261] new fiels and logic

---
 net-misc/webrtc2sip/Manifest                |  5 ++-
 net-misc/webrtc2sip/files/w2scmd            | 50 +++++++++++++++++----
 net-misc/webrtc2sip/files/webrtc2sip-confd  |  2 +
 net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild |  3 +-
 4 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 net-misc/webrtc2sip/files/webrtc2sip-confd

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index 8fe509f..df8098e 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,5 +1,6 @@
-AUX w2scmd 5598 SHA256 f52b7b5c40742139de362d52a0bf2fa5908c827797da85e4c7ebfb8c2f48696f SHA512 262709a9ce4cd49e2967c0ff7e15038e688b8bbdd6e0675b55d321871d2b7d1b988abd91bcb29222df94863769f9d5d7b0e6189352d756f4d0b95f636272a3cf WHIRLPOOL 88d4d2753ec1268532886f0b2632cfb1adf25fb40162cdfbee98b16a63be81c99c833c0f3e116dae2ea570e634e915b5d5771a6a6420f7b6897959fd691fd225
+AUX w2scmd 6307 SHA256 aeea38c51689d8e1e89a7e5e45df5c465d68e0d84f1e2204bcda082421a54718 SHA512 b1f53056fb86d1cef36335051f4dbf5273ed05073a81837b725a87861e0b6bfba510b6365d6389b2c27db3b67f3658135301a29fcf0cff4ddcedef75b849883c WHIRLPOOL 4be82951ca72cff126d1b1dbca6ff6e44cfd887429128151a3d5a1d26086531cc4ad7f585afc95acf6b4d8c8a1d1a0c73b003e8bdd4972a3c87fa1f6b3ebc412
 AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
+AUX webrtc2sip-confd 29 SHA256 a1b7a49c01525d9a160ef021c54b441eb2233f78103e38955245a16579585053 SHA512 93c359974de1eeec68ac83ee430cf141b39ffdb5435010eca55db843fa43bb6db6e22e3e88b05720f34b182fab0d20d2f4ffabb4616832162cd8197d4cae202e WHIRLPOOL cce1ac4a64647915c57a553db047d617a96d7b820a5a1904d281d85148502d73ba32877ec72abc34f947a3ad82fd7b8dc07b49a87b29bad9f8592f19d54f75d9
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094
-EBUILD webrtc2sip-2.0.0.ebuild 1648 SHA256 a5ec413b6c0beb86d9067d665be350422c11ffd3a7bc587f66aee084294d45f1 SHA512 7807116a1cddc8495b478ccb2ab0da4350b1fb5de43d524c7dec2fc3b63ced90945549cc54d5361b353ac54e7193e1d1df245be0b83aff165a69de66278ae02f WHIRLPOOL 6b0064450e1a2f097aa58dbe23dfbaa5a5f8cd042e7c44b13d3e07934c025d1d7922e3d6acee5e643856cf1e2673ffb0402d933cec2f62d58d0c043db39dcf8b
+EBUILD webrtc2sip-2.0.0.ebuild 1727 SHA256 2795bdfe8048864356a60f778764483103df4270ab398e3ba6a009a9ab07169e SHA512 4b5713cacbd4438bdeab19bcb009709d3894bab3f48bdebb5d61c1fa1dc2a4b86edd12ca64467a63c01d4e8acafa8d8d722919393e6d9ab8f37fad308b9a8aa8 WHIRLPOOL df2ab803fd155bc74ecf1ad76a35ef737107e52f8d0176773b3199f282aa0ae32e7035b2dc15e638b0a383e6f8ec54bf173a763b1b2f1860b7e841a81159a57f
diff --git a/net-misc/webrtc2sip/files/w2scmd b/net-misc/webrtc2sip/files/w2scmd
index b849974..6349e55 100755
--- a/net-misc/webrtc2sip/files/w2scmd
+++ b/net-misc/webrtc2sip/files/w2scmd
@@ -1,17 +1,43 @@
 #!/usr/bin/php
 <?php
 
+$config = '/etc/conf.d/webrtc2sip';
+$ip = false;
 $state = "";
 $instance = false;
 $instance_count = 10;
 $DEBUG = false;
 
+if(file_exists($config)) {
+
+	$config_array = parse_ini_file($config);
+	if(isset($config_array['instance_count'])) {
+		$instance_count = $config_array['instance_count'];
+	}
+
+	if(isset($config_array['ip'])) {
+		$ip = $config_array['ip'];
+	}
+
+}
+
 if(isset($argv[1]))$state = strtolower($argv[1]);
 if(isset($argv[2]))$instance = $argv[2];
 
-process($state,$instance);
+process($state,$instance,$ip);
+
+function gen_configs($instance_count, $ip) {
+
+	for ($instance = 1; $instance <= $instance_count; $instance++) {
 
-function start($instance) {
+		$config = "/etc/webrtc2sip/instance_".$instance.".xml";
+		if(!file_exists($config)) {
+			file_put_contents($config, gen_config($instance, $ip));
+		}
+	}
+}
+
+function start($instance, $ip = false) {
 
 	global $DEBUG;
 
@@ -27,7 +53,7 @@ function start($instance) {
 
 		if(!file_exists($config)) {
 
-			file_put_contents($config, gen_config($instance));
+			file_put_contents($config, gen_config($instance, $ip));
 
 		}
 
@@ -106,7 +132,7 @@ function stop($instance) {
 }
 
 
-function process($state, $instance) {
+function process($state, $instance, $ip) {
  
 	global $instance_count;
 
@@ -119,7 +145,7 @@ function process($state, $instance) {
 			print "Starting all instances\n";
 
 			for ($x = 1; $x <= $instance_count; $x++) {
-				start($x);
+				start($x,$ip);
 			}
 
 			start_safe();
@@ -128,7 +154,7 @@ function process($state, $instance) {
 
 			print "Stopping instance $instance\n";
 
-			start($instance);
+			start($instance,$ip);
 		}
 
 	} else if($state == "stop") {
@@ -163,6 +189,10 @@ function process($state, $instance) {
                         }
 			sleep(10);
 		}
+	} else if($state == "genconfig") {
+
+		gen_configs($instance_count, $ip);
+
 	}
 
 }
@@ -220,7 +250,9 @@ function become_daemon()
 	}
 }
 
-function gen_config($instance) {
+function gen_config($instance,$ip = false) {
+
+	if(!$ip)$ip = "*";
 
 	$ports = get_ports($instance);
 
@@ -233,8 +265,8 @@ return "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
 
 <debug-level>ERROR</debug-level>
 
-<transport>udp;*;$udp</transport>
-<transport>wss;*;$wss</transport>
+<transport>udp;$ip;$udp</transport>
+<transport>wss;$ip;$wss</transport>
 
 <enable-rtp-symetric>yes</enable-rtp-symetric>
 <enable-100rel>no</enable-100rel>
diff --git a/net-misc/webrtc2sip/files/webrtc2sip-confd b/net-misc/webrtc2sip/files/webrtc2sip-confd
new file mode 100644
index 0000000..9e7e195
--- /dev/null
+++ b/net-misc/webrtc2sip/files/webrtc2sip-confd
@@ -0,0 +1,2 @@
+instance_count=10
+ip=0.0.0.0
diff --git a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
index 6399ad1..1f9476e 100644
--- a/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
+++ b/net-misc/webrtc2sip/webrtc2sip-2.0.0.ebuild
@@ -58,7 +58,8 @@ src_install() {
 	#cp "${FILESDIR}"/monitor "${D}"/etc/webrtc2sip || die "monitor failed to install"
 	#cp "${FILESDIR}"/w2scmd "${D}"/etc/webrtc2sip || die "w2scmd failed to install"
 
-	newinitd "${FILESDIR}"/webrtc2sip-initd webrtc2sip || die "doinitd failed" 
+	newinitd "${FILESDIR}"/webrtc2sip-initd webrtc2sip || die "newinitd failed" 
+	newconfd "${FILESDIR}"/webrtc2sip-confd webrtc2sip || die "newconfd failed" 
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install

From d360b7477c6b04ca07500810148a14f72297efd5 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 13:35:14 -0800
Subject: [PATCH 118/261] updated monitor

---
 net-misc/webrtc2sip/files/w2smonitor | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-misc/webrtc2sip/files/w2smonitor b/net-misc/webrtc2sip/files/w2smonitor
index 3e90b49..1aaf06e 100755
--- a/net-misc/webrtc2sip/files/w2smonitor
+++ b/net-misc/webrtc2sip/files/w2smonitor
@@ -1,14 +1,28 @@
 #!/usr/bin/php
 <?php
 
+$config = '/etc/conf.d/webrtc2sip';
+$ip = "0.0.0.0";
 $timeMax = 10;
 $closeMax = 10;
 $port = $argv[1] - 10000;
 $monitor_port = $argv[1];
 
+if(file_exists($config)) {
+
+        $config_array = parse_ini_file($config);
+
+        if(isset($config_array['ip'])) {
+                $ip = $config_array['ip'];
+        }
+
+}
+
+
+
 date_default_timezone_set('America/Los_Angeles');
 set_time_limit(0);
-$socket = stream_socket_server("tcp://0.0.0.0:$monitor_port", $errno, $errstr);
+$socket = stream_socket_server("tcp://$ip:$monitor_port", $errno, $errstr);
 
 if (!$socket) {
 	echo "$errstr ($errno) \n";

From 8a692ee4964d61aefb5e613707d0dd3c7818c61e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 6 Nov 2015 13:41:03 -0800
Subject: [PATCH 119/261] update dmanifgest

---
 net-misc/webrtc2sip/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/webrtc2sip/Manifest b/net-misc/webrtc2sip/Manifest
index df8098e..2899c84 100644
--- a/net-misc/webrtc2sip/Manifest
+++ b/net-misc/webrtc2sip/Manifest
@@ -1,5 +1,5 @@
 AUX w2scmd 6307 SHA256 aeea38c51689d8e1e89a7e5e45df5c465d68e0d84f1e2204bcda082421a54718 SHA512 b1f53056fb86d1cef36335051f4dbf5273ed05073a81837b725a87861e0b6bfba510b6365d6389b2c27db3b67f3658135301a29fcf0cff4ddcedef75b849883c WHIRLPOOL 4be82951ca72cff126d1b1dbca6ff6e44cfd887429128151a3d5a1d26086531cc4ad7f585afc95acf6b4d8c8a1d1a0c73b003e8bdd4972a3c87fa1f6b3ebc412
-AUX w2smonitor 1192 SHA256 38f2f487fed29192c6971f6f5057d39a07ba5e89fdc19e0209ce0927206798c9 SHA512 59589b6bc7e9684d1b72169b7bcb314893d7d3580d321e0ca6b3c27b0a1b896a4fec844a8e8e2390783d8e9ac36a69c1b55c432398e236d959a7992614cf119b WHIRLPOOL 6ee4c406a57c98f141e224ee6550a7908c59fb58905a6879626bc3c0e6e8136f72754c0ed72416ab9fa33319b4a7256febec6d08fd79bc7e94e90084f746b7ba
+AUX w2smonitor 1419 SHA256 76c9a2ec263553c35f8d3acc92fdd4f91a3b401e4938b6f4938a88edac4baa94 SHA512 ee45b168c6172ec27c5356d8ab9d40c2bf524d7507b169ea9ed2bd9672a4af4a932e6898c62f6daea16084db9a11f8f3969dbb46f34446d692c9853f75ee201d WHIRLPOOL 2b6a096d8165742a1d112b7987499c8432faf05b4bf10bc4c71b6b0b7092806cdfe1744519148cf3d61d715616e1474e7f69d5a3407e18cea39fdb522fc05610
 AUX webrtc2sip-confd 29 SHA256 a1b7a49c01525d9a160ef021c54b441eb2233f78103e38955245a16579585053 SHA512 93c359974de1eeec68ac83ee430cf141b39ffdb5435010eca55db843fa43bb6db6e22e3e88b05720f34b182fab0d20d2f4ffabb4616832162cd8197d4cae202e WHIRLPOOL cce1ac4a64647915c57a553db047d617a96d7b820a5a1904d281d85148502d73ba32877ec72abc34f947a3ad82fd7b8dc07b49a87b29bad9f8592f19d54f75d9
 AUX webrtc2sip-initd 637 SHA256 c345f927eb1f6b2e2411fad1ed43feaf0e754523ad1e2bc5da7c0173254c26e7 SHA512 cf23299877ad88c30778d9b2519ec0c7d22da0d76e15cdaa6b22722fa1d769a844c39309a61c7427032b0f5884e641a6bfad9d23883062e5dc143c10315a82ee WHIRLPOOL e2137edcd126fc233a65e50f03bb83c76f1ec3a2593345ded8bb2fc0df2f3dcfada0088ba32e8e8b463abc539ef40847dedab86ee984d35b63a35c56e24807d1
 DIST webrtc2sip-2.0.0.tar.gz 10257882 SHA256 6af0493ead1e34a3715da12886bee7e7fd7b544be011c26074caf89810131913 SHA512 a317cc9deb1530ec80e7561588f2fe9d5c42fd4ea1006abfe82df6b0b5ef625da833f3e99acbc9cbb4be9a7bf053ae085aa372aea4c6272c26d67f34a75717db WHIRLPOOL 269a0701c828b64997e0b66cbb8d47efd101d5763d82a179bb8b7577a26e305ef6cd5755bda9ec7429acc2ad3c57b07dc0e3a2c17e857eb32c0618376319a094

From 13d9df4ce62d039c101760cc7465e04f76b84e0d Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 9 Nov 2015 14:47:07 -0800
Subject: [PATCH 120/261] first janus ebuild, still needs init.d and possible
 conf.d files added

---
 net-misc/janus/Manifest           |  2 +
 net-misc/janus/janus-0.0.9.ebuild | 72 +++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 net-misc/janus/Manifest
 create mode 100644 net-misc/janus/janus-0.0.9.ebuild

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
new file mode 100644
index 0000000..477416d
--- /dev/null
+++ b/net-misc/janus/Manifest
@@ -0,0 +1,2 @@
+DIST janus-0.0.9.tar.gz 16144235 SHA256 ab6f331c50a87bfabaf6d93cae73e33b134511889991f5c2a5cbe82136a84f19 SHA512 b8134fa750a6f019603104085f213d57b037ec5322c05af7c5d4d483ae160ba2b62ad02d9c67cc0f86d3399c4f1c74eb5b9a7f926d06d13129af8d7870769a1c WHIRLPOOL 1cfba2dfda4708872bc1b49aa70f947b35199f10d63afefb5d3b0c3bafddf42221dd7ffe91f1a2cd8c9d695d3ab9450aa6c401a9123e36e630211b74232baa57
+EBUILD janus-0.0.9.ebuild 1677 SHA256 4609e3232183792a6bb45bd229de80942a350a31af5e84adf0734bf31d168e2a SHA512 34dbd2902b76b887db6ffd5a91939881b0b086a11f8efeeac7fc7aa2d1417e41d57ee1c0bee7556305fa7adcbe54ae18620bba3878818b0d1e1d0a49d4ab2b47 WHIRLPOOL 01ffa13ca0f00731f9223872c85adfee541c6446f48bdb236920b75b7f65bf7ae2be25c5d8b2b8d2b966d6a6a687bc980efe694480f5b249ef2b1e419bc15537
diff --git a/net-misc/janus/janus-0.0.9.ebuild b/net-misc/janus/janus-0.0.9.ebuild
new file mode 100644
index 0000000..80babaf
--- /dev/null
+++ b/net-misc/janus/janus-0.0.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
+HOMEPAGE="http://janus.conf.meetecho.com/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="websockets rabbitmq docs opus ogg"
+
+DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
+	opus? ( media-libs/opus )
+	ogg? ( media-libs/libogg )
+	websockets? ( net-libs/libwebsockets dev-util/cmake )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	net-libs/libmicrohttpd
+	dev-libs/jansson
+	dev-libs/ding-libs
+	net-libs/libnice[-upnp]
+	dev-libs/openssl
+	>=net-libs/libsrtp-1.5.2-r1
+	net-libs/sofia-sip
+	dev-libs/glib
+	dev-util/gengetopt"
+
+
+S="${WORKDIR}/janus-gateway"
+
+src_prepare() {
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+
+	econf \
+		--prefix=/usr \
+		--disable-data-channels \
+		$(use_enable websockets) \
+		$(use_enable rabbitmq) \
+		$(use_enable docs)
+}
+
+src_compile() {
+	export PREFIX="/usr"
+	MAKEOPTS="-j1" emake
+}
+
+src_install() {
+
+        mkdir -p "${D}"/etc/janus
+
+	#newinitd "${FILESDIR}"/webrtc2sip-initd webrtc2sip || die "newinitd failed" 
+	#newconfd "${FILESDIR}"/webrtc2sip-confd webrtc2sip || die "newconfd failed" 
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+
+}
+
+

From 50bc8b8f5a08de3171bec4d4098d1bfa1bc93dc4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 10 Nov 2015 18:48:24 -0800
Subject: [PATCH 121/261] custom tar file

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 477416d..87dad1b 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,2 +1,2 @@
-DIST janus-0.0.9.tar.gz 16144235 SHA256 ab6f331c50a87bfabaf6d93cae73e33b134511889991f5c2a5cbe82136a84f19 SHA512 b8134fa750a6f019603104085f213d57b037ec5322c05af7c5d4d483ae160ba2b62ad02d9c67cc0f86d3399c4f1c74eb5b9a7f926d06d13129af8d7870769a1c WHIRLPOOL 1cfba2dfda4708872bc1b49aa70f947b35199f10d63afefb5d3b0c3bafddf42221dd7ffe91f1a2cd8c9d695d3ab9450aa6c401a9123e36e630211b74232baa57
+DIST janus-0.0.9.tar.gz 16144257 SHA256 873ed7571f3be8757955d88c73bb3b1a4df660ab196d0aaf914d8c82f6bdfef3 SHA512 b998d99fccd738d376c5ff11d4d0606678390dad67858172b028da287c4159e5cc0003d10fac109f1bf1a4f7c2531c37b88763f87557b00edea3fe72896ea121 WHIRLPOOL 5424830cb34061b9b50f1aa92dc7cd64eb82db7a71479365c817b666834b29a1090333f1b04eabb211854d9f74cdfb255db6f06e4fc9b62fae711c03264d4e01
 EBUILD janus-0.0.9.ebuild 1677 SHA256 4609e3232183792a6bb45bd229de80942a350a31af5e84adf0734bf31d168e2a SHA512 34dbd2902b76b887db6ffd5a91939881b0b086a11f8efeeac7fc7aa2d1417e41d57ee1c0bee7556305fa7adcbe54ae18620bba3878818b0d1e1d0a49d4ab2b47 WHIRLPOOL 01ffa13ca0f00731f9223872c85adfee541c6446f48bdb236920b75b7f65bf7ae2be25c5d8b2b8d2b966d6a6a687bc980efe694480f5b249ef2b1e419bc15537

From 431bab02cce83d249e9925e00d5d414f43f0e7a9 Mon Sep 17 00:00:00 2001
From: root <root@devnode02.safesoftsolutions.com>
Date: Tue, 10 Nov 2015 20:29:45 -0800
Subject: [PATCH 122/261] use latest perl ast agi

---
 dev-perl/asterisk-perl/Manifest               |  2 ++
 .../asterisk-perl/asterisk-perl-1.03.ebuild   | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 dev-perl/asterisk-perl/asterisk-perl-1.03.ebuild

diff --git a/dev-perl/asterisk-perl/Manifest b/dev-perl/asterisk-perl/Manifest
index c3c7ca7..9a9516f 100644
--- a/dev-perl/asterisk-perl/Manifest
+++ b/dev-perl/asterisk-perl/Manifest
@@ -1,2 +1,4 @@
 DIST asterisk-perl-0.08.tar.gz 13217 SHA256 9be1c49c5f5519d90a8937ffef32bbde5c2ff9f565fc2f5f219afcef43ac2fa2 SHA512 80e2aeb5ee45504552e68f81fc3507690f3e02c0601370883c9497450b80f6590bb17cb0cb8226a2bda5ac36fb97d677930690de32482e29adc8a90ff6b74716 WHIRLPOOL 58843f1df17445bda67eeb218477df6746f99447ccca669b3ba3dfea7cc775a6e3e79d594d1a8aba04670a3f42b86cbbf60490006969e200724610011a493762
+DIST asterisk-perl-1.03.tar.gz 27876 SHA256 8749cf654a66c2f1af23e996d522fe2223c0f87cff2d2056edf220976e22e967 SHA512 014b8195ca9117dd0a272096f3480dbec839bb7a9f6f48b28cee9cef9062863b2f3c4aad98b5e495ded07d79bbe610c631c6ad5480cd1bc7d1f7e6f8c39f47a4 WHIRLPOOL 2ce264faa5a851279bcb98e5b1ef2606064318652580fc55f1c1822927ace4cc3983abde23944998975f321f8feedc7a4a6f1d481c99b6d7afea3ba84747d9ed
 EBUILD asterisk-perl-0.08.ebuild 928 SHA256 1418fe1ece5c5fb7771850fb87c66b6c9bf65f7093c4c74e24165120ec3c7e52 SHA512 2b998e2873af87cc48313f46e1e24b6ce4081ed3270a4e53eeaa0bf3a868daad41d3d30bec81ba7c7fc6575671612b35eacf80092e7c8e63a37624e6ae1bdb20 WHIRLPOOL d51c9b63266f781bfdbd69e26ffb5c0485caae1f78c263eda9fe4cd8a7124cef66065a5dfec657e2aebfddaa3d14bbfa5da70e767f11c2b7d6e2fd081eb10422
+EBUILD asterisk-perl-1.03.ebuild 928 SHA256 1418fe1ece5c5fb7771850fb87c66b6c9bf65f7093c4c74e24165120ec3c7e52 SHA512 2b998e2873af87cc48313f46e1e24b6ce4081ed3270a4e53eeaa0bf3a868daad41d3d30bec81ba7c7fc6575671612b35eacf80092e7c8e63a37624e6ae1bdb20 WHIRLPOOL d51c9b63266f781bfdbd69e26ffb5c0485caae1f78c263eda9fe4cd8a7124cef66065a5dfec657e2aebfddaa3d14bbfa5da70e767f11c2b7d6e2fd081eb10422
diff --git a/dev-perl/asterisk-perl/asterisk-perl-1.03.ebuild b/dev-perl/asterisk-perl/asterisk-perl-1.03.ebuild
new file mode 100644
index 0000000..a619b99
--- /dev/null
+++ b/dev-perl/asterisk-perl/asterisk-perl-1.03.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/asterisk-perl/Attic/asterisk-perl-0.08.ebuild,v 1.4 2005/10/01 00:24:59 stkn dead $
+
+EAPI="5"
+
+inherit eutils perl-module
+
+DESCRIPTION="Perl bindings for the Asterisk AGI"
+HOMEPAGE="http://asterisk.gnuinter.net/"
+SRC_URI="http://asterisk.gnuinter.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+mydoc="README CHANGES examples/*"
+
+pkg_setup() {
+	einfo "Checking your perl installation..."
+#	if built_with_use "dev-lang/perl" minimal; then
+#		eerror "Your perl was built with the 'minimal' USE flag."
+#		eerror "asterisk-perl will not build in these conditions."
+#		eerror "Re-emerge dev-lang/perl with the 'minimal' flag unset."
+#		#die "perl with 'minimal' use flag found"
+#	fi
+	einfo "Everything is fine, continuing..."
+}

From 27aa6e07f524dd8ae7444403d4507b416e1c89d3 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sun, 15 Nov 2015 22:24:28 -0800
Subject: [PATCH 123/261] add a custom sofia patch

---
 net-libs/sofia-sip/Manifest                 |  3 ++
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild | 39 +++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 net-libs/sofia-sip/Manifest
 create mode 100644 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
new file mode 100644
index 0000000..6e33766
--- /dev/null
+++ b/net-libs/sofia-sip/Manifest
@@ -0,0 +1,3 @@
+DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
+DIST sofia-sip-patchset.tar.gz 626 SHA256 0ca9f7921b0dbf2bcd1ad66f5e864d5ba2c29f7fffecf38c8c2750bfff7c5b0c SHA512 56bd55b8a2a78022e5dd6fd5cf4af0e991a8e7bdaafe5f082318f6c861deb6552fa37c9f4a191729836c0002604042abe012e41d90c8d37ba2774cc1d06405ab WHIRLPOOL e1fa7196a60e7186ad89aa413cf447324aee3a64729d6556ed72c57a830c2613f040bf37661fc9c58b73e7056aa33f3854c2ac7a80ca3cb68ca0b5c5bd84e916
+EBUILD sofia-sip-1.12.11.ebuild 1022 SHA256 1b84b0e6fdff16fc4114cdee030fd1b32f1b6148c5d04e751127670b2ec272cd SHA512 80f648676a6660670d526d680fbe290a3ac6898497512fd9442cbc5dd084f016f8c56bf1d27afc71e8791a938114d866a50c5cdace760ce674d002bd9a186ee1 WHIRLPOOL aa1ec807dffab4965428aa3b3a76be321f63137b49bce71e6d37464563d1621f33820651262d5234377727bfff21708b09ae24c6ce57655857be69632dffb575
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
new file mode 100644
index 0000000..664e93d
--- /dev/null
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="RFC3261 compliant SIP User-Agent library"
+HOMEPAGE="http://sofia-sip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/sofia-sip-patchset.tar.gz"
+
+LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+IUSE="ssl static-libs"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/sofia-sip-patchset" )
+
+RDEPEND="dev-libs/glib:2
+        ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+        virtual/pkgconfig"
+
+# tests are broken, see bugs 304607 and 330261
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README README.developers RELEASE TODO )
+
+src_configure() {
+        econf \
+                $(use_enable static-libs static) \
+                $(use_with ssl openssl)
+}
+
+src_install() {
+        default
+        rm -f "${ED}"usr/lib*/lib${PN}*.la
+}

From c358cae32479138db5adebe765abe6e24144882a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 16 Nov 2015 01:11:33 -0800
Subject: [PATCH 124/261] compile sofia-sip with a different clag

---
 net-libs/sofia-sip/Manifest                 | 4 ++--
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 6e33766..7c94dde 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
-DIST sofia-sip-patchset.tar.gz 626 SHA256 0ca9f7921b0dbf2bcd1ad66f5e864d5ba2c29f7fffecf38c8c2750bfff7c5b0c SHA512 56bd55b8a2a78022e5dd6fd5cf4af0e991a8e7bdaafe5f082318f6c861deb6552fa37c9f4a191729836c0002604042abe012e41d90c8d37ba2774cc1d06405ab WHIRLPOOL e1fa7196a60e7186ad89aa413cf447324aee3a64729d6556ed72c57a830c2613f040bf37661fc9c58b73e7056aa33f3854c2ac7a80ca3cb68ca0b5c5bd84e916
-EBUILD sofia-sip-1.12.11.ebuild 1022 SHA256 1b84b0e6fdff16fc4114cdee030fd1b32f1b6148c5d04e751127670b2ec272cd SHA512 80f648676a6660670d526d680fbe290a3ac6898497512fd9442cbc5dd084f016f8c56bf1d27afc71e8791a938114d866a50c5cdace760ce674d002bd9a186ee1 WHIRLPOOL aa1ec807dffab4965428aa3b3a76be321f63137b49bce71e6d37464563d1621f33820651262d5234377727bfff21708b09ae24c6ce57655857be69632dffb575
+DIST sofia-sip-patchset.tar.gz 637 SHA256 c745a656e9c6cf386e572ed27d2e934e05f9eab364cf0a36273246ce2a13d5b0 SHA512 418b29bfc387baa536171cf807a875778ecbee71861b4f1df485e97e3bf8231b2d37765b96732da3b0a90ff78d6b1e6261450ee68cdc2610e9c4c19c04ccebac WHIRLPOOL e08dcf44f5d4635fa07dfaee9b2101dabdb5a53bd00259e595a547eebbbc637c5db37e8d6c00d8acc9a53203a73e3b07992f4c11898791205582fb6f16d5468b
+EBUILD sofia-sip-1.12.11.ebuild 1126 SHA256 b9890284fae23dc0556a9402141031617ca85fde720dbb9c7b64eaa7ea70d29c SHA512 2d5a7022085c24a4c67061da1343a77af367e15b077e6b284b5574837160150652d3f57b6d07bf661cd130b97e4c03fd317346afb178cbc44f08a890dabf3370 WHIRLPOOL ef16470e09c2f58678615346ffb59f87c8b0329bfe694f549e83a3b24dde3c3910a2752a049a0035a6fe9cd3b23e1b037096a31c4dc7748d070b917fabe0fa3f
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 664e93d..89ae5a9 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 DESCRIPTION="RFC3261 compliant SIP User-Agent library"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/${P}.tar.gz
 	http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/sofia-sip-patchset.tar.gz"
 
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
@@ -33,6 +33,10 @@ src_configure() {
                 $(use_with ssl openssl)
 }
 
+src_compile() {
+	CFLAGS="-fno-aggressive-loop-optimizations" emake
+}
+
 src_install() {
         default
         rm -f "${ED}"usr/lib*/lib${PN}*.la

From 858deb22bd20b4e07e6583c2587b86f73271bd03 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 24 Nov 2015 07:17:01 -0800
Subject: [PATCH 125/261] custom sofia for janus

---
 net-libs/sofia-sip/Manifest                 | 2 +-
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild | 4 ++--
 net-misc/janus/Manifest                     | 4 ++--
 net-misc/janus/janus-0.0.9.ebuild           | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 7c94dde..8be71af 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
 DIST sofia-sip-patchset.tar.gz 637 SHA256 c745a656e9c6cf386e572ed27d2e934e05f9eab364cf0a36273246ce2a13d5b0 SHA512 418b29bfc387baa536171cf807a875778ecbee71861b4f1df485e97e3bf8231b2d37765b96732da3b0a90ff78d6b1e6261450ee68cdc2610e9c4c19c04ccebac WHIRLPOOL e08dcf44f5d4635fa07dfaee9b2101dabdb5a53bd00259e595a547eebbbc637c5db37e8d6c00d8acc9a53203a73e3b07992f4c11898791205582fb6f16d5468b
-EBUILD sofia-sip-1.12.11.ebuild 1126 SHA256 b9890284fae23dc0556a9402141031617ca85fde720dbb9c7b64eaa7ea70d29c SHA512 2d5a7022085c24a4c67061da1343a77af367e15b077e6b284b5574837160150652d3f57b6d07bf661cd130b97e4c03fd317346afb178cbc44f08a890dabf3370 WHIRLPOOL ef16470e09c2f58678615346ffb59f87c8b0329bfe694f549e83a3b24dde3c3910a2752a049a0035a6fe9cd3b23e1b037096a31c4dc7748d070b917fabe0fa3f
+EBUILD sofia-sip-1.12.11.ebuild 1128 SHA256 482282e64b5bfc9d7928f205da1778d6cf7ee298dad28de62c233c5ae1b2548d SHA512 e71bb47b1e4a263d9b3478b94b1621f0d5dd1c4256699bf321d41419ce32131cb9c3069f0114dae3694d2fb2feddb65130697f198b4886b4c4d3ca25eb033b17 WHIRLPOOL 8f1dedba2df284655d03bd555c350d70d11997d6e8132a102d335fbddeaa88f449c299959a07106c56fa1c83bcfaa19901140260e48c14e7ecb54ba6ad2a7e83
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 89ae5a9..bdcf16a 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="ssl static-libs"
 
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/sofia-sip-patchset" )
+#EPATCH_SUFFIX="patch"
+#PATCHES=( "${WORKDIR}/sofia-sip-patchset" )
 
 RDEPEND="dev-libs/glib:2
         ssl? ( dev-libs/openssl )"
diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 87dad1b..0dd174b 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,2 +1,2 @@
-DIST janus-0.0.9.tar.gz 16144257 SHA256 873ed7571f3be8757955d88c73bb3b1a4df660ab196d0aaf914d8c82f6bdfef3 SHA512 b998d99fccd738d376c5ff11d4d0606678390dad67858172b028da287c4159e5cc0003d10fac109f1bf1a4f7c2531c37b88763f87557b00edea3fe72896ea121 WHIRLPOOL 5424830cb34061b9b50f1aa92dc7cd64eb82db7a71479365c817b666834b29a1090333f1b04eabb211854d9f74cdfb255db6f06e4fc9b62fae711c03264d4e01
-EBUILD janus-0.0.9.ebuild 1677 SHA256 4609e3232183792a6bb45bd229de80942a350a31af5e84adf0734bf31d168e2a SHA512 34dbd2902b76b887db6ffd5a91939881b0b086a11f8efeeac7fc7aa2d1417e41d57ee1c0bee7556305fa7adcbe54ae18620bba3878818b0d1e1d0a49d4ab2b47 WHIRLPOOL 01ffa13ca0f00731f9223872c85adfee541c6446f48bdb236920b75b7f65bf7ae2be25c5d8b2b8d2b966d6a6a687bc980efe694480f5b249ef2b1e419bc15537
+DIST janus-0.0.9.tar.gz 16045085 SHA256 4c2324275d55313481f1b3d6455c676f099a6980ce3a85ab4497532aa2fca860 SHA512 5f13ca2135c9c2cd071582d04a530acbf0427168bac6424dc30089e1732d6b507a177f59a37c37b5fcea4e6e0b8da9909b9f41a9ea9501bf9580481c7ddc14c3 WHIRLPOOL 2217222bee0a49a3d08f040798d279d3047fc538344ec35f65cd89713b844c9aefe6a542aaca671c141df9a781adf38d9d5559cfc81464e461b6d63819f10a7f
+EBUILD janus-0.0.9.ebuild 1850 SHA256 338ac6b78265408d72b96c04a7d53332854b1df8e778adb6bfa7032e3c84888b SHA512 8d0f2511aac5f2e95093f4ca09dbcccac3c950ca1023dd8b6c98a9b7dcf08a167683a8a38f1fe2e3eb8d4f43f987d356994e49a950de2ade3c09fe3e0e25a46a WHIRLPOOL ebd4501b0e51a4c4256d05d6930a2e943c1133de1dd2a62ec7c7ae05ea68bc223968a1326fc6690e8521b4eacceab8647018741fff62bdfb31f7d02a2865f52d
diff --git a/net-misc/janus/janus-0.0.9.ebuild b/net-misc/janus/janus-0.0.9.ebuild
index 80babaf..6571697 100644
--- a/net-misc/janus/janus-0.0.9.ebuild
+++ b/net-misc/janus/janus-0.0.9.ebuild
@@ -11,11 +11,15 @@ MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
 HOMEPAGE="http://janus.conf.meetecho.com/"
 SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
+#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="websockets rabbitmq docs opus ogg"
 
+#EPATCH_SUFFIX="patch"
+#PATCHES=( "${WORKDIR}/janus-patchset" )
+
 DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	opus? ( media-libs/opus )
 	ogg? ( media-libs/libogg )
@@ -29,7 +33,8 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	>=net-libs/libsrtp-1.5.2-r1
 	net-libs/sofia-sip
 	dev-libs/glib
-	dev-util/gengetopt"
+	dev-util/gengetopt
+	>=sys-devel/gcc-4.9.3:4.9"
 
 
 S="${WORKDIR}/janus-gateway"

From 1a5f7e9cd1f0a339bb720943dcf91f838c18a72c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 26 Nov 2015 23:38:42 -0800
Subject: [PATCH 126/261] janus ebuild with proper startup and multi instance

---
 net-libs/sofia-sip/Manifest                 |  2 +-
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild |  1 +
 net-misc/janus/Manifest                     |  5 +-
 net-misc/janus/janus-0.0.9.ebuild           | 77 ---------------------
 4 files changed, 5 insertions(+), 80 deletions(-)
 delete mode 100644 net-misc/janus/janus-0.0.9.ebuild

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 8be71af..37ee8ee 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
 DIST sofia-sip-patchset.tar.gz 637 SHA256 c745a656e9c6cf386e572ed27d2e934e05f9eab364cf0a36273246ce2a13d5b0 SHA512 418b29bfc387baa536171cf807a875778ecbee71861b4f1df485e97e3bf8231b2d37765b96732da3b0a90ff78d6b1e6261450ee68cdc2610e9c4c19c04ccebac WHIRLPOOL e08dcf44f5d4635fa07dfaee9b2101dabdb5a53bd00259e595a547eebbbc637c5db37e8d6c00d8acc9a53203a73e3b07992f4c11898791205582fb6f16d5468b
-EBUILD sofia-sip-1.12.11.ebuild 1128 SHA256 482282e64b5bfc9d7928f205da1778d6cf7ee298dad28de62c233c5ae1b2548d SHA512 e71bb47b1e4a263d9b3478b94b1621f0d5dd1c4256699bf321d41419ce32131cb9c3069f0114dae3694d2fb2feddb65130697f198b4886b4c4d3ca25eb033b17 WHIRLPOOL 8f1dedba2df284655d03bd555c350d70d11997d6e8132a102d335fbddeaa88f449c299959a07106c56fa1c83bcfaa19901140260e48c14e7ecb54ba6ad2a7e83
+EBUILD sofia-sip-1.12.11.ebuild 1151 SHA256 e538cd66183151f1cf516f830e1a53f6895a66a0f6a5912a8d1567d3e0842573 SHA512 57e36ea25ca1cad4e7be60e9490e36c604f76ed1508b8aea2bd2241179dc8acaf01b49a81bda1dd02ecbe0945ddccc093d7e53f1ea9a1bec2d1803b2fb7c17ee WHIRLPOOL daa8a7484caa87e777c01cc17c8019e45773057bb59081a82174ec7ceb2ca503c67725c613a695b708646ebcb8fcfe9197c4964e44e952f3073bfd73342685ee
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index bdcf16a..035cc60 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -18,6 +18,7 @@ IUSE="ssl static-libs"
 #PATCHES=( "${WORKDIR}/sofia-sip-patchset" )
 
 RDEPEND="dev-libs/glib:2
+	<=sys-devel/gcc-4.7.4
         ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
         virtual/pkgconfig"
diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 0dd174b..4db4df9 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,2 +1,3 @@
-DIST janus-0.0.9.tar.gz 16045085 SHA256 4c2324275d55313481f1b3d6455c676f099a6980ce3a85ab4497532aa2fca860 SHA512 5f13ca2135c9c2cd071582d04a530acbf0427168bac6424dc30089e1732d6b507a177f59a37c37b5fcea4e6e0b8da9909b9f41a9ea9501bf9580481c7ddc14c3 WHIRLPOOL 2217222bee0a49a3d08f040798d279d3047fc538344ec35f65cd89713b844c9aefe6a542aaca671c141df9a781adf38d9d5559cfc81464e461b6d63819f10a7f
-EBUILD janus-0.0.9.ebuild 1850 SHA256 338ac6b78265408d72b96c04a7d53332854b1df8e778adb6bfa7032e3c84888b SHA512 8d0f2511aac5f2e95093f4ca09dbcccac3c950ca1023dd8b6c98a9b7dcf08a167683a8a38f1fe2e3eb8d4f43f987d356994e49a950de2ade3c09fe3e0e25a46a WHIRLPOOL ebd4501b0e51a4c4256d05d6930a2e943c1133de1dd2a62ec7c7ae05ea68bc223968a1326fc6690e8521b4eacceab8647018741fff62bdfb31f7d02a2865f52d
+AUX janus-initd 1052 SHA256 b158a024187e796083dfab6864e51c74b335e1050f196b56167399eeb3dc5355 SHA512 cef38424ec1ca430401257a66199d4436b95209162828ad9fb5a9f01c11e1cdcc922c8a8499a580a2df3f97c301406916ddd483d442c46330521bbd4dbe2ec83 WHIRLPOOL 23f27d61840a116a617f9533255e885ab44fc6b892eb1f452d7fb2844babc58e3de7129305b69f62131199b0df41bbc838bd630019d847da0a46766d206410f9
+DIST janus-0.0.5.tar.gz 17154474 SHA256 118df1eb14e1ce62d3efc028a0e0bc5652ec724e77d364d0962fea7ed539a317 SHA512 6fcd4ae6e1a4d00c6301a17f008907673adab3f8335f3f82fd3667e39db7809717acc52dcb3aa81efa8fb287d1459e3dc6931983288047a8a75095ee9a16b0b7 WHIRLPOOL 5b91c108dda582c35a5515b6a4d694da422bb42692733800d1ac2fd36347ec14e860ac833860293060510e0c215e4e9efc94305b7859b2d8473565e3125edad9
+EBUILD janus-0.0.5.ebuild 1953 SHA256 c8798aedc3095f5a161266f18cde8e0339b9f8a768f77a9e01cbd1d5439e157a SHA512 c5fa5ed2d6e0b106d1b9d6e3bf7c66a8ea21364de4273542d5e82970f5b913ebab1d8f9a28fbb957583c4ecce87fed4da8857799177860ee351f4b57ae2533e9 WHIRLPOOL 290231b42336590e7d4f6a6dc5971ce61a93051ec4f6f715859d67665d037b948507cb7c2e337313863e8cd84b8856b95c917055fc5b9aa44d108a06bbbd21bc
diff --git a/net-misc/janus/janus-0.0.9.ebuild b/net-misc/janus/janus-0.0.9.ebuild
deleted file mode 100644
index 6571697..0000000
--- a/net-misc/janus/janus-0.0.9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#inherit autotools base eutils linux-info multilib user systemd
-inherit autotools base eutils multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
-HOMEPAGE="http://janus.conf.meetecho.com/"
-SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
-#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="websockets rabbitmq docs opus ogg"
-
-#EPATCH_SUFFIX="patch"
-#PATCHES=( "${WORKDIR}/janus-patchset" )
-
-DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
-	opus? ( media-libs/opus )
-	ogg? ( media-libs/libogg )
-	websockets? ( net-libs/libwebsockets dev-util/cmake )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	net-libs/libmicrohttpd
-	dev-libs/jansson
-	dev-libs/ding-libs
-	net-libs/libnice[-upnp]
-	dev-libs/openssl
-	>=net-libs/libsrtp-1.5.2-r1
-	net-libs/sofia-sip
-	dev-libs/glib
-	dev-util/gengetopt
-	>=sys-devel/gcc-4.9.3:4.9"
-
-
-S="${WORKDIR}/janus-gateway"
-
-src_prepare() {
-        ./autogen.sh || die "Autogen script failed"
-}
-
-src_configure() {
-	local vmst
-
-	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
-
-	econf \
-		--prefix=/usr \
-		--disable-data-channels \
-		$(use_enable websockets) \
-		$(use_enable rabbitmq) \
-		$(use_enable docs)
-}
-
-src_compile() {
-	export PREFIX="/usr"
-	MAKEOPTS="-j1" emake
-}
-
-src_install() {
-
-        mkdir -p "${D}"/etc/janus
-
-	#newinitd "${FILESDIR}"/webrtc2sip-initd webrtc2sip || die "newinitd failed" 
-	#newconfd "${FILESDIR}"/webrtc2sip-confd webrtc2sip || die "newconfd failed" 
-
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-
-}
-
-

From 104efac1f6b5a781865a59985fbd5085568e5d1f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 26 Nov 2015 23:40:22 -0800
Subject: [PATCH 127/261] add export flags

---
 net-misc/janus/files/janus-initd  | 51 +++++++++++++++++++
 net-misc/janus/janus-0.0.5.ebuild | 82 +++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100755 net-misc/janus/files/janus-initd
 create mode 100644 net-misc/janus/janus-0.0.5.ebuild

diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
new file mode 100755
index 0000000..f8ab84f
--- /dev/null
+++ b/net-misc/janus/files/janus-initd
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+janus_svcname() {
+        local ebextra=
+        case "${SVCNAME}" in
+                janus*) ;;
+                *) ebextra=" (janus)" ;;
+        esac
+        echo "${SVCNAME}${ebextra}"
+}
+
+
+start() {
+
+        ebegin "Starting $(janus_svcname)"
+
+	pid_file="/run/${SVCNAME}.pid"
+
+	export G_MESSAGES_DEBUG=false
+	export NICE_DEBUG=false
+
+        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+        if [ ! -r "${JANUS_CNF_PATH}/janus.cfg" ] ; then
+                eerror "Cannot read the configuration file \`${JANUS_CNF_PATH}/janus.cfg'"
+                return 1
+        fi
+
+        start-stop-daemon --start --exec /usr/bin/janus \
+                --pidfile ${pid_file} --make-pidfile --background \
+                -- -F${JANUS_CNF_PATH}
+	eend $?
+
+        save_options pidfile "${pidfile}"
+
+}
+
+stop() {
+
+        ebegin "Stopping $(janus_svcname)"
+
+	pid_file="/run/${SVCNAME}.pid"
+
+	ebegin "${pid_file}"
+
+	start-stop-daemon --stop -q --pidfile ${pid_file}
+        eend $?
+}
+
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
new file mode 100644
index 0000000..76197aa
--- /dev/null
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
+HOMEPAGE="http://janus.conf.meetecho.com/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
+#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="websockets rabbitmq docs opus ogg"
+
+#EPATCH_SUFFIX="patch"
+#PATCHES=( "${WORKDIR}/janus-patchset" )
+
+DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
+	opus? ( media-libs/opus )
+	ogg? ( media-libs/libogg )
+	websockets? ( net-libs/libwebsockets dev-util/cmake )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	net-libs/libmicrohttpd
+	dev-libs/jansson
+	net-libs/libnice[-upnp]
+	dev-libs/openssl
+	>=net-libs/libsrtp-1.5.2-r1
+	net-libs/sofia-sip
+	dev-libs/glib
+	app-misc/screen
+	dev-util/gengetopt"
+
+#	dev-libs/ding-libs
+
+
+S="${WORKDIR}/janus-gateway"
+
+src_prepare() {
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+
+	econf \
+		--prefix=/usr \
+		--disable-data-channels \
+		$(use_enable websockets) \
+		$(use_enable rabbitmq) \
+		$(use_enable docs)
+}
+
+src_compile() {
+	export PREFIX="/usr"
+	MAKEOPTS="-j1" emake
+}
+
+src_install() {
+
+        mkdir -p "${D}"/etc/janus
+
+        dodir /usr/sbin
+
+        cp "${FILESDIR}"/jmonitor "${D}"/usr/sbin/ || die "monitor failed to install"
+        cp "${FILESDIR}"/w2scmd "${D}"/usr/sbin/ || die "w2scmd failed to install"
+
+        newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+
+}
+
+

From 3271a43fd4ae80309e1188c4e040e175b6141653 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 01:45:01 -0800
Subject: [PATCH 128/261] small updates

---
 net-misc/janus/Manifest           | 6 +++---
 net-misc/janus/files/janus-initd  | 4 ++--
 net-misc/janus/janus-0.0.5.ebuild | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 4db4df9..f20a70c 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,3 +1,3 @@
-AUX janus-initd 1052 SHA256 b158a024187e796083dfab6864e51c74b335e1050f196b56167399eeb3dc5355 SHA512 cef38424ec1ca430401257a66199d4436b95209162828ad9fb5a9f01c11e1cdcc922c8a8499a580a2df3f97c301406916ddd483d442c46330521bbd4dbe2ec83 WHIRLPOOL 23f27d61840a116a617f9533255e885ab44fc6b892eb1f452d7fb2844babc58e3de7129305b69f62131199b0df41bbc838bd630019d847da0a46766d206410f9
-DIST janus-0.0.5.tar.gz 17154474 SHA256 118df1eb14e1ce62d3efc028a0e0bc5652ec724e77d364d0962fea7ed539a317 SHA512 6fcd4ae6e1a4d00c6301a17f008907673adab3f8335f3f82fd3667e39db7809717acc52dcb3aa81efa8fb287d1459e3dc6931983288047a8a75095ee9a16b0b7 WHIRLPOOL 5b91c108dda582c35a5515b6a4d694da422bb42692733800d1ac2fd36347ec14e860ac833860293060510e0c215e4e9efc94305b7859b2d8473565e3125edad9
-EBUILD janus-0.0.5.ebuild 1953 SHA256 c8798aedc3095f5a161266f18cde8e0339b9f8a768f77a9e01cbd1d5439e157a SHA512 c5fa5ed2d6e0b106d1b9d6e3bf7c66a8ea21364de4273542d5e82970f5b913ebab1d8f9a28fbb957583c4ecce87fed4da8857799177860ee351f4b57ae2533e9 WHIRLPOOL 290231b42336590e7d4f6a6dc5971ce61a93051ec4f6f715859d67665d037b948507cb7c2e337313863e8cd84b8856b95c917055fc5b9aa44d108a06bbbd21bc
+AUX janus-initd 1117 SHA256 42e7e405dffd3d448959c560108cd8dab63a1a0dbf207567c1cfced1d8e1ac10 SHA512 fb503775ed02a88c015c60c8d1913407272580eed668a0844ecfb1a166ed34bd11aed849ea2eb899aea95c929b476cb4234ba8be989cc23f57a2b1bc4a5c6d5a WHIRLPOOL 3a3465b6e60fc5b7ccc8e391a04ecf3dae60b9435d47a3e7176d5f539c9594ccbf7910f8e501cc1db3dedb84deb3f8038cbd0163e751fa442fe35c063c1a49bb
+DIST janus-0.0.5.tar.gz 17430043 SHA256 a1c9b8cb588a9abaadc23525e086a4663a408c79d0e550181bf11b6783b407dc SHA512 08839049435949dac27870389f29967b5f515be16697c549ea2860e3b71a8f54220b556bf9c135cb7ce3f51695cb6d70c936fd840e4cb5849b4644698d559628 WHIRLPOOL 6962ad42bb8796050996ae08164c52f6456920a37eda548acb21671179c840326f12412664c18049ec217296916dd0c3abef951e0a409ccab1391f46714dd4c2
+EBUILD janus-0.0.5.ebuild 1783 SHA256 b21cd858d5cad57186a70c66accd7ea28db2afd6d48020f3acdfb4fe8769dadd SHA512 e0fea37eecb69d895cf57eeb3b0766eb164c08f3c2b0bb35a8be0c16ce2f016df41250f37e98e0faa5c5884469e8e8d164281c658a279b89d3852853f126f6d7 WHIRLPOOL bceed02ade64afecb47da7650e1afd37dfbe4b29b99a7f3fb85c66c7377fe6b663f395d94e0f171828b068d159066a099b8cce2b40a85ab9e957667d4724b5f9
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index f8ab84f..a80c3b0 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -16,7 +16,7 @@ start() {
 
         ebegin "Starting $(janus_svcname)"
 
-	pid_file="/run/${SVCNAME}.pid"
+	pid_file="/var/run/${SVCNAME}.pid"
 
 	export G_MESSAGES_DEBUG=false
 	export NICE_DEBUG=false
@@ -41,7 +41,7 @@ stop() {
 
         ebegin "Stopping $(janus_svcname)"
 
-	pid_file="/run/${SVCNAME}.pid"
+	pid_file="/var/run/${SVCNAME}.pid"
 
 	ebegin "${pid_file}"
 
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
index 76197aa..eaef96a 100644
--- a/net-misc/janus/janus-0.0.5.ebuild
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -68,9 +68,6 @@ src_install() {
 
         dodir /usr/sbin
 
-        cp "${FILESDIR}"/jmonitor "${D}"/usr/sbin/ || die "monitor failed to install"
-        cp "${FILESDIR}"/w2scmd "${D}"/usr/sbin/ || die "w2scmd failed to install"
-
         newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
 
 	emake DESTDIR="${D}" installdirs

From 8549f9efaf6e44c8d80dd1abbf8bf456204c4c90 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 07:21:09 -0800
Subject: [PATCH 129/261] updates

---
 net-misc/janus/Manifest          | 4 ++--
 net-misc/janus/files/janus-initd | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index f20a70c..3cea54a 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,3 +1,3 @@
-AUX janus-initd 1117 SHA256 42e7e405dffd3d448959c560108cd8dab63a1a0dbf207567c1cfced1d8e1ac10 SHA512 fb503775ed02a88c015c60c8d1913407272580eed668a0844ecfb1a166ed34bd11aed849ea2eb899aea95c929b476cb4234ba8be989cc23f57a2b1bc4a5c6d5a WHIRLPOOL 3a3465b6e60fc5b7ccc8e391a04ecf3dae60b9435d47a3e7176d5f539c9594ccbf7910f8e501cc1db3dedb84deb3f8038cbd0163e751fa442fe35c063c1a49bb
-DIST janus-0.0.5.tar.gz 17430043 SHA256 a1c9b8cb588a9abaadc23525e086a4663a408c79d0e550181bf11b6783b407dc SHA512 08839049435949dac27870389f29967b5f515be16697c549ea2860e3b71a8f54220b556bf9c135cb7ce3f51695cb6d70c936fd840e4cb5849b4644698d559628 WHIRLPOOL 6962ad42bb8796050996ae08164c52f6456920a37eda548acb21671179c840326f12412664c18049ec217296916dd0c3abef951e0a409ccab1391f46714dd4c2
+AUX janus-initd 1140 SHA256 05a2142ebea734aa227a4a436dc7048c880715737fd37fcf0eefd23f648708ab SHA512 30b13e30ebb931a9d71eb526c144d82e087941a5d04f05f7e88f2f4e6886f51a77dd9841abc7cf064eed442a49b04960c85836df06af3b5ca465461164509ce7 WHIRLPOOL 3c1b658658ce4d81ef780aa422969d705379f731b00896404c6b926047e8c1115475dbc1294d2599ae215c67d9e84a255b7678b535514dbcdd962b480c248c62
+DIST janus-0.0.5.tar.gz 16336211 SHA256 aa6184d9effb8e8f905c39baf6b891c74c50bf26b9be35b14e2e3f4f1688a314 SHA512 41a74b9217023bd4b66469f6386c876b70c11dedaf29a2a4e3f048344d9f7fd790b9731227ae0ff5a92e883045ff0c3e4a3136c2ed5e4a0a744437eaf5bc9d36 WHIRLPOOL f793f2864fc667b174b3596a8113f90a5ba82efd9863baacb417fe53e54a83807c904bed358f8552baeac908484c84ee07a4ae4bfe7b34c8aa3aaf90a98a63e1
 EBUILD janus-0.0.5.ebuild 1783 SHA256 b21cd858d5cad57186a70c66accd7ea28db2afd6d48020f3acdfb4fe8769dadd SHA512 e0fea37eecb69d895cf57eeb3b0766eb164c08f3c2b0bb35a8be0c16ce2f016df41250f37e98e0faa5c5884469e8e8d164281c658a279b89d3852853f126f6d7 WHIRLPOOL bceed02ade64afecb47da7650e1afd37dfbe4b29b99a7f3fb85c66c7377fe6b663f395d94e0f171828b068d159066a099b8cce2b40a85ab9e957667d4724b5f9
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index a80c3b0..428e2df 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+
 janus_svcname() {
         local ebextra=
         case "${SVCNAME}" in
@@ -18,6 +19,8 @@ start() {
 
 	pid_file="/var/run/${SVCNAME}.pid"
 
+	ulimit -c unlimited
+
 	export G_MESSAGES_DEBUG=false
 	export NICE_DEBUG=false
 
@@ -30,7 +33,7 @@ start() {
 
         start-stop-daemon --start --exec /usr/bin/janus \
                 --pidfile ${pid_file} --make-pidfile --background \
-                -- -F${JANUS_CNF_PATH}
+                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
 	eend $?
 
         save_options pidfile "${pidfile}"

From 67e69cefee0ed068650415398b8e3f78fbe648f4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 08:01:56 -0800
Subject: [PATCH 130/261] update

---
 net-misc/janus/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 3cea54a..d21cd07 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,3 +1,3 @@
-AUX janus-initd 1140 SHA256 05a2142ebea734aa227a4a436dc7048c880715737fd37fcf0eefd23f648708ab SHA512 30b13e30ebb931a9d71eb526c144d82e087941a5d04f05f7e88f2f4e6886f51a77dd9841abc7cf064eed442a49b04960c85836df06af3b5ca465461164509ce7 WHIRLPOOL 3c1b658658ce4d81ef780aa422969d705379f731b00896404c6b926047e8c1115475dbc1294d2599ae215c67d9e84a255b7678b535514dbcdd962b480c248c62
-DIST janus-0.0.5.tar.gz 16336211 SHA256 aa6184d9effb8e8f905c39baf6b891c74c50bf26b9be35b14e2e3f4f1688a314 SHA512 41a74b9217023bd4b66469f6386c876b70c11dedaf29a2a4e3f048344d9f7fd790b9731227ae0ff5a92e883045ff0c3e4a3136c2ed5e4a0a744437eaf5bc9d36 WHIRLPOOL f793f2864fc667b174b3596a8113f90a5ba82efd9863baacb417fe53e54a83807c904bed358f8552baeac908484c84ee07a4ae4bfe7b34c8aa3aaf90a98a63e1
+AUX janus-initd 1165 SHA256 0ad40d0e8dc00e4a17c95fd0196bfc3ebe17ebc0b64382153ff3905352687c80 SHA512 20c41924a7bd8cf7108c70f2958a5163b12857b4c1a942a5b0050c942be18c6618d71d81181094d1264cf38c26de8304fbc737128ab6a3fd70721e10256d1605 WHIRLPOOL 3142372c785cc01e96a38347aea4f96d09943e798845c518e0d29d6a138caa187866f37ce42f8508c09f6cba944484c5651897d64f3b994caa626d836a14e888
+DIST janus-0.0.5.tar.gz 16336231 SHA256 e41c50eccc7c93cf86fc809e727dc14bc83cb42cf461d561414c3bfe64506524 SHA512 6f0f4687441d89aef8e6bc68babb327129f2682017522dab630ac3f048c43954629c5c4fdfbedb7ad415c382acaf3cd7633b3619927050d92fead71a115d5048 WHIRLPOOL b751bb7686d3f85150e7f72059ccf4c117b209c19ca148fabd7cddea965640c103e7910d93fabfd332f47ed32512f7a7d2e30b184286205c7fa9df40524fd5bf
 EBUILD janus-0.0.5.ebuild 1783 SHA256 b21cd858d5cad57186a70c66accd7ea28db2afd6d48020f3acdfb4fe8769dadd SHA512 e0fea37eecb69d895cf57eeb3b0766eb164c08f3c2b0bb35a8be0c16ce2f016df41250f37e98e0faa5c5884469e8e8d164281c658a279b89d3852853f126f6d7 WHIRLPOOL bceed02ade64afecb47da7650e1afd37dfbe4b29b99a7f3fb85c66c7377fe6b663f395d94e0f171828b068d159066a099b8cce2b40a85ab9e957667d4724b5f9

From da9c42f54bff273104da538ce1b887be1c520ff6 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Fri, 27 Nov 2015 08:46:32 -0800
Subject: [PATCH 131/261] add newer opus

---
 media-libs/opus/ChangeLog                     | 173 ++++++++++++++++++
 media-libs/opus/Manifest                      |   5 +
 .../1.1-fix-configure.ac-shell-bug.patch      |  14 ++
 media-libs/opus/metadata.xml                  |   8 +
 media-libs/opus/opus-1.1.1.ebuild             |  35 ++++
 5 files changed, 235 insertions(+)
 create mode 100644 media-libs/opus/ChangeLog
 create mode 100644 media-libs/opus/Manifest
 create mode 100644 media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
 create mode 100644 media-libs/opus/metadata.xml
 create mode 100644 media-libs/opus/opus-1.1.1.ebuild

diff --git a/media-libs/opus/ChangeLog b/media-libs/opus/ChangeLog
new file mode 100644
index 0000000..ed0b43a
--- /dev/null
+++ b/media-libs/opus/ChangeLog
@@ -0,0 +1,173 @@
+# ChangeLog for media-libs/opus
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opus/ChangeLog,v 1.48 2015/07/03 10:12:04 ago Exp $
+
+  03 Jul 2015; Agostino Sarubbo <ago@gentoo.org> opus-1.1.ebuild:
+  Stable for alpha, wrt bug #500868
+
+  07 Jun 2015; Markus Meier <maekke@gentoo.org> opus-1.1.ebuild:
+  arm stable, bug #500868
+
+  29 May 2015; Jack Morgan <jmorgan@gentoo.org> opus-1.1.ebuild:
+  sparc stable wrt bug #500868
+
+  29 May 2015; Jack Morgan <jmorgan@gentoo.org> opus-1.1.ebuild:
+  ia64 stable wrt bug #500868
+
+  28 May 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/1.1-fix-configure.ac-shell-bug.patch, opus-1.1.ebuild:
+  Add non-bash-shell patch from upstream provided in bug #510918
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> opus-1.1.ebuild:
+  Mark stable for amd64, bug #500868
+
+  05 May 2015; Jeroen Roovers <jer@gentoo.org> opus-1.1.ebuild:
+  Stable for PPC64 (bug #500868).
+
+  26 Apr 2015; Pacho Ramos <pacho@gentoo.org> opus-1.1.ebuild:
+  ppc stable wrt bug #500868
+
+  26 Apr 2015; Pacho Ramos <pacho@gentoo.org> opus-1.1.ebuild:
+  x86 stable wrt bug #500868
+
+  21 Apr 2015; Jeroen Roovers <jer@gentoo.org> opus-1.1.ebuild:
+  Stable for HPPA (bug #500868).
+
+  19 Apr 2015; Ben de Groot <yngwin@gentoo.org> -opus-1.0.1.ebuild,
+  -opus-1.0.2-r1.ebuild, -opus-1.0.2.ebuild, -opus-1.0.3.ebuild, metadata.xml:
+  remove old
+
+  10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for sparc, wrt bug #515234
+
+  10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for ia64, wrt bug #515234
+
+  23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for x86, wrt bug #512012
+
+  22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for amd64, wrt bug #512912
+
+  19 Jun 2014; Michał Górny <mgorny@gentoo.org> opus-1.1.ebuild:
+  Re-add ~sparc that most likely was mistakenly removed in revbump.
+
+*opus-1.1 (06 Dec 2013)
+
+  06 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +opus-1.1.ebuild:
+  Version bump.
+
+  28 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for alpha, wrt bug #446720
+
+  26 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for ppc, wrt bug #446720
+
+  24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for arm, wrt bug #446720
+
+  24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for ppc64, wrt bug #446720
+
+  23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2.ebuild:
+  Stable for x86, wrt bug #446720
+
+  23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2.ebuild:
+  Stable for amd64, wrt bug #446720
+
+  23 Aug 2013; Jeroen Roovers <jer@gentoo.org> opus-1.0.2-r2.ebuild:
+  Stable for HPPA (bug #446720).
+
+*opus-1.0.3 (08 Aug 2013)
+
+  08 Aug 2013; Alexis Ballier <aballier@gentoo.org> +opus-1.0.3.ebuild:
+  version bump
+
+*opus-1.0.2-r2 (08 May 2013)
+
+  08 May 2013; Alexis Ballier <aballier@gentoo.org> +opus-1.0.2-r2.ebuild:
+  Add multilib support by Karl Lindén, bug #468564
+
+  23 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Stable for sparc, wrt bug #458188
+
+  22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Stable for ia64, wrt bug #458188
+
+  08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Stable for alpha, wrt bug #450438
+
+  08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild,
+  opus-1.0.2-r1.ebuild:
+  reverted the stabilization on wong version, stabilized the right.
+
+  07 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.2-r1.ebuild:
+  Stable for hppa, wrt bug #454906
+
+  04 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Add ~sparc, wrt bug #450672
+
+*opus-1.0.2-r1 (04 Feb 2013)
+
+  04 Feb 2013; Hanno Boeck <hanno@gentoo.org> +opus-1.0.2-r1.ebuild,
+  metadata.xml:
+  Add custom-modes local use flag, fix herd (audio -> sound).
+
+  03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Add ~alpha, wrt bug #450672
+
+  03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Add ~ia64, wrt bug #450672
+
+  12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> -opus-0.9.14.ebuild,
+  -opus-0.9.8.ebuild, -opus-1.0.1_rc3.ebuild:
+  Redux versions to keep only stable as oldest.
+
+*opus-1.0.2 (12 Jan 2013)
+
+  12 Jan 2013; Hanno Boeck <hanno@gentoo.org> +opus-1.0.2.ebuild, metadata.xml:
+  Security bump (#446720), don't enable discouraged custom modes (#451268),
+  verbose log (#442592)
+
+  07 Jan 2013; Jeroen Roovers <jer@gentoo.org> opus-1.0.1.ebuild:
+  Marked ~hppa (bug #450672).
+
+  22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> opus-1.0.1.ebuild:
+  Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
+  bug #442518
+
+  11 Nov 2012; Anthony G. Basile <blueness@gentoo.org> opus-1.0.1.ebuild:
+  stable arm ppc ppc64, bug #442518
+
+  10 Nov 2012; <ago@gentoo.org> opus-1.0.1.ebuild:
+  Stable for amd64, wrt bug #442518
+
+  18 Oct 2012; Luca Barbato <lu_zero@gentoo.org> opus-1.0.1.ebuild:
+  Add freebsd as well
+
+  18 Oct 2012; Luca Barbato <lu_zero@gentoo.org> opus-1.0.1.ebuild:
+  Add few arches
+
+*opus-1.0.1 (17 Sep 2012)
+
+  17 Sep 2012; Ben de Groot <yngwin@gentoo.org> +opus-1.0.1.ebuild:
+  Version bump, bug #435278
+
+*opus-1.0.1_rc3 (09 Sep 2012)
+
+  09 Sep 2012; Luca Barbato <lu_zero@gentoo.org> +opus-1.0.1_rc3.ebuild:
+  New version
+
+  25 Jul 2012; Jeff Horelick <jdhore@gentoo.org> opus-0.9.14.ebuild:
+  Keyword ~x86 wrt bug 418233
+
+*opus-0.9.14 (14 Jun 2012)
+
+  14 Jun 2012; Luca Barbato <lu_zero@gentoo.org> +opus-0.9.14.ebuild:
+  New version
+
+*opus-0.9.8 (19 Nov 2011)
+
+  19 Nov 2011; Luca Barbato <lu_zero@gentoo.org> +opus-0.9.8.ebuild,
+  +metadata.xml:
+  Initial commit
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
new file mode 100644
index 0000000..9d458de
--- /dev/null
+++ b/media-libs/opus/Manifest
@@ -0,0 +1,5 @@
+AUX 1.1-fix-configure.ac-shell-bug.patch 545 SHA256 31bef7d778611192b973a8ce92b83ca4ebdec9404c0fc2853a2916e66977d4af SHA512 0174060c67c89a6836673784c7269d33ef4a421040ee9f9e37368e613f1ff482e792e1a3a9ac69868d933e5881edd778bcac2d254cb9ae9b4e3206d3a2245dee WHIRLPOOL ebebc79f75ca1bc9de95cb6a1a3edca98a4383258abeffb11ac71477783c1c30d8e1647a7cbb6c5e2e3dcc2992becaffbc6db3592bc893ae86e3209845136f44
+DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
+EBUILD opus-1.1.1.ebuild 921 SHA256 9edb018603d9b0690756efe2df91a3d4472445a91ac8b7e81488b3e3e7d3ec44 SHA512 e5fd8e75eb95df23a5911ad084da7349abaf55230bcd15fbfefafbf0773116595b59429261cf96829ff84e06ac72dfc1610a37ffc35268128a8c329019bd9d71 WHIRLPOOL ce69367a2bb47205122f3b6bf604b277003be72c3d49a53be295e10204477d5a0b8997e1c9674c30b6e44a8c75948d3b718e092c06a152aec5ba04596e4bf403
+MISC ChangeLog 5760 SHA256 30b7b09107813e0bdb94065535b28999b1abf4c63f05d43329d7d4fa9c62e031 SHA512 aceb0ed9b591f0a2263908b827f9a90750b569ef68d5a366547d2dc3ca405748f2717986656f1a31559c952456ce40a9e288ee03691e90e1eca4afefd9396514 WHIRLPOOL 4b8c75fe6aae4aed6c5e929c9191ea38f9b6c5ca6ba6d75d9c4258c9bd6f56167d82f616f5e0af9a9e45392789be41e3c02c5e31da403ca85a0d723ed5202879
+MISC metadata.xml 239 SHA256 0f0fec7fcbe04ead6403176cfaa25a426ad2be9b4bf28b11d77b92fb4fa0bc68 SHA512 bacd799b1cb6ba0a972796b62b80a2ea0b81511334c1dad6f5ffb57da72e9516e3a8b98a058f3b4461eb29723b75243c261af3aa5a43e3b43a5d10cc0e226796 WHIRLPOOL df085ffb47655ab7c87b466ec9bca481924b812e234dabba63fadfb1b167c09c52cff6f94d07ca9c85d570795b8ae5e98b5179e3e0a5e9e1ed09031d2d12c5b6
diff --git a/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch b/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
new file mode 100644
index 0000000..e354524
--- /dev/null
+++ b/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
@@ -0,0 +1,14 @@
+--- opus-1.1.orig/configure.ac
++++ opus-1.1/configure.ac
+@@ -333,9 +333,9 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
+ 
+ AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"])
+ AM_CONDITIONAL([OPUS_ARM_INLINE_ASM],
+-    [test x"${inline_optimization:0:3}" = x"ARM"])
++    [test x"${inline_optimization%% *}" = x"ARM"])
+ AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM],
+-    [test x"${asm_optimization:0:3}" = x"ARM"])
++    [test x"${asm_optimization%% *}" = x"ARM"])
+ 
+ AS_IF([test x"$enable_rtcd" = x"yes"],[
+     AS_IF([test x"$rtcd_support" != x"no"],[
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
new file mode 100644
index 0000000..82bdb14
--- /dev/null
+++ b/media-libs/opus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <use>
+    <flag name="custom-modes">Build with custom-modes.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-libs/opus/opus-1.1.1.ebuild b/media-libs/opus/opus-1.1.1.ebuild
new file mode 100644
index 0000000..205c25b
--- /dev/null
+++ b/media-libs/opus/opus-1.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF="1"
+inherit autotools-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/opus.git"
+else
+	SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Open versatile codec designed for interactive speech and audio transmission over the internet"
+HOMEPAGE="http://opus-codec.org/"
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="custom-modes doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/1.1-fix-configure.ac-shell-bug.patch" ) # bug 510918
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+	)
+	autotools-multilib_src_configure
+}

From 6ffafb47506f842eb31d5865363e04c5aebcfd23 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 08:53:31 -0800
Subject: [PATCH 132/261] manigest updated

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 250cde9..cc93901 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -91,7 +91,7 @@ DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
-DIST asterisk-patchset-3.0.tar.gz 6429 SHA256 0a2b2cad40e6815b393e9b3fe79a73611e0a0f2d8dfab9233c3867fa174ae55e SHA512 70c64326b8b4956ad77c852c7ce83d566c61c258ebb602877309ffe8370474ae0ed53bcc2c0db5ab07f159a14b263772a5c1b17263590461d5334c979afa2ad7 WHIRLPOOL e492adab4c3b0f6cf60f30e34f0da13c25024103c6d20d3fe4df118e4cc8fb507c629708beff3e8add1ae0eabd2b773071572e722729c7a29079a2e255c22943
+DIST asterisk-patchset-3.0.tar.gz 16093 SHA256 476c82d534656b11e0f99694787f08e46242ccaf13a323e5a2a589a7e4d77e3a SHA512 3380a672257dd7f854a3b1e562846b60043304e16a56587f390bd71e11ad86ba0a6df72d671126da273464aea8f2ad91905482e308212430ec4c7f0f45defa05 WHIRLPOOL 319e9bf9515ee79d3b6862d1974520462afa54c2ddfadaf1c6137e35734c194318db6930c5ab5368665db9644b12ff046aecfc52e4c70e55c4484c2f38a46bd9
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From fe37a819555e091b4ccadbef98091417028ac2ad Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 11:00:45 -0800
Subject: [PATCH 133/261] updated init with safe wrapper

---
 net-misc/janus/Manifest           |   3 -
 net-misc/janus/files/janus-confd  |  22 ++++
 net-misc/janus/files/janus-initd  | 163 ++++++++++++++++++++++++++++--
 net-misc/janus/janus-0.0.5.ebuild |   1 +
 4 files changed, 178 insertions(+), 11 deletions(-)
 delete mode 100644 net-misc/janus/Manifest
 create mode 100644 net-misc/janus/files/janus-confd

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
deleted file mode 100644
index d21cd07..0000000
--- a/net-misc/janus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX janus-initd 1165 SHA256 0ad40d0e8dc00e4a17c95fd0196bfc3ebe17ebc0b64382153ff3905352687c80 SHA512 20c41924a7bd8cf7108c70f2958a5163b12857b4c1a942a5b0050c942be18c6618d71d81181094d1264cf38c26de8304fbc737128ab6a3fd70721e10256d1605 WHIRLPOOL 3142372c785cc01e96a38347aea4f96d09943e798845c518e0d29d6a138caa187866f37ce42f8508c09f6cba944484c5651897d64f3b994caa626d836a14e888
-DIST janus-0.0.5.tar.gz 16336231 SHA256 e41c50eccc7c93cf86fc809e727dc14bc83cb42cf461d561414c3bfe64506524 SHA512 6f0f4687441d89aef8e6bc68babb327129f2682017522dab630ac3f048c43954629c5c4fdfbedb7ad415c382acaf3cd7633b3619927050d92fead71a115d5048 WHIRLPOOL b751bb7686d3f85150e7f72059ccf4c117b209c19ca148fabd7cddea965640c103e7910d93fabfd332f47ed32512f7a7d2e30b184286205c7fa9df40524fd5bf
-EBUILD janus-0.0.5.ebuild 1783 SHA256 b21cd858d5cad57186a70c66accd7ea28db2afd6d48020f3acdfb4fe8769dadd SHA512 e0fea37eecb69d895cf57eeb3b0766eb164c08f3c2b0bb35a8be0c16ce2f016df41250f37e98e0faa5c5884469e8e8d164281c658a279b89d3852853f126f6d7 WHIRLPOOL bceed02ade64afecb47da7650e1afd37dfbe4b29b99a7f3fb85c66c7377fe6b663f395d94e0f171828b068d159066a099b8cce2b40a85ab9e957667d4724b5f9
diff --git a/net-misc/janus/files/janus-confd b/net-misc/janus/files/janus-confd
new file mode 100644
index 0000000..485d27a
--- /dev/null
+++ b/net-misc/janus/files/janus-confd
@@ -0,0 +1,22 @@
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#JANUS_NOTIFY_EMAIL="root"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+JANUS_CORE_DIR="/etc/janus"
+
+
+#
+# Delay time before restarting janus after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+JANUS_RESTART_DELAY=5
+
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 428e2df..cd6ee25 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+extra_started_commands="forcestop"
 
 janus_svcname() {
         local ebextra=
@@ -13,6 +14,98 @@ janus_svcname() {
 }
 
 
+
+is_running() {
+
+	pid_file="/var/run/${SVCNAME}.pid"
+                
+	if [ "$(pidof janus)" ]; then
+		echo "$(pidof janus)" > ${pid_file}
+	fi
+
+        [ -r "${pid_file}" ] || return 1
+        PID="$(cat "${pid_file}")"
+        [ -d "/proc/${PID}" ] || return 1
+        EXE="$(readlink -f /proc/${PID}/exe)"
+        EXE="${EXE% (deleted)}" # in case janus got upgraded and we're still looking at an old one.
+        [ "${EXE}" = /usr/bin/janus ] || return 1 # pid got re-used for another process.
+
+        # PID reported in pidfile is active, and is still an janus instance.
+        return 0
+}
+
+
+janus_run_loop() {
+        local result=0 signal=0
+
+        pid_file="/var/run/${SVCNAME}.pid"
+
+        echo "Initializing $(janus_svcname) wrapper"
+        
+        trap "rm -f '/var/run/janus_wrapper_loop.running'" EXIT
+        touch "/var/run/janus_wrapper_loop.running"
+
+        while [ -r "/var/run/janus_wrapper_loop.running" ]; do
+
+	        export G_MESSAGES_DEBUG=false
+	        export NICE_DEBUG=false
+
+	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+		if [ ! "$(pidof janus)" ]; then
+			/usr/bin/janus -F${JANUS_CNF_PATH} -N -L /var/log/janus.log 
+			echo "$(pidof janus)" > ${pid_file}
+                        result=$?
+		fi
+
+                if [ "$result" -eq 0 ]; then
+                        echo "Janus terminated normally"
+                        break
+                else
+                        if [ "$result" -gt 128 ]; then
+                                signal="$(expr "$result" - 128)"
+                                MSG="Janus terminated with Signal: $signal"
+
+                                CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+                                local CORE_DUMPED=0
+                                if [ -f "${JANUS_CORE_DIR}/core" ]; then
+                                        mv "${JANUS_CORE_DIR}/core" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                elif [ -f "${JANUS_CORE_DIR}/core.${PID}" ]; then
+                                        mv "${JANUS_CORE_DIR}/core.${PID}" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                fi
+
+                                [ $CORE_DUMPED -eq 1 ] && \
+                                        MSG="${MSG}\n\rCore dumped: ${JANUS_CORE_DIR}/${CORE_TARGET}"
+                        else
+                                MSG="Janus terminated with return code: $result"
+                        fi
+
+                        # kill left-over tasks
+                        for X in ${JANUS_CLEANUP_ON_CRASH}; do
+                                kill -9 "$(pidof "${X}")";
+                        done
+                fi
+
+                if [ -n "${JANUS_NOTIFY_EMAIL}" ] && \
+                   [ -x /usr/sbin/sendmail ]; then
+                        echo -e -n "Subject: Janus crashed\r\n${MSG}\r\n" |\
+                                 /usr/sbin/sendmail "${JANUS_NOTIFY_EMAIL}"
+                fi
+                sleep "${JANUS_RESTART_DELAY}"
+                echo "Restarting Janus..."
+        done
+
+        echo "Terminating wrapper loop."
+        return 0
+}
+
 start() {
 
         ebegin "Starting $(janus_svcname)"
@@ -31,24 +124,78 @@ start() {
                 return 1
         fi
 
-        start-stop-daemon --start --exec /usr/bin/janus \
-                --pidfile ${pid_file} --make-pidfile --background \
-                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
-	eend $?
+#        start-stop-daemon --start --exec /usr/bin/janus \
+#                --pidfile ${pid_file} --make-pidfile --background \
+#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
+
+        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+        result=$?
+
+        if [ $result -eq 0 ]; then
+                # 2 seconds should be enough for janus to start
+                sleep 2
+                is_running
+                result=$?
+
+                [ $result -eq 0 ] || wrapperstop
+        fi
 
-        save_options pidfile "${pidfile}"
 
 }
 
+wrapperstop() {
+        # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+        if [ -r "/var/run/janus_wrapper_loop.pid" ]; then
+                ebegin "Killing janus wrapper script"
+                kill "$(cat /var/run/janus_wrapper_loop.pid)"
+                eend $?
+        fi
+
+        # The new one (due to "hardened" requirements) uses a simpler
+        # flag to indicate running or shutting down.
+        if [ -r "/var/run/janus_wrapper_loop.running" ]; then
+                ebegin "Signalling wrapper script to terminate"
+                rm "/var/run/janus_wrapper_loop.running"
+                eend $?
+        fi
+
+        return 0
+}
+
 stop() {
 
         ebegin "Stopping $(janus_svcname)"
 
+	wrapperstop
+
 	pid_file="/var/run/${SVCNAME}.pid"
 
-	ebegin "${pid_file}"
+        if is_running; then
+                einfon "Waiting for janus to shutdown ."
+                local cnt=0
+                while is_running; do
+                        cnt="$(expr $cnt + 1)"
+                        if [ $cnt -gt 5 ] ; then
+
+		                if [ "$(pidof janus)" ]; then
+		                        echo "$(pidof janus)" > ${pid_file}
+		                fi
+
+                                start-stop-daemon --stop --pidfile ${pid_file}
+                                return
+                        fi
+                        if [ $cnt -gt 60 ] ; then
+                                # Waited 120 seconds now. Fail.
+                                echo
+                                eend 1 "Failed."
+                                return
+                        fi
+                        sleep 2
+                        echo -n "."
+                done
+                echo
+        fi
+        eend 0
 
-	start-stop-daemon --stop -q --pidfile ${pid_file}
-        eend $?
 }
 
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
index eaef96a..ae708a0 100644
--- a/net-misc/janus/janus-0.0.5.ebuild
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -69,6 +69,7 @@ src_install() {
         dodir /usr/sbin
 
         newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
+        newconfd "${FILESDIR}"/janus-confd janus || die "newconfd failed"
 
 	emake DESTDIR="${D}" installdirs
 	emake DESTDIR="${D}" install

From d6ee3c22f5d0b588e6e223397fd91142f859ec88 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 11:01:43 -0800
Subject: [PATCH 134/261] new mani

---
 net-misc/janus/Manifest | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 net-misc/janus/Manifest

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
new file mode 100644
index 0000000..9a8724a
--- /dev/null
+++ b/net-misc/janus/Manifest
@@ -0,0 +1,4 @@
+AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
+AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
+DIST janus-0.0.5.tar.gz 16336231 SHA256 e41c50eccc7c93cf86fc809e727dc14bc83cb42cf461d561414c3bfe64506524 SHA512 6f0f4687441d89aef8e6bc68babb327129f2682017522dab630ac3f048c43954629c5c4fdfbedb7ad415c382acaf3cd7633b3619927050d92fead71a115d5048 WHIRLPOOL b751bb7686d3f85150e7f72059ccf4c117b209c19ca148fabd7cddea965640c103e7910d93fabfd332f47ed32512f7a7d2e30b184286205c7fa9df40524fd5bf
+EBUILD janus-0.0.5.ebuild 1857 SHA256 2f4bfe1fb164ceb240795ca5c22105014f136bc8c1c1a113a37f077c26d01638 SHA512 f4b6e3feaff3d55e7cbe98e62365a35968b08f9666a1f59c42d4302a164be0030c4c502cdab81ea9c836d2ab98168a57efc0e87f0751276160f1b34d9f6dca5a WHIRLPOOL 411569d8978e46d16aca96465e668ea895261372be4bdfd324377bb6386da1de1931d0d861c704dcff72bf1bfeea60632cb84df01622e03a91a1e315a76a0cdb

From ff50f41e293a701dfc9abbd3b06d2ddef77b6916 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 27 Nov 2015 13:53:21 -0800
Subject: [PATCH 135/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 9a8724a..ba10533 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
-DIST janus-0.0.5.tar.gz 16336231 SHA256 e41c50eccc7c93cf86fc809e727dc14bc83cb42cf461d561414c3bfe64506524 SHA512 6f0f4687441d89aef8e6bc68babb327129f2682017522dab630ac3f048c43954629c5c4fdfbedb7ad415c382acaf3cd7633b3619927050d92fead71a115d5048 WHIRLPOOL b751bb7686d3f85150e7f72059ccf4c117b209c19ca148fabd7cddea965640c103e7910d93fabfd332f47ed32512f7a7d2e30b184286205c7fa9df40524fd5bf
+DIST janus-0.0.5.tar.gz 16336225 SHA256 84e89678dc3e296c5c25a35ccc9c4f33ffb62324e8990d32bff2df47ea9c7fe8 SHA512 7875550f3f857ec8cf8f12b556d3b9a77260c56f4ee8cb28bb299c9f039662b37c0f183f74b8224d08fbd52cf130fcd2b4c7fd46587969691f8a0e915ca22717 WHIRLPOOL 812e76b8c64b637950fe68b88951136da83c736d7f2097f23308b0465f0613aea2f9b67ef44375a1bf45ea2ca97024617de0ff5213f7ade80282bfa885373887
 EBUILD janus-0.0.5.ebuild 1857 SHA256 2f4bfe1fb164ceb240795ca5c22105014f136bc8c1c1a113a37f077c26d01638 SHA512 f4b6e3feaff3d55e7cbe98e62365a35968b08f9666a1f59c42d4302a164be0030c4c502cdab81ea9c836d2ab98168a57efc0e87f0751276160f1b34d9f6dca5a WHIRLPOOL 411569d8978e46d16aca96465e668ea895261372be4bdfd324377bb6386da1de1931d0d861c704dcff72bf1bfeea60632cb84df01622e03a91a1e315a76a0cdb

From 45e7533d6152e392d8764d7f0354d75836b1ce82 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 2 Dec 2015 16:29:08 -0800
Subject: [PATCH 136/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index ba10533..06ef132 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
-DIST janus-0.0.5.tar.gz 16336225 SHA256 84e89678dc3e296c5c25a35ccc9c4f33ffb62324e8990d32bff2df47ea9c7fe8 SHA512 7875550f3f857ec8cf8f12b556d3b9a77260c56f4ee8cb28bb299c9f039662b37c0f183f74b8224d08fbd52cf130fcd2b4c7fd46587969691f8a0e915ca22717 WHIRLPOOL 812e76b8c64b637950fe68b88951136da83c736d7f2097f23308b0465f0613aea2f9b67ef44375a1bf45ea2ca97024617de0ff5213f7ade80282bfa885373887
+DIST janus-0.0.5.tar.gz 16336235 SHA256 f81ca57e907dc5eacc3746018e6709b9e4e79ab71d9cbde7e45139bd591e24e8 SHA512 d492f49e48236f84105a82370e4442f9c81e84a1a69939ab4ae777132dc77595b2ea03353d12d39a0b3de58820d375de668765bcb3779ad2ab82e8835a92a207 WHIRLPOOL c4f29905942e8105371ae83eb0a1129e706079900975c4e77b9212d5fcff520d28dc3e7d52bb6f66e6585202ef504f3592bf0368508ff00987858e91f214195d
 EBUILD janus-0.0.5.ebuild 1857 SHA256 2f4bfe1fb164ceb240795ca5c22105014f136bc8c1c1a113a37f077c26d01638 SHA512 f4b6e3feaff3d55e7cbe98e62365a35968b08f9666a1f59c42d4302a164be0030c4c502cdab81ea9c836d2ab98168a57efc0e87f0751276160f1b34d9f6dca5a WHIRLPOOL 411569d8978e46d16aca96465e668ea895261372be4bdfd324377bb6386da1de1931d0d861c704dcff72bf1bfeea60632cb84df01622e03a91a1e315a76a0cdb

From c85a72352a3ba88a5f9331d5ae4542364afe6699 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 2 Dec 2015 16:33:41 -0800
Subject: [PATCH 137/261] update mani

---
 net-misc/janus/Manifest           | 2 +-
 net-misc/janus/janus-0.0.5.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 06ef132..b5a7700 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
 DIST janus-0.0.5.tar.gz 16336235 SHA256 f81ca57e907dc5eacc3746018e6709b9e4e79ab71d9cbde7e45139bd591e24e8 SHA512 d492f49e48236f84105a82370e4442f9c81e84a1a69939ab4ae777132dc77595b2ea03353d12d39a0b3de58820d375de668765bcb3779ad2ab82e8835a92a207 WHIRLPOOL c4f29905942e8105371ae83eb0a1129e706079900975c4e77b9212d5fcff520d28dc3e7d52bb6f66e6585202ef504f3592bf0368508ff00987858e91f214195d
-EBUILD janus-0.0.5.ebuild 1857 SHA256 2f4bfe1fb164ceb240795ca5c22105014f136bc8c1c1a113a37f077c26d01638 SHA512 f4b6e3feaff3d55e7cbe98e62365a35968b08f9666a1f59c42d4302a164be0030c4c502cdab81ea9c836d2ab98168a57efc0e87f0751276160f1b34d9f6dca5a WHIRLPOOL 411569d8978e46d16aca96465e668ea895261372be4bdfd324377bb6386da1de1931d0d861c704dcff72bf1bfeea60632cb84df01622e03a91a1e315a76a0cdb
+EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
index ae708a0..9e31e18 100644
--- a/net-misc/janus/janus-0.0.5.ebuild
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -33,9 +33,8 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	net-libs/sofia-sip
 	dev-libs/glib
 	app-misc/screen
-	dev-util/gengetopt"
-
-#	dev-libs/ding-libs
+	dev-util/gengetopt
+	dev-libs/ding-libs"
 
 
 S="${WORKDIR}/janus-gateway"

From 8187a5a407552cf6637dd234533d9d2ae5262949 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 2 Dec 2015 18:21:21 -0800
Subject: [PATCH 138/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index b5a7700..162d091 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
-DIST janus-0.0.5.tar.gz 16336235 SHA256 f81ca57e907dc5eacc3746018e6709b9e4e79ab71d9cbde7e45139bd591e24e8 SHA512 d492f49e48236f84105a82370e4442f9c81e84a1a69939ab4ae777132dc77595b2ea03353d12d39a0b3de58820d375de668765bcb3779ad2ab82e8835a92a207 WHIRLPOOL c4f29905942e8105371ae83eb0a1129e706079900975c4e77b9212d5fcff520d28dc3e7d52bb6f66e6585202ef504f3592bf0368508ff00987858e91f214195d
+DIST janus-0.0.5.tar.gz 16609696 SHA256 69227d1d370276b7512b52d02109df83e54c6c15dc5f2cee10ed607862e24ba9 SHA512 7480cec39830d8d613434d3dbd96e67e5654387f3bf7be2fd86aa5986daa96f88c6cdf92f90c1d2375aafb31e75647d9f2db73a62e81e058f1ef42de6c9a9310 WHIRLPOOL f2eb0564ba736f970d73151e7db1d53b03f6566fab4ca38c59cd247ceb8e172bfecd89baab9651c7d75473339b42392239d64f3b058ddcd60d602dab6659cb03
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 1be316bea3d955971316024d77114bce0dbb4d48 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 2 Dec 2015 21:18:57 -0800
Subject: [PATCH 139/261] proper pid implementation

---
 net-misc/janus/Manifest          |  2 +-
 net-misc/janus/files/janus-initd | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 162d091..24c0200 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
-DIST janus-0.0.5.tar.gz 16609696 SHA256 69227d1d370276b7512b52d02109df83e54c6c15dc5f2cee10ed607862e24ba9 SHA512 7480cec39830d8d613434d3dbd96e67e5654387f3bf7be2fd86aa5986daa96f88c6cdf92f90c1d2375aafb31e75647d9f2db73a62e81e058f1ef42de6c9a9310 WHIRLPOOL f2eb0564ba736f970d73151e7db1d53b03f6566fab4ca38c59cd247ceb8e172bfecd89baab9651c7d75473339b42392239d64f3b058ddcd60d602dab6659cb03
+DIST janus-0.0.5.tar.gz 16324113 SHA256 e48497a12ac0e44f8a08be00245d57f6dd4fe09f87123750e297950e278fcffe SHA512 66bd4a36522399d2341b90acbaeea5dc59b7fcb5c60e9bb38f47b0b2503c05ca74d5762f4c79fae7d9ac08af8e613a7438d41c55b6990baaca5cc9ce0ec6bd70 WHIRLPOOL e3c7ce27d46e7c8b696c2b6114d5e90bd510f0d3bdd279e7c4f0446298e71625f5c34aaa0316d70499a49eaa07ce50ec9af037e7c4f66ed879650b7f6817ac29
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index cd6ee25..e825998 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -19,10 +19,6 @@ is_running() {
 
 	pid_file="/var/run/${SVCNAME}.pid"
                 
-	if [ "$(pidof janus)" ]; then
-		echo "$(pidof janus)" > ${pid_file}
-	fi
-
         [ -r "${pid_file}" ] || return 1
         PID="$(cat "${pid_file}")"
         [ -d "/proc/${PID}" ] || return 1
@@ -52,11 +48,8 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
-		if [ ! "$(pidof janus)" ]; then
-			/usr/bin/janus -F${JANUS_CNF_PATH} -N -L /var/log/janus.log 
-			echo "$(pidof janus)" > ${pid_file}
-                        result=$?
-		fi
+		/usr/bin/janus -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+		result=$?
 
                 if [ "$result" -eq 0 ]; then
                         echo "Janus terminated normally"
@@ -89,7 +82,7 @@ janus_run_loop() {
 
                         # kill left-over tasks
                         for X in ${JANUS_CLEANUP_ON_CRASH}; do
-                                kill -9 "$(pidof "${X}")";
+                                kill -9 "${PID}";
                         done
                 fi
 
@@ -177,10 +170,6 @@ stop() {
                         cnt="$(expr $cnt + 1)"
                         if [ $cnt -gt 5 ] ; then
 
-		                if [ "$(pidof janus)" ]; then
-		                        echo "$(pidof janus)" > ${pid_file}
-		                fi
-
                                 start-stop-daemon --stop --pidfile ${pid_file}
                                 return
                         fi

From 8d40d3f03f1b9f45391029020e5a4fd35e0be039 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 3 Dec 2015 09:43:52 -0800
Subject: [PATCH 140/261] update pedi mani

---
 net-misc/janus/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 24c0200..95c0fdc 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
-AUX janus-initd 6334 SHA256 7a68d520a118fb08957696cf4fe1cc91ffe7c5f30f225c60cfab5e3535f37b82 SHA512 87fd08ab6bfae2d6752729fcbada4418b2bb3a090092920c4e5bfb9eb5f91a089b19b713aa6ac04aa9f0e19197455bcaef30f8a4175ce8b0ebf15974e100e739 WHIRLPOOL 079c2a8a165ac767ed201e79178d72012f9c9023a56d09eb3fdafe7861aac9282cd7354ac9246c879b995ca8ed22dbabd1dc529fb4ea3dadc3f331b513dddc19
-DIST janus-0.0.5.tar.gz 16324113 SHA256 e48497a12ac0e44f8a08be00245d57f6dd4fe09f87123750e297950e278fcffe SHA512 66bd4a36522399d2341b90acbaeea5dc59b7fcb5c60e9bb38f47b0b2503c05ca74d5762f4c79fae7d9ac08af8e613a7438d41c55b6990baaca5cc9ce0ec6bd70 WHIRLPOOL e3c7ce27d46e7c8b696c2b6114d5e90bd510f0d3bdd279e7c4f0446298e71625f5c34aaa0316d70499a49eaa07ce50ec9af037e7c4f66ed879650b7f6817ac29
+AUX janus-initd 6032 SHA256 6cf1a1f3d345ecbf19ed1e25c638b1e4e6fa32ff01ae6256e85a8c7d36724324 SHA512 e5d5aa65a4b5513200f2edb1fca2cf855da887887b54de1e938d0f75c07468750bde3dca0c45599f977adcbb4db2d1411d19cafe1d5aa7a9fe3b31b9e515e8e2 WHIRLPOOL 5985c51b3d335da4d602713c0f54020639d65662914c5d9cfdfceb2dfdce2a4c589661e802a135c2f5ef7b972acf795702f6419da9624e7480ce8a8253b8759b
+DIST janus-0.0.5.tar.gz 16361655 SHA256 8b0b57f371d2ad4196a7dc4d9dd2b2aa9ba2786c6da25ea73aab7f8231b4db02 SHA512 b3de5d3aeaf7f49bf3ef78d5fa8c6f2b7b0c9fd6652bbce8660e9bd93437bd07687a8fd6e87abc8ed9212aa9632e23437ebd4047fe8e3f0704cb7573ca2d8fe0 WHIRLPOOL 1f254220e93e7f24131173c3803dc44accfff86b2e1e1ca287fa0a9d1507db49308968dc1f2b0e4064a9de6c7fb9a9983be26bb3a79d6dae9b856ad182e1deb8
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 3cde9988a6f79ead8070597c7e5da09a165d7ae3 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 7 Dec 2015 10:50:16 -0800
Subject: [PATCH 141/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 95c0fdc..61edb5e 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6032 SHA256 6cf1a1f3d345ecbf19ed1e25c638b1e4e6fa32ff01ae6256e85a8c7d36724324 SHA512 e5d5aa65a4b5513200f2edb1fca2cf855da887887b54de1e938d0f75c07468750bde3dca0c45599f977adcbb4db2d1411d19cafe1d5aa7a9fe3b31b9e515e8e2 WHIRLPOOL 5985c51b3d335da4d602713c0f54020639d65662914c5d9cfdfceb2dfdce2a4c589661e802a135c2f5ef7b972acf795702f6419da9624e7480ce8a8253b8759b
-DIST janus-0.0.5.tar.gz 16361655 SHA256 8b0b57f371d2ad4196a7dc4d9dd2b2aa9ba2786c6da25ea73aab7f8231b4db02 SHA512 b3de5d3aeaf7f49bf3ef78d5fa8c6f2b7b0c9fd6652bbce8660e9bd93437bd07687a8fd6e87abc8ed9212aa9632e23437ebd4047fe8e3f0704cb7573ca2d8fe0 WHIRLPOOL 1f254220e93e7f24131173c3803dc44accfff86b2e1e1ca287fa0a9d1507db49308968dc1f2b0e4064a9de6c7fb9a9983be26bb3a79d6dae9b856ad182e1deb8
+DIST janus-0.0.5.tar.gz 16485964 SHA256 7aa83dc6673e6aeef8b0995f83c6303f84191f1ba29b0138dfc11bbfafc29fbb SHA512 0d82dadd64e468cb1f8acfd87bcf742b2fa9558e8f3436070fafec99f65b28344bbaf0cfb655b9d16c17ca449f634fb4846c02e9836df952828bce0d7d99fd82 WHIRLPOOL 77830bbe292d60ae3d4239bda72b0b0722f961a29ea13a233ea39625185284eec12185e929390e913d279186be766903c2e7fb64a2fc526f75e6d4f817ee2066
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 9928f89d8e6106fb462892812bf641267874f9fd Mon Sep 17 00:00:00 2001
From: root <root@vcall07-02>
Date: Tue, 15 Dec 2015 01:15:51 -0800
Subject: [PATCH 142/261] updates

---
 dev-php/PEAR-DB/Manifest          | 12 +-----------
 media-libs/opus/Manifest          |  2 +-
 media-libs/opus/opus-1.1.1.ebuild |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index abc77bb..72ce03a 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST DB-1.7.14.tgz 133103 SHA256 a574483fd5c4440a4bf08018e8bcdde7f4619e9b964de2b357bd60733ec5919c SHA512 d20c1c052409397a3ded1f498d979cc07e43d6c156b4b707ef941d5d1c8bfd2fa996e5e9a912495fdd01bc231656e990b8b37ea6373f6f0d2cea9f875131a6ac WHIRLPOOL 7e616069251ea8d8609feaf5d663262222c9fce73319b1d75ee9d91b73dd6523a1b9bf7d472d7e76c60210c7937ddee70c7429cb5fe13c7981e707fbd5a1dc1a
+DIST DB-1.7.14.tgz 134864 SHA256 6b768ce1f627b5bde08405b3ee87ad95f6f3c4944054f119db68423596bee29c SHA512 45a812c8313197c26e2293180be9c5fc05d8be98940996c879141611539cb9a6fc6f9563156a5b483136b5259ce9619f8374bcaedbcbc76d2c4c58c1d04cc49f WHIRLPOOL 5292ccc17cc9744986ccf561b38c81c0237faa62246b799b60178515ec0ab3acafca977ea2ec055207740ea3053101cf70bda76ef98f659229f5413f1da6747d
 EBUILD PEAR-DB-1.7.14.ebuild 392 SHA256 fd394904efc98bc7aacd116743197d68a0a613c52334d9bc0e6d454b317f44cd SHA512 586270cefd45524d66756a7641d358e4e22a41cb9458989cb3cf5081c948cc7eaf6d5e35ab62800940b591f5333324d95b705f87dee3580b22b6a127540ff308 WHIRLPOOL db57ae2095e637bc0528296be48329ab7ed76e5f224609e54223b5930264c036acbcfb842b53ded25a515109f7ade9cb01f36703347371f63665ab29fd9eb669
 MISC ChangeLog 9047 SHA256 6ddaa8a2acc4c4214157b304d3dbd54d3e135361e6dfa2295593494f0a6f2cca SHA512 18c8416e5e87ee5e8c5ea83bf4958c0af93e2ff1b4590adff41f64f8a1166c5ed0dcc96f97171c201485b07e988375d952ce13a7a77719d88b45eb4ef2035ab7 WHIRLPOOL 15c2ea1aaf1e921e21bd7ae68beaf3bf9d5fae69f49078deed8ebf934411344a09ad6362b1ff124f79535aed8fcaeb5029595eca5d61369f8ab2d3f6dba674e5
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn2gUACgkQcaHudmEf86rU2QCdGzJ9hcsDILLBl/kUEqC0415U
-CFwAnRKuxUkxCvxi3Sdt6V1Qjd7FIp5I
-=ZKIw
------END PGP SIGNATURE-----
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 9d458de..ba58459 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,5 @@
 AUX 1.1-fix-configure.ac-shell-bug.patch 545 SHA256 31bef7d778611192b973a8ce92b83ca4ebdec9404c0fc2853a2916e66977d4af SHA512 0174060c67c89a6836673784c7269d33ef4a421040ee9f9e37368e613f1ff482e792e1a3a9ac69868d933e5881edd778bcac2d254cb9ae9b4e3206d3a2245dee WHIRLPOOL ebebc79f75ca1bc9de95cb6a1a3edca98a4383258abeffb11ac71477783c1c30d8e1647a7cbb6c5e2e3dcc2992becaffbc6db3592bc893ae86e3209845136f44
 DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
-EBUILD opus-1.1.1.ebuild 921 SHA256 9edb018603d9b0690756efe2df91a3d4472445a91ac8b7e81488b3e3e7d3ec44 SHA512 e5fd8e75eb95df23a5911ad084da7349abaf55230bcd15fbfefafbf0773116595b59429261cf96829ff84e06ac72dfc1610a37ffc35268128a8c329019bd9d71 WHIRLPOOL ce69367a2bb47205122f3b6bf604b277003be72c3d49a53be295e10204477d5a0b8997e1c9674c30b6e44a8c75948d3b718e092c06a152aec5ba04596e4bf403
+EBUILD opus-1.1.1.ebuild 922 SHA256 957f0c14e90bac9178449f3d5c40d04cdf169c99b4660c92b34502ade313683a SHA512 b6a8447645ffb2c0c586226aadf00b67478a473d1cef5d314370feb92049c14ebb63ede5aa757852ff81e2cc90f6eb23af31a7aa1eba40f54f2292e1439b5fb2 WHIRLPOOL 685b406169f8bcadb8d90a24ff27b15651d18977d4c6d64cda263120128c6a08d68ba31a0ae43fd16ee58cd69de51c9a076e8278b106cfba4c827bd946672ff7
 MISC ChangeLog 5760 SHA256 30b7b09107813e0bdb94065535b28999b1abf4c63f05d43329d7d4fa9c62e031 SHA512 aceb0ed9b591f0a2263908b827f9a90750b569ef68d5a366547d2dc3ca405748f2717986656f1a31559c952456ce40a9e288ee03691e90e1eca4afefd9396514 WHIRLPOOL 4b8c75fe6aae4aed6c5e929c9191ea38f9b6c5ca6ba6d75d9c4258c9bd6f56167d82f616f5e0af9a9e45392789be41e3c02c5e31da403ca85a0d723ed5202879
 MISC metadata.xml 239 SHA256 0f0fec7fcbe04ead6403176cfaa25a426ad2be9b4bf28b11d77b92fb4fa0bc68 SHA512 bacd799b1cb6ba0a972796b62b80a2ea0b81511334c1dad6f5ffb57da72e9516e3a8b98a058f3b4461eb29723b75243c261af3aa5a43e3b43a5d10cc0e226796 WHIRLPOOL df085ffb47655ab7c87b466ec9bca481924b812e234dabba63fadfb1b167c09c52cff6f94d07ca9c85d570795b8ae5e98b5179e3e0a5e9e1ed09031d2d12c5b6
diff --git a/media-libs/opus/opus-1.1.1.ebuild b/media-libs/opus/opus-1.1.1.ebuild
index 205c25b..4e16ed8 100644
--- a/media-libs/opus/opus-1.1.1.ebuild
+++ b/media-libs/opus/opus-1.1.1.ebuild
@@ -24,7 +24,7 @@ IUSE="custom-modes doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/1.1-fix-configure.ac-shell-bug.patch" ) # bug 510918
+#PATCHES=( "${FILESDIR}/1.1-fix-configure.ac-shell-bug.patch" ) # bug 510918
 
 src_configure() {
 	local myeconfargs=(

From 5f625396e0a66b66d4010446f433b82fd7bc3021 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 15 Dec 2015 01:52:01 -0800
Subject: [PATCH 143/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 61edb5e..4a6cd96 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6032 SHA256 6cf1a1f3d345ecbf19ed1e25c638b1e4e6fa32ff01ae6256e85a8c7d36724324 SHA512 e5d5aa65a4b5513200f2edb1fca2cf855da887887b54de1e938d0f75c07468750bde3dca0c45599f977adcbb4db2d1411d19cafe1d5aa7a9fe3b31b9e515e8e2 WHIRLPOOL 5985c51b3d335da4d602713c0f54020639d65662914c5d9cfdfceb2dfdce2a4c589661e802a135c2f5ef7b972acf795702f6419da9624e7480ce8a8253b8759b
-DIST janus-0.0.5.tar.gz 16485964 SHA256 7aa83dc6673e6aeef8b0995f83c6303f84191f1ba29b0138dfc11bbfafc29fbb SHA512 0d82dadd64e468cb1f8acfd87bcf742b2fa9558e8f3436070fafec99f65b28344bbaf0cfb655b9d16c17ca449f634fb4846c02e9836df952828bce0d7d99fd82 WHIRLPOOL 77830bbe292d60ae3d4239bda72b0b0722f961a29ea13a233ea39625185284eec12185e929390e913d279186be766903c2e7fb64a2fc526f75e6d4f817ee2066
+DIST janus-0.0.5.tar.gz 16933965 SHA256 286ced2c1d17b475cc5ea50b76debe4ecec6cb101e7eb5329f57db5798dfce72 SHA512 0eb0d42547cbab273fe1ef7ae29fa8bff629dda41a3a44291cd6ae44b2235721630353038d1b5bf6a388b453d25f634d626851e1143f8c5f4fbf1e66a4b6c788 WHIRLPOOL 79e9badddb7c57856f32989913db38425f05a03ef0be10ac9e5694be76802828db1a534dee644bfd5b0df768953b6c78779e50cc0c03469425dc7d5d95fa8844
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 7e1e6848cc3282d138569befbdfa12476618fc78 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 18 Dec 2015 11:01:01 -0800
Subject: [PATCH 144/261] new mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 4a6cd96..50fd987 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
 AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
 AUX janus-initd 6032 SHA256 6cf1a1f3d345ecbf19ed1e25c638b1e4e6fa32ff01ae6256e85a8c7d36724324 SHA512 e5d5aa65a4b5513200f2edb1fca2cf855da887887b54de1e938d0f75c07468750bde3dca0c45599f977adcbb4db2d1411d19cafe1d5aa7a9fe3b31b9e515e8e2 WHIRLPOOL 5985c51b3d335da4d602713c0f54020639d65662914c5d9cfdfceb2dfdce2a4c589661e802a135c2f5ef7b972acf795702f6419da9624e7480ce8a8253b8759b
-DIST janus-0.0.5.tar.gz 16933965 SHA256 286ced2c1d17b475cc5ea50b76debe4ecec6cb101e7eb5329f57db5798dfce72 SHA512 0eb0d42547cbab273fe1ef7ae29fa8bff629dda41a3a44291cd6ae44b2235721630353038d1b5bf6a388b453d25f634d626851e1143f8c5f4fbf1e66a4b6c788 WHIRLPOOL 79e9badddb7c57856f32989913db38425f05a03ef0be10ac9e5694be76802828db1a534dee644bfd5b0df768953b6c78779e50cc0c03469425dc7d5d95fa8844
+DIST janus-0.0.5.tar.gz 16934003 SHA256 f466fb33cca256809106cfb0f740a0483d6104d908acf11fed6f6f6651be01d9 SHA512 412313c803c7058514a344bbb4bcdcd8655096745b1c2c2ae47b484f2652d0ea8073be1f616b51ce1bbaeae9d3c70e19945b2377ca521122ae5dd319a395592f WHIRLPOOL 2bfd227dd4ce7dba7312a71342585dce8e5e2945c3c2b52eb7b883bb0de3edf8b4895ba56db24528203eecf75387c70d12ed68a37061fecd32a91ede6058fe48
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 11eec8a06802d8ffd8937f41e9835ba7174bef08 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 6 Jan 2016 09:05:26 -0800
Subject: [PATCH 145/261] uppy

---
 net-misc/janus/files/janus-confd | 1 +
 net-misc/janus/files/janus-initd | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/janus/files/janus-confd b/net-misc/janus/files/janus-confd
index 485d27a..ca5706d 100644
--- a/net-misc/janus/files/janus-confd
+++ b/net-misc/janus/files/janus-confd
@@ -20,3 +20,4 @@ JANUS_CORE_DIR="/etc/janus"
 #
 JANUS_RESTART_DELAY=5
 
+JANUS_OPTS="-b"
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index e825998..78f073d 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -48,7 +48,7 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
-		/usr/bin/janus -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+		/usr/bin/janus -F${JANUS_CNF_PATH} -N -L ${JANUS_OPTS} /var/log/janus.log -p ${pid_file}
 		result=$?
 
                 if [ "$result" -eq 0 ]; then

From 7b8085be56dfc47e8e00e0b91afd5019b5eaf7d2 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 6 Jan 2016 11:08:15 -0800
Subject: [PATCH 146/261] uppy

---
 net-misc/janus/files/janus-initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 78f073d..457503d 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -48,7 +48,7 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
-		/usr/bin/janus -F${JANUS_CNF_PATH} -N -L ${JANUS_OPTS} /var/log/janus.log -p ${pid_file}
+		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
 		result=$?
 
                 if [ "$result" -eq 0 ]; then

From dc8c3452cb1398fdb9df37a7af5a74fbc306187b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 7 Jan 2016 12:46:38 -0800
Subject: [PATCH 147/261] update mani

---
 net-misc/janus/Manifest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 50fd987..7af873a 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,4 @@
-AUX janus-confd 479 SHA256 37ee33dbd184f2d2db0c4d441dfd03b6b8b80aa6bcbc7b9dfade8c5bedbca570 SHA512 3ad486a1527b1e354ed6a58c243458b308d194b034c24da774b683b2cc0d424f818f8937c466f82b7ef9b82a3e308499f06b3e30ae3123693404636d817f65cf WHIRLPOOL eeaeb85a737b5070c59ea65a8041cf283685ae1b7117e49aff8157b3e03056fd7c9ae5f04d696d1aa1fe78cf940b893a080140b1c9342c4c38e491c56231a3a1
-AUX janus-initd 6032 SHA256 6cf1a1f3d345ecbf19ed1e25c638b1e4e6fa32ff01ae6256e85a8c7d36724324 SHA512 e5d5aa65a4b5513200f2edb1fca2cf855da887887b54de1e938d0f75c07468750bde3dca0c45599f977adcbb4db2d1411d19cafe1d5aa7a9fe3b31b9e515e8e2 WHIRLPOOL 5985c51b3d335da4d602713c0f54020639d65662914c5d9cfdfceb2dfdce2a4c589661e802a135c2f5ef7b972acf795702f6419da9624e7480ce8a8253b8759b
-DIST janus-0.0.5.tar.gz 16934003 SHA256 f466fb33cca256809106cfb0f740a0483d6104d908acf11fed6f6f6651be01d9 SHA512 412313c803c7058514a344bbb4bcdcd8655096745b1c2c2ae47b484f2652d0ea8073be1f616b51ce1bbaeae9d3c70e19945b2377ca521122ae5dd319a395592f WHIRLPOOL 2bfd227dd4ce7dba7312a71342585dce8e5e2945c3c2b52eb7b883bb0de3edf8b4895ba56db24528203eecf75387c70d12ed68a37061fecd32a91ede6058fe48
+AUX janus-confd 495 SHA256 891d4f48923fb5b1ddd0876d5e2f25597d247c80850976b1bdf05a935d94696b SHA512 996151fb44cab09162f57ac0cc74a0105f3c797d7a2d6d0ff94f1aa00c5fffc6ba2eb3d9464839db80baffb543cd7d1c4313287f8777e2c02689326d8059ec6c WHIRLPOOL 1b4d929edf4a0713d9d0b41840d8ef7220403a175efb784ea9e6f165a4bf2ba84e944f438b366e9794cd9abddf1f73eb941b6238fb7721b5dcd88cedf20b662c
+AUX janus-initd 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
+DIST janus-0.0.5.tar.gz 17513350 SHA256 416e14c45aa52a2fc5f78b2e6d0089835434477ff7bc75ec885fbdf7c91c78a5 SHA512 dcb708ccf8bcaa2f02b3a6bbbe52e241879f6a8010ed61d77a2a3612da1191ec54ad7427f9df11cd9e487237af2d512ba51b17a52e11df66d87f85556c8c4f82 WHIRLPOOL 38b5186ea066977a33157a20d77691225a41241d6cf6f49d82929569fa1cdc72a5e9126bcef2fc07caac0a29de829980d72af5aeec2e4f20c9b9aebcb4ca3e80
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 69b6e18a314d4db5a78e248e1fa4b43423c9b927 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 7 Jan 2016 12:53:46 -0800
Subject: [PATCH 148/261] mesos is cool

---
 sys-cluster/mesos/Manifest                   |  3 +
 sys-cluster/mesos/mesos-0.20.0.ebuild        | 44 ++++++++++
 sys-cluster/mesos/mesos-0.21.0.ebuild        | 75 +++++++++++++++++
 sys-cluster/mesos/mesos-0.22.0.ebuild        | 75 +++++++++++++++++
 sys-cluster/mesos/mesos-9999.ebuild          | 53 ++++++++++++
 sys-cluster/zookeeper/Manifest               |  1 +
 sys-cluster/zookeeper/zookeeper-3.4.6.ebuild | 85 ++++++++++++++++++++
 7 files changed, 336 insertions(+)
 create mode 100644 sys-cluster/mesos/Manifest
 create mode 100644 sys-cluster/mesos/mesos-0.20.0.ebuild
 create mode 100644 sys-cluster/mesos/mesos-0.21.0.ebuild
 create mode 100644 sys-cluster/mesos/mesos-0.22.0.ebuild
 create mode 100644 sys-cluster/mesos/mesos-9999.ebuild
 create mode 100644 sys-cluster/zookeeper/Manifest
 create mode 100644 sys-cluster/zookeeper/zookeeper-3.4.6.ebuild

diff --git a/sys-cluster/mesos/Manifest b/sys-cluster/mesos/Manifest
new file mode 100644
index 0000000..840cf24
--- /dev/null
+++ b/sys-cluster/mesos/Manifest
@@ -0,0 +1,3 @@
+DIST mesos-0.20.0.tar.gz 27537727 SHA256 7334b8d8648886470d3b76efd2c8b85a351054c1a6f83678689a88017ba31381 SHA512 9286790eeb19beb9fcd042ab79953a204e78545f2fcde96d38d343f42d41889a913806bb16f908ff2638cfc8f595052545e0cd99af06c0ff335e11b68a5671d8 WHIRLPOOL 2c80e1557c19c0b3b9a089dc3eec685320ca48d044145ff71ba20f7ea996f4afd57ad1e5e4989ec30fe6c83a022288346f44c11cb9799bb69162eafe94fa41de
+DIST mesos-0.21.0.tar.gz 28140492 SHA256 d1742fe55f98d96aa32f7f0311ddd2125abbf7c9240ef78de0868095e9425705 SHA512 7c30fd0a1e327d0297ea5f32768b14b5b760620751e21caf03bb26923af1cd363c1a8e40e626d9e28e4dcaea5fd1654d620358b3a18da70ff5e9d48f6e7d3e0f WHIRLPOOL e8e52bef2a63b153422c74896a2af7d4a3783ad7226c2d418feca28fb5ed29b4777906a2bd61700c56216866721f381e86a7ae9eb53a5d8c4b8726d77b1fb3e6
+DIST mesos-0.22.0.tar.gz 28229400 SHA256 689f66f63bec043eb1bbf16be1cbe15ea5f359f308f7f5b01dd48075f20e0c7d SHA512 e21b394d760339651221291b688caf77356d0ad019e3cb35ce98f8440a015da295b1fe66e1e6cebe9ec023a4e4a125e4f397ec9f7514ff1ea928ebdb540f8fcb WHIRLPOOL d280f20fe20abed886351e713138c98b1e3dc5b91c6f88c3e6eed2b0e25e354320d80f9184d2cc99c4b581a90ee522b33b393190603db9fe473f9c8885d7d239
diff --git a/sys-cluster/mesos/mesos-0.20.0.ebuild b/sys-cluster/mesos/mesos-0.20.0.ebuild
new file mode 100644
index 0000000..e95b755
--- /dev/null
+++ b/sys-cluster/mesos/mesos-0.20.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="a cluster manager that provides efficient resource isolation and sharing across distributed applications"
+HOMEPAGE="http://mesos.apache.org/"
+SRC_URI="http://ftp.ps.pl/pub/apache/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+IUSE="java python"
+SLOT="0"
+
+DEPEND="dev-cpp/glog
+        dev-cpp/gmock
+		dev-java/maven-bin
+        net-misc/curl
+        dev-libs/cyrus-sasl
+		dev-libs/leveldb
+		sys-cluster/zookeeper
+		>=dev-libs/protobuf-2.5.0[java,python]
+        python? ( dev-lang/python dev-python/boto )
+        java? ( virtual/jdk )"
+
+S="${WORKDIR}/${P}"
+
+src_configure() {
+#    cd "${S}/build"
+	export PROTOBUF_JAR=/usr/share/protobuf/lib/protobuf.jar
+    econf $(use_enable python) $(use_enable java) --disable-bundled
+}
+
+src_compile() {
+#    cd "${S}/build"
+    emake || "emake failed"
+}
+
+src_install() {
+#    cd "${S}/build"
+    emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/sys-cluster/mesos/mesos-0.21.0.ebuild b/sys-cluster/mesos/mesos-0.21.0.ebuild
new file mode 100644
index 0000000..9fbe8cc
--- /dev/null
+++ b/sys-cluster/mesos/mesos-0.21.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="a cluster manager that provides efficient resource isolation and sharing across distributed applications"
+HOMEPAGE="http://mesos.apache.org/"
+SRC_URI="http://ftp.ps.pl/pub/apache/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+IUSE="java python"
+SLOT="0"
+
+DEPEND="dev-cpp/glog
+        dev-java/maven-bin
+        net-misc/curl
+        dev-libs/cyrus-sasl
+        dev-libs/apr
+        dev-libs/leveldb
+        sys-cluster/zookeeper
+        dev-vcs/subversion
+        >=dev-libs/protobuf-2.5.0[java,python]
+        python? ( dev-lang/python dev-python/boto )
+        java? ( virtual/jdk )"
+
+S="${WORKDIR}/${P}"
+
+src_configure() {
+#    cd "${S}/build"
+	export PROTOBUF_JAR=/usr/share/protobuf/lib/protobuf.jar
+    econf $(use_enable python) $(use_enable java) \
+          --with-protobuf=/usr \
+          --with-leveldb=/usr \
+          --with-zookeeper=/usr \
+          --with-glog=/usr \
+          --with-apr=/usr \
+          --with-svn=/usr
+}
+
+src_compile() {
+#    cd "${S}/build"
+    emake || "emake failed"
+}
+
+src_install() {
+#    cd "${S}/build"
+    emake DESTDIR="${T}/image" install || die "emake install failed"
+    
+#    dodir /usr/bin
+    exeinto /usr/bin
+    doexe ${T}/image/usr/bin/*
+
+    dolib.so ${T}/image/usr/lib64/*-0.21.0.so
+
+    dodir /usr/libexec/mesos
+    exeinto /usr/libexec/mesos
+    doexe ${T}/image/usr/libexec/mesos/mesos-*
+    insinto /usr/libexec/mesos
+    dodir /usr/libexec/mesos/python/mesos
+    insinto /usr/libexec/mesos/python/mesos
+    doins ${T}/image/usr/libexec/mesos/python/mesos/*
+
+    into /usr
+    dosbin ${T}/image/usr/sbin/*
+
+    dodir /usr/share/mesos
+    cp -R ${T}/image/usr/share/mesos/* ${D}/usr/share/mesos/ || die "Can not install /usr/share/mesos/*"
+
+    dodir /etc/mesos
+    insinto /etc/mesos
+    doins ${T}/image/etc/mesos/*
+}
diff --git a/sys-cluster/mesos/mesos-0.22.0.ebuild b/sys-cluster/mesos/mesos-0.22.0.ebuild
new file mode 100644
index 0000000..c83ae4b
--- /dev/null
+++ b/sys-cluster/mesos/mesos-0.22.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="a cluster manager that provides efficient resource isolation and sharing across distributed applications"
+HOMEPAGE="http://mesos.apache.org/"
+SRC_URI="http://ftp.ps.pl/pub/apache/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+IUSE="java python"
+SLOT="0"
+
+DEPEND="dev-cpp/glog
+        dev-java/maven-bin
+        net-misc/curl
+        dev-libs/cyrus-sasl
+        dev-libs/apr
+        dev-libs/leveldb
+        sys-cluster/zookeeper
+        dev-vcs/subversion
+        >=dev-libs/protobuf-2.5.0[java,python]
+        python? ( dev-lang/python dev-python/boto )
+        java? ( virtual/jdk )"
+
+S="${WORKDIR}/${P}"
+
+src_configure() {
+#    cd "${S}/build"
+	export PROTOBUF_JAR=/usr/share/protobuf/lib/protobuf.jar
+    econf $(use_enable python) $(use_enable java) \
+          --with-protobuf=/usr \
+          --with-leveldb=/usr \
+          --with-zookeeper=/usr \
+          --with-glog=/usr \
+          --with-apr=/usr \
+          --with-svn=/usr
+}
+
+src_compile() {
+#    cd "${S}/build"
+    emake || "emake failed"
+}
+
+src_install() {
+#    cd "${S}/build"
+    emake DESTDIR="${T}/image" install || die "emake install failed"
+    
+#    dodir /usr/bin
+    exeinto /usr/bin
+    doexe ${T}/image/usr/bin/*
+
+    dolib.so ${T}/image/usr/lib64/*-${PV}.so
+
+    dodir /usr/libexec/mesos
+    exeinto /usr/libexec/mesos
+    doexe ${T}/image/usr/libexec/mesos/mesos-*
+    insinto /usr/libexec/mesos
+    dodir /usr/libexec/mesos/python/mesos
+    insinto /usr/libexec/mesos/python/mesos
+    doins ${T}/image/usr/libexec/mesos/python/mesos/*
+
+    into /usr
+    dosbin ${T}/image/usr/sbin/*
+
+    dodir /usr/share/mesos
+    cp -R ${T}/image/usr/share/mesos/* ${D}/usr/share/mesos/ || die "Can not install /usr/share/mesos/*"
+
+    dodir /etc/mesos
+    insinto /etc/mesos
+    doins ${T}/image/etc/mesos/*
+}
diff --git a/sys-cluster/mesos/mesos-9999.ebuild b/sys-cluster/mesos/mesos-9999.ebuild
new file mode 100644
index 0000000..b0d0fb4
--- /dev/null
+++ b/sys-cluster/mesos/mesos-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit git-2 autotools
+
+EGIT_REPO_URI="https://github.com/apache/mesos.git"
+
+DESCRIPTION="a cluster manager that provides efficient resource isolation and sharing across distributed applications"
+HOMEPAGE="http://mesos.apache.org/"
+
+LICENSE="Apache-2.0"
+KEYWORDS=""
+IUSE="java python"
+SLOT="0"
+
+DEPEND="dev-cpp/glog
+        dev-cpp/gmock
+		dev-java/maven-bin
+        net-misc/curl
+        dev-libs/cyrus-sasl
+		dev-libs/leveldb
+		sys-cluster/zookeeper
+		>=dev-libs/protobuf-2.5.0[java,python]
+        python? ( dev-lang/python dev-python/boto )
+        java? ( virtual/jdk )"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+    rm -rf $S/3rdparty/leveldb*
+    rm -rf $S/3rdparty/zookeper*
+    rm -rf $s/3rdparty/libprocess/3rdparty/protobuf*
+    rm -rf $s/3rdparty/libprocess/3rdparty/boost*
+    eautoreconf
+}
+
+src_configure() {
+#    cd "${S}/build"
+	export PROTOBUF_JAR=/usr/share/protobuf/lib/protobuf.jar
+    econf $(use_enable python) $(use_enable java) --with-protobuf=/usr --with-boost=/usr --with-zookeeper=/usr --with-leveldb=/usr
+}
+
+src_compile() {
+#    cd "${S}/build"
+    emake
+}
+
+src_install() {
+#    cd "${S}/build"
+    emake DESTDIR="${D}" install
+}
diff --git a/sys-cluster/zookeeper/Manifest b/sys-cluster/zookeeper/Manifest
new file mode 100644
index 0000000..9f2f06f
--- /dev/null
+++ b/sys-cluster/zookeeper/Manifest
@@ -0,0 +1 @@
+DIST zookeeper-3.4.6.tar.gz 17699306 SHA256 01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994 SHA512 5b9a3337a7edad38d1f5d9fd4f3c0d4e439128a31890b75cf2f2e2f5f19f83ef469535ab508aa44ae28daf0185807440c45f918058c4510ca3e98adb0352ce17 WHIRLPOOL 6eb037f044d5c341536d894425283ea642e64aaaa6ce37a76334025d78949885d12ba8aaea5c3bd8a0978e46b54d334ef6745880deca1bcab942a22dfd032c75
diff --git a/sys-cluster/zookeeper/zookeeper-3.4.6.ebuild b/sys-cluster/zookeeper/zookeeper-3.4.6.ebuild
new file mode 100644
index 0000000..30bfe47
--- /dev/null
+++ b/sys-cluster/zookeeper/zookeeper-3.4.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils java-utils-2
+
+MY_PN="${PN/apache-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ZooKeeper is a high-performance coordination service for
+distributed applications."
+HOMEPAGE="http://hadoop.apache.org/"
+SRC_URI="http://ftp.ps.pl/pub/apache/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR=/opt/"${PN}"
+DATA_DIR=/var/db/"${PN}"
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+src_configure() {
+    cd "${S}/src/c"
+	econf
+}
+
+src_compile() {
+    cd "${S}/src/c"
+	emake
+}
+
+src_install() {
+    cd "${S}/src/c"
+    emake DESTDIR="${D}" install || die "emake install failed"
+	cd -
+
+	dodir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+
+	dodir "${INSTALL_DIR}"
+	mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}" || die "doenvd failed"
+
+	cat > "${PN}" <<-EOF
+		#!/sbin/runscript
+
+		opts="start stop restart"
+
+		start() {
+			${INSTALL_DIR}/bin/zkServer.sh start > /dev/null
+				}
+
+		stop() {
+			${INSTALL_DIR}/bin/zkServer.sh stop
+				}
+
+		restart() {
+			${INSTALL_DIR}/bin/zkServer.sh restart > /dev/null
+				}
+
+		status() {
+			${INSTALL_DIR}/bin/zkServer.sh status
+				}
+	EOF
+	doinitd "${PN}" || die "doinitd failed"
+}
+
+pkg_postinst() {
+	elog "For info on configuration see http://hadoop.apache.org/${MY_PN}/docs/r${PV}"
+}

From 99ac35b50d7b7d64fa2515a77eddc8d67021a3e5 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 8 Jan 2016 14:04:02 -0800
Subject: [PATCH 149/261] new init

---
 net-misc/janus/Manifest              |   3 +-
 net-misc/janus/files/janus-initd     |  30 ++---
 net-misc/janus/files/janus-initd.old | 190 +++++++++++++++++++++++++++
 3 files changed, 207 insertions(+), 16 deletions(-)
 create mode 100755 net-misc/janus/files/janus-initd.old

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 7af873a..96c61c1 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,4 +1,5 @@
 AUX janus-confd 495 SHA256 891d4f48923fb5b1ddd0876d5e2f25597d247c80850976b1bdf05a935d94696b SHA512 996151fb44cab09162f57ac0cc74a0105f3c797d7a2d6d0ff94f1aa00c5fffc6ba2eb3d9464839db80baffb543cd7d1c4313287f8777e2c02689326d8059ec6c WHIRLPOOL 1b4d929edf4a0713d9d0b41840d8ef7220403a175efb784ea9e6f165a4bf2ba84e944f438b366e9794cd9abddf1f73eb941b6238fb7721b5dcd88cedf20b662c
-AUX janus-initd 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
+AUX janus-initd 6031 SHA256 64ca073813c67526db66e6572e60ea2cb0e1e7e82362de2206ae0faac848f4fe SHA512 3604d59a3a62c38d51e22c90e8e5211dc205d6a3e6482d6d7c2f8d75bdf9b364c43bdd23c27205fb383820fb8599786c4c60232cd66d5d0591cb6abb8e2c7c22 WHIRLPOOL 609eef0bdcd973d467391e64161fbb99d6f94935ee7864ebe3160b41ef5e4443cfcbde18b5ac096ca81b07adfa0c020e749c3d3e6bcf89da6002754fdf18a0f0
+AUX janus-initd.old 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
 DIST janus-0.0.5.tar.gz 17513350 SHA256 416e14c45aa52a2fc5f78b2e6d0089835434477ff7bc75ec885fbdf7c91c78a5 SHA512 dcb708ccf8bcaa2f02b3a6bbbe52e241879f6a8010ed61d77a2a3612da1191ec54ad7427f9df11cd9e487237af2d512ba51b17a52e11df66d87f85556c8c4f82 WHIRLPOOL 38b5186ea066977a33157a20d77691225a41241d6cf6f49d82929569fa1cdc72a5e9126bcef2fc07caac0a29de829980d72af5aeec2e4f20c9b9aebcb4ca3e80
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 457503d..f721c30 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -117,21 +117,21 @@ start() {
                 return 1
         fi
 
-#        start-stop-daemon --start --exec /usr/bin/janus \
-#                --pidfile ${pid_file} --make-pidfile --background \
-#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
-
-        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
-        result=$?
-
-        if [ $result -eq 0 ]; then
-                # 2 seconds should be enough for janus to start
-                sleep 2
-                is_running
-                result=$?
-
-                [ $result -eq 0 ] || wrapperstop
-        fi
+        start-stop-daemon --start --exec /usr/bin/janus \
+                --background \
+                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+
+#        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+#        result=$?
+
+#        if [ $result -eq 0 ]; then
+#                # 2 seconds should be enough for janus to start
+#                sleep 2
+#                is_running
+#                result=$?
+#
+#                [ $result -eq 0 ] || wrapperstop
+#        fi
 
 
 }
diff --git a/net-misc/janus/files/janus-initd.old b/net-misc/janus/files/janus-initd.old
new file mode 100755
index 0000000..457503d
--- /dev/null
+++ b/net-misc/janus/files/janus-initd.old
@@ -0,0 +1,190 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop"
+
+janus_svcname() {
+        local ebextra=
+        case "${SVCNAME}" in
+                janus*) ;;
+                *) ebextra=" (janus)" ;;
+        esac
+        echo "${SVCNAME}${ebextra}"
+}
+
+
+
+is_running() {
+
+	pid_file="/var/run/${SVCNAME}.pid"
+                
+        [ -r "${pid_file}" ] || return 1
+        PID="$(cat "${pid_file}")"
+        [ -d "/proc/${PID}" ] || return 1
+        EXE="$(readlink -f /proc/${PID}/exe)"
+        EXE="${EXE% (deleted)}" # in case janus got upgraded and we're still looking at an old one.
+        [ "${EXE}" = /usr/bin/janus ] || return 1 # pid got re-used for another process.
+
+        # PID reported in pidfile is active, and is still an janus instance.
+        return 0
+}
+
+
+janus_run_loop() {
+        local result=0 signal=0
+
+        pid_file="/var/run/${SVCNAME}.pid"
+
+        echo "Initializing $(janus_svcname) wrapper"
+        
+        trap "rm -f '/var/run/janus_wrapper_loop.running'" EXIT
+        touch "/var/run/janus_wrapper_loop.running"
+
+        while [ -r "/var/run/janus_wrapper_loop.running" ]; do
+
+	        export G_MESSAGES_DEBUG=false
+	        export NICE_DEBUG=false
+
+	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
+		result=$?
+
+                if [ "$result" -eq 0 ]; then
+                        echo "Janus terminated normally"
+                        break
+                else
+                        if [ "$result" -gt 128 ]; then
+                                signal="$(expr "$result" - 128)"
+                                MSG="Janus terminated with Signal: $signal"
+
+                                CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+                                local CORE_DUMPED=0
+                                if [ -f "${JANUS_CORE_DIR}/core" ]; then
+                                        mv "${JANUS_CORE_DIR}/core" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                elif [ -f "${JANUS_CORE_DIR}/core.${PID}" ]; then
+                                        mv "${JANUS_CORE_DIR}/core.${PID}" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                fi
+
+                                [ $CORE_DUMPED -eq 1 ] && \
+                                        MSG="${MSG}\n\rCore dumped: ${JANUS_CORE_DIR}/${CORE_TARGET}"
+                        else
+                                MSG="Janus terminated with return code: $result"
+                        fi
+
+                        # kill left-over tasks
+                        for X in ${JANUS_CLEANUP_ON_CRASH}; do
+                                kill -9 "${PID}";
+                        done
+                fi
+
+                if [ -n "${JANUS_NOTIFY_EMAIL}" ] && \
+                   [ -x /usr/sbin/sendmail ]; then
+                        echo -e -n "Subject: Janus crashed\r\n${MSG}\r\n" |\
+                                 /usr/sbin/sendmail "${JANUS_NOTIFY_EMAIL}"
+                fi
+                sleep "${JANUS_RESTART_DELAY}"
+                echo "Restarting Janus..."
+        done
+
+        echo "Terminating wrapper loop."
+        return 0
+}
+
+start() {
+
+        ebegin "Starting $(janus_svcname)"
+
+	pid_file="/var/run/${SVCNAME}.pid"
+
+	ulimit -c unlimited
+
+	export G_MESSAGES_DEBUG=false
+	export NICE_DEBUG=false
+
+        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+        if [ ! -r "${JANUS_CNF_PATH}/janus.cfg" ] ; then
+                eerror "Cannot read the configuration file \`${JANUS_CNF_PATH}/janus.cfg'"
+                return 1
+        fi
+
+#        start-stop-daemon --start --exec /usr/bin/janus \
+#                --pidfile ${pid_file} --make-pidfile --background \
+#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
+
+        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+        result=$?
+
+        if [ $result -eq 0 ]; then
+                # 2 seconds should be enough for janus to start
+                sleep 2
+                is_running
+                result=$?
+
+                [ $result -eq 0 ] || wrapperstop
+        fi
+
+
+}
+
+wrapperstop() {
+        # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+        if [ -r "/var/run/janus_wrapper_loop.pid" ]; then
+                ebegin "Killing janus wrapper script"
+                kill "$(cat /var/run/janus_wrapper_loop.pid)"
+                eend $?
+        fi
+
+        # The new one (due to "hardened" requirements) uses a simpler
+        # flag to indicate running or shutting down.
+        if [ -r "/var/run/janus_wrapper_loop.running" ]; then
+                ebegin "Signalling wrapper script to terminate"
+                rm "/var/run/janus_wrapper_loop.running"
+                eend $?
+        fi
+
+        return 0
+}
+
+stop() {
+
+        ebegin "Stopping $(janus_svcname)"
+
+	wrapperstop
+
+	pid_file="/var/run/${SVCNAME}.pid"
+
+        if is_running; then
+                einfon "Waiting for janus to shutdown ."
+                local cnt=0
+                while is_running; do
+                        cnt="$(expr $cnt + 1)"
+                        if [ $cnt -gt 5 ] ; then
+
+                                start-stop-daemon --stop --pidfile ${pid_file}
+                                return
+                        fi
+                        if [ $cnt -gt 60 ] ; then
+                                # Waited 120 seconds now. Fail.
+                                echo
+                                eend 1 "Failed."
+                                return
+                        fi
+                        sleep 2
+                        echo -n "."
+                done
+                echo
+        fi
+        eend 0
+
+}
+

From 2dcbc030aeef9d93ab128652530e8bac9fac9c4a Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 12 Jan 2016 12:47:41 -0800
Subject: [PATCH 150/261] update mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 96c61c1..6ef1edf 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 495 SHA256 891d4f48923fb5b1ddd0876d5e2f25597d247c80850976b1bdf05a935d94696b SHA512 996151fb44cab09162f57ac0cc74a0105f3c797d7a2d6d0ff94f1aa00c5fffc6ba2eb3d9464839db80baffb543cd7d1c4313287f8777e2c02689326d8059ec6c WHIRLPOOL 1b4d929edf4a0713d9d0b41840d8ef7220403a175efb784ea9e6f165a4bf2ba84e944f438b366e9794cd9abddf1f73eb941b6238fb7721b5dcd88cedf20b662c
 AUX janus-initd 6031 SHA256 64ca073813c67526db66e6572e60ea2cb0e1e7e82362de2206ae0faac848f4fe SHA512 3604d59a3a62c38d51e22c90e8e5211dc205d6a3e6482d6d7c2f8d75bdf9b364c43bdd23c27205fb383820fb8599786c4c60232cd66d5d0591cb6abb8e2c7c22 WHIRLPOOL 609eef0bdcd973d467391e64161fbb99d6f94935ee7864ebe3160b41ef5e4443cfcbde18b5ac096ca81b07adfa0c020e749c3d3e6bcf89da6002754fdf18a0f0
 AUX janus-initd.old 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
-DIST janus-0.0.5.tar.gz 17513350 SHA256 416e14c45aa52a2fc5f78b2e6d0089835434477ff7bc75ec885fbdf7c91c78a5 SHA512 dcb708ccf8bcaa2f02b3a6bbbe52e241879f6a8010ed61d77a2a3612da1191ec54ad7427f9df11cd9e487237af2d512ba51b17a52e11df66d87f85556c8c4f82 WHIRLPOOL 38b5186ea066977a33157a20d77691225a41241d6cf6f49d82929569fa1cdc72a5e9126bcef2fc07caac0a29de829980d72af5aeec2e4f20c9b9aebcb4ca3e80
+DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 2ea3f0d20e8a2820ab9c6ee38fff97c24eaf9193 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Mon, 18 Jan 2016 20:44:58 -0800
Subject: [PATCH 151/261] update mani

---
 net-libs/sofia-sip/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 37ee8ee..67ab04c 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
-DIST sofia-sip-patchset.tar.gz 637 SHA256 c745a656e9c6cf386e572ed27d2e934e05f9eab364cf0a36273246ce2a13d5b0 SHA512 418b29bfc387baa536171cf807a875778ecbee71861b4f1df485e97e3bf8231b2d37765b96732da3b0a90ff78d6b1e6261450ee68cdc2610e9c4c19c04ccebac WHIRLPOOL e08dcf44f5d4635fa07dfaee9b2101dabdb5a53bd00259e595a547eebbbc637c5db37e8d6c00d8acc9a53203a73e3b07992f4c11898791205582fb6f16d5468b
+DIST sofia-sip-patchset.tar.gz 607 SHA256 28424860c6070fd36289bf783af2cf30577fed5884b179636aaba1d255c7ea2b SHA512 280c8e9351fd95e0ec07ffc84ea9abd543076365e7fc2abf5383e01ccdaabcb18d0598db55bd811c917e405715da0e3beda4e8078e7ff085824f39e84be7cc35 WHIRLPOOL 05802b6608e7787f91107cabbf9a238ed3ea71c5e4239f5ca6e51af2bd59352734e4712d79aa4cad0b7a7cb61aebbb6274c1dcb5235bf7b217a70d47b621029d
 EBUILD sofia-sip-1.12.11.ebuild 1151 SHA256 e538cd66183151f1cf516f830e1a53f6895a66a0f6a5912a8d1567d3e0842573 SHA512 57e36ea25ca1cad4e7be60e9490e36c604f76ed1508b8aea2bd2241179dc8acaf01b49a81bda1dd02ecbe0945ddccc093d7e53f1ea9a1bec2d1803b2fb7c17ee WHIRLPOOL daa8a7484caa87e777c01cc17c8019e45773057bb59081a82174ec7ceb2ca503c67725c613a695b708646ebcb8fcfe9197c4964e44e952f3073bfd73342685ee

From 9a58cb6209bd7f77de8dc002fe1754fa9f96afb2 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Mon, 18 Jan 2016 22:04:10 -0800
Subject: [PATCH 152/261] move back to old init script

---
 net-misc/janus/files/janus-initd              | 30 +++++++++----------
 .../{janus-initd.old => janus-initd.nosafe}   | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)
 rename net-misc/janus/files/{janus-initd.old => janus-initd.nosafe} (91%)

diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index f721c30..457503d 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -117,21 +117,21 @@ start() {
                 return 1
         fi
 
-        start-stop-daemon --start --exec /usr/bin/janus \
-                --background \
-                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
-
-#        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
-#        result=$?
-
-#        if [ $result -eq 0 ]; then
-#                # 2 seconds should be enough for janus to start
-#                sleep 2
-#                is_running
-#                result=$?
-#
-#                [ $result -eq 0 ] || wrapperstop
-#        fi
+#        start-stop-daemon --start --exec /usr/bin/janus \
+#                --pidfile ${pid_file} --make-pidfile --background \
+#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
+
+        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+        result=$?
+
+        if [ $result -eq 0 ]; then
+                # 2 seconds should be enough for janus to start
+                sleep 2
+                is_running
+                result=$?
+
+                [ $result -eq 0 ] || wrapperstop
+        fi
 
 
 }
diff --git a/net-misc/janus/files/janus-initd.old b/net-misc/janus/files/janus-initd.nosafe
similarity index 91%
rename from net-misc/janus/files/janus-initd.old
rename to net-misc/janus/files/janus-initd.nosafe
index 457503d..f721c30 100755
--- a/net-misc/janus/files/janus-initd.old
+++ b/net-misc/janus/files/janus-initd.nosafe
@@ -117,21 +117,21 @@ start() {
                 return 1
         fi
 
-#        start-stop-daemon --start --exec /usr/bin/janus \
-#                --pidfile ${pid_file} --make-pidfile --background \
-#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
-
-        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
-        result=$?
-
-        if [ $result -eq 0 ]; then
-                # 2 seconds should be enough for janus to start
-                sleep 2
-                is_running
-                result=$?
-
-                [ $result -eq 0 ] || wrapperstop
-        fi
+        start-stop-daemon --start --exec /usr/bin/janus \
+                --background \
+                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+
+#        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+#        result=$?
+
+#        if [ $result -eq 0 ]; then
+#                # 2 seconds should be enough for janus to start
+#                sleep 2
+#                is_running
+#                result=$?
+#
+#                [ $result -eq 0 ] || wrapperstop
+#        fi
 
 
 }

From e23f872cc9682722ccc9a4dc23f7f342de7b0d47 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Mon, 18 Jan 2016 22:04:39 -0800
Subject: [PATCH 153/261] update mani

---
 net-misc/janus/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 6ef1edf..7f276b9 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 495 SHA256 891d4f48923fb5b1ddd0876d5e2f25597d247c80850976b1bdf05a935d94696b SHA512 996151fb44cab09162f57ac0cc74a0105f3c797d7a2d6d0ff94f1aa00c5fffc6ba2eb3d9464839db80baffb543cd7d1c4313287f8777e2c02689326d8059ec6c WHIRLPOOL 1b4d929edf4a0713d9d0b41840d8ef7220403a175efb784ea9e6f165a4bf2ba84e944f438b366e9794cd9abddf1f73eb941b6238fb7721b5dcd88cedf20b662c
-AUX janus-initd 6031 SHA256 64ca073813c67526db66e6572e60ea2cb0e1e7e82362de2206ae0faac848f4fe SHA512 3604d59a3a62c38d51e22c90e8e5211dc205d6a3e6482d6d7c2f8d75bdf9b364c43bdd23c27205fb383820fb8599786c4c60232cd66d5d0591cb6abb8e2c7c22 WHIRLPOOL 609eef0bdcd973d467391e64161fbb99d6f94935ee7864ebe3160b41ef5e4443cfcbde18b5ac096ca81b07adfa0c020e749c3d3e6bcf89da6002754fdf18a0f0
-AUX janus-initd.old 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
+AUX janus-initd 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
+AUX janus-initd.nosafe 6031 SHA256 64ca073813c67526db66e6572e60ea2cb0e1e7e82362de2206ae0faac848f4fe SHA512 3604d59a3a62c38d51e22c90e8e5211dc205d6a3e6482d6d7c2f8d75bdf9b364c43bdd23c27205fb383820fb8599786c4c60232cd66d5d0591cb6abb8e2c7c22 WHIRLPOOL 609eef0bdcd973d467391e64161fbb99d6f94935ee7864ebe3160b41ef5e4443cfcbde18b5ac096ca81b07adfa0c020e749c3d3e6bcf89da6002754fdf18a0f0
 DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From e9fe31979a2e415645c88525a4dbf3867f552c7d Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Mon, 18 Jan 2016 22:20:52 -0800
Subject: [PATCH 154/261] increase file descriptorea

---
 net-misc/janus/files/janus-initd        | 1 +
 net-misc/janus/files/janus-initd.nosafe | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 457503d..6e223e4 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -106,6 +106,7 @@ start() {
 	pid_file="/var/run/${SVCNAME}.pid"
 
 	ulimit -c unlimited
+	ulimit -n 64000
 
 	export G_MESSAGES_DEBUG=false
 	export NICE_DEBUG=false
diff --git a/net-misc/janus/files/janus-initd.nosafe b/net-misc/janus/files/janus-initd.nosafe
index f721c30..75ece8d 100755
--- a/net-misc/janus/files/janus-initd.nosafe
+++ b/net-misc/janus/files/janus-initd.nosafe
@@ -106,6 +106,7 @@ start() {
 	pid_file="/var/run/${SVCNAME}.pid"
 
 	ulimit -c unlimited
+	ulimit -n 64000
 
 	export G_MESSAGES_DEBUG=false
 	export NICE_DEBUG=false

From d590a2723fb8a313870334b949146b932d8b8344 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Mon, 18 Jan 2016 22:29:00 -0800
Subject: [PATCH 155/261] mani

---
 net-misc/janus/files/janus-confd | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/janus/files/janus-confd b/net-misc/janus/files/janus-confd
index ca5706d..9f4164c 100644
--- a/net-misc/janus/files/janus-confd
+++ b/net-misc/janus/files/janus-confd
@@ -20,4 +20,7 @@ JANUS_CORE_DIR="/etc/janus"
 #
 JANUS_RESTART_DELAY=5
 
-JANUS_OPTS="-b"
+# use this if you like to disable the safe wrapper script
+#JANUS_OPTS="-b"
+
+JANUS_OPTS=""

From 7778078409f6c61af1bf723741c2e830ccbdc3ed Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 19 Jan 2016 07:56:26 -0800
Subject: [PATCH 156/261] update mani

---
 net-misc/janus/Manifest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 7f276b9..857bcd2 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
-AUX janus-confd 495 SHA256 891d4f48923fb5b1ddd0876d5e2f25597d247c80850976b1bdf05a935d94696b SHA512 996151fb44cab09162f57ac0cc74a0105f3c797d7a2d6d0ff94f1aa00c5fffc6ba2eb3d9464839db80baffb543cd7d1c4313287f8777e2c02689326d8059ec6c WHIRLPOOL 1b4d929edf4a0713d9d0b41840d8ef7220403a175efb784ea9e6f165a4bf2ba84e944f438b366e9794cd9abddf1f73eb941b6238fb7721b5dcd88cedf20b662c
-AUX janus-initd 6046 SHA256 ce2b2890fcf18ff8c62451d6d81d31b2c8cfd344646b9ca9d2e6b86d8178cb89 SHA512 164703b3649d88c934d42adeca3a3479320f5ffce8531d6501ccc77c69076dca42a8a0fa5cbf63cdf2ac3ff33186765b38a4fa34ee8ca7929919af120b566e3b WHIRLPOOL ee4feb36b1922cc00dae5efa0da1c39e564b348755faa04266c218b7c08a8218e86bc08db3b2a33e00e15a4d153561feaab68f56b589a4d891d2cb356a12b75b
-AUX janus-initd.nosafe 6031 SHA256 64ca073813c67526db66e6572e60ea2cb0e1e7e82362de2206ae0faac848f4fe SHA512 3604d59a3a62c38d51e22c90e8e5211dc205d6a3e6482d6d7c2f8d75bdf9b364c43bdd23c27205fb383820fb8599786c4c60232cd66d5d0591cb6abb8e2c7c22 WHIRLPOOL 609eef0bdcd973d467391e64161fbb99d6f94935ee7864ebe3160b41ef5e4443cfcbde18b5ac096ca81b07adfa0c020e749c3d3e6bcf89da6002754fdf18a0f0
+AUX janus-confd 569 SHA256 274d0709beada487645b8c1e979882e24e13021359762407b81dd1bbad8b3163 SHA512 5e2745f595a8a889dcabc3ac68b290d5d0ae6a1fcf0f80986a0bd168214e4d21689fab8a10e8e86cbecb43b275d6cbf230ba49131b4593bc080fdd0a3676d335 WHIRLPOOL 70ac37aa6e1cdde6842e172866d16959f88100cb8dc6fe0b06b1b263589299c94ef5acd2340c9b3ec23064d446147dd79b8271c4d51502fc77925b57ae0b2373
+AUX janus-initd 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
+AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 2355c2b2ae312bb3c0fc86c749583ad2c26424cf Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Tue, 19 Jan 2016 11:17:53 -0800
Subject: [PATCH 157/261] new as version

---
 media-libs/opus/Manifest                      |   3 +-
 .../1.1-fix-configure.ac-shell-bug.patch      |  14 -
 media-libs/opus/opus-1.1.1.ebuild             |   2 -
 net-misc/asterisk/Manifest                    |   2 +
 net-misc/asterisk/asterisk-11.21.0.ebuild     | 324 ++++++++++++++++++
 5 files changed, 327 insertions(+), 18 deletions(-)
 delete mode 100644 media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
 create mode 100644 net-misc/asterisk/asterisk-11.21.0.ebuild

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 9d458de..6faaabd 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,4 @@
-AUX 1.1-fix-configure.ac-shell-bug.patch 545 SHA256 31bef7d778611192b973a8ce92b83ca4ebdec9404c0fc2853a2916e66977d4af SHA512 0174060c67c89a6836673784c7269d33ef4a421040ee9f9e37368e613f1ff482e792e1a3a9ac69868d933e5881edd778bcac2d254cb9ae9b4e3206d3a2245dee WHIRLPOOL ebebc79f75ca1bc9de95cb6a1a3edca98a4383258abeffb11ac71477783c1c30d8e1647a7cbb6c5e2e3dcc2992becaffbc6db3592bc893ae86e3209845136f44
 DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
-EBUILD opus-1.1.1.ebuild 921 SHA256 9edb018603d9b0690756efe2df91a3d4472445a91ac8b7e81488b3e3e7d3ec44 SHA512 e5fd8e75eb95df23a5911ad084da7349abaf55230bcd15fbfefafbf0773116595b59429261cf96829ff84e06ac72dfc1610a37ffc35268128a8c329019bd9d71 WHIRLPOOL ce69367a2bb47205122f3b6bf604b277003be72c3d49a53be295e10204477d5a0b8997e1c9674c30b6e44a8c75948d3b718e092c06a152aec5ba04596e4bf403
+EBUILD opus-1.1.1.ebuild 844 SHA256 e1523f0d87c074640da69bb013e3e056f9ab4bbb56752730893c5c5eed380f0e SHA512 2e05a4e4b68464bdd68d103028e93c5e2a58e54cc64a0cbaf38524ca6cdd4f0607fc6f1436821f8c7ebdcb6b3ecea56eab8f62762e9fbc0f4202808db66670ec WHIRLPOOL baf0c5e1e3233aaa59ca4066f338ef767564e9debe41c9ea9dc3b70ab8693c46fe3da8517529cd15d011608bbfb612a1b2a235b68c812002e8940e19932a3f2a
 MISC ChangeLog 5760 SHA256 30b7b09107813e0bdb94065535b28999b1abf4c63f05d43329d7d4fa9c62e031 SHA512 aceb0ed9b591f0a2263908b827f9a90750b569ef68d5a366547d2dc3ca405748f2717986656f1a31559c952456ce40a9e288ee03691e90e1eca4afefd9396514 WHIRLPOOL 4b8c75fe6aae4aed6c5e929c9191ea38f9b6c5ca6ba6d75d9c4258c9bd6f56167d82f616f5e0af9a9e45392789be41e3c02c5e31da403ca85a0d723ed5202879
 MISC metadata.xml 239 SHA256 0f0fec7fcbe04ead6403176cfaa25a426ad2be9b4bf28b11d77b92fb4fa0bc68 SHA512 bacd799b1cb6ba0a972796b62b80a2ea0b81511334c1dad6f5ffb57da72e9516e3a8b98a058f3b4461eb29723b75243c261af3aa5a43e3b43a5d10cc0e226796 WHIRLPOOL df085ffb47655ab7c87b466ec9bca481924b812e234dabba63fadfb1b167c09c52cff6f94d07ca9c85d570795b8ae5e98b5179e3e0a5e9e1ed09031d2d12c5b6
diff --git a/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch b/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
deleted file mode 100644
index e354524..0000000
--- a/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- opus-1.1.orig/configure.ac
-+++ opus-1.1/configure.ac
-@@ -333,9 +333,9 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
- 
- AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"])
- AM_CONDITIONAL([OPUS_ARM_INLINE_ASM],
--    [test x"${inline_optimization:0:3}" = x"ARM"])
-+    [test x"${inline_optimization%% *}" = x"ARM"])
- AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM],
--    [test x"${asm_optimization:0:3}" = x"ARM"])
-+    [test x"${asm_optimization%% *}" = x"ARM"])
- 
- AS_IF([test x"$enable_rtcd" = x"yes"],[
-     AS_IF([test x"$rtcd_support" != x"no"],[
diff --git a/media-libs/opus/opus-1.1.1.ebuild b/media-libs/opus/opus-1.1.1.ebuild
index 205c25b..22b1706 100644
--- a/media-libs/opus/opus-1.1.1.ebuild
+++ b/media-libs/opus/opus-1.1.1.ebuild
@@ -24,8 +24,6 @@ IUSE="custom-modes doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/1.1-fix-configure.ac-shell-bug.patch" ) # bug 510918
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable custom-modes)
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index cc93901..c30df5a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -91,9 +91,11 @@ DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
+DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-patchset-3.0.tar.gz 16093 SHA256 476c82d534656b11e0f99694787f08e46242ccaf13a323e5a2a589a7e4d77e3a SHA512 3380a672257dd7f854a3b1e562846b60043304e16a56587f390bd71e11ad86ba0a6df72d671126da273464aea8f2ad91905482e308212430ec4c7f0f45defa05 WHIRLPOOL 319e9bf9515ee79d3b6862d1974520462afa54c2ddfadaf1c6137e35734c194318db6930c5ab5368665db9644b12ff046aecfc52e4c70e55c4484c2f38a46bd9
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
diff --git a/net-misc/asterisk/asterisk-11.21.0.ebuild b/net-misc/asterisk/asterisk-11.21.0.ebuild
new file mode 100644
index 0000000..5cdcf40
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.21.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From a3a4e9cce8c42ce5953057c66676d478c5508dd7 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Tue, 19 Jan 2016 11:19:41 -0800
Subject: [PATCH 158/261] update mani

---
 media-libs/opus/Manifest | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 media-libs/opus/Manifest

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
new file mode 100644
index 0000000..ac01e45
--- /dev/null
+++ b/media-libs/opus/Manifest
@@ -0,0 +1,4 @@
+DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
+EBUILD opus-1.1.1.ebuild 922 SHA256 957f0c14e90bac9178449f3d5c40d04cdf169c99b4660c92b34502ade313683a SHA512 b6a8447645ffb2c0c586226aadf00b67478a473d1cef5d314370feb92049c14ebb63ede5aa757852ff81e2cc90f6eb23af31a7aa1eba40f54f2292e1439b5fb2 WHIRLPOOL 685b406169f8bcadb8d90a24ff27b15651d18977d4c6d64cda263120128c6a08d68ba31a0ae43fd16ee58cd69de51c9a076e8278b106cfba4c827bd946672ff7
+MISC ChangeLog 5760 SHA256 30b7b09107813e0bdb94065535b28999b1abf4c63f05d43329d7d4fa9c62e031 SHA512 aceb0ed9b591f0a2263908b827f9a90750b569ef68d5a366547d2dc3ca405748f2717986656f1a31559c952456ce40a9e288ee03691e90e1eca4afefd9396514 WHIRLPOOL 4b8c75fe6aae4aed6c5e929c9191ea38f9b6c5ca6ba6d75d9c4258c9bd6f56167d82f616f5e0af9a9e45392789be41e3c02c5e31da403ca85a0d723ed5202879
+MISC metadata.xml 239 SHA256 0f0fec7fcbe04ead6403176cfaa25a426ad2be9b4bf28b11d77b92fb4fa0bc68 SHA512 bacd799b1cb6ba0a972796b62b80a2ea0b81511334c1dad6f5ffb57da72e9516e3a8b98a058f3b4461eb29723b75243c261af3aa5a43e3b43a5d10cc0e226796 WHIRLPOOL df085ffb47655ab7c87b466ec9bca481924b812e234dabba63fadfb1b167c09c52cff6f94d07ca9c85d570795b8ae5e98b5179e3e0a5e9e1ed09031d2d12c5b6

From 3eaf47b46985a361f88030c6c739bcd2a85076b3 Mon Sep 17 00:00:00 2001
From: Drew <admin@safesoftsolutions.com>
Date: Thu, 21 Jan 2016 15:47:26 -0800
Subject: [PATCH 159/261] update fil;es

---
 net-misc/janus/files/janus-confd      |   6 +-
 net-misc/janus/files/janus-initd      |  30 ++--
 net-misc/janus/files/janus-initd.safe | 191 ++++++++++++++++++++++++++
 3 files changed, 209 insertions(+), 18 deletions(-)
 create mode 100755 net-misc/janus/files/janus-initd.safe

diff --git a/net-misc/janus/files/janus-confd b/net-misc/janus/files/janus-confd
index 9f4164c..2b96e34 100644
--- a/net-misc/janus/files/janus-confd
+++ b/net-misc/janus/files/janus-confd
@@ -20,7 +20,7 @@ JANUS_CORE_DIR="/etc/janus"
 #
 JANUS_RESTART_DELAY=5
 
-# use this if you like to disable the safe wrapper script
-#JANUS_OPTS="-b"
-
+# use this if you like to enable the safe wrapper script
 JANUS_OPTS=""
+
+JANUS_OPTS="-b"
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 6e223e4..75ece8d 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -118,21 +118,21 @@ start() {
                 return 1
         fi
 
-#        start-stop-daemon --start --exec /usr/bin/janus \
-#                --pidfile ${pid_file} --make-pidfile --background \
-#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
-
-        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
-        result=$?
-
-        if [ $result -eq 0 ]; then
-                # 2 seconds should be enough for janus to start
-                sleep 2
-                is_running
-                result=$?
-
-                [ $result -eq 0 ] || wrapperstop
-        fi
+        start-stop-daemon --start --exec /usr/bin/janus \
+                --background \
+                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+
+#        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+#        result=$?
+
+#        if [ $result -eq 0 ]; then
+#                # 2 seconds should be enough for janus to start
+#                sleep 2
+#                is_running
+#                result=$?
+#
+#                [ $result -eq 0 ] || wrapperstop
+#        fi
 
 
 }
diff --git a/net-misc/janus/files/janus-initd.safe b/net-misc/janus/files/janus-initd.safe
new file mode 100755
index 0000000..6e223e4
--- /dev/null
+++ b/net-misc/janus/files/janus-initd.safe
@@ -0,0 +1,191 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop"
+
+janus_svcname() {
+        local ebextra=
+        case "${SVCNAME}" in
+                janus*) ;;
+                *) ebextra=" (janus)" ;;
+        esac
+        echo "${SVCNAME}${ebextra}"
+}
+
+
+
+is_running() {
+
+	pid_file="/var/run/${SVCNAME}.pid"
+                
+        [ -r "${pid_file}" ] || return 1
+        PID="$(cat "${pid_file}")"
+        [ -d "/proc/${PID}" ] || return 1
+        EXE="$(readlink -f /proc/${PID}/exe)"
+        EXE="${EXE% (deleted)}" # in case janus got upgraded and we're still looking at an old one.
+        [ "${EXE}" = /usr/bin/janus ] || return 1 # pid got re-used for another process.
+
+        # PID reported in pidfile is active, and is still an janus instance.
+        return 0
+}
+
+
+janus_run_loop() {
+        local result=0 signal=0
+
+        pid_file="/var/run/${SVCNAME}.pid"
+
+        echo "Initializing $(janus_svcname) wrapper"
+        
+        trap "rm -f '/var/run/janus_wrapper_loop.running'" EXIT
+        touch "/var/run/janus_wrapper_loop.running"
+
+        while [ -r "/var/run/janus_wrapper_loop.running" ]; do
+
+	        export G_MESSAGES_DEBUG=false
+	        export NICE_DEBUG=false
+
+	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
+		result=$?
+
+                if [ "$result" -eq 0 ]; then
+                        echo "Janus terminated normally"
+                        break
+                else
+                        if [ "$result" -gt 128 ]; then
+                                signal="$(expr "$result" - 128)"
+                                MSG="Janus terminated with Signal: $signal"
+
+                                CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+                                local CORE_DUMPED=0
+                                if [ -f "${JANUS_CORE_DIR}/core" ]; then
+                                        mv "${JANUS_CORE_DIR}/core" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                elif [ -f "${JANUS_CORE_DIR}/core.${PID}" ]; then
+                                        mv "${JANUS_CORE_DIR}/core.${PID}" \
+                                           "${JANUS_CORE_DIR}/${CORE_TARGET}"
+                                        CORE_DUMPED=1
+
+                                fi
+
+                                [ $CORE_DUMPED -eq 1 ] && \
+                                        MSG="${MSG}\n\rCore dumped: ${JANUS_CORE_DIR}/${CORE_TARGET}"
+                        else
+                                MSG="Janus terminated with return code: $result"
+                        fi
+
+                        # kill left-over tasks
+                        for X in ${JANUS_CLEANUP_ON_CRASH}; do
+                                kill -9 "${PID}";
+                        done
+                fi
+
+                if [ -n "${JANUS_NOTIFY_EMAIL}" ] && \
+                   [ -x /usr/sbin/sendmail ]; then
+                        echo -e -n "Subject: Janus crashed\r\n${MSG}\r\n" |\
+                                 /usr/sbin/sendmail "${JANUS_NOTIFY_EMAIL}"
+                fi
+                sleep "${JANUS_RESTART_DELAY}"
+                echo "Restarting Janus..."
+        done
+
+        echo "Terminating wrapper loop."
+        return 0
+}
+
+start() {
+
+        ebegin "Starting $(janus_svcname)"
+
+	pid_file="/var/run/${SVCNAME}.pid"
+
+	ulimit -c unlimited
+	ulimit -n 64000
+
+	export G_MESSAGES_DEBUG=false
+	export NICE_DEBUG=false
+
+        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
+
+        if [ ! -r "${JANUS_CNF_PATH}/janus.cfg" ] ; then
+                eerror "Cannot read the configuration file \`${JANUS_CNF_PATH}/janus.cfg'"
+                return 1
+        fi
+
+#        start-stop-daemon --start --exec /usr/bin/janus \
+#                --pidfile ${pid_file} --make-pidfile --background \
+#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log
+
+        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
+        result=$?
+
+        if [ $result -eq 0 ]; then
+                # 2 seconds should be enough for janus to start
+                sleep 2
+                is_running
+                result=$?
+
+                [ $result -eq 0 ] || wrapperstop
+        fi
+
+
+}
+
+wrapperstop() {
+        # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+        if [ -r "/var/run/janus_wrapper_loop.pid" ]; then
+                ebegin "Killing janus wrapper script"
+                kill "$(cat /var/run/janus_wrapper_loop.pid)"
+                eend $?
+        fi
+
+        # The new one (due to "hardened" requirements) uses a simpler
+        # flag to indicate running or shutting down.
+        if [ -r "/var/run/janus_wrapper_loop.running" ]; then
+                ebegin "Signalling wrapper script to terminate"
+                rm "/var/run/janus_wrapper_loop.running"
+                eend $?
+        fi
+
+        return 0
+}
+
+stop() {
+
+        ebegin "Stopping $(janus_svcname)"
+
+	wrapperstop
+
+	pid_file="/var/run/${SVCNAME}.pid"
+
+        if is_running; then
+                einfon "Waiting for janus to shutdown ."
+                local cnt=0
+                while is_running; do
+                        cnt="$(expr $cnt + 1)"
+                        if [ $cnt -gt 5 ] ; then
+
+                                start-stop-daemon --stop --pidfile ${pid_file}
+                                return
+                        fi
+                        if [ $cnt -gt 60 ] ; then
+                                # Waited 120 seconds now. Fail.
+                                echo
+                                eend 1 "Failed."
+                                return
+                        fi
+                        sleep 2
+                        echo -n "."
+                done
+                echo
+        fi
+        eend 0
+
+}
+

From 4eb760a38ed5dcd17a01554d968f7b2eeac9d11a Mon Sep 17 00:00:00 2001
From: Drew <admin@safesoftsolutions.com>
Date: Thu, 21 Jan 2016 15:47:58 -0800
Subject: [PATCH 160/261] update mani

---
 net-misc/janus/Manifest | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 857bcd2..dda9439 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,6 @@
-AUX janus-confd 569 SHA256 274d0709beada487645b8c1e979882e24e13021359762407b81dd1bbad8b3163 SHA512 5e2745f595a8a889dcabc3ac68b290d5d0ae6a1fcf0f80986a0bd168214e4d21689fab8a10e8e86cbecb43b275d6cbf230ba49131b4593bc080fdd0a3676d335 WHIRLPOOL 70ac37aa6e1cdde6842e172866d16959f88100cb8dc6fe0b06b1b263589299c94ef5acd2340c9b3ec23064d446147dd79b8271c4d51502fc77925b57ae0b2373
-AUX janus-initd 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
+AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b637df72dfc35 SHA512 ca433b8faa324cda84c2bac69d082e0d857a6b61a41de44f527ca138149e5aa1541bf43ef4ac05c0a7e5c04b150f19ce3974ee7ef097cb625eaa98adbbae6af0 WHIRLPOOL b93e7c71be12f8b2fc5618de1c085dd4285912dad92178f51b71f5d67ebcbd158e14c9ebc7c55a9aeb9f26eaa13dacda729c67de4962686b8908a792beb18216
+AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
+AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
 EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad

From 2e417ca775d954b42ded30cb9089194f0796a3e1 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 25 Jan 2016 23:06:04 -0800
Subject: [PATCH 161/261] finally works with neeer gcc

---
 net-libs/sofia-sip/Manifest                   |  4 +-
 .../sofia-sip/files/sofia-sip-gcc-4.8.patch   | 50 +++++++++++++++++++
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild   | 17 ++++---
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 net-libs/sofia-sip/files/sofia-sip-gcc-4.8.patch

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 67ab04c..17e53ff 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
+AUX sofia-sip-gcc-4.8.patch 2480 SHA256 7f0fefb3f4ba9a0508cb9aeb2a5b93e366d161867900a631fef98f2f27bc0fbc SHA512 525970d124ed2a38af18203a66c37531e2d571c9f0afe9372e396b7d142078d83f3ca4e0400b89ddaf3a75572ec8dd321e3a731d0e246f77facab8b9b16ce1a2 WHIRLPOOL 974772d33a2b5509946af9bc8ec153284817f39f1966d83713cfe04f9a74b2464e7e55046ac4ee5dbf9328fb533abcb847f705ab04904aff83bc17ba1d6c65d6
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
-DIST sofia-sip-patchset.tar.gz 607 SHA256 28424860c6070fd36289bf783af2cf30577fed5884b179636aaba1d255c7ea2b SHA512 280c8e9351fd95e0ec07ffc84ea9abd543076365e7fc2abf5383e01ccdaabcb18d0598db55bd811c917e405715da0e3beda4e8078e7ff085824f39e84be7cc35 WHIRLPOOL 05802b6608e7787f91107cabbf9a238ed3ea71c5e4239f5ca6e51af2bd59352734e4712d79aa4cad0b7a7cb61aebbb6274c1dcb5235bf7b217a70d47b621029d
-EBUILD sofia-sip-1.12.11.ebuild 1151 SHA256 e538cd66183151f1cf516f830e1a53f6895a66a0f6a5912a8d1567d3e0842573 SHA512 57e36ea25ca1cad4e7be60e9490e36c604f76ed1508b8aea2bd2241179dc8acaf01b49a81bda1dd02ecbe0945ddccc093d7e53f1ea9a1bec2d1803b2fb7c17ee WHIRLPOOL daa8a7484caa87e777c01cc17c8019e45773057bb59081a82174ec7ceb2ca503c67725c613a695b708646ebcb8fcfe9197c4964e44e952f3073bfd73342685ee
+EBUILD sofia-sip-1.12.11.ebuild 1123 SHA256 05f1811605f2e30717d22599b7a6edf99db3fa1b9ff8bc1c6a11b73268f9f6dd SHA512 e78dcd5320901fd5f4d5dc84a36514d48f2993d138e8db98173aae9121b086301f519c22add8ad758833dc5d166d14d926e63e9999fa8e016d6d56e79ac2c49f WHIRLPOOL 5b4fd99758a2344b36b30e02666cc523fc3e12ed81eb270061323e47864aff8682705ccee2526760595f7d82cdea699691122ec9b1b28fa800830fa659240953
diff --git a/net-libs/sofia-sip/files/sofia-sip-gcc-4.8.patch b/net-libs/sofia-sip/files/sofia-sip-gcc-4.8.patch
new file mode 100644
index 0000000..f61718f
--- /dev/null
+++ b/net-libs/sofia-sip/files/sofia-sip-gcc-4.8.patch
@@ -0,0 +1,50 @@
+From cfeb1a1ee25865b2d8ba7b8a5ea4ad815077b353 Mon Sep 17 00:00:00 2001
+From: Arsen Chaloyan <achaloyan@gmail.com>
+Date: Wed, 23 Apr 2014 13:33:03 -0700
+Subject: [PATCH] Comply with the aggressive-loop-optimization introduced in
+ gcc 4.8.
+
+The problem is in gcc loop optimizers which detect a loop operating with out of bounds memory and then optimize it with something undefined since, according to the C standard, out of bounds behavior is undefined. The problem could have been addressed by using the new option -fno-aggressive-loop-optimization as well.
+---
+ libsofia-sip-ua/msg/msg_parser.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/libsofia-sip-ua/msg/msg_parser.c b/libsofia-sip-ua/msg/msg_parser.c
+index 5a1ef09..0c88b1f 100644
+--- a/libsofia-sip-ua/msg/msg_parser.c
++++ b/libsofia-sip-ua/msg/msg_parser.c
+@@ -2530,8 +2530,6 @@ int msg_header_prepend(msg_t *msg,
+ msg_header_t **
+ msg_hclass_offset(msg_mclass_t const *mc, msg_pub_t const *mo, msg_hclass_t *hc)
+ {
+-  int i;
+-
+   assert(mc && hc);
+ 
+   if (mc == NULL || hc == NULL)
+@@ -2543,12 +2541,16 @@ msg_hclass_offset(msg_mclass_t const *mc, msg_pub_t const *mo, msg_hclass_t *hc)
+       if (mc->mc_hash[j].hr_class == hc) {
+ 	return (msg_header_t **)((char *)mo + mc->mc_hash[j].hr_offset);
+       }
+-  }
+-  else
++  } else {
+     /* Header has no name. */
+-    for (i = 0; i <= 6; i++)
+-      if (hc->hc_hash == mc->mc_request[i].hr_class->hc_hash)
+-	return (msg_header_t **)((char *)mo + mc->mc_request[i].hr_offset);
++    if (hc->hc_hash == mc->mc_request[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_request[0].hr_offset);
++    if (hc->hc_hash == mc->mc_status[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_status[0].hr_offset);
++    if (hc->hc_hash == mc->mc_separator[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_separator[0].hr_offset);
++    if (hc->hc_hash == mc->mc_payload[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_payload[0].hr_offset);
++    if (hc->hc_hash == mc->mc_unknown[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_unknown[0].hr_offset);
++    if (hc->hc_hash == mc->mc_error[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_error[0].hr_offset);
++    if (hc->hc_hash == mc->mc_multipart[0].hr_class->hc_hash) return (msg_header_t **)((char *)mo + mc->mc_multipart[0].hr_offset);
++  }
+ 
+   return NULL;
+ }
+-- 
+1.8.0.msysgit.0
+
+
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 035cc60..76a5823 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -3,22 +3,19 @@
 # $Id$
 
 EAPI=4
+inherit base eutils flag-o-matic linux-info multilib
 
 DESCRIPTION="RFC3261 compliant SIP User-Agent library"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/${P}.tar.gz
-	http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/sofia-sip-patchset.tar.gz"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-libs/sofia-sip/${P}.tar.gz";
 
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="ssl static-libs"
 
-#EPATCH_SUFFIX="patch"
-#PATCHES=( "${WORKDIR}/sofia-sip-patchset" )
-
 RDEPEND="dev-libs/glib:2
-	<=sys-devel/gcc-4.7.4
+        <=sys-devel/gcc-4.7.4
         ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
         virtual/pkgconfig"
@@ -28,6 +25,12 @@ RESTRICT="test"
 
 DOCS=( AUTHORS ChangeLog README README.developers RELEASE TODO )
 
+
+PATCHES=(
+        "${FILESDIR}/sofia-sip-gcc-4.8.patch"
+)
+
+
 src_configure() {
         econf \
                 $(use_enable static-libs static) \
@@ -35,7 +38,7 @@ src_configure() {
 }
 
 src_compile() {
-	CFLAGS="-fno-aggressive-loop-optimizations" emake
+        CFLAGS="-fno-aggressive-loop-optimizations" emake
 }
 
 src_install() {

From ba2c77393aabda57ef08159c22dd89c121babd7e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 25 Jan 2016 23:06:15 -0800
Subject: [PATCH 162/261] finally works with neeer gcc

---
 net-libs/sofia-sip/sofia-sip-1.12.11.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 76a5823..8837b5c 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="ssl static-libs"
 
 RDEPEND="dev-libs/glib:2
-        <=sys-devel/gcc-4.7.4
         ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
         virtual/pkgconfig"

From d436783bb9c9ed12db094e331543733cf6886173 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 25 Jan 2016 23:16:06 -0800
Subject: [PATCH 163/261] u[dates

---
 net-libs/usrsctp/Manifest            |  1 +
 net-libs/usrsctp/usrsctp-9999.ebuild | 40 ++++++++++++++++++++++++++++
 net-misc/janus/Manifest              |  2 +-
 net-misc/janus/janus-0.0.5.ebuild    |  6 ++---
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 net-libs/usrsctp/Manifest
 create mode 100644 net-libs/usrsctp/usrsctp-9999.ebuild

diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest
new file mode 100644
index 0000000..db154cf
--- /dev/null
+++ b/net-libs/usrsctp/Manifest
@@ -0,0 +1 @@
+EBUILD usrsctp-9999.ebuild 797 SHA256 b6eea570398fc63bb8b92dddbfad85a035e70076bf79229ea5153b52af2b6d80 SHA512 415e6ea450ba53d1d485d26c7a0f2067e6eed466febaf20eb389dcba8c287ac7d8387f6a78365859b20ee2276f19159020473978f53743ecf6f8455595b895a0 WHIRLPOOL 65a4991b159d58de21aca411c25496c8ef3dce727b8927f2ac2fae787172d9eef0288d0e20eaf8699511501a333cef8271250828575209a41cacfb7c8e464223
diff --git a/net-libs/usrsctp/usrsctp-9999.ebuild b/net-libs/usrsctp/usrsctp-9999.ebuild
new file mode 100644
index 0000000..dc7914f
--- /dev/null
+++ b/net-libs/usrsctp/usrsctp-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from freeswitch overlay; Bumped by mva; $
+# Distributed under the terms of the GNU General Public License 2
+# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
+# more information
+#
+
+EAPI="4"
+
+IUSE=""
+
+inherit git-2
+EGIT_REPO_URI="https://github.com/sctplab/usrsctp.git"
+EGIT_BOOTSTRAP="./bootstrap"
+
+DESCRIPTION="userland SCTP stack"
+HOMEPAGE="https://github.com/sctplab/usrsctp"
+
+SLOT="0"
+
+LICENSE="BSD"
+KEYWORDS=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/automake-1.10"
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	default_src_install
+}
diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index dda9439..31d1a0c 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -3,4 +3,4 @@ AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa8
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
-EBUILD janus-0.0.5.ebuild 1855 SHA256 86860fa156a7b8344255abe0443f37a14e8f36bb2f4e26e92cf7b375c421623f SHA512 ba3994c935ca9ceb8a38ba9bae0ecba41d6ceae6abfc6df5b4b4cafc79deb438937211c0695367607104aedcf980a6b8c1479acbe605d320853cf2e22281fdec WHIRLPOOL 3da5511d528aa98abeb4feb980f7fa540585a65254f9f28903fdbd15c951fdc870d596a259df748227dbba34b88beeccb22ea8bb603dd2ceadfa862409570bad
+EBUILD janus-0.0.5.ebuild 1909 SHA256 4c21470a743c530d948a6911caaa4f15be928958d0546b50a98263e905eaeae2 SHA512 9a6eac920bd1826d9ce6c5e0a4612c47d55ff7142c5f3ecf64c16b19a1a3c0c77679a3d52078a5293aba2c4d7adf3644bcde45b822af7f29cafbeff890a7437d WHIRLPOOL 872aaa910d8907fd47fe859e064a9eeafe21ed7062869d9ef2172f336a00cb6e540e2adb56fbc2f2553c7938731bf1d2da7a067645f4567a6d7011e00bf1fa5e
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
index 9e31e18..212da7c 100644
--- a/net-misc/janus/janus-0.0.5.ebuild
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="websockets rabbitmq docs opus ogg"
+IUSE="websockets rabbitmq docs opus ogg data-channels"
 
 #EPATCH_SUFFIX="patch"
 #PATCHES=( "${WORKDIR}/janus-patchset" )
@@ -25,6 +25,7 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	ogg? ( media-libs/libogg )
 	websockets? ( net-libs/libwebsockets dev-util/cmake )
 	rabbitmq? ( net-libs/rabbitmq-c )
+	data-channels? ( net-libs/usrsctp )
 	net-libs/libmicrohttpd
 	dev-libs/jansson
 	net-libs/libnice[-upnp]
@@ -36,7 +37,6 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	dev-util/gengetopt
 	dev-libs/ding-libs"
 
-
 S="${WORKDIR}/janus-gateway"
 
 src_prepare() {
@@ -50,7 +50,7 @@ src_configure() {
 
 	econf \
 		--prefix=/usr \
-		--disable-data-channels \
+		$(use_enable data-channels) \
 		$(use_enable websockets) \
 		$(use_enable rabbitmq) \
 		$(use_enable docs)

From a44f3279e72b56929d0e1755fc69981d5b40ad4b Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Mon, 25 Jan 2016 23:19:39 -0800
Subject: [PATCH 164/261] update mani

---
 net-libs/sofia-sip/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 17e53ff..7a5de57 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 AUX sofia-sip-gcc-4.8.patch 2480 SHA256 7f0fefb3f4ba9a0508cb9aeb2a5b93e366d161867900a631fef98f2f27bc0fbc SHA512 525970d124ed2a38af18203a66c37531e2d571c9f0afe9372e396b7d142078d83f3ca4e0400b89ddaf3a75572ec8dd321e3a731d0e246f77facab8b9b16ce1a2 WHIRLPOOL 974772d33a2b5509946af9bc8ec153284817f39f1966d83713cfe04f9a74b2464e7e55046ac4ee5dbf9328fb533abcb847f705ab04904aff83bc17ba1d6c65d6
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
-EBUILD sofia-sip-1.12.11.ebuild 1123 SHA256 05f1811605f2e30717d22599b7a6edf99db3fa1b9ff8bc1c6a11b73268f9f6dd SHA512 e78dcd5320901fd5f4d5dc84a36514d48f2993d138e8db98173aae9121b086301f519c22add8ad758833dc5d166d14d926e63e9999fa8e016d6d56e79ac2c49f WHIRLPOOL 5b4fd99758a2344b36b30e02666cc523fc3e12ed81eb270061323e47864aff8682705ccee2526760595f7d82cdea699691122ec9b1b28fa800830fa659240953
+EBUILD sofia-sip-1.12.11.ebuild 1093 SHA256 b76e48bace0f08c45095164d6e4400ce5e6e9027f255b0456bb6a6fc11d73f9f SHA512 88392d1fec9f1f2a52139b371fcff123903fd305d200e96a81f3a48e259a2498ea3672f90dd75b35ee9e92d819c4bbce9b77b7dc7530db551474971705ece8ce WHIRLPOOL 49e9ecf92203e4174f1e2f047fca29cadc8dd7c938babddadc75f718475fc04e6367b2bc8d7fe253201835dc339ffbfa4bd1cfccd1da644b210c62e410661045

From c7bd02d5a0a4990bd6b08be525924e6604801807 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 3 Feb 2016 16:30:08 -0800
Subject: [PATCH 165/261] update mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 31d1a0c..4998fd5 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b6
 AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 18034071 SHA256 2c52be36d357e04224aceac243f8d150bb7bbd46923a814e781c2287bc0459c4 SHA512 04504df2a43e7e290daa769dd74346d3a6237c7a4781280c9c1db713373e299f8380a16905ac291826f09e80036dabb25a374e3e8f62183afea4bdc321687d5d WHIRLPOOL ee8ccfbcca95998d17183d71e2c504a30411a1dfeba270e4c87802861761a9f9d5259292ebe847ff46f18037313d5403404ac9dac225f4ccdd918c58db99487e
+DIST janus-0.0.5.tar.gz 18345211 SHA256 bfa72c7b51cc2788c0e56289da0feee4b400895b383abed25145c95360a95aa8 SHA512 e9e655e63661da27caae1759cdd222ce669c9711a8a71bf1390cac67da521503848e23a2ba61115af8adc874024587868ca3b2dc4d6f4d6b7aa38771ea09b874 WHIRLPOOL 7139a86241097f3910abf95067150dfb454c2907f7338a94d2c1c078d603c4e6265e58c2d7f98fb71aca5db8db4c27e2cdcbf8c8d51218a2255b75e973d7c5a6
 EBUILD janus-0.0.5.ebuild 1909 SHA256 4c21470a743c530d948a6911caaa4f15be928958d0546b50a98263e905eaeae2 SHA512 9a6eac920bd1826d9ce6c5e0a4612c47d55ff7142c5f3ecf64c16b19a1a3c0c77679a3d52078a5293aba2c4d7adf3644bcde45b822af7f29cafbeff890a7437d WHIRLPOOL 872aaa910d8907fd47fe859e064a9eeafe21ed7062869d9ef2172f336a00cb6e540e2adb56fbc2f2553c7938731bf1d2da7a067645f4567a6d7011e00bf1fa5e

From b2b7815d0c58866f8577d6bad7bba3a0eb5aea85 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Fri, 5 Feb 2016 09:51:26 -0800
Subject: [PATCH 166/261] update mani

---
 net-misc/janus/Manifest           | 2 +-
 net-misc/janus/janus-0.0.5.ebuild | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 4998fd5..a1e4b85 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -3,4 +3,4 @@ AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa8
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 18345211 SHA256 bfa72c7b51cc2788c0e56289da0feee4b400895b383abed25145c95360a95aa8 SHA512 e9e655e63661da27caae1759cdd222ce669c9711a8a71bf1390cac67da521503848e23a2ba61115af8adc874024587868ca3b2dc4d6f4d6b7aa38771ea09b874 WHIRLPOOL 7139a86241097f3910abf95067150dfb454c2907f7338a94d2c1c078d603c4e6265e58c2d7f98fb71aca5db8db4c27e2cdcbf8c8d51218a2255b75e973d7c5a6
-EBUILD janus-0.0.5.ebuild 1909 SHA256 4c21470a743c530d948a6911caaa4f15be928958d0546b50a98263e905eaeae2 SHA512 9a6eac920bd1826d9ce6c5e0a4612c47d55ff7142c5f3ecf64c16b19a1a3c0c77679a3d52078a5293aba2c4d7adf3644bcde45b822af7f29cafbeff890a7437d WHIRLPOOL 872aaa910d8907fd47fe859e064a9eeafe21ed7062869d9ef2172f336a00cb6e540e2adb56fbc2f2553c7938731bf1d2da7a067645f4567a6d7011e00bf1fa5e
+EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
diff --git a/net-misc/janus/janus-0.0.5.ebuild b/net-misc/janus/janus-0.0.5.ebuild
index 212da7c..ea45abb 100644
--- a/net-misc/janus/janus-0.0.5.ebuild
+++ b/net-misc/janus/janus-0.0.5.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="websockets rabbitmq docs opus ogg data-channels"
+FEATURES="nostrip"
 
 #EPATCH_SUFFIX="patch"
 #PATCHES=( "${WORKDIR}/janus-patchset" )

From 383c65b4b982bc55904e086d427955deb7d170ff Mon Sep 17 00:00:00 2001
From: root <root@hyp08.safesoftsolutions.com>
Date: Tue, 9 Feb 2016 17:58:14 -0800
Subject: [PATCH 167/261] update digest

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index a1e4b85..d54cb51 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b6
 AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 18345211 SHA256 bfa72c7b51cc2788c0e56289da0feee4b400895b383abed25145c95360a95aa8 SHA512 e9e655e63661da27caae1759cdd222ce669c9711a8a71bf1390cac67da521503848e23a2ba61115af8adc874024587868ca3b2dc4d6f4d6b7aa38771ea09b874 WHIRLPOOL 7139a86241097f3910abf95067150dfb454c2907f7338a94d2c1c078d603c4e6265e58c2d7f98fb71aca5db8db4c27e2cdcbf8c8d51218a2255b75e973d7c5a6
+DIST janus-0.0.5.tar.gz 18711956 SHA256 c99872d167a0daacba767baa336b62d8f030966d00580ff25302281879784dc2 SHA512 45747782910606bd124e0302198bc240bcc81dbff6619f8624746ebc7b0149cde5d4e2faccbf436b4473fd2a9ed78c5c860eb478b96f9ca6806a7c6f30d49803 WHIRLPOOL 3caa9db4e53fee5104737bbdb6c4758e830a5047482132eb724a17dbe5d363f6bd1f256ad179d18b124a5c3741b8d442c958701404cbe6cabe96b488d1293483
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From d9b5fcdfbd43f6c0495a78c790d4b395b1814d13 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 11 Feb 2016 11:54:07 -0800
Subject: [PATCH 168/261] updates

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index d54cb51..f8cd9bc 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b6
 AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 18711956 SHA256 c99872d167a0daacba767baa336b62d8f030966d00580ff25302281879784dc2 SHA512 45747782910606bd124e0302198bc240bcc81dbff6619f8624746ebc7b0149cde5d4e2faccbf436b4473fd2a9ed78c5c860eb478b96f9ca6806a7c6f30d49803 WHIRLPOOL 3caa9db4e53fee5104737bbdb6c4758e830a5047482132eb724a17dbe5d363f6bd1f256ad179d18b124a5c3741b8d442c958701404cbe6cabe96b488d1293483
+DIST janus-0.0.5.tar.gz 18843431 SHA256 604055ccc0ac8b1c7b9f3b4202f35a4509a29156be9d1399eb69d05b9088686e SHA512 735717d3abaf2a5076401b2081ee567f312cd8cf966ab48ce401ad039a0e987e4ed2245f72679bccea9447984694b5f6a900c3760799fda48db09cd7e4f301f7 WHIRLPOOL 1ce6313afe693af3b85e22681fe56a79dd28240036aeb89041a304cadf8681a72cf46474cd0daf3d60d7ae0848bcf74d28a925b27719e21e7221c649dc6a4010
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 32cfabc24ee97956725cc6a481c28bb3251df646 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 11 Feb 2016 12:03:48 -0800
Subject: [PATCH 169/261] updates

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index f8cd9bc..a948388 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b6
 AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 18843431 SHA256 604055ccc0ac8b1c7b9f3b4202f35a4509a29156be9d1399eb69d05b9088686e SHA512 735717d3abaf2a5076401b2081ee567f312cd8cf966ab48ce401ad039a0e987e4ed2245f72679bccea9447984694b5f6a900c3760799fda48db09cd7e4f301f7 WHIRLPOOL 1ce6313afe693af3b85e22681fe56a79dd28240036aeb89041a304cadf8681a72cf46474cd0daf3d60d7ae0848bcf74d28a925b27719e21e7221c649dc6a4010
+DIST janus-0.0.5.tar.gz 18842538 SHA256 f60167fdb7ab6d8934b7b5dcca25b0505ae459452a23a5b51047bfe0cbda1463 SHA512 090619e8ba4566290540a8ed43d3e2214047f8861970f3309a78be5fc4423c91816219f4ed6a343b05d63f322fd3c4ec7eacb398dc767c491ef2a6351db38c0b WHIRLPOOL 111ce17cfc654ba2e9bb32601e66a777d9ad51d395aaaa518fdae4f14f40a055caf6e9cd55db1c0b0bc9c5ffd10c880e94c32b73a44b9d485af2dc08621d056c
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From a605f0e4197525b188e8727e403a605a544c6003 Mon Sep 17 00:00:00 2001
From: Drew <admin@safesoftsolutions.com>
Date: Thu, 11 Feb 2016 22:02:08 -0800
Subject: [PATCH 170/261] update

---
 net-misc/janus/Manifest          |  4 ++--
 net-misc/janus/files/janus-confd |  2 +-
 net-misc/janus/files/janus-initd | 34 ++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index a948388..23c6939 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
-AUX janus-confd 567 SHA256 ead4f2d61f4f40bdeea081abccf97c83b8b494a30c51c0797a1b637df72dfc35 SHA512 ca433b8faa324cda84c2bac69d082e0d857a6b61a41de44f527ca138149e5aa1541bf43ef4ac05c0a7e5c04b150f19ce3974ee7ef097cb625eaa98adbbae6af0 WHIRLPOOL b93e7c71be12f8b2fc5618de1c085dd4285912dad92178f51b71f5d67ebcbd158e14c9ebc7c55a9aeb9f26eaa13dacda729c67de4962686b8908a792beb18216
-AUX janus-initd 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
+AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
+AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 18842538 SHA256 f60167fdb7ab6d8934b7b5dcca25b0505ae459452a23a5b51047bfe0cbda1463 SHA512 090619e8ba4566290540a8ed43d3e2214047f8861970f3309a78be5fc4423c91816219f4ed6a343b05d63f322fd3c4ec7eacb398dc767c491ef2a6351db38c0b WHIRLPOOL 111ce17cfc654ba2e9bb32601e66a777d9ad51d395aaaa518fdae4f14f40a055caf6e9cd55db1c0b0bc9c5ffd10c880e94c32b73a44b9d485af2dc08621d056c
diff --git a/net-misc/janus/files/janus-confd b/net-misc/janus/files/janus-confd
index 2b96e34..2180bcf 100644
--- a/net-misc/janus/files/janus-confd
+++ b/net-misc/janus/files/janus-confd
@@ -21,6 +21,6 @@ JANUS_CORE_DIR="/etc/janus"
 JANUS_RESTART_DELAY=5
 
 # use this if you like to enable the safe wrapper script
+#JANUS_OPTS="-b"
 JANUS_OPTS=""
 
-JANUS_OPTS="-b"
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 75ece8d..7ecd11d 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -4,6 +4,8 @@
 
 extra_started_commands="forcestop"
 
+ulimit -c unlimited
+
 janus_svcname() {
         local ebextra=
         case "${SVCNAME}" in
@@ -48,6 +50,8 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
+		cd /etc/janus
+
 		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
 		result=$?
 
@@ -118,21 +122,21 @@ start() {
                 return 1
         fi
 
-        start-stop-daemon --start --exec /usr/bin/janus \
-                --background \
-                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
-
-#        janus_run_loop 2>&1 | logger -t "wrapper:$(janus_svcname)" &
-#        result=$?
-
-#        if [ $result -eq 0 ]; then
-#                # 2 seconds should be enough for janus to start
-#                sleep 2
-#                is_running
-#                result=$?
-#
-#                [ $result -eq 0 ] || wrapperstop
-#        fi
+#        start-stop-daemon --start --exec /usr/bin/janus \
+#                --background \
+#                -- -F${JANUS_CNF_PATH} -N -L /var/log/janus.log -p ${pid_file}
+
+        janus_run_loop &
+        result=$?
+
+        if [ $result -eq 0 ]; then
+                # 2 seconds should be enough for janus to start
+                sleep 2
+                is_running
+                result=$?
+
+                [ $result -eq 0 ] || wrapperstop
+        fi
 
 
 }

From f42ac3ab4c8fdc0f2596da14833c2b97812a98f7 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Tue, 16 Feb 2016 10:21:16 -0800
Subject: [PATCH 171/261] update

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 23c6939..5d7b057 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 18842538 SHA256 f60167fdb7ab6d8934b7b5dcca25b0505ae459452a23a5b51047bfe0cbda1463 SHA512 090619e8ba4566290540a8ed43d3e2214047f8861970f3309a78be5fc4423c91816219f4ed6a343b05d63f322fd3c4ec7eacb398dc767c491ef2a6351db38c0b WHIRLPOOL 111ce17cfc654ba2e9bb32601e66a777d9ad51d395aaaa518fdae4f14f40a055caf6e9cd55db1c0b0bc9c5ffd10c880e94c32b73a44b9d485af2dc08621d056c
+DIST janus-0.0.5.tar.gz 19203358 SHA256 1f4aa671ec631a2ed4449f044c17675bf0cb0e1756caf3b4ccb4128ac3f9502f SHA512 cca9660aaba783aaad932303a6c68afa785ac1b8d573452e506f48390a6675f3ffea461947c6f633b1bfdf68398610ff706ecd6934d9f4a8e14479da1d6a714e WHIRLPOOL a2a0ba08c40c4f200b848756d14f455786d8443ac8e4903fb45434e40b91d535fb943564d17d9fc6dfa40500dfa0f8076eb0e2dcc3993bb68ecc3b5a0f623b37
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 95e856d56d5d7c53c9f3f7a8d830b695cf9e4652 Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Fri, 19 Feb 2016 21:21:21 -0800
Subject: [PATCH 172/261] update manu

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 5d7b057..7f7596e 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 19203358 SHA256 1f4aa671ec631a2ed4449f044c17675bf0cb0e1756caf3b4ccb4128ac3f9502f SHA512 cca9660aaba783aaad932303a6c68afa785ac1b8d573452e506f48390a6675f3ffea461947c6f633b1bfdf68398610ff706ecd6934d9f4a8e14479da1d6a714e WHIRLPOOL a2a0ba08c40c4f200b848756d14f455786d8443ac8e4903fb45434e40b91d535fb943564d17d9fc6dfa40500dfa0f8076eb0e2dcc3993bb68ecc3b5a0f623b37
+DIST janus-0.0.5.tar.gz 19435379 SHA256 0a53efbcc911131a88fa201c3e444bfbc7e77bcaa8d78c43682dd64d516c7ae2 SHA512 1d9a20fbf84927d9b3f9321cd1975a05ca46d18255775977381bb9adbb65a171a841ccfa67d16c3d15ac9b94b7a2feefd22e3aa4a25efb3d91d652c879f8e6e9 WHIRLPOOL 012477dca441c268ee2249f622e76a31cb1a56d4d6b886c99a75ee24ef26d09651d9f16b3365783aca761e5a95df2c3c06fd48044eee6d74b53835738e3cd201
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 1c4a5313cde92b57dd18dfac0d3d88eb35b4faa0 Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Wed, 9 Mar 2016 10:04:56 -0800
Subject: [PATCH 173/261] new ebuild

---
 net-misc/asterisk/Manifest                |   2 +
 net-misc/asterisk/asterisk-11.21.2.ebuild | 324 ++++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.21.2.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c30df5a..6db1342 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -92,6 +92,7 @@ DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f6205
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
+DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-patchset-3.0.tar.gz 16093 SHA256 476c82d534656b11e0f99694787f08e46242ccaf13a323e5a2a589a7e4d77e3a SHA512 3380a672257dd7f854a3b1e562846b60043304e16a56587f390bd71e11ad86ba0a6df72d671126da273464aea8f2ad91905482e308212430ec4c7f0f45defa05 WHIRLPOOL 319e9bf9515ee79d3b6862d1974520462afa54c2ddfadaf1c6137e35734c194318db6930c5ab5368665db9644b12ff046aecfc52e4c70e55c4484c2f38a46bd9
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
@@ -99,3 +100,4 @@ EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e11
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
diff --git a/net-misc/asterisk/asterisk-11.21.2.ebuild b/net-misc/asterisk/asterisk-11.21.2.ebuild
new file mode 100644
index 0000000..5cdcf40
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.21.2.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From de04d2562ae7bee0bb954a19449b42c66afe7b2c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 10 Mar 2016 11:36:09 -0800
Subject: [PATCH 174/261] update mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 7f7596e..6802704 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 19435379 SHA256 0a53efbcc911131a88fa201c3e444bfbc7e77bcaa8d78c43682dd64d516c7ae2 SHA512 1d9a20fbf84927d9b3f9321cd1975a05ca46d18255775977381bb9adbb65a171a841ccfa67d16c3d15ac9b94b7a2feefd22e3aa4a25efb3d91d652c879f8e6e9 WHIRLPOOL 012477dca441c268ee2249f622e76a31cb1a56d4d6b886c99a75ee24ef26d09651d9f16b3365783aca761e5a95df2c3c06fd48044eee6d74b53835738e3cd201
+DIST janus-0.0.5.tar.gz 20770645 SHA256 e986c945c845e622c8d84591f5d17177b7a905731db5e301cda02e38f0ff9a11 SHA512 fe583fa44cfbd5ddb589f45166465e6ccbfb3caa84ba94eb89b331d08ac80ce4bade633eb2d3e3cf55f0909aeb012554da4dcc0c1825d6e00f23ee1ed12f43c6 WHIRLPOOL ea4d7bacfb22b1c72c5eff4a1e436a2dbec74dbaadee7959163128e39c5bbe6d1f18833e5193bb319f6417609935ae7022bd8baf7740e35f96ed00bea3e086f6
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From ba36efe0bc700e989d9982c7a13727a960c18ec7 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 15 Mar 2016 10:01:19 -0700
Subject: [PATCH 175/261] update mani

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 6802704..6e05025 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 20770645 SHA256 e986c945c845e622c8d84591f5d17177b7a905731db5e301cda02e38f0ff9a11 SHA512 fe583fa44cfbd5ddb589f45166465e6ccbfb3caa84ba94eb89b331d08ac80ce4bade633eb2d3e3cf55f0909aeb012554da4dcc0c1825d6e00f23ee1ed12f43c6 WHIRLPOOL ea4d7bacfb22b1c72c5eff4a1e436a2dbec74dbaadee7959163128e39c5bbe6d1f18833e5193bb319f6417609935ae7022bd8baf7740e35f96ed00bea3e086f6
+DIST janus-0.0.5.tar.gz 20811816 SHA256 113850c8df640b34022e6cf2b567dbc419af3b5b18395380bc5d5722ab4c1855 SHA512 999456fac00e8beb4a9dcb2f90e3dbc9e7ae4dca8b0376a67db720d81c3c921f040708acb7dc14bd9ee5d1faacad6bf6887e6a1a33c78faea361a4572ebbf671 WHIRLPOOL 17510ba780d846738adc5ac5a61dfc402ccf42e5b0af656d357fea7bd2453bc94066905083d59006610f0e7607395f2d128cd6311937dd59f1eeef8c1ffb862c
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 699bff3c55ea8ff62c1dfab5b1f3fc4123379742 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 14:15:05 -0700
Subject: [PATCH 176/261] mani

---
 net-misc/asterisk/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6db1342..3412765 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,8 +93,8 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16093 SHA256 476c82d534656b11e0f99694787f08e46242ccaf13a323e5a2a589a7e4d77e3a SHA512 3380a672257dd7f854a3b1e562846b60043304e16a56587f390bd71e11ad86ba0a6df72d671126da273464aea8f2ad91905482e308212430ec4c7f0f45defa05 WHIRLPOOL 319e9bf9515ee79d3b6862d1974520462afa54c2ddfadaf1c6137e35734c194318db6930c5ab5368665db9644b12ff046aecfc52e4c70e55c4484c2f38a46bd9
-DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
+DIST asterisk-patchset-3.0.tar.gz 16887 SHA256 efb0706c655c49cbf5995c0a6358e486daf1134db725e666d839acb1bac5da65 SHA512 23278d0cb48bf22b0866a6213368717490bf756c68f1def5fe33bd37d76835f13796c8c02122b5a41ee20947b9f337ba15c87932966fd72472e03369a9109294 WHIRLPOOL af89134713b01dd55d04798c3ab3be77d1f9d8d5775290998228717ade2681f10fdd3bfc13a12dd92e521f5b8f57d23d5bfed77ed280dbd9913d938fd1b812a8
+DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d

From f2f8306d6898888436cb1f0c2606422ff70c98c4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 14:50:15 -0700
Subject: [PATCH 177/261] mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 3412765..07b1250 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16887 SHA256 efb0706c655c49cbf5995c0a6358e486daf1134db725e666d839acb1bac5da65 SHA512 23278d0cb48bf22b0866a6213368717490bf756c68f1def5fe33bd37d76835f13796c8c02122b5a41ee20947b9f337ba15c87932966fd72472e03369a9109294 WHIRLPOOL af89134713b01dd55d04798c3ab3be77d1f9d8d5775290998228717ade2681f10fdd3bfc13a12dd92e521f5b8f57d23d5bfed77ed280dbd9913d938fd1b812a8
+DIST asterisk-patchset-3.0.tar.gz 17006 SHA256 077a8a8b6a8327a4e92c7c692909a642ec20d45127bbced955f939de525ec1f3 SHA512 5b1902b85bc65f30fb1fd3e4dca494ae213690d5ffedab22a7a7af06f2ef53ef65e097766c8846b7b92eb59affa9f3758cace66c169a13a5fe634a35e04a2c5a WHIRLPOOL cce76111b23d988fa515532fedd31508537b3c2bdd1e1d08a8e5c2e8e35a48f79ce15a2db96a7e41d86227cf6a986bae0c90a606bff4e9c528498ca0bb5b966a
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 04c66d3d9f324013542f436e7a2219e26da93144 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:00:00 -0700
Subject: [PATCH 178/261] mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 07b1250..1270360 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 17006 SHA256 077a8a8b6a8327a4e92c7c692909a642ec20d45127bbced955f939de525ec1f3 SHA512 5b1902b85bc65f30fb1fd3e4dca494ae213690d5ffedab22a7a7af06f2ef53ef65e097766c8846b7b92eb59affa9f3758cace66c169a13a5fe634a35e04a2c5a WHIRLPOOL cce76111b23d988fa515532fedd31508537b3c2bdd1e1d08a8e5c2e8e35a48f79ce15a2db96a7e41d86227cf6a986bae0c90a606bff4e9c528498ca0bb5b966a
+DIST asterisk-patchset-3.0.tar.gz 15721 SHA256 cf757a335d9e6ffffe27ba42874b7827de219d6f27edb902f496b5a9af6a2d79 SHA512 32cf2bec0350c6661304e415a3dab817b35f2b855f83e4239dd155902e3e3a4c4b12470f4a2d2fb7313f60a3df868f50440d917821d752924edb941e75ae4510 WHIRLPOOL 099e2d4a4d6c253c82cfab3ecede4c875038d3258b92d1db36a1cc6c83d02ab955915e9e039ad08ab729dd81efd409e5a0d39af66ac0ab12d65e64ca8ab5e12b
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 5926042a5261f6e22443480a29881875b9bd5d66 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:26:24 -0700
Subject: [PATCH 179/261] mani

---
 net-misc/asterisk/Manifest | 103 -------------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 net-misc/asterisk/Manifest

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
deleted file mode 100644
index 1270360..0000000
--- a/net-misc/asterisk/Manifest
+++ /dev/null
@@ -1,103 +0,0 @@
-AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c 3131 SHA256 65974f24ae758f43fb3235830618685e6f257b7c6f9b076209796e7f790fd309 SHA512 fffa8d6798277b904ffd95699c78f9f85928b1bf51d9fd98c164f54026293cc48e76a99df5ca2962c2dd6fbecb4b69f449cda6556683fa9aa47c1b99ce35418e WHIRLPOOL 45144e8601fe79e09fc728cb86332fb0f1a6bebeed232fcffd79046e61bdd6390eef221e6e1fa8a0db2bae06c6f385c1d7fb16c025ade30d7c8f9e67f4c41aca
-AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h 613 SHA256 ff05c73dfd410b764af250bac75af8955825186ca8358cb11a2ceb900953d4a2 SHA512 0fbacea90fab45892a41004901e323bfde157b203afe911cd870238f0629a3028752ef54f8ca8b6f6f9b58e72b4532b364ca9e98a9ac3f7ed84f3e3d91820e1a WHIRLPOOL 6b5e5f250741278a7f68eb8192a418c54bdb2708716260658e892e68f8c2d55381d4270924ab7d6f9f13e37e9224cc8cec58a17c458ff468d3d114aff6a750b2
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c 4847 SHA256 903e62dfeb760c45c8ebae3166715615c85da285ce590ef5feb6e7c66682cfa5 SHA512 6afe96330a806422b3a11e47e3d5aca8686f5bb3e4f3bda30c56e74037cc3bf0d55f2d39dafe7c9b67982647e7384aad485d63d29cc512ac5df9cd4b32100b19 WHIRLPOOL 4f8997df5d8add1b3b1fab91dc146bd295d19ec4b8dd2d93b8b04f53c54d03999d862d9dc7df853d5d9c4a4153102105adc679dc1b4d30e97761dd4175d94994
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h 1376 SHA256 5e231946e10d23a5d17b6182808fef7850092f344618c4c8db60aaa39dca15bb SHA512 cb0b4375bace1c61d3884d47e82691063a1fdfb8ad6e4c28016963c83bdda2843479abab89bc571d5d3dfaba896cce4dd5632756fc5ed25fc96eecc1c2c3a3cf WHIRLPOOL 0d43bb16491197f763b53353909c0c78b15dce0642b9e2d0cc10d2d599d2b2235cdda37be0766779670d371be4de5ae34d430b4d96a04b8921bc30f722f8ed6f
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c 8335 SHA256 fa53f7cd92f830d2fa950cfa2256e545bc1a1cd56a5ea2683e3a1fda4b53e187 SHA512 1d71f9b7abd37c3b643edf62c0feb866fae936033ffd33f829bd8818b8c918628adaa8ccae9d4903742bdb91910075e47891ec0aec32e9dd438649462ff0433e WHIRLPOOL bf2296f11109965566bbb43bd1bc83bd66dead18ff0cf3f42b96195ea791cea9255c7b3aafdee446e3422533e33bc8302140dbf671e324510249dbd0fe922d5e
-AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h 866 SHA256 ca183c69364e2a9dfb209c340c5eab7a14c6818e9334f4c0f9cc9ff8938a4ba1 SHA512 78ca2a9ea565ce9f35df2f1fb93d7d8c6c2174258d621cfad353e04c6bb1c7b2333270c4d2bfef621c6436a58f1d388ada3e7be64119a60f97b663133d6b8938 WHIRLPOOL 7fc1fd1743498e912d486acc509e9086da10d4684c9998cb12cae3569a2b99972a0678478af1baa24f9e0b9a0d655ea3fb24829ea369aa2c5b9dbc1f7b9b319a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c 2233 SHA256 454a7645f4dfba5a1f778fe5fbf072e854c7eb1bfdadb1f9dee80e7040b1de69 SHA512 2472c52534dac936900190a2c3c0003424d484a78f392158d16ed8017ec1223c2108aa332dba096558aed11dcee7f6fc18bfe6dcb98ed8294d7757f9e325a52a WHIRLPOOL 2651c257ea416761d3719b03095ee7609f91c0a2fc587de1c53763fbb86e048207d183dfcf90b5f7677d9f06c601cb5b2eada9e59311f4c7632318051937d554
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h 791 SHA256 8fa3fcfe60b9b6715ec367e741d7bb6b6bf48a20a47434037055d3024407ea71 SHA512 adaf1b484034e833c7fe374dd2d5a95a66c85cf68ac134ba3162d771574f969934ddcfa06dac0461c19e7265f303d8adfc50fdd5334576a16c944fb81a2503d6 WHIRLPOOL 2ce220eed411159c1bbfca98d1faee471e4e36cae740129921211a3388e9a7f2eb59cdf0b79e372f764cc1c178d94048c148d1860eb4caebc4e61718f2fe0478
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c 6028 SHA256 0b63cd18d011a814c5b250e7328e66189c012d41503ef6740d0c85efacb8b78b SHA512 e46b2cfeae0817926692e427692aec201f9c1c7b01716949958b6a3031ae175816b6f5caadabaabf0d794b302a19d98f00577190008cb6d5487e7bfa7fcec3bd WHIRLPOOL c3667ec3a9244cbbd2335fae14b2b80097dddd91d1aef2462dde3b41b0715c31fc6a0c0cef9acccc5527c765c5caa00373b8f1f37925eacc21ce7d0220cbf393
-AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h 1626 SHA256 1cc6c4a1723b8fe27ff35f55b0fff5dcc0a9cbc90072259000ddd6cfff030fa8 SHA512 6b6d8a1ba3f4d8aa95b62c726ed7ab7197c9987f2596a6adb8e9b317b47e6b4b3ba1b61f61355f9415ff1813443fbdcf968b144c628f0dcdcb76f7c590eebccf WHIRLPOOL 558a4f5ba73184bc5ff6c77cb35f9eb4d1be95472c626f9f7536d703f6aa70c9ed264b1f46eddd88e42dc884584f0b2a918d84d9afa7fc3e095b2ba8678dcb3a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c 1701 SHA256 cdc1f00965079e598c9f60c91bedf552605bfabfebaaf2c5e745e423548607f9 SHA512 bd46c1e217fe0efbfc68aa350e5b26714422ba0bb711fe487a87b76487cd1161730d5ba91f713b1a6b57e09c18e7a5ea397f08f05cd625c4313d0f13e1f1b129 WHIRLPOOL 4db10848f3c9c489ce982103a268942f6dfbb7f4191a5de3896ddab9c38aa1bc778ddcd91fc3d9af3828676090631b43e6d173f3adf6946936aa4471211a656b
-AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h 617 SHA256 5600c59f34a4a3ce3cf93a1cc5a6964f0f9f619b10cdf91c6050d002064beba4 SHA512 f758014a8d0c9f4ac286eecfbabff08ca6a54cbaea1bb801a2264a6eeb2393ca2bbe52bb98f12a448e98415127cbc4662fa5ad65767a1e2787dd5513b1205998 WHIRLPOOL 670402f97718fe7bf3a845a1f5f37ca38ea0e1a51841d3b31bacb77f81c34db396f340b773dd6664998b292f9a576b6dd5c8f6ab0d58cf621ac4ffc2a314b10d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.c 36801 SHA256 cb1e41c3db63770b9a40159d196ed80ac6ebbf42d2e664e4bb9efc68eb855812 SHA512 591fd5226c44bc52ac44bb328ddd1de81c3c07d12dcdeb15fcf87a0589ba37dd3284e1906588aa8fb9c6c80e8be0859d29ec7101769d07db99b474db50f7b160 WHIRLPOOL fc15a6787ec0b0acffae05d35e175d7edff9a90cdb7bb128dc37bc895386007a9d64b873f0caeebbd2a03fca1c56e59a6e28a716abfac56d8e5bc66fb11e5853
-AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.h 1607 SHA256 a99d6a17f4961429a4b61d2a052d86d6d32d9bd6cfa9714c59c1c5faef724be1 SHA512 7ed00076dceb3b6dc75467157daf1be38269b8de4890e238452c962306d3a9f05d7521b11fa60d2fca71fa5b8908dad2cf85bc86c5761068a5b182d42a48d7ab WHIRLPOOL b1c2980d5e746852ca1c430e102f3b2a52f93043b719582803db25df11444b1f1786f7c8c5f13a31cf2758382a26b1bc31a3816a483a45db562a44a48b25ca74
-AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.c 6751 SHA256 955913c3a9deaa2a49c3a84181ba16d51c5106793d566b1bbb3c3423366dafc3 SHA512 5d58fe85e244f613bbe3f3d756fa4d0fdfb1de384836133b2077633588915dbcc1305631aaaf9cfe39c68fd0c6a9e7cc0b999fe0a6937370681001a20eb6e957 WHIRLPOOL d0ea64386475ce650f187f833ae51a3414790aa8f2b6d61459fcd9a6e533209b2fcadffb75e38635da0223c39219decd6dbe08afaef2a967d50acc2b8bc12bf3
-AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.h 1993 SHA256 d46a70ad1cc9f465a8f9e0bfb82ec8d31e8e65a94d2a57a0e354543ec342fba3 SHA512 e569740b62e45cbe8bc5c20dd0a0c095530845d8353254debe8d03e9fdf5c47f5dbce972f69d8e831acb08bf3ac61e91079637b2c35288354762a7c2298b7a23 WHIRLPOOL d41bf42b25e3894b709cd94a9f966c5e3e2517bee41cf56fc3115179c7b55695da7372a77342d553eb02491ffb051290d284a26dba28f57b2ba5e9d145e0079c
-AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c 7826 SHA256 68e34fb75db5fcaade4e9a58b254d80bca0b062502fb86090da30eaa27a3cd33 SHA512 89f1d3a68e2013abb2d60355c9ed57652f03332267ccbb1c4a9f5658e5f7e201fad6f8544fc14b9ac9227be401edee10a2d65a9b9ba410ecc2ff3140666efada WHIRLPOOL 8b578c86ae873195d44a9535a4f0861c9c7d1c5a15cea5bef3a849cfbb26c6acd8cf91642109b101fce9cd4da98131f81f686e451215d168d947c5b53f4de5df
-AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h 864 SHA256 8dde21a55ca985b657028a93c8f837c3ab98557854e41859864523c52d8777c4 SHA512 2b25bc764488bd831764880e8597a418ce824f111230e146f56627d474e9dd22d79488b56676fc9d41c3185bb92dfb8894e3a6569de76dfdace3bf41a55e9aa0 WHIRLPOOL f529a014ba19c1f035135c88c90ee7cd1d0186237cf8c1965cd4baadab636a3d7e30091ef414c38c16a8e67161b4ae656d9fe82a4a3b31548438362b675ed716
-AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.c 20605 SHA256 c2cbcfd67edf91bcbb27cd4e88fece09242466c80c733583f6c54cda1b363964 SHA512 788f81f8d32790417847dcbcd9aa4eace84a140cffaa16e0d3ae2a17419142e4e5dd40ecb98a785e48c25f060b14a2878fccf879e8a169e412ea4b89668376cf WHIRLPOOL 4bf8633345dcdfaf0d085090ee03c90774c8d9d6f586fbbaf0c1e16dfb43d8e6123a340f2b3536b30cb7d633e71c697c0c521b24ba69c507e5fa6bbb36d72ebe
-AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.h 828 SHA256 6504cbd083f939a0578be86db60223306de90b833c23178c9cd39f15b995b288 SHA512 99d94e49d8c0d12cd456fc007ae9a5ca6a406e72d17308a72c6ca9a57d513b3d822e67504262ee7790213e265825305775f7c893166a55abfbac7402682c57c8 WHIRLPOOL 5f66a06bfa3ea6fb6498f6d3d815bfa4ee39ead8ffbb52c8d5b83a4a3dced1f0a121424aa7c8320e01ec791a4378db9a0e6391f6aae677d586fdbd882451c621
-AUX 1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk 643 SHA256 cdf3927d184f82e28d94f6614c7e9dd107db5d3f58f59c5fd22aabaf2936a755 SHA512 0af248f3f09fadb3e9dbc496878694d273c47b6294dce7a3b76b343e0e198496ffbf47116edefd3f2e790641ee94441295a84145c36c0a9654587449ebe60458 WHIRLPOOL 73f5f31e5ff003dfb36c9ddc6596d0d7b8b0a8085adffa08897df22d60b9106ad7458e606532ff1ae8afa6d2b6186602f665383c2a907dd0eff6b1877a3159bf
-AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.c 5639 SHA256 0b252aee26607ff1b21834f5dac25f6a0356f3214fffb908ccd66776d04d4513 SHA512 d4a1b40099cf6041a00270b77b60e93a8e75aeaedbf060b2b8ef0387d810686646dbe6fc64cc19666939651dceebd38b6e38a7ab95d23784a6a89fe8c5c59a93 WHIRLPOOL 669e966ea4d29e3307a94f9249530a0d4243e9717ebac273d8eae207fe5f3ef1f1929e8ec6d519fbe2f5d13a4127493f45ab975d665bf40555153b9106f21646
-AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.h 2999 SHA256 f917999699fa2fcc8934401cd42093d4032c23f1316e6480ecbd0acc63d30465 SHA512 2a3e7f25b1312830e04dc0beeb39f07b9fbda0dcf319db66c1632a4b3c5801e530d52b2d0153bfa3f7ba939ba4f70cc7470d71d604b9ef74ff37f2dcc90bdd32 WHIRLPOOL 2a916b712af72da3da22a79d113b1983e783df262c69b7654279ef793565ae7e5f27c15b67150b9222b7441d5f081b3d09f6dbb90cf6fd512f8f22bbf6788cea
-AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.c 2665 SHA256 354890fd77ed9669f24deb288619cc51b2caed5043135e994b95006a598f7d1b SHA512 42fa6a57c2756565487bf5986cb4e3845c815342f16e65fc36efe261764dcdc9e3363298fc92cd93778fbd057f154320e5a8c118278b18fbc7c94db7b0cee565 WHIRLPOOL 0186018b7d4577744592c329bdfd7dbfb822ceff8cb3d7dec8651306799a02c16cbe6b44bce5346ac6145818c732d4165b9e0ce8b4f2931d040ff988f9854600
-AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.h 863 SHA256 8554210e762cfb79c89282ea028957d1ca91fe3d924f887c41b6a8e70ea9c9ef SHA512 217bc0397cde4f4aa9f48fb1bda2a9860343a4029d4e91a9541a08fb4a37626f3ab2a0e2d3d24b7446c2b1141887c2d467c67c71a13b9f2d99f53db469379f93 WHIRLPOOL 1da8466d668c0fbf73140031f35fc9c82ea95a49323c476b6ce4804ed73f19df5e25cd5fd2c798ee4189e58af3e57d99c4acf3f6db1e18e11ae24e6df1723827
-AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c 5043 SHA256 1dfe5eecb11d9ca2afecc11188c243cf25e560e458a1636d35e9575ede9b95d4 SHA512 51a8f6e8532d4b94430993b5f33405b81c457b59ecc2b1105819be85d3bd033bc6ee6554845457a6aa0130906c2600eb24a4eb9607e801fdb01104a7efc473db WHIRLPOOL a683e9022342e8b029b678c25d2250a339eb1cfa3cec3649be8e7d81fc7f2da4f8f99d0e22d6505704845fa476f753b01a0283cec4dde63e3ffa779e9349b6bd
-AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h 652 SHA256 dd2fc6a5038fb6df8b005348fdb067b595b123d1e4f035ab90d5d95d65f495b8 SHA512 a4dd1cba1696ed668c99fdc0dd05dc880ed6d683585f83f8c58bd206ce2ee97671da9232717818570ddfdcc5df9d3968978fdac69c70590b5da3ebea454f806e WHIRLPOOL 5b6d2630e20efa70dda2867582f47ccd123f595f50bf2be041f95ecf66b767764514818bc246cd57aebc2f5a009fe8c33bf16868c94ee8c00196b430e247643d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.c 9314 SHA256 426f51a9af77f05baf3d30a4a6a7275c6a63ecdb0c518c2a3e8d8bb714958efa SHA512 2a69a5bbfc3ca5e98a052644896f6342c136b484ff6973b4bc8dce31937685dda16790f3907671635e8a7e67297cf1e88be8b284ce13f2f074f4cc9d835a4853 WHIRLPOOL c7bb97de0898b7545aa32f13ef72594f319a0cfd881b6d6d985d4d536774324a6b081acb0f67606633fb81fd6bd7235889d805ddb377eebdec8754e01c84287d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.h 3471 SHA256 b0db99729d1dd224981543884ebb058ef7646129e1995166dc6f14a4090532a0 SHA512 cda538d5f1740c364683f06f3293e632dad8149eeed72069e5111e7984425a44dd4ab0e9a6d046463e21f89f02535bcd1dbd947ce1563ba0fcd3659561d0b452 WHIRLPOOL 2e24f429c246d66469c2d9d21c7866697fcc5f65daca0841aad6964252c5fcdd84d2a2d655f20a9536520ac6dc1bb3a6ad66d27f351a73ac10fe396d729c3a62
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.c 1378 SHA256 1b64cb361a3100fa408b5c6cc6a26e5f48c32128026e53ce6c2208538e3a4301 SHA512 da3d6c66ccda960791d88f2bc28a6216badfa2b41e1a1925e0a56e214dbe0e9b62c1304fd8f0fb90e2c5cccff1b9d5353413f3ea92e67131eb257c51fb986fc8 WHIRLPOOL e9ec9996747c2319ac216b77c3f0a5f175c14c15108da978936d16ee89b5cce0e3e6b40e6e208b07e8879738380d6fdf60775451211f3742ee543385c3c21d46
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.h 588 SHA256 b3a2c0c917216ce1cb3e4199dd68adf7b4ee13ba51faf31836368b1791962423 SHA512 84a894760438e9915431201a5d37ab34afb22b712a2e681fd9c7bd688da7d116b68feb3234eb6f50dd4f7b8e49a3c1faf4db0a1d6aa7450be8f04a2b7367e7d9 WHIRLPOOL 36107abb5c99a6b6235dc385c6bbaa249a26637314dc8792274d8d546e7991be13f94662d07eb604e0ed89d773512f8bc71d7e1ab53fffd21d2cfadc9c90783a
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c 1373 SHA256 0fae033bc1c53122f3fb3bd7e5f1888d4cb76b26e80ec2897b6bd965193448ab SHA512 e7ab5667a23b4c19a204ce1fde2c580ad1cae4b55821efcdb76201b71dcf7856cde1d1b1fd6fe3cf94ed6f3bdd47823ec533185f72910500dc7ceb66ffaaa9c4 WHIRLPOOL d8308194e89bc2919bf7a3bf16db42bc4fadbf4678d48315c35acc1ab1f7c259c929e56dcd66b07494d464b8bf2a22d227a3b2970877ff4c5131478e874916c6
-AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h 588 SHA256 e0fc0c1410940b4d68ca6c1987f27372376dae3a8ca272d71230b11c7e0e1f24 SHA512 3a56a7d3bf2ad086eafe1b05d3514f0275ec4d00e19fbd22418374953d7e36b85ba44d1e72fae5587772f2cd22833e4e65acfbb25bbe1ab788250b40d39b4e12 WHIRLPOOL 036f488d319eaf830c0b0be43868d5c529a3e490657421ff59380edd3d98ba3119efa8c68ccce37850aa8209d0d80f6d249a340693e9b2934c4bffe28cca1a40
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c 2885 SHA256 0baae1dc6cf43583814f85fae53622ccee0205d78f35b81dd16856394a474395 SHA512 20211f18544285e615292225284f1bdb3264e8c900be3d28c31ee7e83432ce810dfd182a7941caf778a47f70adefcf6eb26d52e757043f1ba16a356d3841ab4f WHIRLPOOL c08085a0d1a5e0319302f0833d3b52d6db079c6640766942e59da4d0d8aaf1093f4ea968f8b33d82a42922861e4a5b3d06be5a242e05a536b4819c48cfa222ec
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h 986 SHA256 717e603767a286de36d7bf6587cf161cb05bab968453d50b16cda8a519b79475 SHA512 89dfddcb8ca0eac9c096b0d73d28194ab8f090798ed479a117f3f474e750d9fc6fd56eee9d778ed200aaf0bddfd7c2e905f8158652ab03a098c84a6cf90834e1 WHIRLPOOL edb9f7fa35252b61c8652271bfd097da8ef9695cf931891b973708749892f5c6df6ce8d78320c96eb5181c721a0158d124c70d5c36b91d6b4a81fbba4c14884d
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c 14051 SHA256 f0db960244b8c58b505ad8293ffb51acab0e7f99ba1be58cceb6c15d6a5f7df8 SHA512 795b8cb0bfefabef66a0af84953cbcfb77f698b6bfeb468113ec2d2542c48890eba99a6f5e6a0964cbd6e988d7a094c80b4742301d0b785c682fed011fa73d18 WHIRLPOOL f2f1c6ba96a037ffb0c2dd6b0d942e4fc44bc35699e625565d3104be35a54811cf37684019473ac1c76d42d6fb5eb6f1a7cdf6591976c78b3d82610e30d604bc
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h 1086 SHA256 f00855f862619efdb20e29b5423b71a0c289359879f4ffc4b08bd38385d3b272 SHA512 7efcbd65bd3b8431e976254c5e840beebea057041906f575d65294951c7eb5284ca02a0ce5cc3fb8cbd3f01dc0faa4ae9cc8cc6dd7ef7e23087eeca78616f6c9 WHIRLPOOL 0d417a60496c3034081273a2a31b8f7dc9935090ff7e030cc12b4670d33ca86cd4bdfa49ab37a7f31aee7d2d9d7cda51ab42661e2f3173024e08db651910fe17
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c 20730 SHA256 869ce48ad05eac43d7fdf19fb5841614618674aaff87a1ce51de8552dd792337 SHA512 79cd2cd13523151123cc26da8f319af1cc2a831ab1865e371d1c108bddf85d18f4a93991440a057c0c77eb727f79a8da09bf1038658da85f573427be08d9da29 WHIRLPOOL a844e74990c79d8525e90c6cd7f111f267c230273fb633cf76f13a3c744f52514552e63ff4b2c0a3b9929b6aefd31069bc5f620d5bf01f857163f8c611c67ae2
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h 1258 SHA256 02017803f44419ff2e2dd86dd199ba183cdbbe0e84e683bb9ce38b604099c393 SHA512 272807b3e15a7160f1e14557c5e0217479b192821b0e9eadccdc65deb93ccebd57dac1b3bf571551b219841cd1d6701a3d7e44253576becb79ac0c4d3b898f00 WHIRLPOOL f8bd722f6d07f6db244b688dd25cf1bee49cae6f47df04f33c9f77147a3b9dc91ee1877cc126bc64dc1811b2a7a172cab1bae5d3c05bb0dbdc527da5374ebbce
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h 6251 SHA256 77fc1ed8b7d427340bda49df146a219ffba56f1cb9562e0032f104d33217d860 SHA512 7940fd069a4d6a230701b0d86fd83cbd7f6cf4c2f3362a2205e78bcf8bd86e7b4c5a423693a263b2df972dde53e6b33b0b4142470a09548ca46d2bc1175b3c24 WHIRLPOOL d314e6761321485010727c90e2d60efa3560bf509e63bdf21f1ebad57bc8ba111c88dae15ab5597d946d15f30c5c0a527872cf19159a94dc851feb916f0062ff
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c 17526 SHA256 b20b4ceb50a17b050b56387ec616a497c2d3613845d26ab370866f1ac5accfdd SHA512 80e112e3c11a8588c7582deb78e1c28d92eedb638e0813e7f44527aa9a5f302cf9bb10a39dcc097794ac6fe1ab2e23238167f4f5c3c7c3dafff0df8ad5196b76 WHIRLPOOL 1b5b20d6f8f9f85205c4b66a08db31d17b0024e67035207c755d7692656f511e7d7be37822d2f2c7004c14124eeb027086e58617dc109b2b9cb30c0c597aebb5
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h 997 SHA256 4bb62c648dd187367e5787e9b2af4c331257b02ca14b9179deaae2eed5436c52 SHA512 d011d3e153009485fc29e8dfa1d2ceb78e5393d1f3acb4dc3d4a4590ac0cb65b13181202d804639ced5e6fac7867d6dae098f92229bf96a7e03131f098d896a8 WHIRLPOOL d022a17256191b0de5716d086e4722a1cb3f106e5c8195982b49eb9130626fa8f78f9040f8b3c9913f781e2c9277bc6f5a50c54ab6997727f4c3a82701418330
-AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c 9078 SHA256 be1a99b227857570fcedca398c989bf201fb71356dc2a88ac77a46b4bdc1c834 SHA512 484038334898804952a7fe3534dae654fa798c2df4e0d13eddfc59083697305cd6dc677db13aa7d42a80ecc8a6238c4d825d7819c5eec0c7dc10f59b903a43bf WHIRLPOOL 418ee6d97fd9d81efd118acb4369162063c138832437eb02242e748fb8f0d9c593b4560ee5064556cfa27cdd25babbb62dcacb6f97cf1d8c346d40c050d328fd
-AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.c 7667 SHA256 ed2940504c832075bde8d6b8819b8b43a0f609e1543c4ab45feeae9fd4737d8a SHA512 06f1c936fd7e144c0cd16f9780140a8056a6fba96a4b3136acfb405d161313369250b1d87a1d973e7e214c2201e58835d30c6907131ec03dbabebfb41af7014d WHIRLPOOL 8b70576d17f3706ca49cf54f89cff6c143216a15bf1666a85ce6babd889565d0dad43a407c05a726e75b68c7f2cd5e778944903bf40bcb446b878aed29475271
-AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.h 579 SHA256 47024fb68e7c00f8b89cf2df41a57debcea098912fc80915fbf258f1377b3ea8 SHA512 2a912d218e6850483126dbd30f2026e29e513a101123fc2b55ce48eed9ac3e81192a410e08d0667a95b522b08f16a363bee574ce1e8ad8fb408135271a42a130 WHIRLPOOL 77830511830166c37c6fc27324fe337864d7639305b1f45c18a4646ed0de6599a5bf9d0051777c46ff354f7b12c8b953d91e915aefd9c5be90efea3c9d1e7e46
-AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.c 5628 SHA256 8715717aeb9cdf79f235793abd6cfa07dec0ef39605d9acb02cabb8f8498090a SHA512 4c9e06f54ffdb9e90fe0553d308390ec9b41e6c082189798a39e0b748a18541f726e364b5cc4793f159a9d44ef043a84d882012b7e89c7ea91d1672dd077b7d6 WHIRLPOOL ef94337cc199a015911cd11cd65b5c3784a861d69f3e66203fe44846c528ae3dc24fbb3ee2f06aa51a3dff6b78d9c7dec479be59dab4f133ffcdcc982fb11770
-AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.h 2688 SHA256 4daa342a3a2255d23d9fea030ccbeeb24c74e0e04ca101294a81c5c7feff3ec3 SHA512 f0d123298b112c6f46afa4b2a804398faba2a71eaed9537a0f99ad648901067ffcbfd224edc2aa62897a225ea66ca7af35c1f28f364d711263ddacf9e35b860f WHIRLPOOL 44b2602be68c7729ddf15438557dcb55fa7868ef4bf75d4bba0759a5b5e24e27d299658b641f4c20c486fe72360deaab40a080ce508b1b27a326e1062ea26638
-AUX 1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt 373442 SHA256 be5d79cc62d72ddc8ead6dede0ee5fff225305852b0beab2fca67f39e2aec47d SHA512 ad3df37c2dd65f4aeef4cb57f0052577e59bf9b0b5dce92664e77db016ae02519050d2ae4db66f034affec40f466c83dafdd56f29197ff3442b47d4fa358b7b6 WHIRLPOOL c98d09382df6f6872db855ddd9d090ec782db58871d22335e5639292d631c9371f9a4dd588f6a6a4f8e29e9cce518b743736a2c3880fcacc462a9082acd0fb2b
-AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c 1630 SHA256 aaa8be099a90e35d9f84dc2ee3294288d3f8d701a4191535c5eeefff3bec7ee4 SHA512 2ce9a5208e005ef9614fc7198a6858195d542ceae9ac78688ba6c5706fdc33a0014aecbb21d23721f9a9aaf67d6021247b30fd0618bb65c5486e241d3a85ff56 WHIRLPOOL 0572f8f8c46363aadaace26b5a017021be79b46f0ae418488c39b94f68d63a041f32ef7b2a97710a7310f0ae33ff53b1a732ea9c2d6da143501a18e18d46b248
-AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h 589 SHA256 62d687a7f3d11ebd19d9db9d6f29195a5dbbb8be6fd03740769ea22024b1dd1c SHA512 e7b8dc42e632153b45be4162fb166862e508c92d424ca4a1ba2ea4105d3ad7017b7e8dd141116de7b75f89084ee1b43d57b37046e355f3c064dbca0d4013ecae WHIRLPOOL 0a8890d9fba910b187cc554cb3fdb0b1d5e37c75cdf848756514ef78f45ff97f37fd456e7c1575d5acb819c4327b53668cc5c136214307a20f29ccba49b88ab0
-AUX 1.4.39.1/asterisk.confd 2207 SHA256 8d1e6061651291a754cab409bb7fd79171784c324c1e93d81f8f4b7a158d902e SHA512 5efb2e9944c0d6a22f4c5c3b746d44f03f2a862116eebbdb2e2b414ff6418aa14e61c7180053bcc9a6f8472aead98d18c9ed384fd119cc042b9bf30639fe5bf1 WHIRLPOOL 159d69a8ed3bee8bf31b46ba47a78bf1b7cea5be35982de42a0f0092885fd2ff55f712ee87909cbb23a0026537bd1959c8e328309093427f61d60fd30e75a855
-AUX 1.4.39.1/asterisk.initd 7274 SHA256 51eeb0a06fcac7680d8d21fda8b801d06f98045a824a820b6b474c0de97b0258 SHA512 c4f86b3ca301913a5e174c04e6fef234e5bf8c4f88673d900d50f120747206218b206238927ae881446c8eaa26b63a1ecb5f75cba17b397c168552704b859ac7 WHIRLPOOL 19db63ef40715efa4c94c29e8e05c9416dfd580611f52b84ed43de16996c39925558767b3b7675e764283a8cb51f8f3c7b5cfc828b268a3f89d70c4b9c1ffc11
-AUX 1.4.39.1/asterisk.logrotate 247 SHA256 b61c3d7614654c9a4c48b8963f7c4caf60ed74e0ae916fe3b0212619fab1cc24 SHA512 68a9fb2f3c5c992583ec4d5b5d2427d460a268f8b3b86c39314f1a481aac025c5e39c71a775c687df40d4d1f1e2178ba9aa1c3796f4cb0bc9e67af3a27628453 WHIRLPOOL f3065acc5f82b02a371e022dd50a20c63724f9853da8c593d457046dfe958bba32bfad783f16cd124775208d33608a5af6e378216e2a681bb7c841ceb1019064
-AUX 1.4.39.1/dahdi.initd 5962 SHA256 319003d37d0608edab1a8d8411fe666f2ddaede791e7bda5b0beafa3b4bda07a SHA512 d70184172cb83e37bbe6403de3488471b6339e8d10379a80eb497895a41ce4d5a248d13900736223e5629723ea164802edd6ae14b54c786464a4da426fe109c5 WHIRLPOOL 43263a4a5ac1be34e676b23b19040a4514db2bb4c11ae224720da10c381790687d2901b41d1b16e1fb32d6ae9b7f9816016c9b7df01e32b85fdc9bc662364de2
-AUX 1.4.39.1/patches/apps_.moduleinfo.patch 22296 SHA256 c7923ec9b5b2d62b8c7766f77a3f718709c66e2a498a96ee3965c4a9687541c6 SHA512 5bcd36a56e6b1d008ae58e9398ebd0a51b98b649f1a91b45775a0c807234f2f83e132644c1fa05e88f9365012c68ebc59b5695472b3c944beee157d8d2f70553 WHIRLPOOL dd3a44837969a8f0ad197f73f992e91a8429537695704ac04457e067d786c3305b852a0b6f0d6b011e280165053b0ee632d333bc8058ea19fd550214f4d62f3b
-AUX 1.4.39.1/patches/apps_app_meetme.c.patch 424 SHA256 32935b7cfe6e6a0f6d3a5c1510cb4ca829d9c3d8e5bf6379177b31b3e491c27c SHA512 9a510bfc09acd1b1946f407cc1fc2b066e66604f6e487cd5eb90c70cbb4151ba110001b3204988c7135f979c6d3ed27287a77d1e43fa82a0f780ad4cb98b583e WHIRLPOOL 16085b59bde8555e4d6b8980d23af40fde29e770cde7cdf6fdd9c04abd4478475b1f888d150af3231c6ddab8874c40a80e51385a60a42bfcf51baf5538e879cd
-AUX 1.4.39.1/patches/apps_app_waitforsilence.c.patch 1148 SHA256 581f27ef827cb77ef691e5432808d381836599927c3eb9a1fb657ff97bc66f67 SHA512 658f86fd89b7cd749ce353a3cdcf75c7a04fe1f926c43768fab8d9f74fee971248cffaaa55b10b11a319097faedaad08fa0aec7f81f81bd4810f11e443502712 WHIRLPOOL 71aeb0350b91ed1ce76dcd23909fef32a30935c83c4101759d6034c854ce6c626eb02e73a7765611b3c56539bfdbf68f1c04b33f77004ae065f654f191ae3514
-AUX 1.4.39.1/patches/build_tools_menuselect-deps.in.patch 357 SHA256 b4e0635fd44bae5dd4ee0326fea2d8236db01b7ed223af188706bf4ba30f6d41 SHA512 991f5c44095e4e39bc0089ed382956705e0fceb2579e708203564a297f867f70323af93d2375d4bcae308dedb59a22c709b915614acdcfb8a1a45d70911ac0bd WHIRLPOOL aa7f47c9905f6432e128b3d018b0adc3bc8ea6eda3acf1e561cf54b4cf9fff5741dc84917bb7f05cd677855b5bcb5d54b75e11ecc680efae1cffb454227e1fff
-AUX 1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch 309 SHA256 a1571d189c7eb3b128da4455901ac5a7d1729aa436d3ec5f9c9242bc725dc6dd SHA512 62e3580f8438a2ef8e3de4ce3e88d83bdfd598ba613ade58d4466932f3489bb22ed602d5b8c834ba25f1e4694a88dda5635749097b9d508a73cf373a8db9ab96 WHIRLPOOL f998580662dc1c46561bcc07c4a186aac64ae7890040a5ca7d4613dd5ff0633eee0bbc1b62cca21657d60576f8524acaf494609d17faab201e76b5d9253ab29c
-AUX 1.4.39.1/patches/channels_.moduleinfo.patch 471 SHA256 a86d18367d573a0aef594b134152db872564a32c9ac7d7bf589a4da3f902343f SHA512 65a19d221a2ba4cc79ea39036c47ffb18c1721b724903bccc614d29510bd50ac4533f37a0378f2ab872833dd002716614320ce1027009c56f9ff5ee1b60d5a76 WHIRLPOOL b229889b44b0faf82ace6951f341571ab84e1ff96108e502f904ff65a4ec41bbc61aa480f46e83df9a7f34e3b399a63e049b695ee4d7d71727cd9c46643e1703
-AUX 1.4.39.1/patches/channels_chan_dahdi.c.patch 68606 SHA256 c9ad2b9504a46ec03152bfed9db986c5ac0b639e9137c55628652f7fc98eb77e SHA512 4340b56589c3bc199c0b3e64144f17b99eb8d38759409eb37ae661ff25836f5434b8d8e373cd57d8ec458f10a98607df1d74ee0f9652b63c668810a0a75a5d87 WHIRLPOOL 55b33908d07135b142d12360720f93f13768c3feaa4d5c6975fe99979256e82e13357cd7dd07507595d144180de36492baf7b7f77313ab6b6cc0789a412a58a8
-AUX 1.4.39.1/patches/channels_chan_sip.c.patch 2986 SHA256 9a8979de38816e1b88b6f62ef88e2231e399911b3bf8776f6faebd43305473dd SHA512 22dde38de229635d8557d6350e88486fa3d981ee4e88148224359c53cb9a00b6b8e6bea7d09129a851148d6bdb6607289ddc42ef332b3ddce9d7a3f8bf36c0b3 WHIRLPOOL 06ae2e1d561ebf07d695460f48e257ec916e109f5b5e143197a6e57325249a6de59407cd86022fc7007cd2ef4432464586373c2326bce414bf7347e8f949fd73
-AUX 1.4.39.1/patches/configure.ac.patch 958 SHA256 944a1f08e49246a3bb89564798eadcc8c3c374c7f9979d98134e698fde2fd424 SHA512 4a7a9c9e05de8005379cb8664ab420147ade05144fab12ef13cf54811c9a74461a6492c9532b17c6ba22523a238ca4110c792d7d1f00c7e353901f806c984389 WHIRLPOOL 6178daf41c038c9b241b1f5864a9aae4735b140a76f7c8061492e5816a947e8f46fef1c585f99a78d29f824cc90e59d45c23106a6c2160f35d6e3d3c8047e523
-AUX 1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch 579 SHA256 618382d3ea634929676107ec08c75d11d8abb77a303cd265bd04329ba43d866c SHA512 f609b2c3967e97d9b61a1d1b46e897071294c78ff3eac3b10a0419b2c5744912e126a230f15b5a791a6a372a08c2395c0400fd54d16abc943645925a4df7186c WHIRLPOOL 35a97ddc399c29fdcfcd7f8e647a5656c3a4b7bcae51d544695fff3497d1c5b6aa4c6a3ab7bb89d8d946056fd9a29dca1c7c4da1cb32cf4e293bf14d0b7e5202
-AUX 1.4.39.1/patches/include_asterisk_channel.h.patch 1315 SHA256 9ca0f0d9975147d4fdc1ba83a103644966dda141af103052c6e6eae162ce4fe1 SHA512 4b8ca0549c3f608d10b85703e1a21f6341578b04611877a9c3ff57e6f2af57032b21dc7af4ff6bf745fe99bb7990762e07941e9b314ca754df0ed53b24a3746b WHIRLPOOL 939a4ea4fa9c7343deeb7146abdf2e607ac866701f3d1dd05326acb03bcf76bd848c8af2895aacc33987dd7c6e847bbf76f1fb2d20e4d6c10421d56b4906229d
-AUX 1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch 424 SHA256 fffcf7ce5185dca3d39588651cca7e971bcb7806097a78e7d507b3953363c20e SHA512 d0f22a71b197d366e590844ccff8c3bca2e7108c4cbbb020ef9ff3f04de1be0c9d955bbe90df1e6b675cb64a6f72d56fe1c81099e46209a4f2d21752d66808ed WHIRLPOOL 4837e9a2af92d8ddefe7d078f1c68ace0ea153f071319e08b5bd79e93dce14bbeec21dd7c697b5a9473592eb703e18da4509b6a6dc3a3789cda9f80215438697
-AUX 1.4.39.1/patches/main_channel.c.patch 2205 SHA256 c8dd25ff0b90cdcc3916dcb3f1d36520b6b629b4d34e57d27633a995197d917e SHA512 fc4e6ee97c8b018efa27bc61a1713311dd131ac96a30d791064c6a60e80ce8c3a7ce1b9a8f157bf6703b28ff44f144a1264d2423e714d644ee462984414ed7a9 WHIRLPOOL 93cbe3acfb9762b7536e95cdf52fd65eff3870c188067e8a3398c0a3124bb002a6f2738b7370f8cf2e5047f31661cb266be981f59e97750abba8cf7f3d4382fb
-AUX 1.4.39.1/patches/main_manager.c.patch 1708 SHA256 175df28eccbc39d9b367d908dfe64a8fdcc7d5d1488151db459c47fe3c6f91e2 SHA512 5005888c0ddb753597bbe58971043fe82e15cadb3ef02c93b9896fe86937e03305eb0b3d7cfe36e3390685a3c757c684d5c39b5abfaf406b4c4c74453e40b554 WHIRLPOOL 7b2cafc0c0313ee40591f1d27b892cb06016b65ed05825a71036b80b62f11eab6b822741f9a2eba9bb2c44e818e9607be188dfafda124ff0631907f6bdb17292
-AUX 1.4.39.1/patches/main_pbx.c.patch 2337 SHA256 3807d9633ec385ca94b8263334730ad861fa4bfde62dec4946e7d290ff42e160 SHA512 a30ab565b7bbf949e298b6fa76372641e65a25b05ddef26bacedbfcedb419d0d4e8e959b2c0f8491ab6f13a88444d6b161d57bf41ce9ee933474f7e72ce29414 WHIRLPOOL 7886801991967861ae3c39b5af2f2731297df35f9edeffa05e108c8696c5e91bb9b32f52f221a0a1ba24af47d4c61d907c5f99eb9ee5e5005918a98579eaecd4
-AUX 1.4.39.1/patches/main_utils.c.patch 855 SHA256 44cf32f85a3954fa22737c331dc3966912d34b269e68be536cccc602fa3b84e5 SHA512 38249a64252650f0dd1773fcd5f4c8e06c80f8ef33d6be2c1608db1c888b7e8f05d1b46ac7f1649a49234940825bbc319f465ceb35b9d857a8f7a3637a78159d WHIRLPOOL 1c37368a8beed6b8a1851c9688913bba4d6fc539ea79696759d6ef17ace801328841e2ed630df30c160c64a23485367ba9db6e1842278e2a9171b7b2720f0761
-AUX 1.4.39.1/patches/makeopts.in.patch 349 SHA256 ae2ee0657d38f79b2c9947f02014c22fd1492c8cfd302f7d486a3f46c078f5be SHA512 7379b00c59bf81f97e0adba769de882452fc1d52ab04ecfb26961c1a6280b19f8d3622091bb41f5bf79b1c79890751714d64cd48c96d874ff9483d7c7e909563 WHIRLPOOL 47b4055a03e504234f9786764ab851a4d2c0269bde45476cc5939c58af7e0c4022a44a69af933f0053eaba54e46c10d5cde345617c9bfc93335ad440016afdb1
-AUX 1.4.39.1/patches/menuselect-tree.patch 22770 SHA256 cf604fd5f36c237450339009a68974462899e6b8d9744fd9d6c65b932c1c8429 SHA512 1ab9a57a195f64c3c81771f30370ccd96e3d99cec95aa41dbe39597ea532b0e8dfa4d1dac5c7eaf7aecfc257fa2951a7b4ebbd4e2f3469ecdee712d6dc2794f3 WHIRLPOOL 398233d38045c0bf4ead08b34d5f1e89a5566692cfc1395c2ef9fe783a00024b87a3a24aae27a234ea3a289f016d650fa9c5ce6d874961c74c05dc2f446e124b
-AUX 1.4.39.1/patches/res_res_features.c.patch 455 SHA256 4e502ba368e37b5127edeaa168363d589df8bd11c584a87b43b65e1647e375fc SHA512 154cf2ed615c22db1fc13bc8acdb61b83b824f4a59f80053363c1aece78293980674555a8750a05c39225fd03567365baa1b283bc13ea911ae189928d597adcc WHIRLPOOL e4ddf6687f867355650bafcb61fd543ba442db2bebd19a36ae516b8aea69bea5a5dd00f702acbf77b94014ed19c0e34c3bb84b77d0e17cfa6b519592b540d748
-AUX 1.4.39.1/patches/res_res_musiconhold.c.patch 5019 SHA256 328bab1bd68aef365b06a1348fd3907f517eedcfe40e4d30b163a8fa986c24d1 SHA512 ea09e57587bc38a818283e18601cf2dc1032261544c1dfd76e2db29d1b24b83d960f665e2f2bac8918c4a9cdad34be71ce2139c50b8c3fc7c3b2006b5a867a18 WHIRLPOOL 9191c34d10e1185ff05a00d2c634eb86220cf11f81fec44e41c2dcacf51fb65cc08d0f1c109b6fb6adcde478b3964f81cc745f21b20b90a02c7f8190a9c8cddf
-AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
-AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
-AUX 1.6.2/find_call_ids.sh 446 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b WHIRLPOOL eba7c3e8a8c2acee276177daf3649c34a8d863116c96f23ee8b377968d5ad13da16389e2881299b59270afe7cc961c8b1852d4aad13c02734bf96cd84a3ce604
-AUX 1.6.2/find_call_sip_trace.sh 530 SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 WHIRLPOOL 098d8556779b2c053f8bb808354ee9f90e92a63fda99b5eb405407a90889247fa413f964261622f2749a0860bbc2b08b25c3d823d2f014b7c17cdc578ade475d
-AUX 1.6.2/sip_calc_auth 493 SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 WHIRLPOOL 637cbad803360a4f7d2a5aa85b689fd072f6af7592e440025013e47cad77e1f54d614c15194511e37ba1e57630db97982a368cfdfc80264e8733d897a3aa0a10
-AUX 1.8.0/asterisk.confd 2203 SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969 SHA512 53219b410f29f9974fa2ec33ffb0aa914735e4a0897eed0f20a0cd740701757e56f48d0a954a1955cca7c94b2a17cd62dd494ba89a84c8a29312cb633288eee1 WHIRLPOOL 17fef9b012a13529864295629068d034bdd78bba3fc6211e5c2a888097614510c159747768ebb54e6e59999a5254353592f0da665541e82f4fdb2283f0d8dcc1
-AUX 1.8.0/asterisk.initd7 9382 SHA256 7951901371035da2cb958d029ddbd8af276a5de7becd01c9bd36d0c4576461f8 SHA512 44dc81f3b3cab8e65344dcb2767fdd6b573f9ee587c78afa6873995a019b60c1c8bfda1c9f3baf6b5e71ae76ca62fff53e5f2e27deaeb4f88fc78bfd54593707 WHIRLPOOL dfd7f5c4c7fe5c65181a30259bf96f5a813548733b298e9c41319812d4cd47035147616264d4bb91193fcfe81f6ea9fcdbb288a3759b9e86041116885613637b
-AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
-AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
-AUX 1.8.0/patches/vicidial.patch 55603 SHA256 5923bed77ef4a9d29d4e0e196ccd571c0bb6c7bb4b7dae46ebc50ea82215ad3a SHA512 3db13bd173d3de6ad7d3e384f3eeaf24da04410783cc0fb26891ba2bc0176e627703f9bc48c01bc9c773cfc883e03c6fb3b7fe1d762582c2d6efaf3a2a423e19 WHIRLPOOL 0b69e0e0ef30fbf058a0f5f55452e51573e0e84856f61eeb91d007cff29458ca07e76f0589fb9ca8763b6892a81443b59b710035bb60bd7889176023a3148b44
-AUX 11.10.0/patches/asterisk-11.10.0-dtls.patch 97191 SHA256 1172f44f698b0b9a028037380f2597acc78862de28a79626c24310cb96e944b1 SHA512 fb618143dd797181e85fd6da859d74799ed5be87e1b45613a1fbeb261d80a6e8a45d24175ee71f98e59ba206b0cfff5ebd6b72b8edc8592550512fe90fab4f97 WHIRLPOOL b231581bffcb96387b2b9f0982045662346d6c7d84fd80dcb083a2563d509d8fd59c30851dd7ae48a6d6017a1a4eff46470770ee8ba2b23068a8a9a64c199c27
-AUX asterisk.service 456 SHA256 a49fb681161d05b18b1cb6e8c3952de3baf53830709e38cfb125c4cf5085bb81 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 WHIRLPOOL f428284c586240a9e8bcba535cf34924d924649b0891c5306a911ab1416e30ff42f43941dc2aade73bcbfdc6f833b6c14341a39167051adb8365b43e5dfd987d
-AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278bf13bdb3f14ea08083877f SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 WHIRLPOOL efa9e1432e89efec4a0f78ac41f78e26e236f6397c528b6e5bd9d8b9191e4af8480d1ad5fbd3b12e5343e54ac4be5c20fd026ea437cfb28466ad96b9e3e4c988
-AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
-AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
-DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
-DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
-DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
-DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
-DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
-DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 15721 SHA256 cf757a335d9e6ffffe27ba42874b7827de219d6f27edb902f496b5a9af6a2d79 SHA512 32cf2bec0350c6661304e415a3dab817b35f2b855f83e4239dd155902e3e3a4c4b12470f4a2d2fb7313f60a3df868f50440d917821d752924edb941e75ae4510 WHIRLPOOL 099e2d4a4d6c253c82cfab3ecede4c875038d3258b92d1db36a1cc6c83d02ab955915e9e039ad08ab729dd81efd409e5a0d39af66ac0ab12d65e64ca8ab5e12b
-DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
-EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
-EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
-EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
-EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
-EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
-EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed

From dd4506ee16f9d93932bb47f962e4f8a172c1de1f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:26:52 -0700
Subject: [PATCH 180/261] mani

---
 net-misc/asterisk/Manifest | 103 +++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 net-misc/asterisk/Manifest

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
new file mode 100644
index 0000000..8bb1d44
--- /dev/null
+++ b/net-misc/asterisk/Manifest
@@ -0,0 +1,103 @@
+AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.c 3131 SHA256 65974f24ae758f43fb3235830618685e6f257b7c6f9b076209796e7f790fd309 SHA512 fffa8d6798277b904ffd95699c78f9f85928b1bf51d9fd98c164f54026293cc48e76a99df5ca2962c2dd6fbecb4b69f449cda6556683fa9aa47c1b99ce35418e WHIRLPOOL 45144e8601fe79e09fc728cb86332fb0f1a6bebeed232fcffd79046e61bdd6390eef221e6e1fa8a0db2bae06c6f385c1d7fb16c025ade30d7c8f9e67f4c41aca
+AUX 1.4.39.1/ADDONS/codecs/ilbc/FrameClassify.h 613 SHA256 ff05c73dfd410b764af250bac75af8955825186ca8358cb11a2ceb900953d4a2 SHA512 0fbacea90fab45892a41004901e323bfde157b203afe911cd870238f0629a3028752ef54f8ca8b6f6f9b58e72b4532b364ca9e98a9ac3f7ed84f3e3d91820e1a WHIRLPOOL 6b5e5f250741278a7f68eb8192a418c54bdb2708716260658e892e68f8c2d55381d4270924ab7d6f9f13e37e9224cc8cec58a17c458ff468d3d114aff6a750b2
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.c 4847 SHA256 903e62dfeb760c45c8ebae3166715615c85da285ce590ef5feb6e7c66682cfa5 SHA512 6afe96330a806422b3a11e47e3d5aca8686f5bb3e4f3bda30c56e74037cc3bf0d55f2d39dafe7c9b67982647e7384aad485d63d29cc512ac5df9cd4b32100b19 WHIRLPOOL 4f8997df5d8add1b3b1fab91dc146bd295d19ec4b8dd2d93b8b04f53c54d03999d862d9dc7df853d5d9c4a4153102105adc679dc1b4d30e97761dd4175d94994
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCdecode.h 1376 SHA256 5e231946e10d23a5d17b6182808fef7850092f344618c4c8db60aaa39dca15bb SHA512 cb0b4375bace1c61d3884d47e82691063a1fdfb8ad6e4c28016963c83bdda2843479abab89bc571d5d3dfaba896cce4dd5632756fc5ed25fc96eecc1c2c3a3cf WHIRLPOOL 0d43bb16491197f763b53353909c0c78b15dce0642b9e2d0cc10d2d599d2b2235cdda37be0766779670d371be4de5ae34d430b4d96a04b8921bc30f722f8ed6f
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.c 8335 SHA256 fa53f7cd92f830d2fa950cfa2256e545bc1a1cd56a5ea2683e3a1fda4b53e187 SHA512 1d71f9b7abd37c3b643edf62c0feb866fae936033ffd33f829bd8818b8c918628adaa8ccae9d4903742bdb91910075e47891ec0aec32e9dd438649462ff0433e WHIRLPOOL bf2296f11109965566bbb43bd1bc83bd66dead18ff0cf3f42b96195ea791cea9255c7b3aafdee446e3422533e33bc8302140dbf671e324510249dbd0fe922d5e
+AUX 1.4.39.1/ADDONS/codecs/ilbc/LPCencode.h 866 SHA256 ca183c69364e2a9dfb209c340c5eab7a14c6818e9334f4c0f9cc9ff8938a4ba1 SHA512 78ca2a9ea565ce9f35df2f1fb93d7d8c6c2174258d621cfad353e04c6bb1c7b2333270c4d2bfef621c6436a58f1d388ada3e7be64119a60f97b663133d6b8938 WHIRLPOOL 7fc1fd1743498e912d486acc509e9086da10d4684c9998cb12cae3569a2b99972a0678478af1baa24f9e0b9a0d655ea3fb24829ea369aa2c5b9dbc1f7b9b319a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.c 2233 SHA256 454a7645f4dfba5a1f778fe5fbf072e854c7eb1bfdadb1f9dee80e7040b1de69 SHA512 2472c52534dac936900190a2c3c0003424d484a78f392158d16ed8017ec1223c2108aa332dba096558aed11dcee7f6fc18bfe6dcb98ed8294d7757f9e325a52a WHIRLPOOL 2651c257ea416761d3719b03095ee7609f91c0a2fc587de1c53763fbb86e048207d183dfcf90b5f7677d9f06c601cb5b2eada9e59311f4c7632318051937d554
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateConstructW.h 791 SHA256 8fa3fcfe60b9b6715ec367e741d7bb6b6bf48a20a47434037055d3024407ea71 SHA512 adaf1b484034e833c7fe374dd2d5a95a66c85cf68ac134ba3162d771574f969934ddcfa06dac0461c19e7265f303d8adfc50fdd5334576a16c944fb81a2503d6 WHIRLPOOL 2ce220eed411159c1bbfca98d1faee471e4e36cae740129921211a3388e9a7f2eb59cdf0b79e372f764cc1c178d94048c148d1860eb4caebc4e61718f2fe0478
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.c 6028 SHA256 0b63cd18d011a814c5b250e7328e66189c012d41503ef6740d0c85efacb8b78b SHA512 e46b2cfeae0817926692e427692aec201f9c1c7b01716949958b6a3031ae175816b6f5caadabaabf0d794b302a19d98f00577190008cb6d5487e7bfa7fcec3bd WHIRLPOOL c3667ec3a9244cbbd2335fae14b2b80097dddd91d1aef2462dde3b41b0715c31fc6a0c0cef9acccc5527c765c5caa00373b8f1f37925eacc21ce7d0220cbf393
+AUX 1.4.39.1/ADDONS/codecs/ilbc/StateSearchW.h 1626 SHA256 1cc6c4a1723b8fe27ff35f55b0fff5dcc0a9cbc90072259000ddd6cfff030fa8 SHA512 6b6d8a1ba3f4d8aa95b62c726ed7ab7197c9987f2596a6adb8e9b317b47e6b4b3ba1b61f61355f9415ff1813443fbdcf968b144c628f0dcdcb76f7c590eebccf WHIRLPOOL 558a4f5ba73184bc5ff6c77cb35f9eb4d1be95472c626f9f7536d703f6aa70c9ed264b1f46eddd88e42dc884584f0b2a918d84d9afa7fc3e095b2ba8678dcb3a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.c 1701 SHA256 cdc1f00965079e598c9f60c91bedf552605bfabfebaaf2c5e745e423548607f9 SHA512 bd46c1e217fe0efbfc68aa350e5b26714422ba0bb711fe487a87b76487cd1161730d5ba91f713b1a6b57e09c18e7a5ea397f08f05cd625c4313d0f13e1f1b129 WHIRLPOOL 4db10848f3c9c489ce982103a268942f6dfbb7f4191a5de3896ddab9c38aa1bc778ddcd91fc3d9af3828676090631b43e6d173f3adf6946936aa4471211a656b
+AUX 1.4.39.1/ADDONS/codecs/ilbc/anaFilter.h 617 SHA256 5600c59f34a4a3ce3cf93a1cc5a6964f0f9f619b10cdf91c6050d002064beba4 SHA512 f758014a8d0c9f4ac286eecfbabff08ca6a54cbaea1bb801a2264a6eeb2393ca2bbe52bb98f12a448e98415127cbc4662fa5ad65767a1e2787dd5513b1205998 WHIRLPOOL 670402f97718fe7bf3a845a1f5f37ca38ea0e1a51841d3b31bacb77f81c34db396f340b773dd6664998b292f9a576b6dd5c8f6ab0d58cf621ac4ffc2a314b10d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.c 36801 SHA256 cb1e41c3db63770b9a40159d196ed80ac6ebbf42d2e664e4bb9efc68eb855812 SHA512 591fd5226c44bc52ac44bb328ddd1de81c3c07d12dcdeb15fcf87a0589ba37dd3284e1906588aa8fb9c6c80e8be0859d29ec7101769d07db99b474db50f7b160 WHIRLPOOL fc15a6787ec0b0acffae05d35e175d7edff9a90cdb7bb128dc37bc895386007a9d64b873f0caeebbd2a03fca1c56e59a6e28a716abfac56d8e5bc66fb11e5853
+AUX 1.4.39.1/ADDONS/codecs/ilbc/constants.h 1607 SHA256 a99d6a17f4961429a4b61d2a052d86d6d32d9bd6cfa9714c59c1c5faef724be1 SHA512 7ed00076dceb3b6dc75467157daf1be38269b8de4890e238452c962306d3a9f05d7521b11fa60d2fca71fa5b8908dad2cf85bc86c5761068a5b182d42a48d7ab WHIRLPOOL b1c2980d5e746852ca1c430e102f3b2a52f93043b719582803db25df11444b1f1786f7c8c5f13a31cf2758382a26b1bc31a3816a483a45db562a44a48b25ca74
+AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.c 6751 SHA256 955913c3a9deaa2a49c3a84181ba16d51c5106793d566b1bbb3c3423366dafc3 SHA512 5d58fe85e244f613bbe3f3d756fa4d0fdfb1de384836133b2077633588915dbcc1305631aaaf9cfe39c68fd0c6a9e7cc0b999fe0a6937370681001a20eb6e957 WHIRLPOOL d0ea64386475ce650f187f833ae51a3414790aa8f2b6d61459fcd9a6e533209b2fcadffb75e38635da0223c39219decd6dbe08afaef2a967d50acc2b8bc12bf3
+AUX 1.4.39.1/ADDONS/codecs/ilbc/createCB.h 1993 SHA256 d46a70ad1cc9f465a8f9e0bfb82ec8d31e8e65a94d2a57a0e354543ec342fba3 SHA512 e569740b62e45cbe8bc5c20dd0a0c095530845d8353254debe8d03e9fdf5c47f5dbce972f69d8e831acb08bf3ac61e91079637b2c35288354762a7c2298b7a23 WHIRLPOOL d41bf42b25e3894b709cd94a9f966c5e3e2517bee41cf56fc3115179c7b55695da7372a77342d553eb02491ffb051290d284a26dba28f57b2ba5e9d145e0079c
+AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.c 7826 SHA256 68e34fb75db5fcaade4e9a58b254d80bca0b062502fb86090da30eaa27a3cd33 SHA512 89f1d3a68e2013abb2d60355c9ed57652f03332267ccbb1c4a9f5658e5f7e201fad6f8544fc14b9ac9227be401edee10a2d65a9b9ba410ecc2ff3140666efada WHIRLPOOL 8b578c86ae873195d44a9535a4f0861c9c7d1c5a15cea5bef3a849cfbb26c6acd8cf91642109b101fce9cd4da98131f81f686e451215d168d947c5b53f4de5df
+AUX 1.4.39.1/ADDONS/codecs/ilbc/doCPLC.h 864 SHA256 8dde21a55ca985b657028a93c8f837c3ab98557854e41859864523c52d8777c4 SHA512 2b25bc764488bd831764880e8597a418ce824f111230e146f56627d474e9dd22d79488b56676fc9d41c3185bb92dfb8894e3a6569de76dfdace3bf41a55e9aa0 WHIRLPOOL f529a014ba19c1f035135c88c90ee7cd1d0186237cf8c1965cd4baadab636a3d7e30091ef414c38c16a8e67161b4ae656d9fe82a4a3b31548438362b675ed716
+AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.c 20605 SHA256 c2cbcfd67edf91bcbb27cd4e88fece09242466c80c733583f6c54cda1b363964 SHA512 788f81f8d32790417847dcbcd9aa4eace84a140cffaa16e0d3ae2a17419142e4e5dd40ecb98a785e48c25f060b14a2878fccf879e8a169e412ea4b89668376cf WHIRLPOOL 4bf8633345dcdfaf0d085090ee03c90774c8d9d6f586fbbaf0c1e16dfb43d8e6123a340f2b3536b30cb7d633e71c697c0c521b24ba69c507e5fa6bbb36d72ebe
+AUX 1.4.39.1/ADDONS/codecs/ilbc/enhancer.h 828 SHA256 6504cbd083f939a0578be86db60223306de90b833c23178c9cd39f15b995b288 SHA512 99d94e49d8c0d12cd456fc007ae9a5ca6a406e72d17308a72c6ca9a57d513b3d822e67504262ee7790213e265825305775f7c893166a55abfbac7402682c57c8 WHIRLPOOL 5f66a06bfa3ea6fb6498f6d3d815bfa4ee39ead8ffbb52c8d5b83a4a3dced1f0a121424aa7c8320e01ec791a4378db9a0e6391f6aae677d586fdbd882451c621
+AUX 1.4.39.1/ADDONS/codecs/ilbc/extract-cfile.awk 643 SHA256 cdf3927d184f82e28d94f6614c7e9dd107db5d3f58f59c5fd22aabaf2936a755 SHA512 0af248f3f09fadb3e9dbc496878694d273c47b6294dce7a3b76b343e0e198496ffbf47116edefd3f2e790641ee94441295a84145c36c0a9654587449ebe60458 WHIRLPOOL 73f5f31e5ff003dfb36c9ddc6596d0d7b8b0a8085adffa08897df22d60b9106ad7458e606532ff1ae8afa6d2b6186602f665383c2a907dd0eff6b1877a3159bf
+AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.c 5639 SHA256 0b252aee26607ff1b21834f5dac25f6a0356f3214fffb908ccd66776d04d4513 SHA512 d4a1b40099cf6041a00270b77b60e93a8e75aeaedbf060b2b8ef0387d810686646dbe6fc64cc19666939651dceebd38b6e38a7ab95d23784a6a89fe8c5c59a93 WHIRLPOOL 669e966ea4d29e3307a94f9249530a0d4243e9717ebac273d8eae207fe5f3ef1f1929e8ec6d519fbe2f5d13a4127493f45ab975d665bf40555153b9106f21646
+AUX 1.4.39.1/ADDONS/codecs/ilbc/filter.h 2999 SHA256 f917999699fa2fcc8934401cd42093d4032c23f1316e6480ecbd0acc63d30465 SHA512 2a3e7f25b1312830e04dc0beeb39f07b9fbda0dcf319db66c1632a4b3c5801e530d52b2d0153bfa3f7ba939ba4f70cc7470d71d604b9ef74ff37f2dcc90bdd32 WHIRLPOOL 2a916b712af72da3da22a79d113b1983e783df262c69b7654279ef793565ae7e5f27c15b67150b9222b7441d5f081b3d09f6dbb90cf6fd512f8f22bbf6788cea
+AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.c 2665 SHA256 354890fd77ed9669f24deb288619cc51b2caed5043135e994b95006a598f7d1b SHA512 42fa6a57c2756565487bf5986cb4e3845c815342f16e65fc36efe261764dcdc9e3363298fc92cd93778fbd057f154320e5a8c118278b18fbc7c94db7b0cee565 WHIRLPOOL 0186018b7d4577744592c329bdfd7dbfb822ceff8cb3d7dec8651306799a02c16cbe6b44bce5346ac6145818c732d4165b9e0ce8b4f2931d040ff988f9854600
+AUX 1.4.39.1/ADDONS/codecs/ilbc/gainquant.h 863 SHA256 8554210e762cfb79c89282ea028957d1ca91fe3d924f887c41b6a8e70ea9c9ef SHA512 217bc0397cde4f4aa9f48fb1bda2a9860343a4029d4e91a9541a08fb4a37626f3ab2a0e2d3d24b7446c2b1141887c2d467c67c71a13b9f2d99f53db469379f93 WHIRLPOOL 1da8466d668c0fbf73140031f35fc9c82ea95a49323c476b6ce4804ed73f19df5e25cd5fd2c798ee4189e58af3e57d99c4acf3f6db1e18e11ae24e6df1723827
+AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.c 5043 SHA256 1dfe5eecb11d9ca2afecc11188c243cf25e560e458a1636d35e9575ede9b95d4 SHA512 51a8f6e8532d4b94430993b5f33405b81c457b59ecc2b1105819be85d3bd033bc6ee6554845457a6aa0130906c2600eb24a4eb9607e801fdb01104a7efc473db WHIRLPOOL a683e9022342e8b029b678c25d2250a339eb1cfa3cec3649be8e7d81fc7f2da4f8f99d0e22d6505704845fa476f753b01a0283cec4dde63e3ffa779e9349b6bd
+AUX 1.4.39.1/ADDONS/codecs/ilbc/getCBvec.h 652 SHA256 dd2fc6a5038fb6df8b005348fdb067b595b123d1e4f035ab90d5d95d65f495b8 SHA512 a4dd1cba1696ed668c99fdc0dd05dc880ed6d683585f83f8c58bd206ce2ee97671da9232717818570ddfdcc5df9d3968978fdac69c70590b5da3ebea454f806e WHIRLPOOL 5b6d2630e20efa70dda2867582f47ccd123f595f50bf2be041f95ecf66b767764514818bc246cd57aebc2f5a009fe8c33bf16868c94ee8c00196b430e247643d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.c 9314 SHA256 426f51a9af77f05baf3d30a4a6a7275c6a63ecdb0c518c2a3e8d8bb714958efa SHA512 2a69a5bbfc3ca5e98a052644896f6342c136b484ff6973b4bc8dce31937685dda16790f3907671635e8a7e67297cf1e88be8b284ce13f2f074f4cc9d835a4853 WHIRLPOOL c7bb97de0898b7545aa32f13ef72594f319a0cfd881b6d6d985d4d536774324a6b081acb0f67606633fb81fd6bd7235889d805ddb377eebdec8754e01c84287d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/helpfun.h 3471 SHA256 b0db99729d1dd224981543884ebb058ef7646129e1995166dc6f14a4090532a0 SHA512 cda538d5f1740c364683f06f3293e632dad8149eeed72069e5111e7984425a44dd4ab0e9a6d046463e21f89f02535bcd1dbd947ce1563ba0fcd3659561d0b452 WHIRLPOOL 2e24f429c246d66469c2d9d21c7866697fcc5f65daca0841aad6964252c5fcdd84d2a2d655f20a9536520ac6dc1bb3a6ad66d27f351a73ac10fe396d729c3a62
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.c 1378 SHA256 1b64cb361a3100fa408b5c6cc6a26e5f48c32128026e53ce6c2208538e3a4301 SHA512 da3d6c66ccda960791d88f2bc28a6216badfa2b41e1a1925e0a56e214dbe0e9b62c1304fd8f0fb90e2c5cccff1b9d5353413f3ea92e67131eb257c51fb986fc8 WHIRLPOOL e9ec9996747c2319ac216b77c3f0a5f175c14c15108da978936d16ee89b5cce0e3e6b40e6e208b07e8879738380d6fdf60775451211f3742ee543385c3c21d46
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpInput.h 588 SHA256 b3a2c0c917216ce1cb3e4199dd68adf7b4ee13ba51faf31836368b1791962423 SHA512 84a894760438e9915431201a5d37ab34afb22b712a2e681fd9c7bd688da7d116b68feb3234eb6f50dd4f7b8e49a3c1faf4db0a1d6aa7450be8f04a2b7367e7d9 WHIRLPOOL 36107abb5c99a6b6235dc385c6bbaa249a26637314dc8792274d8d546e7991be13f94662d07eb604e0ed89d773512f8bc71d7e1ab53fffd21d2cfadc9c90783a
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.c 1373 SHA256 0fae033bc1c53122f3fb3bd7e5f1888d4cb76b26e80ec2897b6bd965193448ab SHA512 e7ab5667a23b4c19a204ce1fde2c580ad1cae4b55821efcdb76201b71dcf7856cde1d1b1fd6fe3cf94ed6f3bdd47823ec533185f72910500dc7ceb66ffaaa9c4 WHIRLPOOL d8308194e89bc2919bf7a3bf16db42bc4fadbf4678d48315c35acc1ab1f7c259c929e56dcd66b07494d464b8bf2a22d227a3b2970877ff4c5131478e874916c6
+AUX 1.4.39.1/ADDONS/codecs/ilbc/hpOutput.h 588 SHA256 e0fc0c1410940b4d68ca6c1987f27372376dae3a8ca272d71230b11c7e0e1f24 SHA512 3a56a7d3bf2ad086eafe1b05d3514f0275ec4d00e19fbd22418374953d7e36b85ba44d1e72fae5587772f2cd22833e4e65acfbb25bbe1ab788250b40d39b4e12 WHIRLPOOL 036f488d319eaf830c0b0be43868d5c529a3e490657421ff59380edd3d98ba3119efa8c68ccce37850aa8209d0d80f6d249a340693e9b2934c4bffe28cca1a40
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.c 2885 SHA256 0baae1dc6cf43583814f85fae53622ccee0205d78f35b81dd16856394a474395 SHA512 20211f18544285e615292225284f1bdb3264e8c900be3d28c31ee7e83432ce810dfd182a7941caf778a47f70adefcf6eb26d52e757043f1ba16a356d3841ab4f WHIRLPOOL c08085a0d1a5e0319302f0833d3b52d6db079c6640766942e59da4d0d8aaf1093f4ea968f8b33d82a42922861e4a5b3d06be5a242e05a536b4819c48cfa222ec
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBConstruct.h 986 SHA256 717e603767a286de36d7bf6587cf161cb05bab968453d50b16cda8a519b79475 SHA512 89dfddcb8ca0eac9c096b0d73d28194ab8f090798ed479a117f3f474e750d9fc6fd56eee9d778ed200aaf0bddfd7c2e905f8158652ab03a098c84a6cf90834e1 WHIRLPOOL edb9f7fa35252b61c8652271bfd097da8ef9695cf931891b973708749892f5c6df6ce8d78320c96eb5181c721a0158d124c70d5c36b91d6b4a81fbba4c14884d
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.c 14051 SHA256 f0db960244b8c58b505ad8293ffb51acab0e7f99ba1be58cceb6c15d6a5f7df8 SHA512 795b8cb0bfefabef66a0af84953cbcfb77f698b6bfeb468113ec2d2542c48890eba99a6f5e6a0964cbd6e988d7a094c80b4742301d0b785c682fed011fa73d18 WHIRLPOOL f2f1c6ba96a037ffb0c2dd6b0d942e4fc44bc35699e625565d3104be35a54811cf37684019473ac1c76d42d6fb5eb6f1a7cdf6591976c78b3d82610e30d604bc
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iCBSearch.h 1086 SHA256 f00855f862619efdb20e29b5423b71a0c289359879f4ffc4b08bd38385d3b272 SHA512 7efcbd65bd3b8431e976254c5e840beebea057041906f575d65294951c7eb5284ca02a0ce5cc3fb8cbd3f01dc0faa4ae9cc8cc6dd7ef7e23087eeca78616f6c9 WHIRLPOOL 0d417a60496c3034081273a2a31b8f7dc9935090ff7e030cc12b4670d33ca86cd4bdfa49ab37a7f31aee7d2d9d7cda51ab42661e2f3173024e08db651910fe17
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.c 20730 SHA256 869ce48ad05eac43d7fdf19fb5841614618674aaff87a1ce51de8552dd792337 SHA512 79cd2cd13523151123cc26da8f319af1cc2a831ab1865e371d1c108bddf85d18f4a93991440a057c0c77eb727f79a8da09bf1038658da85f573427be08d9da29 WHIRLPOOL a844e74990c79d8525e90c6cd7f111f267c230273fb633cf76f13a3c744f52514552e63ff4b2c0a3b9929b6aefd31069bc5f620d5bf01f857163f8c611c67ae2
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_decode.h 1258 SHA256 02017803f44419ff2e2dd86dd199ba183cdbbe0e84e683bb9ce38b604099c393 SHA512 272807b3e15a7160f1e14557c5e0217479b192821b0e9eadccdc65deb93ccebd57dac1b3bf571551b219841cd1d6701a3d7e44253576becb79ac0c4d3b898f00 WHIRLPOOL f8bd722f6d07f6db244b688dd25cf1bee49cae6f47df04f33c9f77147a3b9dc91ee1877cc126bc64dc1811b2a7a172cab1bae5d3c05bb0dbdc527da5374ebbce
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_define.h 6251 SHA256 77fc1ed8b7d427340bda49df146a219ffba56f1cb9562e0032f104d33217d860 SHA512 7940fd069a4d6a230701b0d86fd83cbd7f6cf4c2f3362a2205e78bcf8bd86e7b4c5a423693a263b2df972dde53e6b33b0b4142470a09548ca46d2bc1175b3c24 WHIRLPOOL d314e6761321485010727c90e2d60efa3560bf509e63bdf21f1ebad57bc8ba111c88dae15ab5597d946d15f30c5c0a527872cf19159a94dc851feb916f0062ff
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.c 17526 SHA256 b20b4ceb50a17b050b56387ec616a497c2d3613845d26ab370866f1ac5accfdd SHA512 80e112e3c11a8588c7582deb78e1c28d92eedb638e0813e7f44527aa9a5f302cf9bb10a39dcc097794ac6fe1ab2e23238167f4f5c3c7c3dafff0df8ad5196b76 WHIRLPOOL 1b5b20d6f8f9f85205c4b66a08db31d17b0024e67035207c755d7692656f511e7d7be37822d2f2c7004c14124eeb027086e58617dc109b2b9cb30c0c597aebb5
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_encode.h 997 SHA256 4bb62c648dd187367e5787e9b2af4c331257b02ca14b9179deaae2eed5436c52 SHA512 d011d3e153009485fc29e8dfa1d2ceb78e5393d1f3acb4dc3d4a4590ac0cb65b13181202d804639ced5e6fac7867d6dae098f92229bf96a7e03131f098d896a8 WHIRLPOOL d022a17256191b0de5716d086e4722a1cb3f106e5c8195982b49eb9130626fa8f78f9040f8b3c9913f781e2c9277bc6f5a50c54ab6997727f4c3a82701418330
+AUX 1.4.39.1/ADDONS/codecs/ilbc/iLBC_test.c 9078 SHA256 be1a99b227857570fcedca398c989bf201fb71356dc2a88ac77a46b4bdc1c834 SHA512 484038334898804952a7fe3534dae654fa798c2df4e0d13eddfc59083697305cd6dc677db13aa7d42a80ecc8a6238c4d825d7819c5eec0c7dc10f59b903a43bf WHIRLPOOL 418ee6d97fd9d81efd118acb4369162063c138832437eb02242e748fb8f0d9c593b4560ee5064556cfa27cdd25babbb62dcacb6f97cf1d8c346d40c050d328fd
+AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.c 7667 SHA256 ed2940504c832075bde8d6b8819b8b43a0f609e1543c4ab45feeae9fd4737d8a SHA512 06f1c936fd7e144c0cd16f9780140a8056a6fba96a4b3136acfb405d161313369250b1d87a1d973e7e214c2201e58835d30c6907131ec03dbabebfb41af7014d WHIRLPOOL 8b70576d17f3706ca49cf54f89cff6c143216a15bf1666a85ce6babd889565d0dad43a407c05a726e75b68c7f2cd5e778944903bf40bcb446b878aed29475271
+AUX 1.4.39.1/ADDONS/codecs/ilbc/lsf.h 579 SHA256 47024fb68e7c00f8b89cf2df41a57debcea098912fc80915fbf258f1377b3ea8 SHA512 2a912d218e6850483126dbd30f2026e29e513a101123fc2b55ce48eed9ac3e81192a410e08d0667a95b522b08f16a363bee574ce1e8ad8fb408135271a42a130 WHIRLPOOL 77830511830166c37c6fc27324fe337864d7639305b1f45c18a4646ed0de6599a5bf9d0051777c46ff354f7b12c8b953d91e915aefd9c5be90efea3c9d1e7e46
+AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.c 5628 SHA256 8715717aeb9cdf79f235793abd6cfa07dec0ef39605d9acb02cabb8f8498090a SHA512 4c9e06f54ffdb9e90fe0553d308390ec9b41e6c082189798a39e0b748a18541f726e364b5cc4793f159a9d44ef043a84d882012b7e89c7ea91d1672dd077b7d6 WHIRLPOOL ef94337cc199a015911cd11cd65b5c3784a861d69f3e66203fe44846c528ae3dc24fbb3ee2f06aa51a3dff6b78d9c7dec479be59dab4f133ffcdcc982fb11770
+AUX 1.4.39.1/ADDONS/codecs/ilbc/packing.h 2688 SHA256 4daa342a3a2255d23d9fea030ccbeeb24c74e0e04ca101294a81c5c7feff3ec3 SHA512 f0d123298b112c6f46afa4b2a804398faba2a71eaed9537a0f99ad648901067ffcbfd224edc2aa62897a225ea66ca7af35c1f28f364d711263ddacf9e35b860f WHIRLPOOL 44b2602be68c7729ddf15438557dcb55fa7868ef4bf75d4bba0759a5b5e24e27d299658b641f4c20c486fe72360deaab40a080ce508b1b27a326e1062ea26638
+AUX 1.4.39.1/ADDONS/codecs/ilbc/rfc3951.txt 373442 SHA256 be5d79cc62d72ddc8ead6dede0ee5fff225305852b0beab2fca67f39e2aec47d SHA512 ad3df37c2dd65f4aeef4cb57f0052577e59bf9b0b5dce92664e77db016ae02519050d2ae4db66f034affec40f466c83dafdd56f29197ff3442b47d4fa358b7b6 WHIRLPOOL c98d09382df6f6872db855ddd9d090ec782db58871d22335e5639292d631c9371f9a4dd588f6a6a4f8e29e9cce518b743736a2c3880fcacc462a9082acd0fb2b
+AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.c 1630 SHA256 aaa8be099a90e35d9f84dc2ee3294288d3f8d701a4191535c5eeefff3bec7ee4 SHA512 2ce9a5208e005ef9614fc7198a6858195d542ceae9ac78688ba6c5706fdc33a0014aecbb21d23721f9a9aaf67d6021247b30fd0618bb65c5486e241d3a85ff56 WHIRLPOOL 0572f8f8c46363aadaace26b5a017021be79b46f0ae418488c39b94f68d63a041f32ef7b2a97710a7310f0ae33ff53b1a732ea9c2d6da143501a18e18d46b248
+AUX 1.4.39.1/ADDONS/codecs/ilbc/syntFilter.h 589 SHA256 62d687a7f3d11ebd19d9db9d6f29195a5dbbb8be6fd03740769ea22024b1dd1c SHA512 e7b8dc42e632153b45be4162fb166862e508c92d424ca4a1ba2ea4105d3ad7017b7e8dd141116de7b75f89084ee1b43d57b37046e355f3c064dbca0d4013ecae WHIRLPOOL 0a8890d9fba910b187cc554cb3fdb0b1d5e37c75cdf848756514ef78f45ff97f37fd456e7c1575d5acb819c4327b53668cc5c136214307a20f29ccba49b88ab0
+AUX 1.4.39.1/asterisk.confd 2207 SHA256 8d1e6061651291a754cab409bb7fd79171784c324c1e93d81f8f4b7a158d902e SHA512 5efb2e9944c0d6a22f4c5c3b746d44f03f2a862116eebbdb2e2b414ff6418aa14e61c7180053bcc9a6f8472aead98d18c9ed384fd119cc042b9bf30639fe5bf1 WHIRLPOOL 159d69a8ed3bee8bf31b46ba47a78bf1b7cea5be35982de42a0f0092885fd2ff55f712ee87909cbb23a0026537bd1959c8e328309093427f61d60fd30e75a855
+AUX 1.4.39.1/asterisk.initd 7274 SHA256 51eeb0a06fcac7680d8d21fda8b801d06f98045a824a820b6b474c0de97b0258 SHA512 c4f86b3ca301913a5e174c04e6fef234e5bf8c4f88673d900d50f120747206218b206238927ae881446c8eaa26b63a1ecb5f75cba17b397c168552704b859ac7 WHIRLPOOL 19db63ef40715efa4c94c29e8e05c9416dfd580611f52b84ed43de16996c39925558767b3b7675e764283a8cb51f8f3c7b5cfc828b268a3f89d70c4b9c1ffc11
+AUX 1.4.39.1/asterisk.logrotate 247 SHA256 b61c3d7614654c9a4c48b8963f7c4caf60ed74e0ae916fe3b0212619fab1cc24 SHA512 68a9fb2f3c5c992583ec4d5b5d2427d460a268f8b3b86c39314f1a481aac025c5e39c71a775c687df40d4d1f1e2178ba9aa1c3796f4cb0bc9e67af3a27628453 WHIRLPOOL f3065acc5f82b02a371e022dd50a20c63724f9853da8c593d457046dfe958bba32bfad783f16cd124775208d33608a5af6e378216e2a681bb7c841ceb1019064
+AUX 1.4.39.1/dahdi.initd 5962 SHA256 319003d37d0608edab1a8d8411fe666f2ddaede791e7bda5b0beafa3b4bda07a SHA512 d70184172cb83e37bbe6403de3488471b6339e8d10379a80eb497895a41ce4d5a248d13900736223e5629723ea164802edd6ae14b54c786464a4da426fe109c5 WHIRLPOOL 43263a4a5ac1be34e676b23b19040a4514db2bb4c11ae224720da10c381790687d2901b41d1b16e1fb32d6ae9b7f9816016c9b7df01e32b85fdc9bc662364de2
+AUX 1.4.39.1/patches/apps_.moduleinfo.patch 22296 SHA256 c7923ec9b5b2d62b8c7766f77a3f718709c66e2a498a96ee3965c4a9687541c6 SHA512 5bcd36a56e6b1d008ae58e9398ebd0a51b98b649f1a91b45775a0c807234f2f83e132644c1fa05e88f9365012c68ebc59b5695472b3c944beee157d8d2f70553 WHIRLPOOL dd3a44837969a8f0ad197f73f992e91a8429537695704ac04457e067d786c3305b852a0b6f0d6b011e280165053b0ee632d333bc8058ea19fd550214f4d62f3b
+AUX 1.4.39.1/patches/apps_app_meetme.c.patch 424 SHA256 32935b7cfe6e6a0f6d3a5c1510cb4ca829d9c3d8e5bf6379177b31b3e491c27c SHA512 9a510bfc09acd1b1946f407cc1fc2b066e66604f6e487cd5eb90c70cbb4151ba110001b3204988c7135f979c6d3ed27287a77d1e43fa82a0f780ad4cb98b583e WHIRLPOOL 16085b59bde8555e4d6b8980d23af40fde29e770cde7cdf6fdd9c04abd4478475b1f888d150af3231c6ddab8874c40a80e51385a60a42bfcf51baf5538e879cd
+AUX 1.4.39.1/patches/apps_app_waitforsilence.c.patch 1148 SHA256 581f27ef827cb77ef691e5432808d381836599927c3eb9a1fb657ff97bc66f67 SHA512 658f86fd89b7cd749ce353a3cdcf75c7a04fe1f926c43768fab8d9f74fee971248cffaaa55b10b11a319097faedaad08fa0aec7f81f81bd4810f11e443502712 WHIRLPOOL 71aeb0350b91ed1ce76dcd23909fef32a30935c83c4101759d6034c854ce6c626eb02e73a7765611b3c56539bfdbf68f1c04b33f77004ae065f654f191ae3514
+AUX 1.4.39.1/patches/build_tools_menuselect-deps.in.patch 357 SHA256 b4e0635fd44bae5dd4ee0326fea2d8236db01b7ed223af188706bf4ba30f6d41 SHA512 991f5c44095e4e39bc0089ed382956705e0fceb2579e708203564a297f867f70323af93d2375d4bcae308dedb59a22c709b915614acdcfb8a1a45d70911ac0bd WHIRLPOOL aa7f47c9905f6432e128b3d018b0adc3bc8ea6eda3acf1e561cf54b4cf9fff5741dc84917bb7f05cd677855b5bcb5d54b75e11ecc680efae1cffb454227e1fff
+AUX 1.4.39.1/patches/channels_.chan_dahdi.moduleinfo.patch 309 SHA256 a1571d189c7eb3b128da4455901ac5a7d1729aa436d3ec5f9c9242bc725dc6dd SHA512 62e3580f8438a2ef8e3de4ce3e88d83bdfd598ba613ade58d4466932f3489bb22ed602d5b8c834ba25f1e4694a88dda5635749097b9d508a73cf373a8db9ab96 WHIRLPOOL f998580662dc1c46561bcc07c4a186aac64ae7890040a5ca7d4613dd5ff0633eee0bbc1b62cca21657d60576f8524acaf494609d17faab201e76b5d9253ab29c
+AUX 1.4.39.1/patches/channels_.moduleinfo.patch 471 SHA256 a86d18367d573a0aef594b134152db872564a32c9ac7d7bf589a4da3f902343f SHA512 65a19d221a2ba4cc79ea39036c47ffb18c1721b724903bccc614d29510bd50ac4533f37a0378f2ab872833dd002716614320ce1027009c56f9ff5ee1b60d5a76 WHIRLPOOL b229889b44b0faf82ace6951f341571ab84e1ff96108e502f904ff65a4ec41bbc61aa480f46e83df9a7f34e3b399a63e049b695ee4d7d71727cd9c46643e1703
+AUX 1.4.39.1/patches/channels_chan_dahdi.c.patch 68606 SHA256 c9ad2b9504a46ec03152bfed9db986c5ac0b639e9137c55628652f7fc98eb77e SHA512 4340b56589c3bc199c0b3e64144f17b99eb8d38759409eb37ae661ff25836f5434b8d8e373cd57d8ec458f10a98607df1d74ee0f9652b63c668810a0a75a5d87 WHIRLPOOL 55b33908d07135b142d12360720f93f13768c3feaa4d5c6975fe99979256e82e13357cd7dd07507595d144180de36492baf7b7f77313ab6b6cc0789a412a58a8
+AUX 1.4.39.1/patches/channels_chan_sip.c.patch 2986 SHA256 9a8979de38816e1b88b6f62ef88e2231e399911b3bf8776f6faebd43305473dd SHA512 22dde38de229635d8557d6350e88486fa3d981ee4e88148224359c53cb9a00b6b8e6bea7d09129a851148d6bdb6607289ddc42ef332b3ddce9d7a3f8bf36c0b3 WHIRLPOOL 06ae2e1d561ebf07d695460f48e257ec916e109f5b5e143197a6e57325249a6de59407cd86022fc7007cd2ef4432464586373c2326bce414bf7347e8f949fd73
+AUX 1.4.39.1/patches/configure.ac.patch 958 SHA256 944a1f08e49246a3bb89564798eadcc8c3c374c7f9979d98134e698fde2fd424 SHA512 4a7a9c9e05de8005379cb8664ab420147ade05144fab12ef13cf54811c9a74461a6492c9532b17c6ba22523a238ca4110c792d7d1f00c7e353901f806c984389 WHIRLPOOL 6178daf41c038c9b241b1f5864a9aae4735b140a76f7c8061492e5816a947e8f46fef1c585f99a78d29f824cc90e59d45c23106a6c2160f35d6e3d3c8047e523
+AUX 1.4.39.1/patches/contrib_scripts_get_ilbc_source.sh.patch 579 SHA256 618382d3ea634929676107ec08c75d11d8abb77a303cd265bd04329ba43d866c SHA512 f609b2c3967e97d9b61a1d1b46e897071294c78ff3eac3b10a0419b2c5744912e126a230f15b5a791a6a372a08c2395c0400fd54d16abc943645925a4df7186c WHIRLPOOL 35a97ddc399c29fdcfcd7f8e647a5656c3a4b7bcae51d544695fff3497d1c5b6aa4c6a3ab7bb89d8d946056fd9a29dca1c7c4da1cb32cf4e293bf14d0b7e5202
+AUX 1.4.39.1/patches/include_asterisk_channel.h.patch 1315 SHA256 9ca0f0d9975147d4fdc1ba83a103644966dda141af103052c6e6eae162ce4fe1 SHA512 4b8ca0549c3f608d10b85703e1a21f6341578b04611877a9c3ff57e6f2af57032b21dc7af4ff6bf745fe99bb7990762e07941e9b314ca754df0ed53b24a3746b WHIRLPOOL 939a4ea4fa9c7343deeb7146abdf2e607ac866701f3d1dd05326acb03bcf76bd848c8af2895aacc33987dd7c6e847bbf76f1fb2d20e4d6c10421d56b4906229d
+AUX 1.4.39.1/patches/include_asterisk_dahdi_compat.h.patch 424 SHA256 fffcf7ce5185dca3d39588651cca7e971bcb7806097a78e7d507b3953363c20e SHA512 d0f22a71b197d366e590844ccff8c3bca2e7108c4cbbb020ef9ff3f04de1be0c9d955bbe90df1e6b675cb64a6f72d56fe1c81099e46209a4f2d21752d66808ed WHIRLPOOL 4837e9a2af92d8ddefe7d078f1c68ace0ea153f071319e08b5bd79e93dce14bbeec21dd7c697b5a9473592eb703e18da4509b6a6dc3a3789cda9f80215438697
+AUX 1.4.39.1/patches/main_channel.c.patch 2205 SHA256 c8dd25ff0b90cdcc3916dcb3f1d36520b6b629b4d34e57d27633a995197d917e SHA512 fc4e6ee97c8b018efa27bc61a1713311dd131ac96a30d791064c6a60e80ce8c3a7ce1b9a8f157bf6703b28ff44f144a1264d2423e714d644ee462984414ed7a9 WHIRLPOOL 93cbe3acfb9762b7536e95cdf52fd65eff3870c188067e8a3398c0a3124bb002a6f2738b7370f8cf2e5047f31661cb266be981f59e97750abba8cf7f3d4382fb
+AUX 1.4.39.1/patches/main_manager.c.patch 1708 SHA256 175df28eccbc39d9b367d908dfe64a8fdcc7d5d1488151db459c47fe3c6f91e2 SHA512 5005888c0ddb753597bbe58971043fe82e15cadb3ef02c93b9896fe86937e03305eb0b3d7cfe36e3390685a3c757c684d5c39b5abfaf406b4c4c74453e40b554 WHIRLPOOL 7b2cafc0c0313ee40591f1d27b892cb06016b65ed05825a71036b80b62f11eab6b822741f9a2eba9bb2c44e818e9607be188dfafda124ff0631907f6bdb17292
+AUX 1.4.39.1/patches/main_pbx.c.patch 2337 SHA256 3807d9633ec385ca94b8263334730ad861fa4bfde62dec4946e7d290ff42e160 SHA512 a30ab565b7bbf949e298b6fa76372641e65a25b05ddef26bacedbfcedb419d0d4e8e959b2c0f8491ab6f13a88444d6b161d57bf41ce9ee933474f7e72ce29414 WHIRLPOOL 7886801991967861ae3c39b5af2f2731297df35f9edeffa05e108c8696c5e91bb9b32f52f221a0a1ba24af47d4c61d907c5f99eb9ee5e5005918a98579eaecd4
+AUX 1.4.39.1/patches/main_utils.c.patch 855 SHA256 44cf32f85a3954fa22737c331dc3966912d34b269e68be536cccc602fa3b84e5 SHA512 38249a64252650f0dd1773fcd5f4c8e06c80f8ef33d6be2c1608db1c888b7e8f05d1b46ac7f1649a49234940825bbc319f465ceb35b9d857a8f7a3637a78159d WHIRLPOOL 1c37368a8beed6b8a1851c9688913bba4d6fc539ea79696759d6ef17ace801328841e2ed630df30c160c64a23485367ba9db6e1842278e2a9171b7b2720f0761
+AUX 1.4.39.1/patches/makeopts.in.patch 349 SHA256 ae2ee0657d38f79b2c9947f02014c22fd1492c8cfd302f7d486a3f46c078f5be SHA512 7379b00c59bf81f97e0adba769de882452fc1d52ab04ecfb26961c1a6280b19f8d3622091bb41f5bf79b1c79890751714d64cd48c96d874ff9483d7c7e909563 WHIRLPOOL 47b4055a03e504234f9786764ab851a4d2c0269bde45476cc5939c58af7e0c4022a44a69af933f0053eaba54e46c10d5cde345617c9bfc93335ad440016afdb1
+AUX 1.4.39.1/patches/menuselect-tree.patch 22770 SHA256 cf604fd5f36c237450339009a68974462899e6b8d9744fd9d6c65b932c1c8429 SHA512 1ab9a57a195f64c3c81771f30370ccd96e3d99cec95aa41dbe39597ea532b0e8dfa4d1dac5c7eaf7aecfc257fa2951a7b4ebbd4e2f3469ecdee712d6dc2794f3 WHIRLPOOL 398233d38045c0bf4ead08b34d5f1e89a5566692cfc1395c2ef9fe783a00024b87a3a24aae27a234ea3a289f016d650fa9c5ce6d874961c74c05dc2f446e124b
+AUX 1.4.39.1/patches/res_res_features.c.patch 455 SHA256 4e502ba368e37b5127edeaa168363d589df8bd11c584a87b43b65e1647e375fc SHA512 154cf2ed615c22db1fc13bc8acdb61b83b824f4a59f80053363c1aece78293980674555a8750a05c39225fd03567365baa1b283bc13ea911ae189928d597adcc WHIRLPOOL e4ddf6687f867355650bafcb61fd543ba442db2bebd19a36ae516b8aea69bea5a5dd00f702acbf77b94014ed19c0e34c3bb84b77d0e17cfa6b519592b540d748
+AUX 1.4.39.1/patches/res_res_musiconhold.c.patch 5019 SHA256 328bab1bd68aef365b06a1348fd3907f517eedcfe40e4d30b163a8fa986c24d1 SHA512 ea09e57587bc38a818283e18601cf2dc1032261544c1dfd76e2db29d1b24b83d960f665e2f2bac8918c4a9cdad34be71ce2139c50b8c3fc7c3b2006b5a867a18 WHIRLPOOL 9191c34d10e1185ff05a00d2c634eb86220cf11f81fec44e41c2dcacf51fb65cc08d0f1c109b6fb6adcde478b3964f81cc745f21b20b90a02c7f8190a9c8cddf
+AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
+AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
+AUX 1.6.2/find_call_ids.sh 446 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b WHIRLPOOL eba7c3e8a8c2acee276177daf3649c34a8d863116c96f23ee8b377968d5ad13da16389e2881299b59270afe7cc961c8b1852d4aad13c02734bf96cd84a3ce604
+AUX 1.6.2/find_call_sip_trace.sh 530 SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 WHIRLPOOL 098d8556779b2c053f8bb808354ee9f90e92a63fda99b5eb405407a90889247fa413f964261622f2749a0860bbc2b08b25c3d823d2f014b7c17cdc578ade475d
+AUX 1.6.2/sip_calc_auth 493 SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 WHIRLPOOL 637cbad803360a4f7d2a5aa85b689fd072f6af7592e440025013e47cad77e1f54d614c15194511e37ba1e57630db97982a368cfdfc80264e8733d897a3aa0a10
+AUX 1.8.0/asterisk.confd 2203 SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969 SHA512 53219b410f29f9974fa2ec33ffb0aa914735e4a0897eed0f20a0cd740701757e56f48d0a954a1955cca7c94b2a17cd62dd494ba89a84c8a29312cb633288eee1 WHIRLPOOL 17fef9b012a13529864295629068d034bdd78bba3fc6211e5c2a888097614510c159747768ebb54e6e59999a5254353592f0da665541e82f4fdb2283f0d8dcc1
+AUX 1.8.0/asterisk.initd7 9382 SHA256 7951901371035da2cb958d029ddbd8af276a5de7becd01c9bd36d0c4576461f8 SHA512 44dc81f3b3cab8e65344dcb2767fdd6b573f9ee587c78afa6873995a019b60c1c8bfda1c9f3baf6b5e71ae76ca62fff53e5f2e27deaeb4f88fc78bfd54593707 WHIRLPOOL dfd7f5c4c7fe5c65181a30259bf96f5a813548733b298e9c41319812d4cd47035147616264d4bb91193fcfe81f6ea9fcdbb288a3759b9e86041116885613637b
+AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
+AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
+AUX 1.8.0/patches/vicidial.patch 55603 SHA256 5923bed77ef4a9d29d4e0e196ccd571c0bb6c7bb4b7dae46ebc50ea82215ad3a SHA512 3db13bd173d3de6ad7d3e384f3eeaf24da04410783cc0fb26891ba2bc0176e627703f9bc48c01bc9c773cfc883e03c6fb3b7fe1d762582c2d6efaf3a2a423e19 WHIRLPOOL 0b69e0e0ef30fbf058a0f5f55452e51573e0e84856f61eeb91d007cff29458ca07e76f0589fb9ca8763b6892a81443b59b710035bb60bd7889176023a3148b44
+AUX 11.10.0/patches/asterisk-11.10.0-dtls.patch 97191 SHA256 1172f44f698b0b9a028037380f2597acc78862de28a79626c24310cb96e944b1 SHA512 fb618143dd797181e85fd6da859d74799ed5be87e1b45613a1fbeb261d80a6e8a45d24175ee71f98e59ba206b0cfff5ebd6b72b8edc8592550512fe90fab4f97 WHIRLPOOL b231581bffcb96387b2b9f0982045662346d6c7d84fd80dcb083a2563d509d8fd59c30851dd7ae48a6d6017a1a4eff46470770ee8ba2b23068a8a9a64c199c27
+AUX asterisk.service 456 SHA256 a49fb681161d05b18b1cb6e8c3952de3baf53830709e38cfb125c4cf5085bb81 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 WHIRLPOOL f428284c586240a9e8bcba535cf34924d924649b0891c5306a911ab1416e30ff42f43941dc2aade73bcbfdc6f833b6c14341a39167051adb8365b43e5dfd987d
+AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278bf13bdb3f14ea08083877f SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 WHIRLPOOL efa9e1432e89efec4a0f78ac41f78e26e236f6397c528b6e5bd9d8b9191e4af8480d1ad5fbd3b12e5343e54ac4be5c20fd026ea437cfb28466ad96b9e3e4c988
+AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
+AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
+DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
+DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
+DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
+DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
+DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
+DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
+DIST asterisk-patchset-3.0.tar.gz 15783 SHA256 531498c3d21ba13b6cb89968ef933061cab96cb43ad08e5d507caf7aed114c48 SHA512 03d1ab294cbfca19feed72e6dc7dc11bc48c9f7f68efac6c830e700944e6c362801bbbc79c623a14ee06a776b0cac7cb8139354b6cd3e763ac7edab311367a15 WHIRLPOOL a1328c1a1041bbdd605f71cf84a9ddbd2de2a90bd9ada1a018915ea7a85cae5767b907a9295555cfa2dce9c7dda10643c964660eb018862ea1ff27928fbda197
+DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
+EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
+EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
+EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
+EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed

From aea2827bb315b4941b8b976fc0203e7f51910241 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:38:05 -0700
Subject: [PATCH 181/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 8bb1d44..409e921 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 15783 SHA256 531498c3d21ba13b6cb89968ef933061cab96cb43ad08e5d507caf7aed114c48 SHA512 03d1ab294cbfca19feed72e6dc7dc11bc48c9f7f68efac6c830e700944e6c362801bbbc79c623a14ee06a776b0cac7cb8139354b6cd3e763ac7edab311367a15 WHIRLPOOL a1328c1a1041bbdd605f71cf84a9ddbd2de2a90bd9ada1a018915ea7a85cae5767b907a9295555cfa2dce9c7dda10643c964660eb018862ea1ff27928fbda197
+DIST asterisk-patchset-3.0.tar.gz 15787 SHA256 8fcc510ba728259b86b597190c9ccb916d2298ab05656ed28c6049b7677a62c0 SHA512 1548ba213cff6473bdc1c01a4c83d7ad5af6e1a563e75dd066208ddcd1534c6dc025fc5ea5b09f83dd195d942b03cf7046093d3d85d2548296a473a5f7ddbbfd WHIRLPOOL 3901217a0c8a36a0bc07747cb39d5ee0c5db610fd478462f8cb9810e273861fe9e81802e256b76cd36e92f6a45916aebe4e1a6e02d6515a603c9493271436397
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From db23d0a8185c88e8caf6b1fa2c4db4af882cc48c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:40:12 -0700
Subject: [PATCH 182/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 409e921..279e413 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 15787 SHA256 8fcc510ba728259b86b597190c9ccb916d2298ab05656ed28c6049b7677a62c0 SHA512 1548ba213cff6473bdc1c01a4c83d7ad5af6e1a563e75dd066208ddcd1534c6dc025fc5ea5b09f83dd195d942b03cf7046093d3d85d2548296a473a5f7ddbbfd WHIRLPOOL 3901217a0c8a36a0bc07747cb39d5ee0c5db610fd478462f8cb9810e273861fe9e81802e256b76cd36e92f6a45916aebe4e1a6e02d6515a603c9493271436397
+DIST asterisk-patchset-3.0.tar.gz 15787 SHA256 0ef7a5b58d734b44297d25e1c2617720facc5132166c1dfe748e422ba4fc4417 SHA512 b93a052f9943f37d97436f8a6ae3de1f71c9b5b832a804000fa5392eacdc7910df825dc7488d2bc9e2650d552f44f85950277ffcf87b7044d89f37a3fbe5d2dd WHIRLPOOL 87a3a8beceff41dca483bab809c4fbdd12ef254bee161d20aed5a6024e7929e3b546e50d5972dee6b1a77530be5e204a4209c2de926ce4f57d1cec096e7c3cad
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From cd0e38ac16cfcac55daf75ed630c9840cc6b7567 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 15:50:35 -0700
Subject: [PATCH 183/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 279e413..52dd12b 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 15787 SHA256 0ef7a5b58d734b44297d25e1c2617720facc5132166c1dfe748e422ba4fc4417 SHA512 b93a052f9943f37d97436f8a6ae3de1f71c9b5b832a804000fa5392eacdc7910df825dc7488d2bc9e2650d552f44f85950277ffcf87b7044d89f37a3fbe5d2dd WHIRLPOOL 87a3a8beceff41dca483bab809c4fbdd12ef254bee161d20aed5a6024e7929e3b546e50d5972dee6b1a77530be5e204a4209c2de926ce4f57d1cec096e7c3cad
+DIST asterisk-patchset-3.0.tar.gz 15924 SHA256 0093efc942f1671c7977f3107becd32d9cc3d83100a1b39499938c2589fb0c64 SHA512 e07e2926ce9a6f972dc290d4466b199f10433fb01d37a51c96b822b4e535b5290a6133e6a6fb71af942c880917e3c210a4adbf977d520c5a87309f64e13f62c4 WHIRLPOOL 43d11c43f8d8f24db781e0bffde9c6a1075d7d21577f8a34d1c17ab33130119b7849c292fffa9ba2fcbdc4d1e8c33ce3ae1aef1a593dcb825223934d103fc998
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 890f8af48a53a647401b214a8c120771baf9cfd9 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 16:31:12 -0700
Subject: [PATCH 184/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 52dd12b..3b61b4c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 15924 SHA256 0093efc942f1671c7977f3107becd32d9cc3d83100a1b39499938c2589fb0c64 SHA512 e07e2926ce9a6f972dc290d4466b199f10433fb01d37a51c96b822b4e535b5290a6133e6a6fb71af942c880917e3c210a4adbf977d520c5a87309f64e13f62c4 WHIRLPOOL 43d11c43f8d8f24db781e0bffde9c6a1075d7d21577f8a34d1c17ab33130119b7849c292fffa9ba2fcbdc4d1e8c33ce3ae1aef1a593dcb825223934d103fc998
+DIST asterisk-patchset-3.0.tar.gz 16046 SHA256 db076802ef67f594ec112c30634f85671ef3d9e33463c3c4517cd7da1b0edc3f SHA512 9af391c17df1cdce09e5d8868f66b86434f03a236a6ecede290386e8ad5f71cd26c072232f9fdc22288220fc165e79badd6644c974f1cbc119c836cda19d7e90 WHIRLPOOL 248d408c4041e7d925f55c0b9132cdaedc20eeb46084fed1ab3b4ff42ac6bcbe91fc7d88165d00fce43617e89bb58141e6adca2bca11d4abdeca0fb9527cf2ed
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 8c379ad185b336fcfd4376a6be96802f16034f46 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 16:55:37 -0700
Subject: [PATCH 185/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 3b61b4c..b7d890c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16046 SHA256 db076802ef67f594ec112c30634f85671ef3d9e33463c3c4517cd7da1b0edc3f SHA512 9af391c17df1cdce09e5d8868f66b86434f03a236a6ecede290386e8ad5f71cd26c072232f9fdc22288220fc165e79badd6644c974f1cbc119c836cda19d7e90 WHIRLPOOL 248d408c4041e7d925f55c0b9132cdaedc20eeb46084fed1ab3b4ff42ac6bcbe91fc7d88165d00fce43617e89bb58141e6adca2bca11d4abdeca0fb9527cf2ed
+DIST asterisk-patchset-3.0.tar.gz 16046 SHA256 b8d2208fe0c0a9f0718ada60de4ce6c8537bb7d3f6ed0b95be5c8d7cdf6b819a SHA512 6f6489732ff061a1bf4786eadb6684a5b3cb919b760df02cf25de7e27971f977ea688aee517bb64ea73664300cacdc92c94c8ea2a92f71fbbc49cee298d4ca1e WHIRLPOOL 8c43e4254ff40d38349eeb47f9c26df53174f0bf0d7bbc16c412d13b01012f8e7bd86bd1ea6278ad673fdca5a27249042fa4c5ec50f063aa0597f44df085626b
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From ccac6db6b9a849952df1ca3b648b17257da98c3c Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 17:07:37 -0700
Subject: [PATCH 186/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index b7d890c..05d5840 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16046 SHA256 b8d2208fe0c0a9f0718ada60de4ce6c8537bb7d3f6ed0b95be5c8d7cdf6b819a SHA512 6f6489732ff061a1bf4786eadb6684a5b3cb919b760df02cf25de7e27971f977ea688aee517bb64ea73664300cacdc92c94c8ea2a92f71fbbc49cee298d4ca1e WHIRLPOOL 8c43e4254ff40d38349eeb47f9c26df53174f0bf0d7bbc16c412d13b01012f8e7bd86bd1ea6278ad673fdca5a27249042fa4c5ec50f063aa0597f44df085626b
+DIST asterisk-patchset-3.0.tar.gz 16134 SHA256 cedf221feb9ddfe6e226f4f5b8323cfa739f20af247d34bf29ef4284c73efcde SHA512 08cf9375584e4ea4a37a21e68462adabb1de20d0fa848a40af54da8e986bd424019f7081ac99ec0f976e2dedd8b00d380b93f6bab2f327e7d5c2f8eb88dd2b01 WHIRLPOOL 93a8034f45480544177ad6e0863339a6d29a400c3a30841ec23bf82855f77411b78ed69d61cff15fe2dbd40b12ba0fbcf4905fb296acfd56c03a5a39117c6a69
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 9506b46a1711dde7f7d5ce9c02215ed8305b55a2 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 17:38:16 -0700
Subject: [PATCH 187/261] update

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 05d5840..481b126 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16134 SHA256 cedf221feb9ddfe6e226f4f5b8323cfa739f20af247d34bf29ef4284c73efcde SHA512 08cf9375584e4ea4a37a21e68462adabb1de20d0fa848a40af54da8e986bd424019f7081ac99ec0f976e2dedd8b00d380b93f6bab2f327e7d5c2f8eb88dd2b01 WHIRLPOOL 93a8034f45480544177ad6e0863339a6d29a400c3a30841ec23bf82855f77411b78ed69d61cff15fe2dbd40b12ba0fbcf4905fb296acfd56c03a5a39117c6a69
+DIST asterisk-patchset-3.0.tar.gz 16501 SHA256 c849583c67d910ad4fbeb5b22b9e58b6abefe3e80b1c2ec86a854f9a24c115f8 SHA512 e4e0b9e96737d0f03154309380f72f8b0982d8a428a351359f25a86e028bcd4e8accc3ac33476b5f3a797c165a6178ebd03419e9128a81c65db4b7ed5fde5a15 WHIRLPOOL 70e95005e8ed23beed5dc5850048fc87d83c0ec47277ae80d323d2b36391e7b9d7dd872b192af18005ffd747598abb1d95033154cde5a6b0d128b8ad33d74e14
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 20664a38c344382eb91d2607b7d25e5f1f57c2ab Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Mar 2016 20:36:20 -0700
Subject: [PATCH 188/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 481b126..9730a46 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,7 +93,7 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
-DIST asterisk-patchset-3.0.tar.gz 16501 SHA256 c849583c67d910ad4fbeb5b22b9e58b6abefe3e80b1c2ec86a854f9a24c115f8 SHA512 e4e0b9e96737d0f03154309380f72f8b0982d8a428a351359f25a86e028bcd4e8accc3ac33476b5f3a797c165a6178ebd03419e9128a81c65db4b7ed5fde5a15 WHIRLPOOL 70e95005e8ed23beed5dc5850048fc87d83c0ec47277ae80d323d2b36391e7b9d7dd872b192af18005ffd747598abb1d95033154cde5a6b0d128b8ad33d74e14
+DIST asterisk-patchset-3.0.tar.gz 25867 SHA256 d4f45c74130250335e96abe89495fd19cf08016d2cb6bb1c90725a1f6a325f3e SHA512 6a459ae53110acccb952424696858eb899fbceba39dfe309653af79fd1431bc2736e1fe19a677e2ac4707ef50e354b84628b8159036067cbcc89d9c66606daff WHIRLPOOL 6780ce8c243415d4298ce54cc3eaf3e87915223f064b08d759deb8cc06c3ec8ac1f81ca8139c77fb4b9660bcab618dbb95629967e86328bb6a92731b64a9cba3
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From f5d43bb243ca633ffcffff3c9d3af57dd3101700 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 23 Mar 2016 18:09:12 -0700
Subject: [PATCH 189/261] new version of asterisk

---
 dev-php/hhvm/Manifest                        |  37 ---
 dev-php/hhvm/files/config.hdf.dist           | 261 ---------------
 dev-php/hhvm/files/config.hdf.dist-r3        | 238 --------------
 dev-php/hhvm/files/hhvm                      |   4 -
 dev-php/hhvm/files/hhvm.confd                |  58 ----
 dev-php/hhvm/files/hhvm.confd-r3             |  55 ----
 dev-php/hhvm/files/hhvm.confd-r4             |  58 ----
 dev-php/hhvm/files/hhvm.initd                | 101 ------
 dev-php/hhvm/files/hhvm.initd-r3             | 104 ------
 dev-php/hhvm/files/hhvm.initd-r4             | 117 -------
 dev-php/hhvm/files/hhvm.rc                   |  46 ---
 dev-php/hhvm/files/php.ini                   |  63 ----
 dev-php/hhvm/files/server.ini                |  13 -
 dev-php/hhvm/files/support-curl-7.31.0.patch |  17 -
 dev-php/hhvm/hhvm-2.2.0.ebuild               | 160 ---------
 dev-php/hhvm/hhvm-2.3.0.ebuild               | 133 --------
 dev-php/hhvm/hhvm-2.3.1.ebuild               | 133 --------
 dev-php/hhvm/hhvm-2.3.2.ebuild               | 133 --------
 dev-php/hhvm/hhvm-2.3.3.ebuild               | 133 --------
 dev-php/hhvm/hhvm-2.4.0.ebuild               | 132 --------
 dev-php/hhvm/hhvm-2.4.1.ebuild               | 132 --------
 dev-php/hhvm/hhvm-2.4.2.ebuild               | 140 --------
 dev-php/hhvm/hhvm-3.0.0.ebuild               | 111 -------
 dev-php/hhvm/hhvm-3.0.1.ebuild               | 112 -------
 dev-php/hhvm/hhvm-3.1.0.ebuild               | 120 -------
 dev-php/hhvm/hhvm-3.2.0.ebuild               | 141 --------
 dev-php/hhvm/hhvm-3.3.3.ebuild               | 141 --------
 dev-php/hhvm/hhvm-3.4.2.ebuild               | 141 --------
 dev-php/hhvm/hhvm-3.5.0.ebuild               | 141 --------
 dev-php/hhvm/hhvm-3.5.1.ebuild               | 141 --------
 dev-php/hhvm/hhvm-3.6.0.ebuild               | 147 ---------
 dev-php/hhvm/hhvm-3.6.1.ebuild               | 147 ---------
 dev-php/hhvm/hhvm-3.6.2.ebuild               | 147 ---------
 dev-php/hhvm/hhvm-3.7.0.ebuild               | 147 ---------
 dev-php/hhvm/hhvm-9999.ebuild                | 147 ---------
 net-misc/asterisk/Manifest                   |   4 +-
 net-misc/asterisk/asterisk-11.22.0.ebuild    | 324 +++++++++++++++++++
 37 files changed, 327 insertions(+), 4052 deletions(-)
 delete mode 100644 dev-php/hhvm/Manifest
 delete mode 100644 dev-php/hhvm/files/config.hdf.dist
 delete mode 100644 dev-php/hhvm/files/config.hdf.dist-r3
 delete mode 100644 dev-php/hhvm/files/hhvm
 delete mode 100644 dev-php/hhvm/files/hhvm.confd
 delete mode 100644 dev-php/hhvm/files/hhvm.confd-r3
 delete mode 100644 dev-php/hhvm/files/hhvm.confd-r4
 delete mode 100644 dev-php/hhvm/files/hhvm.initd
 delete mode 100644 dev-php/hhvm/files/hhvm.initd-r3
 delete mode 100644 dev-php/hhvm/files/hhvm.initd-r4
 delete mode 100644 dev-php/hhvm/files/hhvm.rc
 delete mode 100644 dev-php/hhvm/files/php.ini
 delete mode 100644 dev-php/hhvm/files/server.ini
 delete mode 100644 dev-php/hhvm/files/support-curl-7.31.0.patch
 delete mode 100644 dev-php/hhvm/hhvm-2.2.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.3.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.3.1.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.3.2.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.3.3.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.4.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.4.1.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-2.4.2.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.0.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.0.1.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.1.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.2.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.3.3.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.4.2.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.5.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.5.1.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.6.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.6.1.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.6.2.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-3.7.0.ebuild
 delete mode 100644 dev-php/hhvm/hhvm-9999.ebuild
 create mode 100644 net-misc/asterisk/asterisk-11.22.0.ebuild

diff --git a/dev-php/hhvm/Manifest b/dev-php/hhvm/Manifest
deleted file mode 100644
index dd7f7f3..0000000
--- a/dev-php/hhvm/Manifest
+++ /dev/null
@@ -1,37 +0,0 @@
-AUX config.hdf.dist 7653 SHA256 6efb672ad0c40d90504ffa6c21b1b7c4c33defd65cbc34fd594de48159fae6ed SHA512 870aad5725f68a1aac79f0b19c847e0f45d5a26a242fa970fc03a3a3b2583a9d65da56059102c7ca921aae29dab9abb85966d0191b31992f7b7c4927f1796cc0 WHIRLPOOL 049806fb6faf6917e7c1956953cdb257c978053fa2a7111ef8e47a1d905d0765ed18517faa1067249cdcbaa967076735d951b949511ef564c25b8220ef26c11a
-AUX config.hdf.dist-r3 7180 SHA256 b409edafa837647110e1e6ace949289d9bf2e11a868b88488b6ebdba472fc4f3 SHA512 516993104f5e91a72dcf96500b595c996fb4ebf4baa3d5af5f1519231632411ef5e45096e888793930f4ff5acda27645f2a44751d15ddfd9cedaf56ce56d71e9 WHIRLPOOL 9ca9f09ab50c066a3bccb82a443372f0ea01404d421f3604bc796a504b9045781dd720533f9c8a8fb31845b97ca30ac2a039f2d3f308a63170fa021d9b0a5ddf
-AUX hhvm 111 SHA256 5d8dce0d9c85aecb86ced7b4153b7881406904a6667069c3050b7c5df728d4cb SHA512 2f1d7c9f023a7331b6f0f5c5cc58555ffd33786aba35b1ccef528fe6d09af829f9d95c4d1855f48b53155df5d2c35f43245511a9048e4d9cc05682389a8ffc15 WHIRLPOOL 98525211956c406b1a06fa242c2265f2050ff9754b29723015cc0e4c0c2c62360379ea948ae5b1a6e583de0e13cd645c1a9dfe90aaa7e9e6fde37ecd54a4a3fb
-AUX hhvm.confd 1017 SHA256 0b53b30188cef3b177385f3aebbf92e50d741aba0caa3416d1a39355d2a0655d SHA512 80bc550d5b0a763cd343051bd07be5cd2c8af04c83337983fa72abd3647f55fd6efabb3dc2b4e62a201e3226a2c344530e136d82b999e43c32a65ec3ae760369 WHIRLPOOL 3183db423131d999a9f7c9ba3d27d0be331c94654ea23c68d4e38d3eae6abc7c156945cc406238a60a6f66300f26ab00c7625815cd8b5f3f30a1cb66121e6626
-AUX hhvm.confd-r3 962 SHA256 ac5333d1a59164d35eae11f1b8d79b0b43c21f84503b2e6ebdb187d5a12bc371 SHA512 75585c5613c1ed7c3ca1324301412bc8df64604a3ae28495843d146fbd05aa7ac7dfc89630b83c78c215daa43e5ac2e2ee85373bbabd8c91783e40e972dba3cd WHIRLPOOL dda0e6281eba4c924082708259b7e172cd7279d603349d359cd4f39664ae3b81407cc52a2fb68c26db81636c5e21bbd6efa22ad5889310def23077e5a367a58b
-AUX hhvm.confd-r4 1024 SHA256 53bfbbcbd90719d58e5c1ff483213d4f218816d0d9e3a29612eee95194209c06 SHA512 459d749db56fe03630bc5e8996c8b3b10dc083e092b86e0912d7172de09b2ea673fd67f57c1c2362270e965cc48539e256b8191fbeb9f1771197b4a9bbb55188 WHIRLPOOL e1fcb4914f2573bb1e78f8069ba4691cc7a2f4cac8bc6e8ce2c125004ae70dda609ea5a57d129e7094a810faf3387a45cc1769ab86ad98176da68191f2ab919c
-AUX hhvm.initd 2840 SHA256 7a9814deb56e5ffc24144d6dd2949d36bf60bec239614de3d22f9fedfb6b6466 SHA512 b437677b20c6a00d620c4e18b2116b59caaaa9eeeee53ad38b393a14f8465de1ac45d285c721b78a7a7bd54b4106b79f0932626664989ef6e6a61ffec3745b98 WHIRLPOOL afe784eb0bfc8d103abcbbc421f31ce065a1f697c83589a64c165a3a56044931689b549bda407ed41173c3ff100d37fba2a2e6d3bcf6329bf5ef699ff266ef9c
-AUX hhvm.initd-r3 2685 SHA256 612eec92a5682ee31b177d4543d6157bca749911c5a6aa92491aab3b4426081f SHA512 c379a6c546a0251207c5cbd80ae6309b02fee7408b27a6a20d488016f8cca9c24f52bf547324b1909b3694374f65d9e4edf00e2e73bd757e7db0d594f631b1ca WHIRLPOOL 220289a2d8bc8a35ac8188f5ae3e7ccfe581365cecc7cb81d347f98b95bf87dc0a0784c03154e9872aafef2a04cf2957109833d6d4af1cec7a28bf5a5176b398
-AUX hhvm.initd-r4 3044 SHA256 399a9c8f67321dcd9381cf683f65116ed9d6bb4470ca19671e42315d466cb9b2 SHA512 3dcbd35e5b872e5d2d4357d32f41e48e8f3af9077372867290eb59c8c7cf57431b46b9f306ff187268c4d0c8470901c1c655c42b68983cb4bd667eab5926574f WHIRLPOOL 6fd8fbae0bbd87c7758c9503728945b2f75f2ad195a68aaf237576ac9582f36b938edb6876566f3e99aa53a5763f438eb74354c4caa3d68d091e6cc75e4365da
-AUX hhvm.rc 1060 SHA256 36a106b5003c90f68b401394619c5a829f7c5c2502d4383287497c4bd4d20d50 SHA512 9e8625c56fa57dbca005b7462a0dac216d6cf573c7136d8b496640dbaf6712147239c3ad5c2d7a1711795412208f90719b5587df760ce14cddcc0b38cccd0f7e WHIRLPOOL 7bcab0b6309714c9305966727f60b45093c901af916c9102a78469086232fdcb584a7fe9c8f6a974cb5480c246f59e17d79ce12aeceddf0962de055f2fbb3231
-AUX php.ini 1701 SHA256 f758dae7cd5374bd415d573a9e3ce859fd4f0e8d5910cb105138a591147fd5c2 SHA512 a91dc3073da4ea1c54af9bcd23c8356b32c2660943ab9a04ef3a3296767a0e33f1f586978ed139009fc14ed84771d544f39ef968f0ffac366898bb181999074f WHIRLPOOL 194feb161cc808b519a9981b5b098b3f8f6605855ef0d13e01c9316b0414c96c80c945edd8e60ec36e306167e940286e2cd8cc7936765b6e896ad935e2f7e083
-AUX server.ini 296 SHA256 1deba06d5533178f026993d7f41703b19df2ba88ce623d675802a9cb7e8f8d77 SHA512 88682f8e903256db0bdea362e86e56d9d34f0a27ac5a269adaaf2efff0f2ca1c0275c039ad40de0a8489a6e3ca7e6e78cab27d3e87ab0ed1bb0029884129678c WHIRLPOOL 350f6d67f8847e31e2289d4ee5deec20cb88c23f56659de8cbe4573a66f809f3be4206d1d19694276f43b99ac43a8c09f2bbc5ed5598dfa6cebfb26f4b036182
-AUX support-curl-7.31.0.patch 561 SHA256 c10f8d63f0eae3a2f07eb1badecb2e1b970fc1b48c359f76a50e3bbe6236df8f SHA512 a6ced847c8815b87e4fca3b5ff0371273f56dd20cbd2fbf4aa0fc4fa4852d6e140d03a9e30ad4b7bbd7f7c91d6eaa7ff11d9824e2e423f05ad48d404abae6812 WHIRLPOOL 8f6c28e5a3d8579f469f62399da1073dbc04621758cca70bf3d609b30b121dfe90ff4d0a8340551b2667632e814d4c4cc1f06795c5c13efda6dc425633c04556
-DIST curl-7.31.0.tar.bz2 2679209 SHA256 a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08 SHA512 56b69cf5ec6e4de2b38280fe03ce97dfad33f3f88d2147a0334dab5cd6cde30aef2f4d09761b1dc8d515b448b5c149aff7f15c6ccd235cdf951f3c021b360200 WHIRLPOOL a7b2fcab8c65edd83d89addf2c7fa3ea334d8554a4d69efe8ff40790e41d0dbe3bda0c471130f3401e39a79c1c264f141fd1843abfa588c2b58036474bc7d385
-DIST jemalloc-3.0.0.tar.bz2 245192 SHA256 cce16f18dd1dc7a087d37d33ae4ca507b5bcba64dabefa228ba801d1a78e4554 SHA512 631fec886a0fcf04fa3945de49e84bbab3399f59bcf818a77634e60497647da87b3c3c0ed8eb3b9b050958abc98681aed2530adac707bb0e68ec09b20530d74f WHIRLPOOL 0c54174aa70bf28076a92f0a83ab31c4133db01fafaa232708e79f3f68889e286d5324c8e76c48f45462fd6f13f5da9c695f63fdfd6236db2cb5566a2563461e
-DIST libevent-1.4.14b-stable.tar.gz 474874 SHA256 afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301 SHA512 a385d8d6c11cdb8fe7f477928de2401bc7f80f5952f2a542220be9f18413cd760a7c03c6fe7c83b4e6feef534cb1688ae8112a1e3a879fc5e301cfcbba5b4385 WHIRLPOOL 732267e4458054abed4afc62a346ef207e171ed922957a0d31dae2978edd1f300f5e930a26e880fb08167ebf4adc4c8699ba1593441f2739458082f16637523d
-EBUILD hhvm-2.2.0.ebuild 3441 SHA256 3173f32fb4f172bc2d57f8e6fa67db12e47967fafbc71f286d34f10ff183382a SHA512 117c3a69afac5a89c4700329f498602a666476bf39d4c41a94e656779ce0263f1d76a4395faef02568b33b85b99c5af288be43df847c6fde8bcafaa7d214631a WHIRLPOOL 36e91662815aca2e70ae67c696cdc51f1f117a65a655dcc79f9e4cde9a2109aaa3813aa4274a3b745586bfaa9f75645ea6c477c90120c44630c6a6726523fabd
-EBUILD hhvm-2.3.0.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
-EBUILD hhvm-2.3.1.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
-EBUILD hhvm-2.3.2.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
-EBUILD hhvm-2.3.3.ebuild 2773 SHA256 102a51dc3ad63a57421f108a5ae407b313c59d1c2caaccb349bd2b20ae5df685 SHA512 6887b06314ef547977d12da742e75befe97a0bd730468d5ee0625f33775c9d1d51975612d5961cc3a018b3770859ba1238a2b7fe79d67d550ec7e4ca92f62e93 WHIRLPOOL 7fceb7e1662727e0b9d5fcd6e143c7223e5e20a5adc4c9d35aef21616ab1d23b5a33cbf5c0511411de775312962ede946469fa04a5ae0e89726d6cbb4732bc9d
-EBUILD hhvm-2.4.0.ebuild 2750 SHA256 d151acc85e6b72b4993f219d6319f4fb50982bc9d4484fe761293c42440691b7 SHA512 8c8812da59f4ac759db4e0c4b95ca70be48dcdfeee94bb5f3c81f39ccd84f8a7c36b8715eb7d1bd773d144c74818f55892ec3bc67dc280892ddef97c12dfb6e9 WHIRLPOOL e629afe70c77e5e1fb56d663635a2bc64e3f2ba39a55c456fe7702385daf9e45e98b6318db6943998e56703fdd3b002eb7e34dffd0851f77b52ed7bef1243eef
-EBUILD hhvm-2.4.1.ebuild 2750 SHA256 d151acc85e6b72b4993f219d6319f4fb50982bc9d4484fe761293c42440691b7 SHA512 8c8812da59f4ac759db4e0c4b95ca70be48dcdfeee94bb5f3c81f39ccd84f8a7c36b8715eb7d1bd773d144c74818f55892ec3bc67dc280892ddef97c12dfb6e9 WHIRLPOOL e629afe70c77e5e1fb56d663635a2bc64e3f2ba39a55c456fe7702385daf9e45e98b6318db6943998e56703fdd3b002eb7e34dffd0851f77b52ed7bef1243eef
-EBUILD hhvm-2.4.2.ebuild 2936 SHA256 dea4df35571aacb3e8a30cdc60e3ea9105bf6739b3c9ddca6278c6465dac2212 SHA512 fce8a71e50e56b37e7428276de03446a2b543e4ba262a5db42a12c2b4babed02ff18a124ddd69ed4d501e2d394acb874d7f074fcaa093dbc8d6c1e80f4b601d6 WHIRLPOOL 003311a744dc0cf70a02165921fcb208a37cf8de5ee454e33ac86ef896a19b0815064197a660ba6dd3ce2c937e7593928ff8a76329f6553d36f3dcdb5554eafb
-EBUILD hhvm-3.0.0.ebuild 2234 SHA256 40611b65449dca636d846d9bce395adab00b5c82d64f181524fe743bf769d54a SHA512 2bb24a9e50daa36968776b49042392440cdd6027832d867ab8478358f722772dff53ed7ce24fb6dc492d2631f7ec624dd23dba68922e3a78f44a2e4af72ae6a4 WHIRLPOOL 2fa8c12e7feb5bed4890625ced97735187b4db4771755d5bc240fb31f032f0816b405ba59f6f5e6eeca8bd35d144afecac990202736d742f6a9f45f40e3e0368
-EBUILD hhvm-3.0.1.ebuild 2293 SHA256 d8517630d0b02c24556839b3af0319eb07f3a7e8271f0bb7ec882cd7d1d17100 SHA512 b93355be9c4dbd5a213ac34bfb22ee561a1e4ce4ec07001fbf09e81f9e724cac542d3c88d7576010d0fa32bc01c66ed7fc028e254cd02971bb0a3607261a5445 WHIRLPOOL e3456982fc9ef45a2355cc9e592079abe3a9d4783a1c888f922dbf99ecb9ac02b4e1a7ee9fef1c38fce16589e67f379e6bb3a91f6ac96c42bd88c04782a0725c
-EBUILD hhvm-3.1.0.ebuild 2523 SHA256 e0cbb3b4fa6ba211d472fc69d60404a226f89114a91df4df18556c2b279dc07b SHA512 450c7b76b853ebd696852556744ae7c0e7cf5f42190f710623405a2a6cb8173a3642ffc6b8f72078b0dcbad9f69d767c49d672a0fab17e07b55de4f4315846ce WHIRLPOOL 4841970386bd3758d47aeca358ed8f0f36e3effe0927396ba8e07495850f38899ba263aab56aa0b63d5424cb634bafff11b036f723ff187290f19f35cb0161e2
-EBUILD hhvm-3.2.0.ebuild 2983 SHA256 786adee047717e91d9fa6e311b395f66a5462a2508cdec7375aeb94d4e841823 SHA512 d6c4b86704e72c5cbb724040aebd178bff7e739095116171a73422a5c0bd2e66eeec3d390d960e4dd8e1e1efbb95a364de45eead1e75f283c6cdeb3d54321118 WHIRLPOOL b6f710d8f05985a8f12060a068e8722fae696854d34da4e988fd95b50f9115f0b57bf44f03e552b10eaabb11fee7378653b9951d742001c3be9552bc5e6561c8
-EBUILD hhvm-3.3.3.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
-EBUILD hhvm-3.4.2.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
-EBUILD hhvm-3.5.0.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
-EBUILD hhvm-3.5.1.ebuild 2996 SHA256 b81ed7369c71bb2217533858230f32dccfbe0bc0a95e92b386f6538779e62ad3 SHA512 2276ba2609fac478ec9bd459fbb00b6ffe20d8b4d759a8e8507f06ec4d5d64422ff8444f229e672439c291a9e0c87fddb785f6b8ae111e2c44bcc647a588a995 WHIRLPOOL dc5493a1cc3e30fbb5b6a603a1c9d754281f2a639a7eecc1d56993f2f0ca418ac1d88d0a362175447a6fd0bfe35a244a01b08d58d2293011c99a8a0069110938
-EBUILD hhvm-3.6.0.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
-EBUILD hhvm-3.6.1.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
-EBUILD hhvm-3.6.2.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
-EBUILD hhvm-3.7.0.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
-EBUILD hhvm-9999.ebuild 3102 SHA256 36e99b226d635017750222dc7b65de8cae5c8f0cafa2e6c309b676866a93b332 SHA512 24e16f67a1ddbadd6a3739c9d07284190a7f24fd6ad675ae68e02c19ede71869e6720e22733601296df9a91583e9876a9bba0fd80feacb8eb05180dbee44cca0 WHIRLPOOL 50b820d65d8734d7a3d6be2eab6bc72a038b747fd4e862c37cd95892e1c3165b1e815cb488a13c652d20a03cb8e9ea6f24e290747a68831a633568c6d9cdf013
diff --git a/dev-php/hhvm/files/config.hdf.dist b/dev-php/hhvm/files/config.hdf.dist
deleted file mode 100644
index 01ba38b..0000000
--- a/dev-php/hhvm/files/config.hdf.dist
+++ /dev/null
@@ -1,261 +0,0 @@
-PidFile = /var/run/hhvm/hhvm.pid
-
-Log {
-    Level = Info
-    Header = true
-
-    UseLogFile = true
-    File = /var/log/hhvm/hhvm_error.log
-
-    Access {
-        * {
-            File = /var/log/hhvm/access.log
-        }
-    }
-}
-
-Server {
-    #Host = domain.tld
-    IP = 127.0.0.1
-    Port = 4247
-    ThreadCount = 10
-
-    SourceRoot = /var/www/localhost
-    IncludeSearchPaths {
-        #symfony = /var/www/symfony-1.4
-    }
-
-    RequestTimeoutSeconds = 30
-    RequestMemoryMaxBytes = 67108864
-
-    # If ServerName is not specified for a virtual host, use prefix + this
-    # suffix to compose one
-    #DefaultServerNameSuffix = default_domain.com
-    # Forcing $_SERVER['SERVER_NAME'] to come from request header
-    ForceServerNameToHeader = false
-
-    ### startup options
-    # TakeoverFilename = filename   # for port takeover between server instances
-    # DefaultDocument = index.php
-    # StartupDocument = filename
-    # WarmupDocument = filename
-    # RequestInitFunction = function_name
-    # ThreadDocuments {
-    #     * = somedoc.php
-    #     * = another.php
-    # }
-    ErrorDocument404 = 404.php
-    FatalErrorMessage = Something went terribly wrong... Check back :)
-
-    ### shutdown options
-
-    # Graceful shutdown will try admin /stop command and it waits for number
-    # of seconds specified by GracefulShutdownWait.
-    #GracefulShutdownWait = 0   # in seconds
-
-    # Harsh shutdown looks for pid file and try to kill that process.
-    #HarshShutdown = true
-
-    # Evil shutdown kills anything listening on the server port it’s trying to grab.
-    #EvilShutdown = true
-
-    # How long to wait for dangling server to respond.
-    #DanglingWait = 0
-
-    ### HTTP settings
-
-    #GzipCompressionLevel = 3
-    #EnableMagicQuotesGpc = false
-    #EnableKeepAlive = true
-
-    # EnableEarlyFlush allows chunked encoding responses, and
-    # ForceChunkedEncoding will only send chunked encoding responses,
-    # unless client doesn’t understand.
-    #EnableEarlyFlush = true
-    #ForceChunkedEncoding = false
-
-    MaxPostSize = 65  # in MB
-
-    # LibEventSyncSend allows response packets to be sent directly from worker
-    # thread, normally resulting in faster server responses.
-    #LibEventSyncSend = true
-
-    # ResponseQueueCount specifies how many response queues to use for sending.
-    #ResponseQueueCount = 0
-
-    ### static contents
-
-    # A static content cache creates one single file from all static contents,
-    # including css, js, html, images and any other non-PHP files (or even PHP
-    # files, if CachePHPFile is turned on for compiler options). Normally this
-    # is prepared by compiler at compilation time, but it can also be prepared
-    # at run-time, if SourceRoot points to real file directory and
-    # EnableStaticContentFromDisk is true. Otherwise, use FileCache to point
-    # to the static content cache file created by the compiler.
-    #FileCache = filename
-    #EnableStaticContentCache = true
-    #EnableStaticContentFromDisk = true
-    #ExpiresActive = true
-    #ExpiresDefault = 2592000
-    #DefaultCharsetName = UTF-8
-
-    ### file access control
-
-    #SafeFileAccess = false
-    #FontPath = where to look for font files
-    #AllowedDirectories {
-    #    * = /tmp
-    #}
-    #AllowedFiles {
-    #    * = specific file to allow
-    #}
-
-    APC {
-        EnableApc = true
-
-        # There is a way to prepare APC items in dry format, serialized in
-        # binary files, and these files can be loaded (or “primed”) extremely
-        # fast at startup time. To prepare these .cpp files, check
-        # bin/apc_sample_serializer.php for one way of doing it. Once prepared,
-        # we can compiled them into .so that can be loaded through PrimeLibrary
-        # option. The loading can be done in parallel with LoadThread count of
-        # threads. Once loading is done, it can write to APC with some specified
-        # keys in CompletionKeys to tell web application about priming.
-        #PrimeLibrary = filename
-        #LoadThread = 2
-        #CompletionKeys {
-        #    * = key name
-        #}
-
-        # Recommend to use “concurrent”, the fastest with least locking.
-        # “lfu” is experimental for now and it may have bugs.
-        # When “concurrent”, LockType doesn’t matter.
-        # UseLockedRefs uses mutexes than atomic numbers for APC item’s reference
-        # counting, so it’s recommended to turn off.
-        #TableType = hash          # hash (default) | lfu | concurrent
-        #LockType = readwritelock        # readwritelock | mutex
-        #UseLockedRefs = false
-
-        # ExpireOnSets turns on item purging on expiration, and it’s only done
-        # once per PurgeFrequency of sets.
-        #ExpireOnSets = false
-        #PurgeFrequency = 4096
-
-        # These are experimental LFU settings.
-        #KeyMaturityThreshold = 20
-        #MaximumCapacity = 0
-        #KeyFrequencyUpdatePeriod = 1000  # in number of accesses
-    }
-
-    # DNS cache
-    DnsCache {
-        Enable = false
-        TTL = 600   # in seconds
-        KeyMaturityThreshold = 20
-        MaximumCapacity = 0
-        KeyFrequencyUpdatePeriod = 1000
-    }
-
-    # Light process has very little forking cost, because they are pre-forked
-    # Recommend to turn it on for faster shell command execution.
-    #LightProcessFilePrefix = ./lightprocess
-    #LightProcessCount = 0
-
-    # RTTI profiling settings. Experimental.
-    #RTTIDirectory = /tmp/
-    #EnableCliRTTI = false
-}
-
-
-VirtualHost {
-    default {
-        Disabled = false
-        #Prefix = prefix.
-        #Pattern = .*
-        #PathTranslation = htdocs/
-        #ServerName =
-        #ServerVariables {
-        #    name = value
-        #}
-
-        RewriteRules {
-            backend {
-                pattern = .*
-                to = index.php
-                qsa = true
-                #redirect = 0   #(default: off) | 302 | 301 | other status code
-            }
-        }
-    }
-}
-
-### Administration Server
-#AdminServer {
-#    Port = 8088
-#    ThreadCount = 1
-#    Password =
-#}
-
-### Static Content
-# In addition to Static Content Cache, we also support Dynamic Content Cache.
-# If static_resource.php generates identical files given the same HTTP input,
-# it can be listed under Generators, so its generated content can be cached
-# for next requests.
-#StaticFile {
-#    Extensions {
-#        bmp = image/bmp
-#    }
-#    Generators {
-#        * = static_resource.php
-#    }
-#}
-
-### Stats
-Stats = false
-Stats {
-    Web = false
-    Memory = false
-    SQL = false
-
-    #XSL = xsl filename
-    #XSLProxy = url to get the xsl file
-
-    #SlotDuration = 600  # in seconds
-    #MaxSlot = 72        # 10 minutes x 72 = 12 hours
-}
-
-### MySQL
-MySQL {
-    ReadOnly = false
-    ConnectTimeout = 1000      # in ms
-    ReadTimeout = 4000         # in ms
-    SlowQueryThreshold = 2000  # in ms, log slow queries as errors
-    # When a query takes a long time to execute on server, client has a chance
-    # to kill it to avoid extra server cost by turning on KillOnTimeout.
-    KillOnTimeout = false
-}
-
-### HTTP Monitoring
-Http {
-    DefaultTimeout = 30         # in seconds
-    SlowQueryThreshold = 5000   # in ms, log slow HTTP requests as errors
-}
-
-### Mail
-Mail {
-    SendmailPath = sendmail -t -i
-    ForceExtraParameters =
-}
-
-### Tier overwrites
-# This feature allows a machine to overwrite configurations just by matching
-# machine names with specified regex pattern. This block of configuration can
-# appear at any location of the file, even at top.
-#Tiers {
-#    * {
-#        machine = /regex pattern/
-#        overwrite {
-#            # any config settings described in this documentation
-#        }
-#    }
-#}
diff --git a/dev-php/hhvm/files/config.hdf.dist-r3 b/dev-php/hhvm/files/config.hdf.dist-r3
deleted file mode 100644
index d0c48bb..0000000
--- a/dev-php/hhvm/files/config.hdf.dist-r3
+++ /dev/null
@@ -1,238 +0,0 @@
-PidFile = /var/run/hhvm/hhvm.pid
-
-Log {
-    Level = Info
-    Header = true
-
-    UseLogFile = true
-    File = /var/log/hhvm/hhvm_error.log
-
-    Access {
-        * {
-            File = /var/log/hhvm/access.log
-        }
-    }
-}
-
-Server {
-    IP = 127.0.0.1
-    Port = 9000
-    Type = fastcgi
-    ThreadCount = 10
-
-    SourceRoot = /var/www/localhost
-    IncludeSearchPaths {
-        #symfony = /var/www/symfony-1.4
-    }
-
-    RequestTimeoutSeconds = 30
-    RequestMemoryMaxBytes = 67108864
-
-    # If ServerName is not specified for a virtual host, use prefix + this
-    # suffix to compose one
-    #DefaultServerNameSuffix = default_domain.com
-    # Forcing $_SERVER['SERVER_NAME'] to come from request header
-    ForceServerNameToHeader = false
-
-    ### startup options
-    # TakeoverFilename = filename   # for port takeover between server instances
-    # DefaultDocument = index.php
-    # StartupDocument = filename
-    # WarmupDocument = filename
-    # RequestInitFunction = function_name
-    # ThreadDocuments {
-    #     * = somedoc.php
-    #     * = another.php
-    # }
-    ErrorDocument404 = 404.php
-    FatalErrorMessage = Something went terribly wrong... Check back :)
-
-    ### shutdown options
-
-    # Graceful shutdown will try admin /stop command and it waits for number
-    # of seconds specified by GracefulShutdownWait.
-    #GracefulShutdownWait = 0   # in seconds
-
-    # Harsh shutdown looks for pid file and try to kill that process.
-    #HarshShutdown = true
-
-    # Evil shutdown kills anything listening on the server port it’s trying to grab.
-    #EvilShutdown = true
-
-    # How long to wait for dangling server to respond.
-    #DanglingWait = 0
-
-    ### HTTP settings
-
-    #GzipCompressionLevel = 3
-    #EnableMagicQuotesGpc = false
-    #EnableKeepAlive = true
-
-    # EnableEarlyFlush allows chunked encoding responses, and
-    # ForceChunkedEncoding will only send chunked encoding responses,
-    # unless client doesn’t understand.
-    #EnableEarlyFlush = true
-    #ForceChunkedEncoding = false
-
-    MaxPostSize = 65  # in MB
-
-    # LibEventSyncSend allows response packets to be sent directly from worker
-    # thread, normally resulting in faster server responses.
-    #LibEventSyncSend = true
-
-    # ResponseQueueCount specifies how many response queues to use for sending.
-    #ResponseQueueCount = 0
-
-    ### static contents
-
-    # A static content cache creates one single file from all static contents,
-    # including css, js, html, images and any other non-PHP files (or even PHP
-    # files, if CachePHPFile is turned on for compiler options). Normally this
-    # is prepared by compiler at compilation time, but it can also be prepared
-    # at run-time, if SourceRoot points to real file directory and
-    # EnableStaticContentFromDisk is true. Otherwise, use FileCache to point
-    # to the static content cache file created by the compiler.
-    #FileCache = filename
-    #EnableStaticContentCache = true
-    #EnableStaticContentFromDisk = true
-    #ExpiresActive = true
-    #ExpiresDefault = 2592000
-    #DefaultCharsetName = UTF-8
-
-    ### file access control
-
-    #SafeFileAccess = false
-    #FontPath = where to look for font files
-    #AllowedDirectories {
-    #    * = /tmp
-    #}
-    #AllowedFiles {
-    #    * = specific file to allow
-    #}
-
-    APC {
-        EnableApc = true
-
-        # There is a way to prepare APC items in dry format, serialized in
-        # binary files, and these files can be loaded (or “primed”) extremely
-        # fast at startup time. To prepare these .cpp files, check
-        # bin/apc_sample_serializer.php for one way of doing it. Once prepared,
-        # we can compiled them into .so that can be loaded through PrimeLibrary
-        # option. The loading can be done in parallel with LoadThread count of
-        # threads. Once loading is done, it can write to APC with some specified
-        # keys in CompletionKeys to tell web application about priming.
-        #PrimeLibrary = filename
-        #LoadThread = 2
-        #CompletionKeys {
-        #    * = key name
-        #}
-
-        # Recommend to use “concurrent”, the fastest with least locking.
-        # “lfu” is experimental for now and it may have bugs.
-        # When “concurrent”, LockType doesn’t matter.
-        # UseLockedRefs uses mutexes than atomic numbers for APC item’s reference
-        # counting, so it’s recommended to turn off.
-        #TableType = hash          # hash (default) | lfu | concurrent
-        #LockType = readwritelock        # readwritelock | mutex
-        #UseLockedRefs = false
-
-        # ExpireOnSets turns on item purging on expiration, and it’s only done
-        # once per PurgeFrequency of sets.
-        #ExpireOnSets = false
-        #PurgeFrequency = 4096
-
-        # These are experimental LFU settings.
-        #KeyMaturityThreshold = 20
-        #MaximumCapacity = 0
-        #KeyFrequencyUpdatePeriod = 1000  # in number of accesses
-    }
-
-    # DNS cache
-    DnsCache {
-        Enable = false
-        TTL = 600   # in seconds
-        KeyMaturityThreshold = 20
-        MaximumCapacity = 0
-        KeyFrequencyUpdatePeriod = 1000
-    }
-
-    # Light process has very little forking cost, because they are pre-forked
-    # Recommend to turn it on for faster shell command execution.
-    #LightProcessFilePrefix = ./lightprocess
-    #LightProcessCount = 0
-
-    # RTTI profiling settings. Experimental.
-    #RTTIDirectory = /tmp/
-    #EnableCliRTTI = false
-}
-
-### Administration Server
-#AdminServer {
-#    Port = 8088
-#    ThreadCount = 1
-#    Password =
-#}
-
-### Static Content
-# In addition to Static Content Cache, we also support Dynamic Content Cache.
-# If static_resource.php generates identical files given the same HTTP input,
-# it can be listed under Generators, so its generated content can be cached
-# for next requests.
-#StaticFile {
-#    Extensions {
-#        bmp = image/bmp
-#    }
-#    Generators {
-#        * = static_resource.php
-#    }
-#}
-
-### Stats
-Stats = false
-Stats {
-    Web = false
-    Memory = false
-    SQL = false
-
-    #XSL = xsl filename
-    #XSLProxy = url to get the xsl file
-
-    #SlotDuration = 600  # in seconds
-    #MaxSlot = 72        # 10 minutes x 72 = 12 hours
-}
-
-### MySQL
-MySQL {
-    ReadOnly = false
-    ConnectTimeout = 1000      # in ms
-    ReadTimeout = 4000         # in ms
-    SlowQueryThreshold = 2000  # in ms, log slow queries as errors
-    # When a query takes a long time to execute on server, client has a chance
-    # to kill it to avoid extra server cost by turning on KillOnTimeout.
-    KillOnTimeout = false
-}
-
-### HTTP Monitoring
-Http {
-    DefaultTimeout = 30         # in seconds
-    SlowQueryThreshold = 5000   # in ms, log slow HTTP requests as errors
-}
-
-### Mail
-Mail {
-    SendmailPath = sendmail -t -i
-    ForceExtraParameters =
-}
-
-### Tier overwrites
-# This feature allows a machine to overwrite configurations just by matching
-# machine names with specified regex pattern. This block of configuration can
-# appear at any location of the file, even at top.
-#Tiers {
-#    * {
-#        machine = /regex pattern/
-#        overwrite {
-#            # any config settings described in this documentation
-#        }
-#    }
-#}
diff --git a/dev-php/hhvm/files/hhvm b/dev-php/hhvm/files/hhvm
deleted file mode 100644
index 64ed5f9..0000000
--- a/dev-php/hhvm/files/hhvm
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export HPHP_HOME="/usr/lib/hhvm/lib/"
-LD_LIBRARY_PATH=/usr/lib/hhvm/lib /usr/lib/hhvm/bin/hhvm "$@"
diff --git a/dev-php/hhvm/files/hhvm.confd b/dev-php/hhvm/files/hhvm.confd
deleted file mode 100644
index 8a3357c..0000000
--- a/dev-php/hhvm/files/hhvm.confd
+++ /dev/null
@@ -1,58 +0,0 @@
-# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
-
-# Config file
-#HHVM_CONFIG="/etc/hhvm/config.hdf"
-
-# Base directory
-#HHVM_DIR="/usr/lib/hhvm"
-
-# Lib directory
-#HHVM_LIB="${HHVM_DIR}/lib"
-
-# Binary file
-#HHVM_BIN="${HHVM_DIR}/bin/hhvm"
-
-# Run HHVM as user
-#HHVM_USER="hhvm"
-
-# Run HHVM as group
-#HHVM_GROUP="hhvm"
-
-# Data directory
-#HHVM_DATADIR="/var/lib/hhvm"
-
-# Repository filename
-#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
-
-# PID directory
-#HHVM_PIDDIR="/var/run/hhvm"
-
-# PID filename
-#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
-
-# Log directory
-#HHVM_LOGDIR="/var/log/hhvm"
-
-# Log filename
-#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
-
-# Stop timeout
-#HHVM_TIMEOUT=15
-
-# Any additional options passed to HHVM when starting
-#HHVM_OPTS=""
-
-# Server type: libevent (http), fastcgi
-#SERVER_TYPE="libevent"
-
-# Server IP
-#SERVER_IP="127.0.0.1"
-
-# Server port: 4247 (http), 9000 (fastcgi)
-#SERVER_PORT=4247
-
-# Server threads count
-#SERVER_THREADCOUNT=10
-
-# Server source root
-#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.confd-r3 b/dev-php/hhvm/files/hhvm.confd-r3
deleted file mode 100644
index f98f4a8..0000000
--- a/dev-php/hhvm/files/hhvm.confd-r3
+++ /dev/null
@@ -1,55 +0,0 @@
-# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
-
-# Config file
-#HHVM_CONFIG="/etc/hhvm/config.hdf"
-
-# Binary file
-#HHVM_BIN="/usr/bin/hhvm"
-
-# Run HHVM as user
-#HHVM_USER="hhvm"
-
-# Run HHVM as group
-#HHVM_GROUP="hhvm"
-
-# Data directory
-#HHVM_DATADIR="/var/lib/hhvm"
-
-# Repository filename
-#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
-
-# PID directory
-#HHVM_PIDDIR="/var/run/hhvm"
-
-# PID filename
-#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
-
-# Log directory
-#HHVM_LOGDIR="/var/log/hhvm"
-
-# Log filename
-#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
-
-# Stop timeout
-#HHVM_TIMEOUT=15
-
-# Any additional options passed to HHVM when starting
-#HHVM_OPTS=""
-
-# Server type: fastcgi
-#SERVER_TYPE="fastcgi"
-
-# Server socket
-#SERVER_SOCKET="${HHVM_PIDDIR}/hhvm.sock"
-
-# Server IP
-#SERVER_IP="127.0.0.1"
-
-# Server port: 4247 (http), 9000 (fastcgi)
-#SERVER_PORT=9000
-
-# Server threads count
-#SERVER_THREADCOUNT=10
-
-# Server source root
-#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.confd-r4 b/dev-php/hhvm/files/hhvm.confd-r4
deleted file mode 100644
index 90b712f..0000000
--- a/dev-php/hhvm/files/hhvm.confd-r4
+++ /dev/null
@@ -1,58 +0,0 @@
-# /etc/conf.d/hhvm: config file for /etc/init.d/hhvm
-
-# Config file
-#HHVM_CONFIG="/etc/hhvm/server.ini"
-
-# System config file
-#HHVM_SYSTEM_CONFIG="/etc/hhvm/php.ini"
-
-# Binary file
-#HHVM_BIN="/usr/bin/hhvm"
-
-# Run HHVM as user
-#HHVM_USER="hhvm"
-
-# Run HHVM as group
-#HHVM_GROUP="hhvm"
-
-# Data directory
-#HHVM_DATADIR="/var/lib/hhvm"
-
-# Repository filename
-#HHVM_REPOFILE="${HHVM_DATADIR}/hhvm.hhbc"
-
-# PID directory
-#HHVM_PIDDIR="/var/run/hhvm"
-
-# PID filename
-#HHVM_PIDFILE="${HHVM_PIDDIR}/hhvm.pid"
-
-# Log directory
-#HHVM_LOGDIR="/var/log/hhvm"
-
-# Log filename
-#HHVM_LOGFILE="${HHVM_LOGDIR}/hhvm_error.log"
-
-# Stop timeout
-#HHVM_TIMEOUT=15
-
-# Any additional options passed to HHVM when starting
-#HHVM_OPTS=""
-
-# Server type: fastcgi
-#SERVER_TYPE="fastcgi"
-
-# Server socket
-#SERVER_SOCKET="${HHVM_PIDDIR}/hhvm.sock"
-
-# Server IP
-#SERVER_IP="127.0.0.1"
-
-# Server port: 4247 (http), 9000 (fastcgi)
-#SERVER_PORT=9000
-
-# Server threads count
-#SERVER_THREADCOUNT=10
-
-# Server source root
-#SERVER_SOURCEROOT="/var/www/localhost"
diff --git a/dev-php/hhvm/files/hhvm.initd b/dev-php/hhvm/files/hhvm.initd
deleted file mode 100644
index db6d262..0000000
--- a/dev-php/hhvm/files/hhvm.initd
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-
-description="Virtual Machine, Runtime, and JIT for PHP"
-description_configtest="Run syntax tests for configuration files."
-
-HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/config.hdf}
-HHVM_DIR=${HHVM_DIR:-/usr/lib/hhvm}
-HHVM_LIB=${HHVM_LIB:-${HHVM_DIR}/lib}
-HHVM_BIN=${HHVM_BIN:-${HHVM_DIR}/bin/hhvm}
-HHVM_USER=${HHVM_USER:-hhvm}
-HHVM_GROUP=${HHVM_GROUP:-hhvm}
-HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
-HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
-HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
-HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
-HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
-HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
-HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
-
-depend() {
-	need net localmount
-	use dns logger
-	after bootmisc
-}
-
-checkconfig() {
-	if [ ! -f "${HHVM_CONFIG}" ] ; then
-		eerror "Please create ${HHVM_CONFIG}"
-		eerror "Sample conf: /etc/hhvm/config.hdf.dist"
-		return 1
-	fi
-
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
-
-	export HPHP_HOME="${HHVM_LIB}"
-	LD_LIBRARY_PATH="${HHVM_LIB}" ${HHVM_BIN} -c "${HHVM_CONFIG}" /dev/null >/dev/null 2>&1
-	ret=$?
-
-	if [ $ret -ne 0 ]; then
-		LD_LIBRARY_PATH="${HHVM_LIB}" ${HHVM_BIN} -c "${HHVM_CONFIG}" /dev/null
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return $?
-
-	local OPTS=""
-	if [[ -n "${SERVER_TYPE}" ]]; then
-		OPTS+=" -vServer.Type=${SERVER_TYPE}"
-	fi
-	if [[ -n "${SERVER_IP}" ]]; then
-		OPTS+=" -vServer.IP=${SERVER_IP}"
-	fi
-	if [[ -n "${SERVER_PORT}" ]]; then
-		OPTS+=" -vServer.Port=${SERVER_PORT}"
-	fi
-	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
-		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
-	fi
-	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
-		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	LD_LIBRARY_PATH="${HHVM_LIB}" start-stop-daemon --start --background \
-		--exec "${HHVM_BIN}" \
-		--pidfile "${HHVM_PIDFILE}" \
-		--user "${HHVM_USER}:${HHVM_GROUP}" \
-		--stdout "${HHVM_LOGFILE}" \
-		--stderr "${HHVM_LOGFILE}" \
-		--env HPHP_HOME="${HHVM_LIB}/" \
-		-- -m server \
-		-c "${HHVM_CONFIG}" \
-		-u "${HHVM_USER}" \
-		-vPidFile=${HHVM_PIDFILE} \
-		-vLog.File=${HHVM_LOGFILE} \
-		-vRepo.Central.Path=${HHVM_REPOFILE} \
-		${OPTS} \
-		${HHVM_OPTS}
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $? "failed, please correct errors above"
-}
diff --git a/dev-php/hhvm/files/hhvm.initd-r3 b/dev-php/hhvm/files/hhvm.initd-r3
deleted file mode 100644
index b6a706d..0000000
--- a/dev-php/hhvm/files/hhvm.initd-r3
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-
-description="Virtual Machine, Runtime, and JIT for PHP"
-description_configtest="Run syntax tests for configuration files."
-
-HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/config.hdf}
-HHVM_BIN=${HHVM_BIN:-/usr/bin/hhvm}
-HHVM_USER=${HHVM_USER:-hhvm}
-HHVM_GROUP=${HHVM_GROUP:-hhvm}
-HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
-HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
-HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
-HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
-HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
-HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
-HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
-
-depend() {
-	need net localmount
-	use dns logger
-	after bootmisc
-}
-
-checkconfig() {
-	if [ ! -f "${HHVM_CONFIG}" ] ; then
-		eerror "Please create ${HHVM_CONFIG}"
-		eerror "Sample conf: /etc/hhvm/config.hdf.dist"
-		return 1
-	fi
-
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
-
-	buildopts
-
-	${HHVM_BIN} ${OPTS} /dev/null >/dev/null 2>&1
-	ret=$?
-
-	if [ $ret -ne 0 ]; then
-		${HHVM_BIN} ${OPTS} /dev/null
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --background \
-		--exec "${HHVM_BIN}" \
-		--pidfile "${HHVM_PIDFILE}" \
-		--user "${HHVM_USER}:${HHVM_GROUP}" \
-		--stdout "${HHVM_LOGFILE}" \
-		--stderr "${HHVM_LOGFILE}" \
-		-- -m server ${OPTS}
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $? "failed, please correct errors above"
-}
-
-buildopts() {
-	OPTS="-c ${HHVM_CONFIG} \
-		-u ${HHVM_USER} \
-		-vPidFile=${HHVM_PIDFILE} \
-		-vLog.File=${HHVM_LOGFILE} \
-		-vRepo.Central.Path=${HHVM_REPOFILE}"
-
-	if [[ -n "${SERVER_TYPE}" ]]; then
-		OPTS+=" -vServer.Type=${SERVER_TYPE}"
-	fi
-	if [[ -n "${SERVER_SOCKET}" ]]; then
-		OPTS+=" -vServer.FileSocket=${SERVER_SOCKET}"
-	fi
-	if [[ -n "${SERVER_IP}" ]]; then
-		OPTS+=" -vServer.IP=${SERVER_IP}"
-	fi
-	if [[ -n "${SERVER_PORT}" ]]; then
-		OPTS+=" -vServer.Port=${SERVER_PORT}"
-	fi
-	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
-		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
-	fi
-	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
-		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
-	fi
-
-	OPTS+=" ${HHVM_OPTS}"
-}
diff --git a/dev-php/hhvm/files/hhvm.initd-r4 b/dev-php/hhvm/files/hhvm.initd-r4
deleted file mode 100644
index 91c04bd..0000000
--- a/dev-php/hhvm/files/hhvm.initd-r4
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-
-description="HHVM FastCGI Daemon"
-description_configtest="Run syntax tests for configuration files."
-
-HHVM_CONFIG=${HHVM_CONFIG:-/etc/hhvm/server.ini}
-HHVM_SYSTEM_CONFIG=${HHVM_SYSTEM_CONFIG:-/etc/hhvm/php.ini}
-HHVM_BIN=${HHVM_BIN:-/usr/bin/hhvm}
-HHVM_USER=${HHVM_USER:-hhvm}
-HHVM_GROUP=${HHVM_GROUP:-hhvm}
-HHVM_DATADIR=${HHVM_DATADIR:-/var/lib/hhvm}
-HHVM_REPOFILE=${HHVM_REPOFILE:-${HHVM_DATADIR}/${SVCNAME}.hhbc}
-HHVM_PIDDIR=${HHVM_PIDDIR:-/var/run/hhvm}
-HHVM_PIDFILE=${HHVM_PIDFILE:-${HHVM_PIDDIR}/${SVCNAME}.pid}
-HHVM_LOGDIR=${HHVM_LOGDIR:-/var/log/hhvm}
-HHVM_LOGFILE=${HHVM_LOGFILE:-${HHVM_LOGDIR}/${SVCNAME}_error.log}
-HHVM_TIMEOUT=${HHVM_TIMEOUT:-15}
-
-depend() {
-	need net localmount
-	use dns logger
-	after bootmisc
-}
-
-checkconfig() {
-	if [ ! -f "${HHVM_CONFIG}" ] ; then
-		eerror "Please create ${HHVM_CONFIG}"
-		eerror "Sample conf: /etc/hhvm/server.ini.dist"
-		return 1
-	fi
-
-	if [ ! -f "${HHVM_SYSTEM_CONFIG}" ] ; then
-		eerror "Please create ${HHVM_SYSTEM_CONFIG}"
-		eerror "Sample conf: /etc/hhvm/php.ini.dist"
-		return 1
-	fi
-
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_DATADIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_PIDDIR}
-	checkpath -q -d -m 0750 -o ${HHVM_USER}:${HHVM_GROUP} ${HHVM_LOGDIR}
-
-	buildopts
-
-	touch "${HHVM_PIDFILE}"
-	chown "${HHVM_USER}:${HHVM_GROUP}" "${HHVM_PIDFILE}"
-
-	${HHVM_BIN} ${OPTS} /dev/null >/dev/null 2>&1
-	ret=$?
-
-	if [ $ret -ne 0 ]; then
-		${HHVM_BIN} ${OPTS} /dev/null
-	fi
-
-	chown -R "${HHVM_USER}:${HHVM_GROUP}" "${HHVM_DATADIR}"
-
-	return $ret
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --background \
-		--exec "${HHVM_BIN}" \
-		--pidfile "${HHVM_PIDFILE}" \
-		--user "${HHVM_USER}:${HHVM_GROUP}" \
-		--stdout "${HHVM_LOGFILE}" \
-		--stderr "${HHVM_LOGFILE}" \
-		-- -m server ${OPTS}
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${HHVM_PIDFILE}" --retry "${HHVM_TIMEOUT}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $? "failed, please correct errors above"
-}
-
-buildopts() {
-	OPTS="-c ${HHVM_SYSTEM_CONFIG} \
-		-c ${HHVM_CONFIG} \
-		-u ${HHVM_USER} \
-		-vPidFile=${HHVM_PIDFILE} \
-		-vLog.File=${HHVM_LOGFILE} \
-		-vRepo.Central.Path=${HHVM_REPOFILE}"
-
-	if [[ -n "${SERVER_TYPE}" ]]; then
-		OPTS+=" -vServer.Type=${SERVER_TYPE}"
-	fi
-	if [[ -n "${SERVER_SOCKET}" ]]; then
-		OPTS+=" -vServer.FileSocket=${SERVER_SOCKET}"
-	fi
-	if [[ -n "${SERVER_IP}" ]]; then
-		OPTS+=" -vServer.IP=${SERVER_IP}"
-	fi
-	if [[ -n "${SERVER_PORT}" ]]; then
-		OPTS+=" -vServer.Port=${SERVER_PORT}"
-	fi
-	if [[ -n "${SERVER_THREADCOUNT}" ]]; then
-		OPTS+=" -vServer.ThreadCount=${SERVER_THREADCOUNT}"
-	fi
-	if [[ -n "${SERVER_SOURCEROOT}" ]]; then
-		OPTS+=" -vServer.SourceRoot=${SERVER_SOURCEROOT}"
-	fi
-
-	OPTS+=" ${HHVM_OPTS}"
-}
diff --git a/dev-php/hhvm/files/hhvm.rc b/dev-php/hhvm/files/hhvm.rc
deleted file mode 100644
index b42c52a..0000000
--- a/dev-php/hhvm/files/hhvm.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Virtual Machine, Runtime, and JIT for PHP"
-
-hhvm_config=${hhvm_config:-/etc/hhvm/config.hdf}
-
-hhvm_lib="/usr/lib/hhvm/lib"
-command="/usr/lib/hhvm/bin/hhvm"
-pidfile=${pidfile:-/var/run/hhvm.pid}
-logfile=${logfile:-/var/log/hhvm_server.log}
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "${hhvm_config}" ] ; then
-		eerror "Please create ${hhvm_config}"
-		eerror "Sample conf: ${hhvm_config}.dist"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting HipHop VM"
-	LD_LIBRARY_PATH="${hhvm_lib}" start-stop-daemon --start --background \
-		--exec "${command}" \
-		--pidfile "${pidfile}" \
-		--stdout "${logfile}" \
-		--stderr "${logfile}" \
-		--env HPHP_HOME="${hhvm_lib}/" \
-		-- -m server -c "${hhvm_config}"
-	eend $? "Failed to start HipHop VM"
-}
-
-stop() {
-	ebegin "Stopping HipHop VM"
-	start-stop-daemon --stop --pidfile "${pidfile}"
-	eend $? "Failed to stop HipHop VM"
-}
diff --git a/dev-php/hhvm/files/php.ini b/dev-php/hhvm/files/php.ini
deleted file mode 100644
index bde1aa1..0000000
--- a/dev-php/hhvm/files/php.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-; php options
-
-;max_execution_time = 30
-;memory_limit = 128M
-;include_path = ".:/usr/share/php5:/usr/share/php"
-;open_basedir =
-;error_reporting = E_ALL
-;display_errors = On
-;log_errors = On
-;error_log = /var/log/hhvm/error.log
-;post_max_size = 100M
-;file_uploads = On
-;upload_tmp_dir = /tmp
-;upload_max_filesize = 100M
-;allow_url_fopen = On
-;default_socket_timeout = 5
-;bcmath.scale = 0
-;date.timezone = Europe/Kiev
-;date.default_latitude = 31.7667
-;date.default_longitude = 35.2333
-;date.sunset_zenith = 90.583333
-;date.sunrise_zenith = 90.583333
-;highlight.string = #DD0000
-;highlight.comment = #FF8000
-;highlight.keyword = #007700
-;highlight.default = #0000BB
-;highlight.html = #000000
-;intl.default_locale =
-;imagick.locale_fix = 0
-;imagick.progress_monitor = 0
-;memcache.hash_strategy = standard
-;memcache.hash_function = crc32
-;pcre.backtrack_limit = 1000000
-;pcre.recursion_limit = 100000
-;session.save_path =
-;session.name = PHPSESSID
-;session.save_handler = files
-;session.auto_start = 0
-;session.gc_probability = 1
-;session.gc_divisor = 100
-;session.gc_maxlifetime = 1440
-;session.serialize_handler = php
-;session.cookie_lifetime = 0
-;session.cookie_path = /
-;session.cookie_domain =
-;session.cookie_secure =
-;session.cookie_httponly =
-;session.use_cookies = 1
-;session.use_only_cookies = 1
-;session.referer_check =
-;session.entropy_file =
-;session.entropy_length = 0
-;session.cache_limiter = nocache
-;session.cache_expire = 180
-;session.use_trans_sid = 0
-;session.hash_function = 0
-;session.hash_bits_per_character = 4
-
-; hhvm specific 
-hhvm.log.level = Warning
-hhvm.log.always_log_unhandled_exceptions = true
-hhvm.log.runtime_error_reporting_level = 8191
-hhvm.mysql.typed_results = false
diff --git a/dev-php/hhvm/files/server.ini b/dev-php/hhvm/files/server.ini
deleted file mode 100644
index 38fecf0..0000000
--- a/dev-php/hhvm/files/server.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-; php options
-
-pid = /var/run/hhvm/hhvm.pid
-
-; hhvm specific 
-
-hhvm.server.port = 9000
-hhvm.server.type = fastcgi
-hhvm.server.default_document = index.php
-hhvm.log.use_log_file = true
-hhvm.log.header = true
-hhvm.log.file = /var/log/hhvm/error.log
-hhvm.repo.central.path = /var/lib/hhvm/hhvm.hhbc
diff --git a/dev-php/hhvm/files/support-curl-7.31.0.patch b/dev-php/hhvm/files/support-curl-7.31.0.patch
deleted file mode 100644
index 106b502..0000000
--- a/dev-php/hhvm/files/support-curl-7.31.0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/hphp/third_party/libcurl.fb-changes.diff	2013-08-22 12:53:28.002201916 +0300
-+++ b/hphp/third_party/libcurl.fb-changes.diff	2013-08-22 13:03:19.629264831 +0300
-@@ -32,14 +32,6 @@
- diff -u -r1.210 multi.c
- --- curl-old/lib/multi.c	28 Jan 2010 15:34:18 -0000	1.210
- +++ curl-new/lib/multi.c	29 Jan 2010 23:45:19 -0000
--@@ -42,6 +42,7 @@
-- #include "sendf.h"
-- #include "timeval.h"
-- #include "http.h"
--+#include "select.h"
-- 
-- #define _MPRINTF_REPLACE /* use our functions only */
-- #include <curl/mprintf.h>
- @@ -900,6 +901,80 @@
-    return CURLM_OK;
-  }
diff --git a/dev-php/hhvm/hhvm-2.2.0.ebuild b/dev-php/hhvm/hhvm-2.2.0.ebuild
deleted file mode 100644
index 416f6f2..0000000
--- a/dev-php/hhvm/hhvm-2.2.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_BRANCH="HHVM-2.2"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-JEMALLOC_P="jemalloc-3.0.0"
-GOOGLE_GLOG_P="google-glog"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz
-         jemalloc? ( http://www.canonware.com/download/jemalloc/${JEMALLOC_P}.tar.bz2 )"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.37
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	dev-db/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.6
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/cmake
-	dev-vcs/git
-	dev-vcs/subversion
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building Google glog"
-	pushd "${WORKDIR}" > /dev/null
-	svn checkout http://google-glog.googlecode.com/svn/trunk/ ${GOOGLE_GLOG_P}
-	cd ${GOOGLE_GLOG_P}
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	if use jemalloc; then
-		einfo "Building jemalloc"
-		pushd "${WORKDIR}/${JEMALLOC_P}" > /dev/null
-		./configure --prefix="${CMAKE_PREFIX_PATH}"
-		emake
-		emake -j1 install
-		popd > /dev/null
-	fi
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${JEMALLOC_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${GOOGLE_GLOG_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.3.0.ebuild b/dev-php/hhvm/hhvm-2.3.0.ebuild
deleted file mode 100644
index 46338db..0000000
--- a/dev-php/hhvm/hhvm-2.3.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	=dev-libs/libdwarf-20120410
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	dev-vcs/git
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.3.1.ebuild b/dev-php/hhvm/hhvm-2.3.1.ebuild
deleted file mode 100644
index 46338db..0000000
--- a/dev-php/hhvm/hhvm-2.3.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	=dev-libs/libdwarf-20120410
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	dev-vcs/git
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.3.2.ebuild b/dev-php/hhvm/hhvm-2.3.2.ebuild
deleted file mode 100644
index 46338db..0000000
--- a/dev-php/hhvm/hhvm-2.3.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	=dev-libs/libdwarf-20120410
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	dev-vcs/git
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.3.3.ebuild b/dev-php/hhvm/hhvm-2.3.3.ebuild
deleted file mode 100644
index 46338db..0000000
--- a/dev-php/hhvm/hhvm-2.3.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	=dev-libs/libdwarf-20120410
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	dev-vcs/git
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.4.0.ebuild b/dev-php/hhvm/hhvm-2.4.0.ebuild
deleted file mode 100644
index f872610..0000000
--- a/dev-php/hhvm/hhvm-2.4.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.4.1.ebuild b/dev-php/hhvm/hhvm-2.4.1.ebuild
deleted file mode 100644
index f872610..0000000
--- a/dev-php/hhvm/hhvm-2.4.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.rc hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-2.4.2.ebuild b/dev-php/hhvm/hhvm-2.4.2.ebuild
deleted file mode 100644
index b270172..0000000
--- a/dev-php/hhvm/hhvm-2.4.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="+jemalloc devel debug"
-
-CURL_P="curl-7.31.0"
-LIBEVENT_P="libevent-1.4.14b-stable"
-
-SRC_URI="http://curl.haxx.se/download/${CURL_P}.tar.bz2
-         https://github.com/downloads/libevent/libevent/${LIBEVENT_P}.tar.gz"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	>=dev-libs/boost-1.48
-	sys-devel/flex
-	sys-devel/bison
-	dev-util/re2c
-	virtual/mysql
-	dev-libs/libxml2
-	dev-libs/libmcrypt
-	dev-libs/icu
-	dev-libs/openssl
-	sys-libs/libcap
-	media-libs/gd
-	sys-libs/zlib
-	dev-cpp/tbb
-	dev-libs/oniguruma
-	dev-libs/libpcre
-	dev-libs/expat
-	sys-libs/readline
-	sys-libs/ncurses
-	dev-libs/libmemcached
-	net-nds/openldap
-	net-libs/c-client[kerberos]
-	dev-util/google-perftools
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	app-arch/bzip2
-	sys-devel/binutils
-	>=sys-devel/gcc-4.7
-	dev-cpp/glog
-	jemalloc? ( >=dev-libs/jemalloc-3.0.0[stats] )
-	media-libs/libvpx
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule init
-	git submodule update
-
-	epatch "${FILESDIR}/support-curl-7.31.0.patch"
-
-	export CMAKE_PREFIX_PATH="${D}/usr/lib/hhvm"
-
-	einfo "Building custom libevent"
-	export EPATCH_SOURCE="${S}/hphp/third_party"
-	EPATCH_OPTS="-d ""${WORKDIR}/${LIBEVENT_P}" epatch libevent-1.4.14.fb-changes.diff
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	./autogen.sh
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	einfo "Building custom curl"
-	EPATCH_OPTS="-d ""${WORKDIR}/${CURL_P} -p1" epatch libcurl.fb-changes.diff
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	./buildconf
-	./configure --prefix="${CMAKE_PREFIX_PATH}"
-	emake
-	emake -j1 install
-	popd > /dev/null
-
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-	export CMAKE_BUILD_TYPE
-}
-
-src_configure()
-{
-	export HPHP_HOME="${S}"
-	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	pushd "${WORKDIR}/${LIBEVENT_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	pushd "${WORKDIR}/${CURL_P}" > /dev/null
-	emake -j1 install
-	popd > /dev/null
-
-	rm -rf "${D}/usr/lib/hhvm/"{bin,include,share}
-	rm -rf "${D}/usr/lib/hhvm/lib/pkgconfig"
-	rm -f "${D}/usr/lib/hhvm/lib/"*.{a,la}
-
-	exeinto "/usr/lib/hhvm/bin"
-	doexe hphp/hhvm/hhvm
-
-	if use devel; then
-		cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
-	fi
-
-	dobin "${FILESDIR}/hhvm"
-	newinitd "${FILESDIR}"/hhvm.initd hhvm
-	newconfd "${FILESDIR}"/hhvm.confd hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.0.0.ebuild b/dev-php/hhvm/hhvm-3.0.0.ebuild
deleted file mode 100644
index e0d7f80..0000000
--- a/dev-php/hhvm/hhvm-3.0.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="debug hack xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	>=sys-devel/gcc-4.7
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	dobin hphp/hhvm/hhvm
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r3 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r3 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist-r3 config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.0.1.ebuild b/dev-php/hhvm/hhvm-3.0.1.ebuild
deleted file mode 100644
index 499b9fb..0000000
--- a/dev-php/hhvm/hhvm-3.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="debug hack xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	>=sys-devel/gcc-4.7
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	dobin hphp/hhvm/hhvm
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r3 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r3 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/config.hdf.dist-r3 config.hdf.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.1.0.ebuild b/dev-php/hhvm/hhvm-3.1.0.ebuild
deleted file mode 100644
index a3e67ef..0000000
--- a/dev-php/hhvm/hhvm-3.1.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-EGIT_COMMIT="HHVM-${PV}"
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	>=sys-devel/gcc-4.7
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-KEYWORDS="amd64"
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	dobin hphp/hhvm/hhvm
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/hhi" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.2.0.ebuild b/dev-php/hhvm/hhvm-3.2.0.ebuild
deleted file mode 100644
index 6608eb8..0000000
--- a/dev-php/hhvm/hhvm-3.2.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.3.3.ebuild b/dev-php/hhvm/hhvm-3.3.3.ebuild
deleted file mode 100644
index 2576286..0000000
--- a/dev-php/hhvm/hhvm-3.3.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.4.2.ebuild b/dev-php/hhvm/hhvm-3.4.2.ebuild
deleted file mode 100644
index 2576286..0000000
--- a/dev-php/hhvm/hhvm-3.4.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.5.0.ebuild b/dev-php/hhvm/hhvm-3.5.0.ebuild
deleted file mode 100644
index 2576286..0000000
--- a/dev-php/hhvm/hhvm-3.5.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.5.1.ebuild b/dev-php/hhvm/hhvm-3.5.1.ebuild
deleted file mode 100644
index 2576286..0000000
--- a/dev-php/hhvm/hhvm-3.5.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/editor-plugins/vim" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.6.0.ebuild b/dev-php/hhvm/hhvm-3.6.0.ebuild
deleted file mode 100644
index c237705..0000000
--- a/dev-php/hhvm/hhvm-3.6.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen +zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49[context]
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	else
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/h2tp
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_format
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		doman hphp/hack/man/*.1
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	doman hphp/doc/man/*.1
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.6.1.ebuild b/dev-php/hhvm/hhvm-3.6.1.ebuild
deleted file mode 100644
index c237705..0000000
--- a/dev-php/hhvm/hhvm-3.6.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen +zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49[context]
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	else
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/h2tp
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_format
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		doman hphp/hack/man/*.1
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	doman hphp/doc/man/*.1
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.6.2.ebuild b/dev-php/hhvm/hhvm-3.6.2.ebuild
deleted file mode 100644
index c237705..0000000
--- a/dev-php/hhvm/hhvm-3.6.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen +zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49[context]
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	else
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/h2tp
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_format
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		doman hphp/hack/man/*.1
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	doman hphp/doc/man/*.1
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-3.7.0.ebuild b/dev-php/hhvm/hhvm-3.7.0.ebuild
deleted file mode 100644
index c237705..0000000
--- a/dev-php/hhvm/hhvm-3.7.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen +zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49[context]
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	else
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/h2tp
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_format
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		doman hphp/hack/man/*.1
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	doman hphp/doc/man/*.1
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/dev-php/hhvm/hhvm-9999.ebuild b/dev-php/hhvm/hhvm-9999.ebuild
deleted file mode 100644
index c237705..0000000
--- a/dev-php/hhvm/hhvm-9999.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils git-2 user
-
-EGIT_REPO_URI="https://github.com/facebook/hhvm.git"
-
-case ${PV} in
-9999)
-	EGIT_BRANCH="master"
-	KEYWORDS="~amd64"
-	;;
-*)
-	# For now, git is the only way to fetch releases
-	# https://github.com/facebook/hhvm/issues/2806
-	EGIT_COMMIT="HHVM-${PV}"
-	KEYWORDS="amd64"
-	;;
-esac
-
-IUSE="debug hack jsonc xen +zend-compat"
-
-DESCRIPTION="Virtual Machine, Runtime, and JIT for PHP"
-HOMEPAGE="https://github.com/facebook/hhvm"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/glog
-	dev-cpp/tbb
-	dev-db/sqlite
-	hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
-	>=dev-libs/boost-1.49[context]
-	dev-libs/cloog
-	dev-libs/elfutils
-	dev-libs/expat
-	dev-libs/icu
-	>=dev-libs/jemalloc-3.0.0[stats]
-	jsonc? ( dev-libs/json-c )
-	dev-libs/libdwarf
-	>=dev-libs/libevent-2.0.9
-	dev-libs/libmcrypt
-	dev-libs/libmemcached
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/libzip-0.11.0
-	dev-libs/oniguruma
-	dev-libs/openssl
-	media-gfx/imagemagick
-	media-libs/freetype
-	media-libs/gd[jpeg,png]
-	net-libs/c-client[kerberos]
-	>=net-misc/curl-7.28.0
-	net-nds/openldap
-	sys-libs/libcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	virtual/mysql
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-2.8.7
-	sys-devel/binutils[static-libs]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-SLOT="0"
-LICENSE="PHP-3"
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-			; then
-		eerror "${PN} needs to be built with gcc-4.8 or later."
-		eerror "Please use gcc-config to switch to gcc-4.8 or later version."
-		die
-	fi
-}
-
-pkg_setup() {
-	ebegin "Creating hhvm user and group"
-	enewgroup hhvm
-	enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
-	eend $?
-}
-
-src_prepare()
-{
-	git submodule update --init --recursive
-}
-
-src_configure()
-{
-	CMAKE_BUILD_TYPE="Release"
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	if use jsonc; then
-		HHVM_OPTS="${HHVM_OPTS} -DUSE_JSONC=ON"
-	fi
-
-	if use xen; then
-		HHVM_OPTS="${HHVM_OPTS} -DDISABLE_HARDWARE_COUNTERS=ON"
-	fi
-
-	if use zend-compat; then
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=ON"
-	else
-		HHVM_OPTS="${HHVM_OPTS} -DENABLE_ZEND_COMPAT=OFF"
-	fi
-
-	econf -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${HHVM_OPTS}
-}
-
-src_install()
-{
-	emake install DESTDIR=${D}
-
-	if use hack; then
-		dobin hphp/hack/bin/h2tp
-		dobin hphp/hack/bin/hh_client
-		dobin hphp/hack/bin/hh_format
-		dobin hphp/hack/bin/hh_server
-		dobin hphp/hack/bin/hh_single_type_check
-		doman hphp/hack/man/*.1
-		dodir "/usr/share/hhvm/hack"
-		cp -a "${S}/hphp/hack/editor-plugins/emacs" "${D}/usr/share/hhvm/hack/"
-		cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
-	fi
-
-	doman hphp/doc/man/*.1
-
-	newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
-	newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
-	dodir "/etc/hhvm"
-	insinto /etc/hhvm
-	newins "${FILESDIR}"/php.ini php.ini
-	newins "${FILESDIR}"/php.ini php.ini.dist
-	newins "${FILESDIR}"/server.ini server.ini
-	newins "${FILESDIR}"/server.ini server.ini.dist
-}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9730a46..c68554b 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -93,11 +93,13 @@ DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccf
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
+DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
 DIST asterisk-patchset-3.0.tar.gz 25867 SHA256 d4f45c74130250335e96abe89495fd19cf08016d2cb6bb1c90725a1f6a325f3e SHA512 6a459ae53110acccb952424696858eb899fbceba39dfe309653af79fd1431bc2736e1fe19a677e2ac4707ef50e354b84628b8159036067cbcc89d9c66606daff WHIRLPOOL 6780ce8c243415d4298ce54cc3eaf3e87915223f064b08d759deb8cc06c3ec8ac1f81ca8139c77fb4b9660bcab618dbb95629967e86328bb6a92731b64a9cba3
-DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
+DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.22.0.ebuild 9635 SHA256 e37b06d92ef090896fb26198ac7c33592af72965f25f9535f1c06f0b732e65d9 SHA512 b526b9c597eb86fa2cd4f1579a12d4ca405bff8bc1688e27a710d27bd63da09d39f1d8ba2b3f9a38cea37204868b46a0890ab41e81546b07fe1b46f583a7f816 WHIRLPOOL bba3e1a8aef110d2a1b5e406d559a9badd5b0ac279e5c720b5ff19c8eeb6be8f7ae90b22f3aba4b69462e8fc893353cdf82718bd40c121ea608dd5b276f7d3cf
diff --git a/net-misc/asterisk/asterisk-11.22.0.ebuild b/net-misc/asterisk/asterisk-11.22.0.ebuild
new file mode 100644
index 0000000..67dc2a4
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.22.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}-rc1.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 216edb21632e824f6b1aa585de1b4d218bfe6cb4 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 23 Mar 2016 18:15:57 -0700
Subject: [PATCH 190/261] update to ebuild file

---
 net-misc/asterisk/Manifest                                      | 2 +-
 .../{asterisk-11.22.0.ebuild => asterisk-11.22.0_rc1.ebuild}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename net-misc/asterisk/{asterisk-11.22.0.ebuild => asterisk-11.22.0_rc1.ebuild} (99%)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c68554b..0a30670 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -102,4 +102,4 @@ EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
-EBUILD asterisk-11.22.0.ebuild 9635 SHA256 e37b06d92ef090896fb26198ac7c33592af72965f25f9535f1c06f0b732e65d9 SHA512 b526b9c597eb86fa2cd4f1579a12d4ca405bff8bc1688e27a710d27bd63da09d39f1d8ba2b3f9a38cea37204868b46a0890ab41e81546b07fe1b46f583a7f816 WHIRLPOOL bba3e1a8aef110d2a1b5e406d559a9badd5b0ac279e5c720b5ff19c8eeb6be8f7ae90b22f3aba4b69462e8fc893353cdf82718bd40c121ea608dd5b276f7d3cf
+EBUILD asterisk-11.22.0_rc1.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
diff --git a/net-misc/asterisk/asterisk-11.22.0.ebuild b/net-misc/asterisk/asterisk-11.22.0_rc1.ebuild
similarity index 99%
rename from net-misc/asterisk/asterisk-11.22.0.ebuild
rename to net-misc/asterisk/asterisk-11.22.0_rc1.ebuild
index 67dc2a4..5cdcf40 100644
--- a/net-misc/asterisk/asterisk-11.22.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.22.0_rc1.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_/-}"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}-rc1.tar.gz
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
          http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"

From a66919915eac884707e51ea9349410b30fef8692 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 23 Mar 2016 18:19:18 -0700
Subject: [PATCH 191/261] add patch to fix ast

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 0a30670..4568b40 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -94,7 +94,7 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
-DIST asterisk-patchset-3.0.tar.gz 25867 SHA256 d4f45c74130250335e96abe89495fd19cf08016d2cb6bb1c90725a1f6a325f3e SHA512 6a459ae53110acccb952424696858eb899fbceba39dfe309653af79fd1431bc2736e1fe19a677e2ac4707ef50e354b84628b8159036067cbcc89d9c66606daff WHIRLPOOL 6780ce8c243415d4298ce54cc3eaf3e87915223f064b08d759deb8cc06c3ec8ac1f81ca8139c77fb4b9660bcab618dbb95629967e86328bb6a92731b64a9cba3
+DIST asterisk-patchset-3.0.tar.gz 24120 SHA256 bdee9cbafee546d882d14b28b2bcb1199ed5ac90e43c9c0aeb60c0f8f290daa1 SHA512 3e317dc5655ce528ac55d36ecb078ea48b860ed3e0d5c112013a5383f62b208ef01191a79293b44b704daf7066890a0de8cd4bdb4a507a1933fa6b0190a16b61 WHIRLPOOL a8a90836d038f1382190f4bcd945bbfc10d36c2be1f3acd4157e2cc1b1b738cd285477346b6e5c167b32cb2e1c2dfd196bc92a7c7b775a1164b554d3f6121408
 DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 1741ba116259552e1c57368cd348857ead48f2d8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 26 Mar 2016 02:17:09 -0700
Subject: [PATCH 192/261] update mani

---
 net-misc/asterisk/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4568b40..019dbe9 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -94,8 +94,8 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
-DIST asterisk-patchset-3.0.tar.gz 24120 SHA256 bdee9cbafee546d882d14b28b2bcb1199ed5ac90e43c9c0aeb60c0f8f290daa1 SHA512 3e317dc5655ce528ac55d36ecb078ea48b860ed3e0d5c112013a5383f62b208ef01191a79293b44b704daf7066890a0de8cd4bdb4a507a1933fa6b0190a16b61 WHIRLPOOL a8a90836d038f1382190f4bcd945bbfc10d36c2be1f3acd4157e2cc1b1b738cd285477346b6e5c167b32cb2e1c2dfd196bc92a7c7b775a1164b554d3f6121408
-DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
+DIST asterisk-patchset-3.0.tar.gz 24739 SHA256 2ddf7ca0a19d17310ff3a2d64b9fb360bb0199070bb1293992c2031eead62781 SHA512 0cf2f8159beecaa49bd1f5abbd8e1e8be33c07570eb74538173f092b1bc02c3ebc6d41d70d1607c1cf36946189903e38f1ea9fced6ecfdbd8c48d1408e9e0e35 WHIRLPOOL 5d995d95e99783812a5ac5632d23328b66cc4ef277a1c2b1b337ba2f2eef850ded8ef5365bd08548cbdb96dc8013543d1db3d8f31d44c2e0aa51f1761d0acd58
+DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d

From a75aa9c30893b55f7c224f79b51dd545c001a71b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 26 Mar 2016 02:31:06 -0700
Subject: [PATCH 193/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 019dbe9..5609ba7 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -94,7 +94,7 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
-DIST asterisk-patchset-3.0.tar.gz 24739 SHA256 2ddf7ca0a19d17310ff3a2d64b9fb360bb0199070bb1293992c2031eead62781 SHA512 0cf2f8159beecaa49bd1f5abbd8e1e8be33c07570eb74538173f092b1bc02c3ebc6d41d70d1607c1cf36946189903e38f1ea9fced6ecfdbd8c48d1408e9e0e35 WHIRLPOOL 5d995d95e99783812a5ac5632d23328b66cc4ef277a1c2b1b337ba2f2eef850ded8ef5365bd08548cbdb96dc8013543d1db3d8f31d44c2e0aa51f1761d0acd58
+DIST asterisk-patchset-3.0.tar.gz 24774 SHA256 ddfb5b6ddec94b34c6709796b13415d02dcd8dac3f40681618b2b05cf061254c SHA512 a2a58e072207335e917f84d16098b3c8d84cb07ad54d6a441cb01215355f2dc09b5c5cf7ac8d18e0f7612cb777afa81a675c464490599cddeeb31ae10072dcd0 WHIRLPOOL b592235aa90961ba2a7b3e91ba15a84949c71098c46d83249685b104bc7f0eccca30e789dbdf4d109d09178bc2abc07cad1cdd9ceb76a53e7ccf68fbc928c1c4
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 3a6b4c8d60b0601a6dbb475fb047d2ec7f29d161 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 26 Mar 2016 03:01:37 -0700
Subject: [PATCH 194/261] update mani

---
 net-misc/asterisk/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 5609ba7..e68b79a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -94,7 +94,7 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
-DIST asterisk-patchset-3.0.tar.gz 24774 SHA256 ddfb5b6ddec94b34c6709796b13415d02dcd8dac3f40681618b2b05cf061254c SHA512 a2a58e072207335e917f84d16098b3c8d84cb07ad54d6a441cb01215355f2dc09b5c5cf7ac8d18e0f7612cb777afa81a675c464490599cddeeb31ae10072dcd0 WHIRLPOOL b592235aa90961ba2a7b3e91ba15a84949c71098c46d83249685b104bc7f0eccca30e789dbdf4d109d09178bc2abc07cad1cdd9ceb76a53e7ccf68fbc928c1c4
+DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807

From 39acaefcafd66d5193647015cdb5a416821539ec Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 29 Mar 2016 18:10:20 -0700
Subject: [PATCH 195/261] added 1.8

---
 net-misc/asterisk/Manifest                 |   2 +
 net-misc/asterisk/asterisk-1.8.23.0.ebuild | 322 +++++++++++++++++++++
 2 files changed, 324 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-1.8.23.0.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e68b79a..0f50be5 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -88,6 +88,7 @@ AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278b
 AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
 AUX get_ilbc_source.sh 328 SHA256 bf73082908cf01f28b3b02c24d0766aa977a4cb75275751975cdf1a2b9d6dda4 SHA512 30936715d1ecb6491af534f0b4e2cdcad6281bfc20f5008c8df495081bf5ed35f75fa60f0624ec04f59c7cb7a85847ce8202d2df452877662eb23f40c77d3b77 WHIRLPOOL 77f307cd65993668a7f071ce6987a66b288a0bc9c4b208c8de318827119891df00cab2627475515483355fee62b7aadead8619b0d49562cbb00889f0470f1095
 DIST asterisk-1.4.39.1.tar.gz 21651888 SHA256 39af16a3b15f7ff7a4008b4cc892523189dd89fc57ba9278e248d896ecdabe9c SHA512 2ced1c2ef5c8b5aa590e5636abd4e60dcfda29ece31f1ee8a1b3db655c39765b2de9f1c258d0eaa4dc4abe78c02e6664e1adc15b1b038db074a8f9fb16d3d82c WHIRLPOOL b32231912dddf25483596585dc8d5c082926990e81d6b8bddf8c0b19d4038c921ab1ea407a8231224c489cc71e857ab6b554c1f3d6cb747418d87618c2c4e65c
+DIST asterisk-1.8.23.0-vici.tar.gz 25606316 SHA256 3c9cdb81f15d97f5916b79f8fa104f9ab67483b12dd4c03d752eb438257db286 SHA512 5769f4c9013a22b5f3ed5df7da1b6c92d8a1c8ccfe82f7e5fbde9185d21d73d3d0804db626a9b8d767eecb9afe8c9dc3a9c9c773b33dc608362e5ff19a543a99 WHIRLPOOL 112cbbd7f353c81a2c34717cb79e46acfdcb4bafd57a77985ec6ad29463a2b3f3cad1aed42b4eab6ce3154751a9792e781265db758faa4c85b1218b4dd74d076
 DIST asterisk-11.15.0.tar.gz 34981005 SHA256 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 SHA512 12ff80d3f5e07ec6a2845ab27513cb61f2d94864e376ba96ceee9a1f15402d5c810cf96ee74bfcaab7eb785f68a1b9b072ac715046bae7ab25617cc8fd27d711 WHIRLPOOL cf01fabf9c0d304cfcfdbcb9010a9756e3fb166819bf1f4f6c65126d9dc31a5954a7b53a218baef2c32003cac72a756fb6cf169779100568dd627cc680d8695d
 DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
 DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
@@ -97,6 +98,7 @@ DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85
 DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
+EBUILD asterisk-1.8.23.0.ebuild 9454 SHA256 8a03f6d596fd0f7635836b5583b994bcb06aa207440d69ea8e350f2bb0b7c51d SHA512 800d4774847de6606528f23eafbdd894069a29efa83cae0b75dcf1b427b29133af696201156cf18bfebd501dbdff58903461a7cb139eef3b131dd27f625930b4 WHIRLPOOL bb63fb7b7f82295d6ee3d724faa67210969cc812d136eff6f45ad640ff3f061419143a4d2d342c55ee1c5ea48bed14693edfb9b52b7cac4e836df5c3f9214e85
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
 EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c4206eb60270466d3257dbed4673 SHA512 77a869e7b40b6ffc74588541aa8a15a527854b9ac02b7e8c5c60c4d222430fe4a181ea4d0875d7d8ce8bcbe0c4d2a05cb759b04bb5acb6755d4d86a879cc9295 WHIRLPOOL 545f04940976041fa1fdeba480775af6e784eeaed710c0c73b726144a81c68dd06c815a62b5e75dcd340a078a7302e458bf1d0a9b97d7e7dff37d384d9a7c70d
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
diff --git a/net-misc/asterisk/asterisk-1.8.23.0.ebuild b/net-misc/asterisk/asterisk-1.8.23.0.ebuild
new file mode 100644
index 0000000..20d309e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.8.23.0.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/Attic/asterisk-1.8.29.0.ebuild,v 1.3 2014/10/21 09:41:28 chainsaw dead $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://download.vicidial.com/required-apps/asterisk-1.8.23.0-vici.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex sqlite sqlite3 srtp static syslog vorbis"
+
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+
+REQUIRED_USE="
+	gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+RDEPEND="dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	ais? ( sys-cluster/openais )
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	jingle? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( dev-db/sqlite:3 )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	!net-libs/openh323
+	!net-libs/pjsip
+	virtual/pkgconfig"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select ais			res_ais
+	use_select alsa			chan_alsa
+	use_select bluetooth	chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_gtalk
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_jabber
+	use_select jingle		chan_jingle
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup	app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select sqlite		cdr_sqlite
+	use_select sqlite3		{cdr,cel}_sqlite3_custom
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bugs #300832 & #414585
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "1.6 -> 1.8 changes that you may care about:"
+	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
+

From c8fe4a6d8fd7eaf5e43f16752def2a2cb08cb015 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Tue, 29 Mar 2016 23:45:07 -0700
Subject: [PATCH 196/261] addded certified version of asterisk

---
 net-misc/asterisk/Manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 0f50be5..d234515 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -95,6 +95,7 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
+DIST asterisk-certified-11.6-current.tar.gz 28887227 SHA256 592e3084e86c64b4c22848290124481e3f14d7cc1bfe01a8223c064a1ba0916c SHA512 32ea8fbaf159a364577d229c1cd1fda19c5f757c317268284c24cd9917c969b58a830604311ae9afcd20c7881233767bcde3f2ba2e42be5e2863d184a7e69907 WHIRLPOOL 9102f8c1c810f2e41bdec62e691f7d54449ff91afc7b90e94586cf9cee472dcd7f1b76e11d394f0d3fac8ba1b05a0003926088a3bebe5a8c7f3f846d6ac95603
 DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
@@ -105,3 +106,4 @@ EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259
 EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.22.0_rc1.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.6.ebuild 9656 SHA256 5eaf9d59d2a902db8b49f98ccef973943453497a5e6044cf5512e7df1aebbcaf SHA512 2c39db59c6a1bd2f6092e24a403d352d8560ad464cd9bbad854bf1a1ebadfbd1664f3b12b79e825f85791f5bab3073123721499d8dace84228663f39fdf2996c WHIRLPOOL 228a4e2bda2188b0f424e3007eef5909e6fe2b44add37eed714b59df9a82a100e2d4a49083ec9c61ddbc41d2f14fb2dc4110eddd259d5de5c7f17b3789cd4a35

From b8d1c5d892799bb91e716eb8a130f7c3052514c3 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Wed, 30 Mar 2016 13:35:04 -0700
Subject: [PATCH 197/261] add ast 11 cert

---
 net-misc/asterisk/asterisk-11.6.ebuild | 324 +++++++++++++++++++++++++
 1 file changed, 324 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.6.ebuild

diff --git a/net-misc/asterisk/asterisk-11.6.ebuild b/net-misc/asterisk/asterisk-11.6.ebuild
new file mode 100644
index 0000000..206a97f
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.6.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/certified-asterisk/asterisk-certified-11.6-current.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 8a374f028534cf457dbd9e333222131ba86351b8 Mon Sep 17 00:00:00 2001
From: root <root@vreg07-01.safesoftsolutions.com>
Date: Sat, 9 Apr 2016 01:55:07 -0700
Subject: [PATCH 198/261] new ast version

---
 net-misc/asterisk/Manifest                |   2 +
 net-misc/asterisk/asterisk-11.22.0.ebuild | 324 ++++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.22.0.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d234515..4620057 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -95,6 +95,7 @@ DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d
 DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e SHA512 8e20d9b6fd9ead585fcb79de505942f498b69b4b275567f7f2353bd4d18e722d4bdf2ae2638ab06cd0cffb3791962534aaf50ed199ea0ddab646d34f45328d8c WHIRLPOOL a1c0219f4bd693f61d6193114bc2389894152a7850332fc0a67ca5544cf58f300595149e843b09db6bd5ffaa1015fcaed0d94a86a27e5be51692a87bf8cd7f55
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
+DIST asterisk-11.22.0.tar.gz 35101090 SHA256 590c361f8926e08eeaf320a35985cd39a2ea651ec3e94fb62484a7179c32f527 SHA512 98085053fc8d2aaf1c3305ef1900287bc1ee9d1e421a073cb0e1b56d379fd7803fdbfaab16143be24bdd41a7b28305dce7b91763564e750697ac2b2d9e8ad719 WHIRLPOOL f531ae8be5db9071c1809149523883cf0b7e65d2e8cecbc70d585d1881cd36a206de8cbc0edd2c4805d326427bb67a87cf2e079bed464fcc0cce376cb1098d59
 DIST asterisk-certified-11.6-current.tar.gz 28887227 SHA256 592e3084e86c64b4c22848290124481e3f14d7cc1bfe01a8223c064a1ba0916c SHA512 32ea8fbaf159a364577d229c1cd1fda19c5f757c317268284c24cd9917c969b58a830604311ae9afcd20c7881233767bcde3f2ba2e42be5e2863d184a7e69907 WHIRLPOOL 9102f8c1c810f2e41bdec62e691f7d54449ff91afc7b90e94586cf9cee472dcd7f1b76e11d394f0d3fac8ba1b05a0003926088a3bebe5a8c7f3f846d6ac95603
 DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
@@ -105,5 +106,6 @@ EBUILD asterisk-11.17.1.ebuild 9627 SHA256 21f037d2fe93799965dccd12db1ece272e98c
 EBUILD asterisk-11.20.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.22.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.22.0_rc1.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.6.ebuild 9656 SHA256 5eaf9d59d2a902db8b49f98ccef973943453497a5e6044cf5512e7df1aebbcaf SHA512 2c39db59c6a1bd2f6092e24a403d352d8560ad464cd9bbad854bf1a1ebadfbd1664f3b12b79e825f85791f5bab3073123721499d8dace84228663f39fdf2996c WHIRLPOOL 228a4e2bda2188b0f424e3007eef5909e6fe2b44add37eed714b59df9a82a100e2d4a49083ec9c61ddbc41d2f14fb2dc4110eddd259d5de5c7f17b3789cd4a35
diff --git a/net-misc/asterisk/asterisk-11.22.0.ebuild b/net-misc/asterisk/asterisk-11.22.0.ebuild
new file mode 100644
index 0000000..5cdcf40
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.22.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 74f7d68779b4e757009915140b2c051527a2dd9e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Sat, 9 Jul 2016 03:10:15 -0700
Subject: [PATCH 199/261] add version of crmsh that we need to make it
 comptabile again

---
 sys-cluster/crmsh/Manifest           |  2 +
 sys-cluster/crmsh/crmsh-2.1.5.ebuild | 56 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 sys-cluster/crmsh/Manifest
 create mode 100644 sys-cluster/crmsh/crmsh-2.1.5.ebuild

diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
new file mode 100644
index 0000000..b1732ac
--- /dev/null
+++ b/sys-cluster/crmsh/Manifest
@@ -0,0 +1,2 @@
+DIST crmsh-2.1.5.tar.gz 742915 SHA256 48b08b72594045dd3b5cd0b317b4a56b1863ccec2a75e36b55a6e57d01c65633 SHA512 c43a39a7dd97cda71380178470091ba6d13ded3f3d2202a71d489a890f6a91457311681818e2f5465173be1ad8ceadb52fd7740955d74c3aa07445d16f61f0ed WHIRLPOOL 0f78062e6ce9c5bcec6e558d3a2aec413980c1b3e11f6085b50d4d3a527e41898d7f14d63ae3c392d90e2602c0da199ea397eed715e57b4daffad6fecdd69573
+EBUILD crmsh-2.1.5.ebuild 1202 SHA256 eebe39d4fff1a9aeacc6949c19953ba479f5679bfff7af56e044712fd05dbb5b SHA512 9362cc397499596d12c20f12f0be4db4e3edd9f08379e62c8731c6813cca10cabcf6cd1afd5754da743a651ca3156f0eefbc2e708daeaf150b11610ead4ef2bb WHIRLPOOL 0f87ef099c44f5e39511ddde7abdd2a3dd9b168cd9b630bc9b1daefec6392e47b707c8141b679d2e23fd24526e4f554c8f0347988a320d3c635dbdfb675fd4ec
diff --git a/sys-cluster/crmsh/crmsh-2.1.5.ebuild b/sys-cluster/crmsh/crmsh-2.1.5.ebuild
new file mode 100644
index 0000000..8dda3f2
--- /dev/null
+++ b/sys-cluster/crmsh/crmsh-2.1.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+AUTOTOOLS_AUTORECONF=true
+KEYWORDS=""
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="git://github.com/crmsh/crmsh"
+	inherit git-2
+	S="${WORKDIR}/${PN}-${MY_TREE}"
+else
+	SRC_URI="https://github.com/crmsh/crmsh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~hppa ~x86"
+fi
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="Pacemaker command line interface for management and configuration"
+HOMEPAGE="http://crmsh.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=sys-cluster/pacemaker-1.1.8"
+RDEPEND="${DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed \
+		-e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \
+		-i configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+	python_replicate_script "${ED}"/usr/sbin/crm
+}

From edbc0ca80884f168f066917140feccaf110be734 Mon Sep 17 00:00:00 2001
From: Root USer vreg07-02 <vreg07-02@safesoft.io>
Date: Mon, 15 Aug 2016 13:51:06 -0700
Subject: [PATCH 200/261] add new version of freeswitch

---
 net-misc/freeswitch/Manifest                  |   7 +
 .../files/freeswitch-1.6.2-no-werror.patch    |  16 +
 .../files/freeswitch-1.6.8-no-werror.patch    |  16 +
 net-misc/freeswitch/freeswitch-1.6.2.ebuild   | 554 +++++++++++++++++
 .../freeswitch/freeswitch-1.6.8-r1.ebuild     | 549 +++++++++++++++++
 net-misc/freeswitch/freeswitch-1.6.8.ebuild   | 555 ++++++++++++++++++
 6 files changed, 1697 insertions(+)
 create mode 100644 net-misc/freeswitch/files/freeswitch-1.6.2-no-werror.patch
 create mode 100644 net-misc/freeswitch/files/freeswitch-1.6.8-no-werror.patch
 create mode 100644 net-misc/freeswitch/freeswitch-1.6.2.ebuild
 create mode 100644 net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
 create mode 100644 net-misc/freeswitch/freeswitch-1.6.8.ebuild

diff --git a/net-misc/freeswitch/Manifest b/net-misc/freeswitch/Manifest
index 2ed17fe..c4158cf 100644
--- a/net-misc/freeswitch/Manifest
+++ b/net-misc/freeswitch/Manifest
@@ -1,8 +1,15 @@
+AUX freeswitch-1.6.2-no-werror.patch 651 SHA256 4765ae29af553b5b032bae4f6462ca0f44f8fc37ca864b22b1a43ce7254a7b0d SHA512 71cfd5a71aa70d4711a35bb4678be74fb3fef187e71ac8d5b27fb7a474b0317e1bd6f8d08d049d3526d514abef0f8df4fc76fc2faf1589865f7a085fa7f3b3a4 WHIRLPOOL 220f62a0ce5280158ddf8df1a6cf924cbafec54fc7418fa28b5ab02725ced90626d15baaa3da46d9b289069ac36d2defd013f3a4f54033c62846d46430cb7aaa
+AUX freeswitch-1.6.8-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
 DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
+DIST freeswitch-1.6.2.tar.xz 31212588 SHA256 cf26f491469d2f744fb48ba0a7e25cefd96305e0ef385eda09fca82c096bb48f SHA512 b85ebbdc0f4111f76e798b91d23d05b63966fe8ac273bc2581857c1b9b810f970f25fd244ce40884d4939e835c72d7700448ea663a4f2650eb34d67325aa0517 WHIRLPOOL e710903392490dc32a558d3bb27d4950da50c13f178f8de87465c9b95df85d6931ce9af64b19f6eabd0adc51ebe1d0ec97da85d1ea6c3d988385534b8739c1cf
+DIST freeswitch-1.6.8.tar.xz 33454900 SHA256 c17e0df66d8c6ffaa35523596721ebc983681ae386d564294d1852be5d34596e SHA512 245e2e3a20908b7f7b1c7054c3efbe68510f6577654186af3749e0da9def233b7b61f510d610500a6f7ae0b9fa6c5cd3cc19e1d980306b638f6d0df06120bcf2 WHIRLPOOL 2a3766f3ad77af43ce93b8f64e4d478894199074075236c3cb5d398dfb8624e68c08257c37543bfd01acca435416163b862322288e4c174f3ac5930bfa801f53
 EBUILD freeswitch-1.2.12.ebuild 28623 SHA256 4ce53d6e789a987d8dea70644a62b4a7a473bc74807ee7ffe983c7cd866ca25e SHA512 f54d36e8ac72de2ee1a55dc5558cd0fa0ad826c51bbf6b91a83c52269c601b398660e6001a542441b256a5d6f285bc47b9c7e0d0928049371c85e3028bd1aae2 WHIRLPOOL 553482448cee8b785408bed4a6c53231ad398f34e01ef88a0de4fc5fbc821f8cae2fcb21d1ed4ce708d49601e67b52adff47d11c6beddc421e931fbc7820bace
 EBUILD freeswitch-1.2.9999.ebuild 28607 SHA256 dccc283cfd45e4c4ad181250be888355b0d568c39f862f2a0e481704904cbb62 SHA512 70ecff7f3a7b6fcdb61799ebcbd96456f53dc999e9feec57840766ea873f7de03ff08a1d9f35c549cc326758dd6c84fcc50e7fec74af48cb75d4b2ee12ef5423 WHIRLPOOL 3fed7632f75d013cc40fc7cd868f6c905617785733b96c78dc3cd825fa94373c543b6dea41ba7b75847e612c2493b97be60e0948b272648efcdff616d036a7fb
+EBUILD freeswitch-1.6.2.ebuild 15690 SHA256 82bdb304a68ce044458b3e2fb80e242e1a631db24829e6362e887ad3ebbd3df9 SHA512 a443e2fa793bd9c047da32ffe7bfb927cbedd9ae7ef79ad92b37ae6bb187f319b3486272d41bbc33046a081ef9fde72dd99a63d06be8d24706b49a2f6a1f8c57 WHIRLPOOL 9ac7d4a8c75dd44a382ddf85e84962499fcc2e05d96e6e6fb34858c709ce285fc32b6d82539f95f35684f8e5359a93031924f845e96c2f90ef5f520503f16c8e
+EBUILD freeswitch-1.6.8-r1.ebuild 15699 SHA256 47acc03b753c37d9ceefb57abe8503077cc9cb5d9c79b332fd2481547988d782 SHA512 4222f3a908a2e86933bfeb22b938676ddfc3309ce822271b6ca64fccf6850922de44680b62b931279abebeae1c6d055110d19f6733b131328cda494c9371f31b WHIRLPOOL c2d1d2689bec50bf3fee0d5990ca5f037ea5d258c3aca4fb9ffe2ae660dcb70c103dd7073502e96e0f4df17eaf977733ef49877364721bc2d537172b6303647e
+EBUILD freeswitch-1.6.8.ebuild 15828 SHA256 da4939263250476e380b4c342ae1c68dd406344bc5b9e710ee144711b3c83379 SHA512 2b4c664a0d7430ce2659d59f11a1bcc8b1101986f4e0879abb563a5786a2e831d0ade1987cfd664e5c90cf0d2182754c5a432f95d008b273ef67b7c18929d64f WHIRLPOOL c9306338867cf6e77f6caf551b335fe45b5e1587c00867c25e2bf501c7079328950ea800352763b8e4c7c566ee82e674c0f2d52f6d12d5b25636c504c34cae92
 EBUILD freeswitch-9999-r1.ebuild 29708 SHA256 dbed2a47cd588acac3d9850fa4d5175af1deaf036a86e8f99a3bef3c4f37f9b2 SHA512 7af9b25f895959ce579994259a769b01cba27c44f6289efcd7848243b3c30ecbab3cd5beda760edc9cc230465f8ea75fec78248a06dd76e048bbba79d63a070d WHIRLPOOL 3fddd04bec7a7d1b54f959554623f1cea28b4e9f84f55203b079b3b9bec6a3023f28490c2ed05435626960a4d212f9e90b54ecbac0ab93de8382fe1779d02a7b
 EBUILD freeswitch-9999.ebuild 28603 SHA256 ba4f40c300237488d18eae011cfc93e4d96f51dbce6737256dd470ce681dd3f4 SHA512 5c19d94a326f40169991cb80f53b7e618f9ce7674dc33c4abe9c3a23eb5d0266f70973b9f19fa090ac76123d1ea4039c2012656893a7cae1e7d39e37011ffbcc WHIRLPOOL fcd75a0c23894ae379ca98fa05fda6b2b700d6240cd3e8db5e3ec5ef7f3a2601609019f8c7b5af964d4a0f09ff3d4622a1574a4092606fcbe08e747e84ba195d
 MISC metadata.xml 11401 SHA256 90d2c22ac2d7d4487cc566f9a974676c242388150fd226a86a2dc0fc4a65b2a8 SHA512 1f2bb45df38ced0fc31d9dc31661c6429a5eca499731b87699dfceb27b72dc2c58df65846f75f1613b0435d5beb38cee95308493a9087ba0bd040b7ccf5f3e0f WHIRLPOOL fab963b34e0fa9a8fd14a05215d96622797eaa6f2535a3cf2023ab295937999ddd0b77dd064b8f5f3e57bb8f4af6867e09ab84ccd3d6e718a0399554a92ce086
diff --git a/net-misc/freeswitch/files/freeswitch-1.6.2-no-werror.patch b/net-misc/freeswitch/files/freeswitch-1.6.2-no-werror.patch
new file mode 100644
index 0000000..c283254
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch-1.6.2-no-werror.patch
@@ -0,0 +1,16 @@
+--- configure.ac	2015-03-26 15:23:59.000000000 +0100
++++ configure.ac	2015-05-24 16:17:28.055757601 +0200
+@@ -375,13 +375,9 @@
+ elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+-    fi
+     if test "${enable_64}" = "yes"; then
+ 	case "$host" in
+              *darwin*)
diff --git a/net-misc/freeswitch/files/freeswitch-1.6.8-no-werror.patch b/net-misc/freeswitch/files/freeswitch-1.6.8-no-werror.patch
new file mode 100644
index 0000000..3a4a3d0
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch-1.6.8-no-werror.patch
@@ -0,0 +1,16 @@
+--- configure.ac	2016-05-05 22:42:20.000000000 +0200
++++ configure.ac	2016-06-02 17:50:17.649780531 +0200
+@@ -414,13 +414,11 @@
+ elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
+     if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
+     fi
+     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
diff --git a/net-misc/freeswitch/freeswitch-1.6.2.ebuild b/net-misc/freeswitch/freeswitch-1.6.2.ebuild
new file mode 100644
index 0000000..d2eb9d3
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.6.2.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id:$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic python user java-pkg-opt-2
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+SRC_URI="http://files.freeswitch.org/releases/freeswitch/${P}.tar.xz"
+# No idea what USE=libedit is actually good for
+IUSE="esl libedit odbc +resampler +zrtp debug"
+
+LANGS="de en es es_ar fa fr he hr hu it ja nl pl pt ru sv th zh"
+
+FREETDM_MODULES="
+	libpri misdn r2 sng_isdn sng_ss7 wanpipe
+"
+
+ESL="perl python lua java managed"
+
+# TODO: Add support for mod_bert
+FM_APPLICATIONS="
+	abstraction avmd blacklist callcenter cidlookup cluechoo
+	+commands +conference curl +db directory distributor +dptools
+	easyroute +enum +esf esl +expr +fifo fsk fsv +hash +httapi
+	http_cache ladspa lcr +limit memcache mongo nibblebill
+	osp rad_auth random redis rss skel +sms snapshot
+	snom soundtouch +spandsp spy stress +valet_parking vmd
+	+voicemail voicemail_ivr
+"
+FM_TTS="
+	cepstral flite pocketsphinx tts_commandline unimrcp
+"
+FM_CODECS="
+	+amr amrwb +bv codec2 com_g729 dahdi_codec +g723_1 +g729
+	+h26x +ilbc isac mp4v +opus sangoma_codec silk siren skel_codec
+	theora
+"
+FM_DIALPLANS="
+	dialplan_asterisk +dialplan_directory +dialplan_xml
+"
+FM_DIRECTORIES="
+	ldap
+"
+FM_ENDPOINTS="
+	alsa dingaling freetdm gsmopen h323 khomp +loopback opal
+	portaudio reference rtc rtmp skinny skypopen +sofia unicall verto
+"
+FM_EVENT_HANDLERS="
+	+cdr_csv cdr_mongodb cdr_pg_csv cdr_sqlite erlang_event
+	event_multicast +event_socket event_test event_zmq json_cdr
+	radius_cdr snmp
+"
+FM_FORMATS="
+	+local_stream +native_file png portaudio_stream shell_stream
+	shout +sndfile +tone_stream vlc
+"
+FM_LANGUAGES="
+	java lua managed perl python yaml
+"
+FM_LOGGERS="
+	+console +logfile +syslog
+"
+FM_TIMERS="
+	posix_timer timerfd
+"
+FM_XML="
+	xml_cdr xml_curl xml_ldap xml_rpc xml_scgi
+"
+FM_EXTERNAL="
+	ssh
+"
+FM="
+	${FM_APPLICATIONS}
+	${FM_TTS}
+	${FM_CODECS}
+	${FM_DIALPLANS}
+	${FM_DIRECTORIES}
+	${FM_ENDPOINTS}
+	${FM_EVENT_HANDLERS}
+	${FM_FORMATS}
+	${FM_LANGUAGES}
+	${FM_LOGGERS}
+	${FM_TIMERS}
+	${FM_XML}
+"
+
+FM_BROKEN=""
+
+#? mod_mp4 -> want mp4.h (which was in older versions of libmp4v2
+
+REQUIRED_USE="
+	|| ( linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_he linguas_hr linguas_hu linguas_it linguas_ja linguas_nl linguas_pt linguas_ru linguas_th linguas_zh )
+	esl? ( freeswitch_modules_esl )
+	freeswitch_modules_esl? ( esl )
+	freeswitch_modules_limit? ( freeswitch_modules_db freeswitch_modules_hash )
+	freeswitch_modules_nibblebill? ( odbc )
+	freeswitch_modules_easyroute? ( odbc )
+	freeswitch_modules_lcr? ( odbc )
+	freeswitch_modules_gsmopen? ( freeswitch_modules_spandsp )
+	freeswitch_modules_portaudio_stream? ( freeswitch_modules_portaudio )
+	freeswitch_modules_freetdm? ( freetdm_modules_libpri )
+	freeswitch_modules_verto? ( freeswitch_modules_rtc )
+	freetdm_modules_libpri? ( freeswitch_modules_freetdm )
+	freetdm_modules_misdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_r2? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_isdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_ss7? ( freeswitch_modules_freetdm )
+	freetdm_modules_wanpipe? ( freeswitch_modules_freetdm )
+"
+
+# Though speex is obsolete (see https://wiki.freeswitch.org/wiki/Mod_speex), configure fails without it
+RDEPEND="
+	virtual/libc
+	>=dev-db/sqlite-3.6.20
+	>=dev-libs/libpcre-7.8
+	>=media-libs/speex-1.2_rc1
+	>=net-misc/curl-7.19
+	libedit? ( dev-libs/libedit )
+	odbc? ( dev-db/unixODBC )
+
+	esl_java? ( >=virtual/jre-1.5:* )
+	esl_lua? ( || ( dev-lang/lua:5.1 dev-lang/luajit:2 ) )
+	esl_managed? ( >=dev-lang/mono-1.9 )
+	esl_perl? ( dev-lang/perl )
+	esl_python? ( dev-lang/python:2.7 )
+
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql )
+	freeswitch_modules_enum? ( >=net-libs/ldns-1.6.6 )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_gsmopen? ( net-libs/ctb[-gpib] app-mobilephone/gsmlib )
+	freeswitch_modules_h323? ( || ( net-libs/openh323 net-libs/ptlib ) )
+	freeswitch_modules_java? ( >=virtual/jre-1.5:* )
+	freeswitch_modules_ladspa? ( media-libs/ladspa-sdk )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_opal? ( net-libs/opal[h323,iax] )
+	freeswitch_modules_opus? ( >=media-libs/opus-1.1 )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.3 )
+	freeswitch_modules_perl? ( dev-lang/perl[ithreads] )
+	freeswitch_modules_python? ( dev-lang/python:2.7[threads] )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_sndfile? ( >=media-libs/libsndfile-1.0.20 )
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap[sasl] )
+	freeswitch_modules_yaml? ( >=dev-libs/libyaml-0.1.4 )
+
+	freeswitch_modules_freetdm? (
+		freetdm_modules_libpri? ( >=net-libs/libpri-1.4.0 )
+		freetdm_modules_misdn? ( >=net-dialup/misdnuser-2.0.0 )
+		freetdm_modules_r2? ( net-misc/openr2 )
+		freetdm_modules_sng_isdn? ( net-libs/libsng-isdn )
+		freetdm_modules_sng_ss7? ( net-libs/libsng-ss7 )
+		freetdm_modules_wanpipe? ( net-misc/wanpipe )
+	)
+"
+#	freeswitch_modules_mp4? ( media-libs/libmp4v2 )
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10
+	virtual/pkgconfig
+	esl_java? ( >=virtual/jdk-1.5:* >=dev-lang/swig-1.3.6:1 )
+	esl_lua? ( >=dev-lang/swig-1.3.26:1 )
+	esl_managed? ( =dev-lang/swig-2*:0 )
+	esl_perl? ( >=dev-lang/swig-1.1:1 )
+	esl_python? ( >=dev-lang/swig-1.1:1 )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5:* )
+"
+
+PDEPEND="media-sound/freeswitch-sounds
+	media-sound/freeswitch-sounds-music
+	freeswitch_modules_ssh? ( net-voip/freeswitch-mod_ssh )
+"
+
+for x in ${FM} ${FM_EXTERNAL}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${FREETDM_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freetdm_modules_${x/+}"
+done
+for x in ${ESL}; do
+	IUSE="${IUSE} esl_${x}"
+done
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+for x in ${FM_BROKEN}; do
+	IUSE="${IUSE//${x}}"
+done
+
+FREESWITCH_USER=${FREESWITCH_USER:-freeswitch}
+FREESWITCH_GROUP=${FREESWITCH_GROUP:-freeswitch}
+
+pkg_pretend() {
+	if use freeswitch_modules_h323; then
+		ewarn "You're about to using mod_h323, which depends on "
+		ewarn "'dead' openh323 library. We're suggest you to use mod_opal instead."
+		if has_version net-libs/ptlib; then
+			die "Can't use mod_h323 with net-libs/ptlib. Please, use mod_opal instead."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use freeswitch_modules_cepstral; then
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			eerror 'Try to set SWIFT_HOME="/path/to/swift_tts_engine" in your make.conf'
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup "${FREESWITCH_GROUP}"
+	enewuser "${FREESWITCH_USER}" -1 -1 "/var/lib/${PN}" "${FREESWITCH_GROUP}"
+}
+
+fs_set_module() {
+	local config="modules.conf"
+	local mod="$2"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && {
+		die "Unable to determine category for module \"${mod}\"."
+	}
+
+	case $1 in
+	enable)
+		einfo "  ++ Enabling ${mod}"
+		echo "${category}/${mod}" >> "${config}"
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		echo "#${category}/${mod}" >> "${config}"
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod action
+
+	[ -f "modules.conf" ] && {
+		rm -f "modules.conf" || die "Failed to remove existing modules.conf"
+	}
+	einfo "Optional modules:"
+	for x in ${FM}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use freeswitch_modules_${mod} || action="disable"
+			fs_set_module "${action}" "mod_${mod}"
+		}
+	done
+
+	einfo "Language modules:"
+	for x in ${LANGS}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use linguas_${mod} || action="disable"
+			fs_set_module "${action}" "mod_say_${mod}"
+		}
+	done
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dopymod() {
+	(
+		insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+			doins "${x}" || die "failed to install ${x}"
+		done
+	) || die "failed to install $@"
+}
+
+esl_doluamod() {
+	(
+		insinto $(pkg-config lua --variable INSTALL_CMOD)
+		insopts -m755
+		doins "$@"
+	) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+	(
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+	) || die "failed to install $@"
+}
+
+src_prepare() {
+	# disable -Werror
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+	# Fix broken libtool?
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr/Makefile.in"
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr-util/Makefile.in"
+
+
+	if use freeswitch_modules_freetdm
+	then
+		( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+	fi
+
+	if use esl_python; then
+		python_get_version &>/dev/null && PYVER=$(python_get_version) || die "Failed to determine current python version"
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local java_opts config_opts
+	use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+	use freetdm_modules_libpri && \
+		config_opts="--with-libpri"
+	use freetdm_modules_misdn && \
+		config_opts="--with-misdn"
+
+	use debug || config_opts="${config_opts} --disable-debug"
+
+	einfo "Configuring FreeSWITCH..."
+		touch noreg
+		FREESWITCH_HTDOCS="${FREESWITCH_HTDOCS:-/var/www/localhost/htdocs/${PN}}"
+		econf \
+		--disable-option-checking \
+		${CTARGET:+--target=${CTARGET}} \
+		$(use_enable libedit core-libedit-support) \
+		--localstatedir="/var" \
+		--sysconfdir="/etc" \
+		--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+		--with-rundir="/var/run/${PN}" \
+		--with-logfiledir="/var/log/${PN}" \
+		--with-dbdir="/var/lib/${PN}/db" \
+		--with-htdocsdir="/usr/share/${PN}/htdocs" \
+		--with-soundsdir="/usr/share/${PN}/sounds" \
+		--with-grammardir="/usr/share/${PN}/grammar" \
+		--with-scriptdir="/usr/share/${PN}/scripts" \
+		--with-recordingsdir="/var/lib/${PN}/recordings" \
+		--with-pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
+		$(use_enable zrtp) \
+		$(use_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(use_enable resampler resample) \
+		$(use_enable odbc core-odbc-support) \
+		${java_opts} ${config_opts} || die "failed to configure FreeSWITCH"
+
+	if use freeswitch_modules_freetdm; then
+		pushd "${S}/libs/freetdm"
+		einfo "Configuring FreeTDM..."
+		econf \
+			--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+			--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+			${config_opts} || die "failed to configure FreeTDM"
+		popd
+	fi
+	setup_modules
+}
+
+src_compile() {
+	local esl_lang
+
+	if use freeswitch_modules_freetdm; then
+#	# breaks freetdm:
+#	filter-flags -fvisibility-inlines-hidden
+		einfo "Building FreeTDM..."
+		emake -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+	for esl_lang in ${ESL}; do
+		use esl_${esl_lang} || continue
+
+		esl_lang="${esl_lang#*_}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl/"${esl_lang}" reswig || die "Failed to reswig esl module for language \"${esl_lang}\""
+		emake -C libs/esl "$(esl_modname ${esl_lang})" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+	if use esl; then
+		einfo "Building libesl..."
+		emake -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+src_install() {
+	local esl_lang
+	einfo "Installing freeswitch core and modules..."
+	emake install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto "/usr/share/${PN}/scripts/rss"
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /var/lib/"${PN}"/{cores,storage}
+
+	newinitd "${FILESDIR}"/freeswitch.initd freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	use freeswitch_modules_managed && keepdir "/usr/$(get_libdir)/${PN}/mod/managed"
+#	# TODO: install contributed stuff
+
+	if use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	find "${ED}" -name "*.la" -delete || die "Failed to cleanup .la files"
+
+	if use esl_python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl_lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl_perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl_java; then
+		einfo "Installing esl module for java..."
+		java-pkg_dojar libs/esl/java/esl.jar
+		java-pkg_doso libs/esl/java/libesljni.so
+	fi
+
+	if use esl_managed; then
+		einfo "Installing esl module for Mono..."
+		insinto "/usr/$(get_libdir)/${PN}/mod/managed"
+		doins libs/esl/managed/ESL.so
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/usr/$(get_libdir)"
+		doins libs/esl/libesl.a
+	fi
+
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/etc/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/$(get_libdir)/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/run/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/log/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/share/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "FreeSWITCH has been successfully emerged!"
+	einfo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	einfo
+
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		einfo
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild b/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
new file mode 100644
index 0000000..14bb32b
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id:$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools eutils flag-o-matic python-single-r1 user java-pkg-opt-2
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+SRC_URI="http://files.freeswitch.org/releases/freeswitch/${P}.tar.xz"
+IUSE="esl +libedit odbc postgres +resampler +zrtp debug"
+
+LANGS="de en es es_ar fa fr he hr hu it ja nl pl pt ru sv th zh"
+
+FREETDM_MODULES="
+	libpri misdn r2 sng_isdn sng_ss7 wanpipe
+"
+
+ESL="perl python lua java managed"
+
+# TODO: Add support for mod_bert
+FM_APPLICATIONS="
+	abstraction avmd blacklist callcenter cidlookup cluechoo
+	+commands +conference curl +db directory distributor +dptools
+	easyroute +enum +esf esl +expr +fifo fsk fsv +hash +httapi
+	http_cache ladspa lcr +limit memcache mongo nibblebill
+	osp rad_auth random redis rss skel +sms snapshot
+	snom soundtouch +spandsp spy stress +valet_parking vmd
+	+voicemail voicemail_ivr
+"
+FM_TTS="
+	cepstral flite pocketsphinx tts_commandline unimrcp
+"
+FM_CODECS="
+	+amr amrwb bv codec2 com_g729 dahdi_codec +g723_1 +g729
+	+h26x +ilbc isac mp4v +opus sangoma_codec silk siren skel_codec
+	theora
+"
+FM_DIALPLANS="
+	dialplan_asterisk +dialplan_directory +dialplan_xml
+"
+FM_DIRECTORIES="
+	ldap
+"
+FM_ENDPOINTS="
+	alsa dingaling freetdm gsmopen h323 khomp +loopback opal
+	portaudio reference rtc rtmp skinny skypopen +sofia unicall verto
+"
+FM_EVENT_HANDLERS="
+	amqp +cdr_csv cdr_mongodb cdr_pg_csv cdr_sqlite erlang_event
+	event_multicast +event_socket event_test event_zmq json_cdr
+	radius_cdr snmp
+"
+FM_FORMATS="
+	+local_stream +native_file png portaudio_stream shell_stream
+	shout +sndfile +tone_stream vlc
+"
+FM_LANGUAGES="
+	java lua managed perl python yaml
+"
+FM_LOGGERS="
+	+console +logfile +syslog
+"
+FM_TIMERS="
+	posix_timer timerfd
+"
+FM_XML="
+	xml_cdr xml_curl xml_ldap xml_radius xml_rpc xml_scgi
+"
+FM_EXTERNAL="
+	ssh
+"
+FM="
+	${FM_APPLICATIONS}
+	${FM_TTS}
+	${FM_CODECS}
+	${FM_DIALPLANS}
+	${FM_DIRECTORIES}
+	${FM_ENDPOINTS}
+	${FM_EVENT_HANDLERS}
+	${FM_FORMATS}
+	${FM_LANGUAGES}
+	${FM_LOGGERS}
+	${FM_TIMERS}
+	${FM_XML}
+"
+
+FM_BROKEN=""
+
+#? mod_mp4 -> want mp4.h (which was in older versions of libmp4v2
+
+REQUIRED_USE="
+	|| ( l10n_de l10n_en l10n_es l10n_fa l10n_fr l10n_he l10n_hr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_ru l10n_th l10n_zh )
+	esl? ( freeswitch_modules_esl )
+	esl_python? ( ${PYTHON_REQUIRED_USE} )
+	freeswitch_modules_cdr_pg_csv? ( postgres )
+	freeswitch_modules_esl? ( esl )
+	freeswitch_modules_limit? ( freeswitch_modules_db freeswitch_modules_hash )
+	freeswitch_modules_nibblebill? ( odbc )
+	freeswitch_modules_easyroute? ( odbc )
+	freeswitch_modules_lcr? ( odbc )
+	freeswitch_modules_gsmopen? ( freeswitch_modules_spandsp )
+	freeswitch_modules_portaudio_stream? ( freeswitch_modules_portaudio )
+	freeswitch_modules_python? ( ${PYTHON_REQUIRED_USE} )
+	freeswitch_modules_freetdm? ( freetdm_modules_libpri )
+	freeswitch_modules_verto? ( freeswitch_modules_rtc )
+	freetdm_modules_libpri? ( freeswitch_modules_freetdm )
+	freetdm_modules_misdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_r2? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_isdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_ss7? ( freeswitch_modules_freetdm )
+	freetdm_modules_wanpipe? ( freeswitch_modules_freetdm )
+"
+
+# Though speex is obsolete (see https://wiki.freeswitch.org/wiki/Mod_speex), configure fails without it
+RDEPEND="
+	virtual/libc
+	>=dev-db/sqlite-3.6.20
+	>=dev-libs/libpcre-7.8
+	>=media-libs/speex-1.2_rc1
+	>=net-misc/curl-7.19
+	libedit? ( dev-libs/libedit )
+	odbc? ( dev-db/unixODBC )
+
+	esl_java? ( >=virtual/jre-1.5:* )
+	esl_lua? ( || ( dev-lang/lua:5.1 dev-lang/luajit:2 ) )
+	esl_managed? ( >=dev-lang/mono-1.9 )
+	esl_perl? ( dev-lang/perl )
+	esl_python? ( ${PYTHON_DEPS} )
+
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_amqp? ( >=net-misc/rabbitmq-server-0.5.2 )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql )
+	freeswitch_modules_enum? ( >=net-libs/ldns-1.6.6 )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_gsmopen? ( net-libs/ctb[-gpib] app-mobilephone/gsmlib )
+	freeswitch_modules_h323? ( || ( net-libs/openh323 net-libs/ptlib ) )
+	freeswitch_modules_ilbc? ( >=media-libs/ilbc-freeswitch-0.0.1 )
+	freeswitch_modules_java? ( >=virtual/jre-1.5:* )
+	freeswitch_modules_ladspa? ( media-libs/ladspa-sdk )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_opal? ( net-libs/opal[h323,iax] )
+	freeswitch_modules_opus? ( >=media-libs/opus-1.1 )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.3 )
+	freeswitch_modules_perl? ( dev-lang/perl[ithreads] )
+	freeswitch_modules_python? ( ${PYTHON_DEPS} )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_sndfile? ( >=media-libs/libsndfile-1.0.20 )
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap[sasl] )
+	freeswitch_modules_yaml? ( >=dev-libs/libyaml-0.1.4 )
+
+	freeswitch_modules_freetdm? (
+		freetdm_modules_libpri? ( >=net-libs/libpri-1.4.0 )
+		freetdm_modules_misdn? ( >=net-dialup/misdnuser-2.0.0 )
+		freetdm_modules_r2? ( net-misc/openr2 )
+		freetdm_modules_sng_isdn? ( net-libs/libsng-isdn )
+		freetdm_modules_sng_ss7? ( net-libs/libsng-ss7 )
+		freetdm_modules_wanpipe? ( net-misc/wanpipe )
+	)
+"
+#	freeswitch_modules_mp4? ( media-libs/libmp4v2 )
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10
+	virtual/pkgconfig
+	esl_java? ( >=virtual/jdk-1.5:* >=dev-lang/swig-2.0 )
+	esl_lua? ( >=dev-lang/swig-2.0 )
+	esl_managed? ( >=dev-lang/swig-2.0 )
+	esl_perl? ( >=dev-lang/swig-2.0 )
+	esl_python? ( >=dev-lang/swig-2.0 )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5:* )
+"
+
+PDEPEND="media-sound/freeswitch-sounds
+	media-sound/freeswitch-sounds-music
+"
+
+for x in ${FM} ${FM_EXTERNAL}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${FREETDM_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freetdm_modules_${x/+}"
+done
+for x in ${ESL}; do
+	IUSE="${IUSE} esl_${x}"
+done
+for x in ${LANGS}; do
+	IUSE="${IUSE} l10n_${x}"
+done
+for x in ${FM_BROKEN}; do
+	IUSE="${IUSE//${x}}"
+done
+
+FREESWITCH_USER=${FREESWITCH_USER:-freeswitch}
+FREESWITCH_GROUP=${FREESWITCH_GROUP:-freeswitch}
+
+pkg_pretend() {
+	if use freeswitch_modules_h323; then
+		ewarn "You're about to using mod_h323, which depends on "
+		ewarn "'dead' openh323 library. We're suggest you to use mod_opal instead."
+		if has_version net-libs/ptlib; then
+			die "Can't use mod_h323 with net-libs/ptlib. Please, use mod_opal instead."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use freeswitch_modules_cepstral; then
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			eerror 'Try to set SWIFT_HOME="/path/to/swift_tts_engine" in your make.conf'
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	use freeswitch_modules_python || use esl_python && python-single-r1_pkg_setup
+
+	enewgroup "${FREESWITCH_GROUP}"
+	enewuser "${FREESWITCH_USER}" -1 -1 "/var/lib/${PN}" "${FREESWITCH_GROUP}"
+}
+
+fs_set_module() {
+	local config="modules.conf"
+	local mod="$2"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && {
+		die "Unable to determine category for module \"${mod}\"."
+	}
+
+	case $1 in
+	enable)
+		einfo "  ++ Enabling ${mod}"
+		echo "${category}/${mod}" >> "${config}"
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		echo "#${category}/${mod}" >> "${config}"
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod action
+
+	[ -f "modules.conf" ] && {
+		rm -f "modules.conf" || die "Failed to remove existing modules.conf"
+	}
+	einfo "Optional modules:"
+	for x in ${FM}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use freeswitch_modules_${mod} || action="disable"
+			fs_set_module "${action}" "mod_${mod}"
+		}
+	done
+
+	einfo "Language modules:"
+	for x in ${LANGS}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use l10n_${mod} || action="disable"
+			fs_set_module "${action}" "mod_say_${mod}"
+		}
+	done
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_doluamod() {
+	(
+		insinto $(pkg-config lua --variable INSTALL_CMOD)
+		insopts -m755
+		doins "$@"
+	) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+	(
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+	) || die "failed to install $@"
+}
+
+src_prepare() {
+	# disable -Werror
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+	# Fix broken libtool?
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr/Makefile.in"
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr-util/Makefile.in"
+
+	# Change invocations of "swig2.0" to "swig"
+	local potentially_affected_makefiles=$(find "${S}/libs/esl/" "${S}/src/mod/languages/" -name "Makefile*")
+	for file in $potentially_affected_makefiles; do
+		sed -i "s/swig2.0/swig/" "${file}"
+	done
+
+	if use freeswitch_modules_freetdm
+	then
+		( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+	fi
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local java_opts config_opts
+	use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+	use freetdm_modules_libpri && \
+		config_opts="--with-libpri"
+	use freetdm_modules_misdn && \
+		config_opts="--with-misdn"
+
+	use debug || config_opts="${config_opts} --disable-debug"
+
+	einfo "Configuring FreeSWITCH..."
+		touch noreg
+		FREESWITCH_HTDOCS="${FREESWITCH_HTDOCS:-/var/www/localhost/htdocs/${PN}}"
+		econf \
+		--disable-option-checking \
+		${CTARGET:+--target=${CTARGET}} \
+		$(use_enable libedit core-libedit-support) \
+		--localstatedir="/var" \
+		--sysconfdir="/etc" \
+		--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+		--with-rundir="/var/run/${PN}" \
+		--with-logfiledir="/var/log/${PN}" \
+		--with-dbdir="/var/lib/${PN}/db" \
+		--with-htdocsdir="/usr/share/${PN}/htdocs" \
+		--with-soundsdir="/usr/share/${PN}/sounds" \
+		--with-grammardir="/usr/share/${PN}/grammar" \
+		--with-scriptdir="/var/lib/${PN}/scripts" \
+		--with-recordingsdir="/var/lib/${PN}/recordings" \
+		--with-pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
+		$(use_enable postgres core-pgsql-support) \
+		$(use_enable zrtp) \
+		$(use_with freeswitch_modules_python python "${PYTHON}") \
+		$(use_enable resampler resample) \
+		$(use_enable odbc core-odbc-support) \
+		${java_opts} ${config_opts} || die "failed to configure FreeSWITCH"
+
+	if use freeswitch_modules_freetdm; then
+		pushd "${S}/libs/freetdm"
+		einfo "Configuring FreeTDM..."
+		econf \
+			--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+			--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+			${config_opts} || die "failed to configure FreeTDM"
+		popd
+	fi
+	setup_modules
+}
+
+src_compile() {
+	local esl_lang
+
+	if use freeswitch_modules_freetdm; then
+#	# breaks freetdm:
+#	filter-flags -fvisibility-inlines-hidden
+		einfo "Building FreeTDM..."
+		emake -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+	for esl_lang in ${ESL}; do
+		use esl_${esl_lang} || continue
+
+		esl_lang="${esl_lang#*_}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl/"${esl_lang}" reswig || die "Failed to reswig esl module for language \"${esl_lang}\""
+		emake -C libs/esl "$(esl_modname ${esl_lang})" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+	if use esl; then
+		einfo "Building libesl..."
+		emake -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+src_install() {
+	local esl_lang
+	einfo "Installing freeswitch core and modules..."
+	emake install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto "/usr/share/${PN}/scripts/rss"
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /var/lib/"${PN}"/{cores,storage}
+
+	newinitd "${FILESDIR}"/freeswitch.initd freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	use freeswitch_modules_managed && keepdir "/usr/$(get_libdir)/${PN}/mod/managed"
+#	# TODO: install contributed stuff
+
+	if use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	find "${ED}" -name "*.la" -delete || die "Failed to cleanup .la files"
+
+	if use esl_python; then
+		einfo "Installing esl module for python..."
+		insinto $(python_get_sitedir)
+		insopts -m644
+		doins "libs/esl/python/_ESL.so"
+		python_domodule "libs/esl/python/ESL.py"
+	fi
+
+	if use esl_lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl_perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl_java; then
+		einfo "Installing esl module for java..."
+		java-pkg_dojar libs/esl/java/esl.jar
+		java-pkg_doso libs/esl/java/libesljni.so
+	fi
+
+	if use esl_managed; then
+		einfo "Installing esl module for Mono..."
+		insinto "/usr/$(get_libdir)/${PN}/mod/managed"
+		doins libs/esl/managed/ESL.so
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/usr/$(get_libdir)"
+		doins libs/esl/.libs/libesl.a
+	fi
+
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/etc/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/$(get_libdir)/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/run/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/log/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/share/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "FreeSWITCH has been successfully emerged!"
+	einfo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	einfo
+
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		einfo
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-1.6.8.ebuild b/net-misc/freeswitch/freeswitch-1.6.8.ebuild
new file mode 100644
index 0000000..ffd2467
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.6.8.ebuild
@@ -0,0 +1,555 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id:$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic python user java-pkg-opt-2
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+SRC_URI="http://files.freeswitch.org/releases/freeswitch/${P}.tar.xz"
+IUSE="esl +libedit odbc postgres +resampler +zrtp debug"
+
+LANGS="de en es es_ar fa fr he hr hu it ja nl pl pt ru sv th zh"
+
+FREETDM_MODULES="
+	libpri misdn r2 sng_isdn sng_ss7 wanpipe
+"
+
+ESL="perl python lua java managed"
+
+# TODO: Add support for mod_bert
+FM_APPLICATIONS="
+	abstraction avmd blacklist callcenter cidlookup cluechoo
+	+commands +conference curl +db directory distributor +dptools
+	easyroute +enum +esf esl +expr +fifo fsk fsv +hash +httapi
+	http_cache ladspa lcr +limit memcache mongo nibblebill
+	osp rad_auth random redis rss skel +sms snapshot
+	snom soundtouch +spandsp spy stress +valet_parking vmd
+	+voicemail voicemail_ivr
+"
+FM_TTS="
+	cepstral flite pocketsphinx tts_commandline unimrcp
+"
+FM_CODECS="
+	+amr amrwb bv codec2 com_g729 dahdi_codec +g723_1 +g729
+	+h26x +ilbc isac mp4v +opus sangoma_codec silk siren skel_codec
+	theora
+"
+FM_DIALPLANS="
+	dialplan_asterisk +dialplan_directory +dialplan_xml
+"
+FM_DIRECTORIES="
+	ldap
+"
+FM_ENDPOINTS="
+	alsa dingaling freetdm gsmopen h323 khomp +loopback opal
+	portaudio reference rtc rtmp skinny skypopen +sofia unicall verto
+"
+FM_EVENT_HANDLERS="
+	amqp +cdr_csv cdr_mongodb cdr_pg_csv cdr_sqlite erlang_event
+	event_multicast +event_socket event_test event_zmq json_cdr
+	radius_cdr snmp
+"
+FM_FORMATS="
+	+local_stream +native_file png portaudio_stream shell_stream
+	shout +sndfile +tone_stream vlc
+"
+FM_LANGUAGES="
+	java lua managed perl python yaml
+"
+FM_LOGGERS="
+	+console +logfile +syslog
+"
+FM_TIMERS="
+	posix_timer timerfd
+"
+FM_XML="
+	xml_cdr xml_curl xml_ldap xml_radius xml_rpc xml_scgi
+"
+FM_EXTERNAL="
+	ssh
+"
+FM="
+	${FM_APPLICATIONS}
+	${FM_TTS}
+	${FM_CODECS}
+	${FM_DIALPLANS}
+	${FM_DIRECTORIES}
+	${FM_ENDPOINTS}
+	${FM_EVENT_HANDLERS}
+	${FM_FORMATS}
+	${FM_LANGUAGES}
+	${FM_LOGGERS}
+	${FM_TIMERS}
+	${FM_XML}
+"
+
+FM_BROKEN=""
+
+#? mod_mp4 -> want mp4.h (which was in older versions of libmp4v2
+
+REQUIRED_USE="
+	|| ( linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_he linguas_hr linguas_hu linguas_it linguas_ja linguas_nl linguas_pt linguas_ru linguas_th linguas_zh )
+	esl? ( freeswitch_modules_esl )
+	freeswitch_modules_cdr_pg_csv? ( postgres )
+	freeswitch_modules_esl? ( esl )
+	freeswitch_modules_limit? ( freeswitch_modules_db freeswitch_modules_hash )
+	freeswitch_modules_nibblebill? ( odbc )
+	freeswitch_modules_easyroute? ( odbc )
+	freeswitch_modules_lcr? ( odbc )
+	freeswitch_modules_gsmopen? ( freeswitch_modules_spandsp )
+	freeswitch_modules_portaudio_stream? ( freeswitch_modules_portaudio )
+	freeswitch_modules_freetdm? ( freetdm_modules_libpri )
+	freeswitch_modules_verto? ( freeswitch_modules_rtc )
+	freetdm_modules_libpri? ( freeswitch_modules_freetdm )
+	freetdm_modules_misdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_r2? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_isdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_ss7? ( freeswitch_modules_freetdm )
+	freetdm_modules_wanpipe? ( freeswitch_modules_freetdm )
+"
+
+# Though speex is obsolete (see https://wiki.freeswitch.org/wiki/Mod_speex), configure fails without it
+RDEPEND="
+	virtual/libc
+	>=dev-db/sqlite-3.6.20
+	>=dev-libs/libpcre-7.8
+	>=media-libs/speex-1.2_rc1
+	>=net-misc/curl-7.19
+	libedit? ( dev-libs/libedit )
+	odbc? ( dev-db/unixODBC )
+
+	esl_java? ( >=virtual/jre-1.5:* )
+	esl_lua? ( || ( dev-lang/lua:5.1 dev-lang/luajit:2 ) )
+	esl_managed? ( >=dev-lang/mono-1.9 )
+	esl_perl? ( dev-lang/perl )
+	esl_python? ( dev-lang/python:2.7 )
+
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_amqp? ( >=net-misc/rabbitmq-server-0.5.2 )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql )
+	freeswitch_modules_enum? ( >=net-libs/ldns-1.6.6 )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_gsmopen? ( net-libs/ctb[-gpib] app-mobilephone/gsmlib )
+	freeswitch_modules_h323? ( || ( net-libs/openh323 net-libs/ptlib ) )
+	freeswitch_modules_ilbc? ( >=media-libs/ilbc-freeswitch-0.0.1 )
+	freeswitch_modules_java? ( >=virtual/jre-1.5:* )
+	freeswitch_modules_ladspa? ( media-libs/ladspa-sdk )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_opal? ( net-libs/opal[h323,iax] )
+	freeswitch_modules_opus? ( >=media-libs/opus-1.1 )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.3 )
+	freeswitch_modules_perl? ( dev-lang/perl[ithreads] )
+	freeswitch_modules_python? ( dev-lang/python:2.7[threads] )
+	freeswitch_modules_shout? ( media-libs/libogg )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_sndfile? ( >=media-libs/libsndfile-1.0.20 )
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap[sasl] )
+	freeswitch_modules_yaml? ( >=dev-libs/libyaml-0.1.4 )
+
+	freeswitch_modules_freetdm? (
+		freetdm_modules_libpri? ( >=net-libs/libpri-1.4.0 )
+		freetdm_modules_misdn? ( >=net-dialup/misdnuser-2.0.0 )
+		freetdm_modules_r2? ( net-misc/openr2 )
+		freetdm_modules_sng_isdn? ( net-libs/libsng-isdn )
+		freetdm_modules_sng_ss7? ( net-libs/libsng-ss7 )
+		freetdm_modules_wanpipe? ( net-misc/wanpipe )
+	)
+"
+#	freeswitch_modules_mp4? ( media-libs/libmp4v2 )
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10
+	virtual/pkgconfig
+	esl_java? ( >=virtual/jdk-1.5:* >=dev-lang/swig-1.3.6:1 )
+	esl_lua? ( >=dev-lang/swig-1.3.26:1 )
+	esl_managed? ( =dev-lang/swig-2*:0 )
+	esl_perl? ( >=dev-lang/swig-1.1:1 )
+	esl_python? ( >=dev-lang/swig-1.1:1 )
+	freeswitch_modules_java? ( >=virtual/jdk-1.5:* )
+"
+
+PDEPEND="media-sound/freeswitch-sounds
+	media-sound/freeswitch-sounds-music
+"
+
+for x in ${FM} ${FM_EXTERNAL}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${FREETDM_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freetdm_modules_${x/+}"
+done
+for x in ${ESL}; do
+	IUSE="${IUSE} esl_${x}"
+done
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+for x in ${FM_BROKEN}; do
+	IUSE="${IUSE//${x}}"
+done
+
+FREESWITCH_USER=${FREESWITCH_USER:-freeswitch}
+FREESWITCH_GROUP=${FREESWITCH_GROUP:-freeswitch}
+
+pkg_pretend() {
+	if use freeswitch_modules_h323; then
+		ewarn "You're about to using mod_h323, which depends on "
+		ewarn "'dead' openh323 library. We're suggest you to use mod_opal instead."
+		if has_version net-libs/ptlib; then
+			die "Can't use mod_h323 with net-libs/ptlib. Please, use mod_opal instead."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use freeswitch_modules_cepstral; then
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			eerror 'Try to set SWIFT_HOME="/path/to/swift_tts_engine" in your make.conf'
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup "${FREESWITCH_GROUP}"
+	enewuser "${FREESWITCH_USER}" -1 -1 "/var/lib/${PN}" "${FREESWITCH_GROUP}"
+}
+
+fs_set_module() {
+	local config="modules.conf"
+	local mod="$2"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && {
+		die "Unable to determine category for module \"${mod}\"."
+	}
+
+	case $1 in
+	enable)
+		einfo "  ++ Enabling ${mod}"
+		echo "${category}/${mod}" >> "${config}"
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		echo "#${category}/${mod}" >> "${config}"
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod action
+
+	[ -f "modules.conf" ] && {
+		rm -f "modules.conf" || die "Failed to remove existing modules.conf"
+	}
+	einfo "Optional modules:"
+	for x in ${FM}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use freeswitch_modules_${mod} || action="disable"
+			fs_set_module "${action}" "mod_${mod}"
+		}
+	done
+
+	einfo "Language modules:"
+	for x in ${LANGS}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use linguas_${mod} || action="disable"
+			fs_set_module "${action}" "mod_say_${mod}"
+		}
+	done
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dopymod() {
+	(
+		insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+			doins "${x}" || die "failed to install ${x}"
+		done
+	) || die "failed to install $@"
+}
+
+esl_doluamod() {
+	(
+		insinto $(pkg-config lua --variable INSTALL_CMOD)
+		insopts -m755
+		doins "$@"
+	) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+	(
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+	) || die "failed to install $@"
+}
+
+src_prepare() {
+	# disable -Werror
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+	# Fix broken libtool?
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr/Makefile.in"
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr-util/Makefile.in"
+
+	if use freeswitch_modules_freetdm
+	then
+		( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+	fi
+
+	if use esl_python; then
+		python_get_version &>/dev/null && PYVER=$(python_get_version) || die "Failed to determine current python version"
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local java_opts config_opts
+	use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+	use freetdm_modules_libpri && \
+		config_opts="--with-libpri"
+	use freetdm_modules_misdn && \
+		config_opts="--with-misdn"
+
+	use debug || config_opts="${config_opts} --disable-debug"
+
+	einfo "Configuring FreeSWITCH..."
+		touch noreg
+		FREESWITCH_HTDOCS="${FREESWITCH_HTDOCS:-/var/www/localhost/htdocs/${PN}}"
+		econf \
+		--disable-option-checking \
+		${CTARGET:+--target=${CTARGET}} \
+		$(use_enable libedit core-libedit-support) \
+		--localstatedir="/var" \
+		--sysconfdir="/etc" \
+		--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+		--with-rundir="/var/run/${PN}" \
+		--with-logfiledir="/var/log/${PN}" \
+		--with-dbdir="/var/lib/${PN}/db" \
+		--with-htdocsdir="/usr/share/${PN}/htdocs" \
+		--with-soundsdir="/usr/share/${PN}/sounds" \
+		--with-grammardir="/usr/share/${PN}/grammar" \
+		--with-scriptdir="/usr/share/${PN}/scripts" \
+		--with-recordingsdir="/var/lib/${PN}/recordings" \
+		--with-pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
+		$(use_enable postgres core-pgsql-support) \
+		$(use_enable zrtp) \
+		$(use_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(use_enable resampler resample) \
+		$(use_enable odbc core-odbc-support) \
+		${java_opts} ${config_opts} || die "failed to configure FreeSWITCH"
+
+	if use freeswitch_modules_freetdm; then
+		pushd "${S}/libs/freetdm"
+		einfo "Configuring FreeTDM..."
+		econf \
+			--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+			--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+			${config_opts} || die "failed to configure FreeTDM"
+		popd
+	fi
+	setup_modules
+}
+
+src_compile() {
+	local esl_lang
+
+	if use freeswitch_modules_freetdm; then
+#	# breaks freetdm:
+#	filter-flags -fvisibility-inlines-hidden
+		einfo "Building FreeTDM..."
+		emake -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+	for esl_lang in ${ESL}; do
+		use esl_${esl_lang} || continue
+
+		esl_lang="${esl_lang#*_}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl/"${esl_lang}" reswig || die "Failed to reswig esl module for language \"${esl_lang}\""
+		emake -C libs/esl "$(esl_modname ${esl_lang})" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+	if use esl; then
+		einfo "Building libesl..."
+		emake -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+src_install() {
+	local esl_lang
+	einfo "Installing freeswitch core and modules..."
+	emake install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto "/usr/share/${PN}/scripts/rss"
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /var/lib/"${PN}"/{cores,storage}
+
+	newinitd "${FILESDIR}"/freeswitch.initd freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	use freeswitch_modules_managed && keepdir "/usr/$(get_libdir)/${PN}/mod/managed"
+#	# TODO: install contributed stuff
+
+	if use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	find "${ED}" -name "*.la" -delete || die "Failed to cleanup .la files"
+
+	if use esl_python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl_lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl_perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl_java; then
+		einfo "Installing esl module for java..."
+		java-pkg_dojar libs/esl/java/esl.jar
+		java-pkg_doso libs/esl/java/libesljni.so
+	fi
+
+	if use esl_managed; then
+		einfo "Installing esl module for Mono..."
+		insinto "/usr/$(get_libdir)/${PN}/mod/managed"
+		doins libs/esl/managed/ESL.so
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/usr/$(get_libdir)"
+		doins libs/esl/libesl.a
+	fi
+
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/etc/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/$(get_libdir)/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/run/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/log/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/share/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "FreeSWITCH has been successfully emerged!"
+	einfo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	einfo
+
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		einfo
+	fi
+}

From 5cd17c03a8a13fc8c91928096555d5842dcc736b Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Mon, 29 Aug 2016 21:42:29 -0700
Subject: [PATCH 201/261] added proper sound overlay for freeswitch

---
 .../freeswitch-music/Manifest                 |  0
 .../freeswitch-music-1.0.3.ebuild             |  0
 .../freeswitch-music-1.0.5.ebuild             |  0
 .../freeswitch-music-1.0.6.ebuild             |  0
 .../freeswitch-music-1.0.7.ebuild             |  0
 .../freeswitch-music-1.0.8.ebuild             |  0
 media-sound/freeswitch-sounds-music/Manifest  |  5 ++
 .../freeswitch-sounds-music-1.0.51.ebuild     | 32 +++++++++
 media-sound/freeswitch-sounds/Manifest        | 34 +++++++++
 .../freeswitch-sounds-1.0.11.ebuild           |  0
 .../freeswitch-sounds-1.0.12.ebuild           |  0
 .../freeswitch-sounds-1.0.13.ebuild           |  0
 .../freeswitch-sounds-1.0.14.ebuild           |  0
 .../freeswitch-sounds-1.0.16.ebuild           |  0
 .../freeswitch-sounds-1.0.18.ebuild           |  0
 .../freeswitch-sounds-1.0.20.ebuild           |  0
 .../freeswitch-sounds-1.0.22.ebuild           |  0
 .../freeswitch-sounds-1.0.24.ebuild           |  0
 .../freeswitch-sounds-1.0.51-r1.ebuild        | 70 +++++++++++++++++++
 net-misc/freeswitch-sounds-en/Manifest        | 50 -------------
 .../freeswitch-sounds-en-1.0.11.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.12.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.13.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.14.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.16.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.18.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.20.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.22.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.24.ebuild        | 46 ------------
 .../freeswitch-sounds-en-1.0.25.ebuild        | 46 ------------
 net-misc/freeswitch-sounds-es/Manifest        |  2 -
 .../freeswitch-sounds-es-1.0.14.ebuild        | 47 -------------
 net-misc/freeswitch-sounds-fr/Manifest        | 20 ------
 .../freeswitch-sounds-fr-1.0.14.ebuild        | 46 ------------
 .../freeswitch-sounds-fr-1.0.15.ebuild        | 46 ------------
 .../freeswitch-sounds-fr-1.0.16.ebuild        | 46 ------------
 .../freeswitch-sounds-fr-1.0.18.ebuild        | 46 ------------
 net-misc/freeswitch-sounds-pt/Manifest        |  2 -
 .../freeswitch-sounds-pt-1.0.14.ebuild        | 47 -------------
 net-misc/freeswitch-sounds-ru/Manifest        | 15 ----
 .../freeswitch-sounds-ru-1.0.11.ebuild        | 47 -------------
 .../freeswitch-sounds-ru-1.0.12.ebuild        | 47 -------------
 .../freeswitch-sounds-ru-1.0.13.ebuild        | 47 -------------
 net-misc/freeswitch-sounds/Manifest           | 10 ---
 .../freeswitch-sounds-1.0.25.ebuild           | 43 ------------
 45 files changed, 141 insertions(+), 1021 deletions(-)
 rename {net-misc => media-sound}/freeswitch-music/Manifest (100%)
 rename {net-misc => media-sound}/freeswitch-music/freeswitch-music-1.0.3.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-music/freeswitch-music-1.0.5.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-music/freeswitch-music-1.0.6.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-music/freeswitch-music-1.0.7.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-music/freeswitch-music-1.0.8.ebuild (100%)
 create mode 100644 media-sound/freeswitch-sounds-music/Manifest
 create mode 100644 media-sound/freeswitch-sounds-music/freeswitch-sounds-music-1.0.51.ebuild
 create mode 100644 media-sound/freeswitch-sounds/Manifest
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild (100%)
 rename {net-misc => media-sound}/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild (100%)
 create mode 100644 media-sound/freeswitch-sounds/freeswitch-sounds-1.0.51-r1.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/Manifest
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-es/Manifest
 delete mode 100644 net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-fr/Manifest
 delete mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-pt/Manifest
 delete mode 100644 net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-ru/Manifest
 delete mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
 delete mode 100644 net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
 delete mode 100644 net-misc/freeswitch-sounds/Manifest
 delete mode 100644 net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild

diff --git a/net-misc/freeswitch-music/Manifest b/media-sound/freeswitch-music/Manifest
similarity index 100%
rename from net-misc/freeswitch-music/Manifest
rename to media-sound/freeswitch-music/Manifest
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild b/media-sound/freeswitch-music/freeswitch-music-1.0.3.ebuild
similarity index 100%
rename from net-misc/freeswitch-music/freeswitch-music-1.0.3.ebuild
rename to media-sound/freeswitch-music/freeswitch-music-1.0.3.ebuild
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild b/media-sound/freeswitch-music/freeswitch-music-1.0.5.ebuild
similarity index 100%
rename from net-misc/freeswitch-music/freeswitch-music-1.0.5.ebuild
rename to media-sound/freeswitch-music/freeswitch-music-1.0.5.ebuild
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild b/media-sound/freeswitch-music/freeswitch-music-1.0.6.ebuild
similarity index 100%
rename from net-misc/freeswitch-music/freeswitch-music-1.0.6.ebuild
rename to media-sound/freeswitch-music/freeswitch-music-1.0.6.ebuild
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild b/media-sound/freeswitch-music/freeswitch-music-1.0.7.ebuild
similarity index 100%
rename from net-misc/freeswitch-music/freeswitch-music-1.0.7.ebuild
rename to media-sound/freeswitch-music/freeswitch-music-1.0.7.ebuild
diff --git a/net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild b/media-sound/freeswitch-music/freeswitch-music-1.0.8.ebuild
similarity index 100%
rename from net-misc/freeswitch-music/freeswitch-music-1.0.8.ebuild
rename to media-sound/freeswitch-music/freeswitch-music-1.0.8.ebuild
diff --git a/media-sound/freeswitch-sounds-music/Manifest b/media-sound/freeswitch-sounds-music/Manifest
new file mode 100644
index 0000000..05bc067
--- /dev/null
+++ b/media-sound/freeswitch-sounds-music/Manifest
@@ -0,0 +1,5 @@
+DIST freeswitch-sounds-music-16000-1.0.51.tar.gz 27993050 SHA256 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e SHA512 4805bf6936eadbe80ea18a5b39dcf83c365cc85a8191d10e58f973d389456cc336472144e9362852008de7c8165b0aee357deffce06ffbc08fc3b72e817eaab2 WHIRLPOOL f295d36c542962013f4c691f6b242c9ca8c21ae0f6f7be572da858276232c10efdb347cd2e979568e433f8c50a106f661e527ef6eb2cd8ebe442d99e0348f892
+DIST freeswitch-sounds-music-32000-1.0.51.tar.gz 53016061 SHA256 c6b6a5ea1b68ee1eb0d879e449052d07dc9ed6371a50cd173fbe09b532becf1e SHA512 81b84eda13253088759e9480bbcc172006f4d202bdd0b36494e960ec497b7824470f38e61b69fab08adbd8ba61b09375a9eaf98b3a18a9a609d8c4f4a4da1df1 WHIRLPOOL c31957ca3579654c2467435bd78fb565cd0b917010a4308da8defa6543496c9afde74057064171a5dd6f08f575a365fabdcb003e0db7609795f0a1c6cbab3f6c
+DIST freeswitch-sounds-music-48000-1.0.51.tar.gz 75546338 SHA256 13ca541c76e42c13e686ff8da3b93cf21fdcff5388e6353856daef4d7bac30fd SHA512 aa42aa1b03352435932bab4c0b69b1be2d3577afcd0247bbbcf618a6530f84995b34a17a0df89f177e1ae8cbc1344ef0364c3a480344680318c99f9d4603312a WHIRLPOOL 555633946042a0b69d9950b48caec4c87d0f09bdfd99acd683c80ca4135735be8ed0b58a6496e68f21f2e628aec095f93326e0e4ee4f63d96744e3d9870b5baf
+DIST freeswitch-sounds-music-8000-1.0.51.tar.gz 14619493 SHA256 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9 SHA512 9dc21d120cf131646d638926e32e8741f7ccf77e050787a1a8841d41e06c8e31ff5786afdc9d75e150a3636a5d6de2bd03ede010ed61031b78f5b2f214e98aba WHIRLPOOL d45f40ed2069b90242b13728108dd695f5c2482ae55691f4b8e9a2aa0017bb664f5caa70ba191aaad729ff16e61ac5df73d96b492ae9e8d3cf708dee4b6bc714
+EBUILD freeswitch-sounds-music-1.0.51.ebuild 756 SHA256 4c2912f425a573263250b45c58f73b3f43cd9ff478a70aba32ccee97571dfd4e SHA512 4f9bfdaf78f9a8c19a1cbb56a8f0293600d05dfa47f2deffac7fbb823af53268371245fcd17d837b8959b75663b4137fdf8310f1aca40fa130a6700df780d171 WHIRLPOOL 91262426fbf51a9ac08e0d3d7e90a641b407e4d2dd3344375d635b1103ce54663af3f1f6b381761eeb47ad453a272d5a67e01e52853131296e8cc3476a58a7fc
diff --git a/media-sound/freeswitch-sounds-music/freeswitch-sounds-music-1.0.51.ebuild b/media-sound/freeswitch-sounds-music/freeswitch-sounds-music-1.0.51.ebuild
new file mode 100644
index 0000000..27a9160
--- /dev/null
+++ b/media-sound/freeswitch-sounds-music/freeswitch-sounds-music-1.0.51.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="On-Hold Music for FreeSWITCH"
+HOMEPAGE="http://www.freeswitch.org/"
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+8k 16k 32k 48k"
+REQUIRED_USE=" || ( 8k 16k 32k 48k )"
+SLOT="0"
+
+URI_BASE="http://files.freeswitch.org/releases/sounds/${PN}"
+SRC_URI="
+	 8k? ( ${URI_BASE}-8000-${PV}.tar.gz )
+	16k? ( ${URI_BASE}-16000-${PV}.tar.gz )
+	32k? ( ${URI_BASE}-32000-${PV}.tar.gz )
+	48k? ( ${URI_BASE}-48000-${PV}.tar.gz )
+        "
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+	dodir /usr/share/freeswitch/sounds
+	mv "${S}"/* "${D}/usr/share/freeswitch/sounds/" || die "Failed to copy sound files"
+}
+
diff --git a/media-sound/freeswitch-sounds/Manifest b/media-sound/freeswitch-sounds/Manifest
new file mode 100644
index 0000000..d1640f9
--- /dev/null
+++ b/media-sound/freeswitch-sounds/Manifest
@@ -0,0 +1,34 @@
+DIST freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz 9417564 SHA256 8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7 SHA512 1f6278d8ec1e020d9fbd629105b931b4ee4ebfd7d139a097346adb72a328b49fcfcd44a6a7e14079da9e777a4435655f41e2ba02c75a6835482d4eb01208dd24 WHIRLPOOL 5b15ac4fa8a49d55fb178281ca6f74e5d59ab514ad3473b01623e071c43e723ccbc166857c34d3d940b387193e47309cb0be9e2a3027676e95e0e2c4abcbe230
+DIST freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz 18422131 SHA256 8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387 SHA512 d36edf056e0a9445a7ebb9d12e7d8cb6955967c51b7dd61b349bf897387f9b0033b3e89ef4aa77fc93e1709068e34f85468a72a1a1a7d0de63f4607ada95b240 WHIRLPOOL bfd72f52f6c7d5f3de7e89de8b2a4403df8b590155beffcb5e94d59b9748469a8c40c4e7306d25930caa9905e47f2a7a790691fb1a5092190ad2ba32d4b67f18
+DIST freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz 27088410 SHA256 d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871 SHA512 3df629bb150caad6e3cb1cfc7a2a6b8f4a0be9c260cd79d8573431e93a74532aaf5e42671d2b2d244f938bcb106cdc845fcea485428beb065237daa9bcad56c3 WHIRLPOOL 7b526c08473a29df233b1cfa3ad725b080634d57913d0bf54945a0cdc8aa9b15873d2da8dc41d0b1f5c22588cdbcd54e2bc56f24e0d2c596411b7f47ea686243
+DIST freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz 4754438 SHA256 9aaa9d73cfecfdab7a1fa2d63d65b922b86a405ebb9a31b09b15e58a2af9260a SHA512 70d1d53b4944b4d99d69c509b35071b2a5b2642f96c850d8844d79958c85d09746c13d00cfa96192011eecb55b1f8ce8b31562a057247aec5c408f0b9080b0a6 WHIRLPOOL e763a09e057d3e73713fa4fb53e1b430edf43d7e42873557910481e94c1802dcd76a5e8f123b0407308e35eac0afd781a8cd9c21aacd98267afc2214de7ca997
+DIST freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz 37171776 SHA256 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2 SHA512 16e2fb3cf5b6bf8e4f62f67c32970f448322c38a68e33c61517d89c08eb6f755da16b06a225c08f4ec2ac7a70dcfc1842029749d81dffeaba66b04cb99033411 WHIRLPOOL 9b9e7fb830b5b8de4be2f7e7b28fe0dc9104b0764bd36ba8c2489a83aed2387aac6d8a947f4f5af9b6b4352f90b7e8bc1906a4d9e3574d488888da9a458e745f
+DIST freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz 73012907 SHA256 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838 SHA512 1c9bca40df6a634708d564dcfd8e8b353e3f60c0c96dc80efcd81084d60f6c64251b136533749ab0b7dbf8e974760f5d42eb08a6c30a7943adba662045e82b1a WHIRLPOOL b727c8033eec25e610b552aca57ea27fa4e695e2de8d041cef51bd4a5e97cb655028a8012755ec342797e2d2d078b03565fa716f90c2dd7807dd18551e68e461
+DIST freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz 105319388 SHA256 cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa SHA512 c832d168dbe97367bb20fb3146d3b4cfc6de520c7f4ad07174ca619bf1c3e8a93b6be088a3737757acaa7cd48ba78bd0cfa79bbda877cc8aba00b671126b1220 WHIRLPOOL af701ae11824ecba1945d39c856f2dc22a64eb0378b7fb480e6ff6e999dc4022932905755fb03dbd85d23d793dcdacfbf2c95af47149f2c9f51fae1182570d2d
+DIST freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz 18657031 SHA256 e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8 SHA512 87fa8ab1f969c7c930d9f7ccde3df38edbdccf253d8415ef92c2049279368742f12e8c8ede0a9c106b9d20c3f1faacb030d6cbb2efbd63449c0d6cd35aed0ba2 WHIRLPOOL 67cb36bb94cf48f88d23fd860a8231f003f138be9ce514548365c065848b1b829a5a58bbcd6826b09ffaa8b92f7e0d3aed6b092673077fbea599d6f377ae392d
+DIST freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz 26591167 SHA256 f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6 SHA512 67cca18d3d6dd27bef763f6671e0c3c053b7f5a790deb75d21c059f71f720e10ac1ef4ea1801ad2d1564b96c6c2d5b47d01486ba4f153037d5eb8e76fc08e1da WHIRLPOOL d3feb63864237dcadd4697f75863d92e274d2af64e6ae35ee83e22209a30e686eed7f060a4f942dac5c45300a78b0601376db277cb6c94b71e116b60bf74fd5e
+DIST freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz 52040064 SHA256 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b SHA512 2826c4aad14e214a9258f9516cf9aff4ee97e6aa99e24433139aa672376b6cf855ba49cfc3a9e50c1db70a00389ac4fb5a2be8781c9de5595270f3a687502cfa WHIRLPOOL 5e820e5ed5c906c1e90db3510dcb188ed0c223061e2d3c6f80cd497c26e926a1c2bbcbfd61a57c479751aaca9ba3f3e9cea65227aa877f155d090bf8c5fdf575
+DIST freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz 76666642 SHA256 abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0 SHA512 b40a2c22c3a4c34d4c4cbda0e3bb30bf32771e0623f990b7fec333381f185444f6fbd45906c58353c237bae18c4dadc41d74e9f0be5e1e5c85d5eb68fd125797 WHIRLPOOL 7070d061005b3fa1aad423f8ad344407c6f5ca459c76c022af5f60d1d0eb557129ed5da0022cf42c4301b6c7961c839c7a3eeb8a98c27bd67fdd2b03957a82a7
+DIST freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz 13460178 SHA256 eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c SHA512 780ce9f7f644b91f7a589a96f3c8841fcd567ce71d68f1c016246501c52de4dfdba24da153101926482af715de500d2294c4d4ffa7d536debb66817f0625c63e WHIRLPOOL b8ee725297b73729de4d4cdcf9ae587b268040d293de3f2370cb0038ad138e7b6ad42a191f07d68721bb5f7c0dd3e293638a4cf5f1cd988579d92d53da1f8a45
+DIST freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz 27665896 SHA256 80432c1027f57e464cd899ed92216936cf48a3993dc1c168b1be2545b8f97aed SHA512 427d5edca092f2dad1d7bc153ece31f2e9dd8b49bc0efce06fee5b99d7a03a34fef9b7537cd5bdbcebe7f4f0a4ae4765ffec2be31c0b438953b111905d6aba4c WHIRLPOOL 8bb6bdce0c9c20bf4871d7204b7700fdbf18355ac76ab524e37a8cc46eb8e6d4cce4f4ae3ce829e642e7827fd7b182ae52cdc13031fb7f3efe05ceea623f08af
+DIST freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz 53420983 SHA256 e80a8653585cf9a4fe9cf1c0004279602542d15894ba13f2104d990cefdee567 SHA512 4225e22999a3a7be0790e5f09e7de8a3e7e723c0781805b3499acee1a42b691cd5880482b954b8a38cd94c885f8cbfd86468ade459f3f745c990cf59660f71c5 WHIRLPOOL 63fd631ae861838fd73fcecf029df10e31e3059bb382c116b93267efad5bd6700b36d1d1a8dc6646df8155d7bc06e840921bf890668f9ebf94aebc1291f8ab13
+DIST freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz 78609528 SHA256 51ef9cac2dc4dd70d81c18f8e65bfd11de44207e8fac9961a68aa0d50d539870 SHA512 42df3cd6adf8d47bd4daf6f5afdc7b69d3c561a43ae47ab38e13496ccb0450cb4862b1e86f4e11c6762bface752e3188f05a28c2c617af3476e4e48e792cbd92 WHIRLPOOL 254dc19fdda310668eb0c5f619fe5e32b93064bc63f67a45178002422452fec8b68e5b2aa2dbb5f967aaf7e46a7f1579b8805ed328d10af598be81e8fa1989d4
+DIST freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz 14142676 SHA256 ba9b5d7f97675c560823a6f94804a6716dac66efe203dd1779952518c3944a77 SHA512 c15a80a879cb931fafc4e1cebf2d893fe492b4a87c92d3cbcf48aacc534c45e2be677c123c3683331f859defe266b28059d439cbcfb70329d99ec021e3670478 WHIRLPOOL 837ec5ec06a13d25dd647f6fcda3541139e34af84dbfc5cca8f831d494d21455ed914a8f18e3d748b6bf5249c9d89a3d9fb739bcf620e8e9d5285343902b4956
+DIST freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz 25072831 SHA256 e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b SHA512 b2b20a3a11559c7e733e941c9706258b8771f970aa7f72a693cfd22d9fe4bdb63f872e6461aa952b6c2078265f65abc1eda88024e980ced710b89550fe1217cb WHIRLPOOL 261a5952ffc910b974e28772816c367be940180f328173c73ded82e10001ed3814a35da0d6e415e9076cb9f212f94ff775c815353b85b0fc23663fc5494c7305
+DIST freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz 49276482 SHA256 a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc SHA512 d433f8d7d496c4a3f33780acbba3748efb252eb6d0a07a0d96260ee5fa58d9d60b08c26bf9006f51b0e5806da96462abc5cc12a31b3db927ff196d4db0926142 WHIRLPOOL 6fbccfff86e2aa7fab6170fb99d9c3d22d4ef3a366b35cf0dca8203af8edbef55352ae40c9fba310f6c68b6eefabc463399cee095072bd7041180fbe4807aa1b
+DIST freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz 72438142 SHA256 ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d SHA512 84f582ec5f14cfbf55df8aa2195305332125db3278e62e78034d24aacfd38a3819be96a612634db320e0c369bd02a08e43e14ad4d5da24f9af7f03284e66ab3a WHIRLPOOL 6e529bc598cdc81a27ffc1d8422114733a89faa813200f0b07782a4ab5ff0ddfedc989aae5a87b7bed30a99b83063e918c981afe076108698451e077b11f913d
+DIST freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz 12678200 SHA256 d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66 SHA512 8e462ca90aee0bec6a6959ad1f92e6b5e57d8d5c55ad9d569f0f18179d56e54bb36489139f8972b131882af479beff17d0c50f84424f91c0c8e65cebf8c2d798 WHIRLPOOL 1cdd647df05db32574e7554d2dcb395652225188c37009f82e499cd449a988d8f02b6b2ed191c843ca09568be2eb065c48c47c699636e3c16a258783f0a23595
+DIST freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz 553051 SHA256 0950e1d971b4f2ba4decd949406ccd0198fe9c686f246e175c70aafdf9783f30 SHA512 bcba0908b7b740b2f704c7ff47637459d110b6558f56b228538efcf821d3217edb8b14177b5fa5c5286e18de80ec160b5be79653f1c83fc6074fa831baeb1fc8 WHIRLPOOL b6a57d19a5ec237198d37e7db90d1f1f68516a0edff320a4106541552c678843dfbb90d5e2b23d2051fbbbbc362bfd808bf9983403219efb17e0361b4a1b7d27
+DIST freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz 1061068 SHA256 97d846ab06b5c84d2c46bec64560556acbfc88eb2080bd325b2c5259a5ae80d0 SHA512 7fb88ec19b5549ee67df9fe74e368919be0537f1a8f839682cbf94444dba372812f0bb3563fd8c4f519366c401faab5f5d106e4857f96dd7366315fc52d8b4ed WHIRLPOOL 8dcfa0193072ffc583ed0bd6c10be858872a535481beaf8eab5f747f00f847e6e30a536b1ae34c31c80dca80a6641df9047bd639996be61c9346772535ad8c23
+DIST freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz 1552162 SHA256 bd605be7e536e11f8f67229a95513ef3f177263587c5bca75ccae647f43962a1 SHA512 9c14091bc9431842bc953b1b83c62795e226a78128d19bfaa08eaeba5da9dfbeaaaf6eefd47eee46f1856c05f7bf66ac2c7ca4ebba337483c1fc73c37ae20933 WHIRLPOOL 1f9cb51c8d983fcf180462ba089dc3a053120e7267155c5ab734c20755e6b7d1cc7a0967a4fb677dc3a74b42a1ec9c40f3b119b3a6c1d5e670da10798697a3ef
+DIST freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz 282597 SHA256 917d08c80969bdaf30f2a63a3b69f542b143614d42c6241503ac655d13864eb0 SHA512 cfbd3e1414cece6ff1e3f88c5c0c576ac4c7e925e06c9773a1220dcf521c0097b343e95706a19f0a267b8275fbfd6eb57be1652a55d5cf8dcec11f1496568235 WHIRLPOOL ce86c623547699994bf10059a4c374ec2269ad59e65a19dd836c5820ebc7cf9e5e15190c72c50424b58334b4721782c86d57c23900b093c1f02b613cceb1a713
+EBUILD freeswitch-sounds-1.0.11.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
+EBUILD freeswitch-sounds-1.0.12.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
+EBUILD freeswitch-sounds-1.0.13.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
+EBUILD freeswitch-sounds-1.0.14.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
+EBUILD freeswitch-sounds-1.0.16.ebuild 996 SHA256 bfee8f1ed3bde09964c82b2d74378455f021c539ff2036cb1f5402fd4e0d05a5 SHA512 49c0b54b83b652b4a57bac49e65853ca5ad1a3f02b5f637d1eb3d32dd84bc20923787cb591f63ed9c068a74c124bfbfd123096a1819c71a67f2805c1399468d9 WHIRLPOOL 141bc4d8d99bc0af97a4a1e9e2cc7f78ce23bac3287e553f6a32f516a0246afcd5c177c1e7e417de8137b94a4d761a3087ffb116ee35731bfa354256f30fb403
+EBUILD freeswitch-sounds-1.0.18.ebuild 996 SHA256 a57bf64ba18ffddc51aff79064044d395f7852f51ace295ec6296eef81a12cc1 SHA512 29d50b87ed8d3c8cdf54a8ea4c058703be22d35ed481175c2ecad2220924fa90774e059f86b553427df445937c33b3ace178b84270189e382db231d8b2e50095 WHIRLPOOL 7eb8458eabbcd76a58dcd044be10648773a12d29ac3dd0104be6263d14a93919f84bb071d4e8ff7bda9ba56a060a3b5577a2dcaed4db10a8b10b5cc00f3a63fa
+EBUILD freeswitch-sounds-1.0.20.ebuild 996 SHA256 3d074edd3e1a1cbbfd6424df123293855aa084446b90a9e1dd295ba14317fc89 SHA512 ce7ad0e7f5b3979c8e2b15e44d311274f9019377be271ca71b21d61e510da6cc317785f46f10637eb4134e1234eff1f08a4217e0279339b09abf47e241b725a0 WHIRLPOOL bafe5929e2c30751cc28baccc494482cffd577e2b2be3cc8b2a6af1a1503b32f8f6cf41d3c29824be67c9efbb6a3cf0068c266241e5bda4b29b7361cdc01ca08
+EBUILD freeswitch-sounds-1.0.22.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
+EBUILD freeswitch-sounds-1.0.24.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
+EBUILD freeswitch-sounds-1.0.51-r1.ebuild 2392 SHA256 642d97e1a9a983f3182d7bdf75ffa93161bc5227a612f4d629159d718816f5f4 SHA512 022fbd3ad778ff5514927738ea5d93c3f8d576108d21d3aef55fb50469befc7a0cc230307f9991d5f0817cfe69519c2f8fb2eb02e6ff398cfdf4eef4f1d86352 WHIRLPOOL 89c4fd270ba96c9840548c60757bcb980f3687ceadebec60a11a5bee71e05616dfb836e5b8fcc19ec544bb022a787b65cbfa981c68711502567e74fdb4b5fe83
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.11.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.12.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.13.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.14.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.16.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.18.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.20.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.22.ebuild
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
similarity index 100%
rename from net-misc/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
rename to media-sound/freeswitch-sounds/freeswitch-sounds-1.0.24.ebuild
diff --git a/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.51-r1.ebuild b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.51-r1.ebuild
new file mode 100644
index 0000000..f22f1f5
--- /dev/null
+++ b/media-sound/freeswitch-sounds/freeswitch-sounds-1.0.51-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
+HOMEPAGE="http://www.freeswitch.org/"
+# The freeswitch-1.4.18 tarball contains .spec files for the creation of RPMs of the sounds.
+# These files state "License: MPL".
+LICENSE="MPL"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+8k 16k 32k 48k linguas_en_CA linguas_en_US linguas_fr_CA linguas_pt_BR linguas_ru_RU linguas_zh_HK"
+REQUIRED_USE="
+	|| ( linguas_en_CA linguas_en_US linguas_fr_CA linguas_pt_BR linguas_ru_RU linguas_zh_HK )
+	|| ( 8k 16k 32k 48k )
+"
+
+MY_PV="${PV/_/.}"
+URI_BASE="http://files.freeswitch.org/releases/sounds/${PN}"
+
+S="${WORKDIR}"
+
+SRC_URI="
+	linguas_en_CA? (
+		 8k? ( ${URI_BASE}-en-ca-june-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-en-ca-june-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-en-ca-june-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-en-ca-june-48000-${MY_PV}.tar.gz )
+	)
+	linguas_en_US? (
+		 8k? ( ${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )
+	)
+	linguas_fr_CA? (
+		 8k? ( ${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )
+	)
+	linguas_pt_BR? (
+		 8k? ( ${URI_BASE}-pt-BR-karina-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-pt-BR-karina-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-pt-BR-karina-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-pt-BR-karina-48000-${MY_PV}.tar.gz )
+	)
+	linguas_ru_RU? (
+		 8k? ( ${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )
+	)
+	linguas_zh_HK? (
+		 8k? ( ${URI_BASE}-zh-hk-sinmei-8000-${MY_PV}.tar.gz )
+		16k? ( ${URI_BASE}-zh-hk-sinmei-16000-${MY_PV}.tar.gz )
+		32k? ( ${URI_BASE}-zh-hk-sinmei-32000-${MY_PV}.tar.gz )
+		48k? ( ${URI_BASE}-zh-hk-sinmei-48000-${MY_PV}.tar.gz )
+	)
+"
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dodir /usr/share/freeswitch/sounds
+	cp -R "${S}/"* "${D}/usr/share/freeswitch/sounds" || die "Installation failed"
+}
diff --git a/net-misc/freeswitch-sounds-en/Manifest b/net-misc/freeswitch-sounds-en/Manifest
deleted file mode 100644
index 65c15ee..0000000
--- a/net-misc/freeswitch-sounds-en/Manifest
+++ /dev/null
@@ -1,50 +0,0 @@
-DIST freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz 16907516 SHA256 634dcda420dbe4c112eb9e2ccccb5a9f47b8c2fc2db82efc0047dfd9884e4158
-DIST freeswitch-sounds-en-us-callie-16000-1.0.12.tar.gz 17595076 SHA256 035b88e5951c3ea976cfb4cd80a4dda8e07a1e68c34cc9474987ac5aeac48960
-DIST freeswitch-sounds-en-us-callie-16000-1.0.13.tar.gz 20221380 SHA256 23886e64c27d75b0bf9c3dc3e59ea5b77726f2ea08cea00caeb345e3997fb1e4
-DIST freeswitch-sounds-en-us-callie-16000-1.0.14.tar.gz 23524382 SHA256 3bba3532a6792865d80c4170316b510e5e9e228074640435829eee329c5ec54d
-DIST freeswitch-sounds-en-us-callie-16000-1.0.16.tar.gz 25739233 SHA256 bf0e3f38ff2e1fd3ba0414f6983ed7ef9871bc86c75775235f6077471a5e8ea1 SHA512 4eb3208b603d0e4af2b9c77814038595009c6905123d967b8977c04d1498b642234f7f9138f98ce6d44680648639aabc4b66421b7c0f06fe6b2e461eba5265d7 WHIRLPOOL 0fceaff63a01b698b390aa33ea7331b19a6b91775919d2d6ca0eadb5368d361634852aace6a6cea058a6f7677753f4bafcb1cf7ed1f17d66acd770d5d0b97d09
-DIST freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz 28161362 SHA256 c1c6d4405055db31eeb47d3a90ffaf9fb5ca5eecc962749f1409780223fd761a SHA512 7fb798bf04188482481b471d2ea9cd8ac58b9f4c426d322d1a351f40072d7da2843dfc6eec108a75ce568db40dcce6f85221de601ab7b87bba9b8d8d88665de6 WHIRLPOOL c965223cd5e7e363548bcb8e4b469b7838de895991d176f20094d9f4f4658aeb111a89a58099007e2999c6975e4dda63f464c35fb0adbf5429ab4d61942cb89f
-DIST freeswitch-sounds-en-us-callie-16000-1.0.20.tar.gz 31160818 SHA256 af788e98a8a638366a2dc7510aa56a4a82507b606f63f982b288ebad7e571a0c SHA512 ba2b04a006e5f2889bdc869501d19163f4710a6dca740d07425865816f323f1a296b0fe5066fa593fe75c208ae6a9d942d0d4ced7bf0db18e551ee09504437ad WHIRLPOOL 73f57aef83436069391a4314484bf5ba57360efbb2d97b3f3fd3fe6c2e5d44801bd7eccdbcd1d0bbca1e55017cb936c89aaf2df38df64e9d3fd2c9c4c6c88c1b
-DIST freeswitch-sounds-en-us-callie-16000-1.0.22.tar.gz 32760710 SHA256 6d8ef9b4bdb19995f69b04623c3ed6db04178da23cb9f3611dc5bd36f5e7eb8f SHA512 e12f8bff995ffe29659b842cd36e89b85350275a5b848746c60aa7227559c41459ee10e9963f133b85157a43ff159fdae5b2e34f9f9ad9eb2778bd9d5c337385 WHIRLPOOL a856a166fbec17f863e43ec701db5f4cc3fda46c27d8914ebb3cef07da71a6ab7f575177c17481856b2604930371e4ff9ffbe0c13361642ce8af8709f63fcf60
-DIST freeswitch-sounds-en-us-callie-16000-1.0.24.tar.gz 35337077 SHA256 d668ee34c17851b8762bc6d7bec55071b12b2d933f157a4d4d9b775e008fe386 SHA512 ac49d0d904d9fd9cba3771279a8e0a16cf8436a389f8b05af8f957ed3151f590a93f28ea2f20a862d6a7de08243bea03ef1acd6ff343987d842bffb3fb8484c2 WHIRLPOOL c3f20be12611003660265de12f7f7fe5b95930f3be91e7883b937496646ed44957f05e8ca3795f5436305770409905d50af287da935d6061a01d6bde55bcde73
-DIST freeswitch-sounds-en-us-callie-16000-1.0.25.tar.gz 36671995 SHA256 ecdf1f30e8003a955f57566a538c27fd7ad262cef3f211ba6ee8debf6ce733f6 SHA512 0e2e888856e859ca927ac74cb0566b961bd3b9e9e3781818eacf5a66973fba2cd9681c85bb5f536c33eba97090172d11aa90eedcf761996295aea36691b868fd WHIRLPOOL f7a48923780f022901a9d7c5e95072060079d1fa86adaf054fcc64efb91cdbc195bd453606c271c5ba85dd985242d633c8dcb332ff703ebdf0ba2c97e5e2ee97
-DIST freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz 33364530 SHA256 4ec8eaab21e84267542efe2fe2d82b9738fa888de5a6f5553abec954747d2e2a
-DIST freeswitch-sounds-en-us-callie-32000-1.0.12.tar.gz 34729377 SHA256 7fcb005a6c7c44f1f2c9cc9d5ad8be8a6c00f551ea0d3ad64cc787b5ba296a9f
-DIST freeswitch-sounds-en-us-callie-32000-1.0.13.tar.gz 39933869 SHA256 4969f0b8375d732cc91f881cb675cc6ed83104c0c1915304959fe79d983581de
-DIST freeswitch-sounds-en-us-callie-32000-1.0.14.tar.gz 46286239 SHA256 287c74738403e319e923f501030b32b2f22f2905af326f478a26399e09e06ba2
-DIST freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz 50567956 SHA256 63eb497b86fa5e6da353970cdf76da17df43f246d3ea9979fa76083eacc9a449
-DIST freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz 55081458 SHA256 cbd55b6355829bb559741700d2a310718a95800f8cf8b229e1d15eb99b94d3a4 SHA512 033a0b7d5ec6f35e872a5291cd5eb8c7a27d4138cb368d34b7367f3504c902402288de065750e178b67e5f3298d1f2b6849d77377ab5da1130b7afa28bdd9ce8 WHIRLPOOL 56c766c5af2c5615d95e7ff8e1757fb6bcdaa86261d8b1b5b0ba028b183ff1ac801315708eecdd75eaef1a2ae58589cafc51b6a9a0af05ca7c6f370b0de243c4
-DIST freeswitch-sounds-en-us-callie-32000-1.0.20.tar.gz 61199871 SHA256 66a192dcf5ebf2b57c5c01ee9e8e2a04d8c50614ce7000698984d5ca8252735c SHA512 3a4a38ea5c323ec459646661f18ff6903873a2ebbce0c108f2127eed1630fc7b3f110a7ccb0984c05c684d38ef86725cd0dcaa7456ae8a014c2b679fcb3ddd5a WHIRLPOOL 6dc7b65b8176f2bed3628c3b627c0264e664eec2215e2c60ad3f46e42b6a2a4e352405ae8509fdeb05ac2e881859ad0372f5bee88564cee3caa655fdfbb89f15
-DIST freeswitch-sounds-en-us-callie-32000-1.0.22.tar.gz 64352708 SHA256 31dd2a3016f9d3401ac7a4cec5568a16e101adebed9a139c47c86b41ab04ebdc SHA512 948ad5924d020196562f58211bc1aa89ddc18d73550840f1d3250fafdd1943c4e96ed8b4d7fc14218be0df1d08224ccdf0be1ccbd06d4df2ef2e36cc496801f8 WHIRLPOOL 6a7b0555dd7eab1e96ac69f79d81430ebbd49de4b4ada99ffae5e19751362de71b1cfd612e3b7f26c15c7f1e59efcea309331d6461a454d301c047681af41b92
-DIST freeswitch-sounds-en-us-callie-32000-1.0.24.tar.gz 69411929 SHA256 691e817e5385eaba8534b36051cd6054e0c3289067a7e23d8890b10870189020 SHA512 1ab2764f584db99ef02a0e37a4d37ec538a7a2e0b5882e86157a9f0763098118e8549dbdc986e63307dffa4188b4dc00c8b372ccd1150628d9b9ecbd9df5f4e5 WHIRLPOOL 4f7a3e31945ea0b6b8f969a2c58ac6f30b48a0dc91af1e31559c50d26dcc649b2ffeee3f03d58f62c5c9c1dce5c38a83895385a23c0f6a1e9a783ca313a29a91
-DIST freeswitch-sounds-en-us-callie-32000-1.0.25.tar.gz 72019603 SHA256 e7b3a8fcfa15b2567c184c074bbacbb00970d1cb03872eff4019090bb065e3b5 SHA512 97bf04ed4fc7cc7a28aa44909db67ca6367bb1d47ad03eccd3405155571272edebca3e4342b0007fcd108a6fd8abdf030b624d21cd66601f97fe92d33b6a0f4e WHIRLPOOL 26773ffef3972b7ccfefe22efd9734227a908856a4ec0b6e95e5f7a0621d36231c0a405dc1b2656c95703c04459f55232a2b0d37b1ae8a68855e521dd98826f9
-DIST freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz 48988220 SHA256 9ba37bd6c221affec903ce87d56670f1b0a0c7de9bcd0aa3edc7d48e88aebc7b
-DIST freeswitch-sounds-en-us-callie-48000-1.0.12.tar.gz 51004130 SHA256 fa8c76ad0c9af48286cd8dcae69dc18e0ec7aa093a94532e465bfc2a8f68cf2a
-DIST freeswitch-sounds-en-us-callie-48000-1.0.13.tar.gz 58647498 SHA256 6920dfdf15b2d089688c1f069e6570a4485eee70eb6bd4f1e3ffe52a6a8e0d7a
-DIST freeswitch-sounds-en-us-callie-48000-1.0.14.tar.gz 67971195 SHA256 cdfdada68476a2fed095b873183fef9d0470a5e60726720586d6521b9c6f6ed1
-DIST freeswitch-sounds-en-us-callie-48000-1.0.16.tar.gz 87130408 SHA256 51d84024d6091c13521fea4397e5d8d21c087770aa4984308d7157a10b034505
-DIST freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz 80491982 SHA256 a060fc118090b679408f8e712af9e556816e0d7f4c59422f7504066c693d71e9 SHA512 c37e4f1ee1f6796786b38afea89f0dce71701ca8ffe25c9be22ff392f1d1c96b872a61b4b6bf1a08b14286e5488ac6572ce92f8dc5e86c76f47e046745570ee3 WHIRLPOOL e5c61ba139573d2d1ff497deb2b00b7f00a6ae6ddb155f56998540ae886ccb07b48f3fff429f83f603af7e5b78e2d24c289de2d7e549bc693b3afd2fdab45f7f
-DIST freeswitch-sounds-en-us-callie-48000-1.0.20.tar.gz 87945358 SHA256 4f5522ccac0167cd6b0de79e1f386a57ba57c3a157910901b0dc28989624678c SHA512 21eb7ceffcc8186e2288c0468bd731f5eee184d241e2f5d0c2b063c6379cd66698623c2365fbc93dcd21d6fb34eccd750a4fa4eb1a611464945d86fcb8aae3b8 WHIRLPOOL c624582c8c1c436a75783b949752de62d76731de87cbfa9a650f0ec7d6ecc4186f8fed160a847ca2d64797d223f75220a8327b172d216b93c3f186c87006003c
-DIST freeswitch-sounds-en-us-callie-48000-1.0.22.tar.gz 92587928 SHA256 75e84d12a998e505adfc300ce2b4c2624ed21dfdc7c72eecd533896df4629138 SHA512 ba27e7dc7b7c39bf31745443031afb08d7b6767e219150fd9a717d785b39f84073c877d55246191a3d7e65e552b81fdd941b1326b3cdbe6d4aad3e3a78d6b430 WHIRLPOOL 579aee3b164f36232afb875b4029224a5bcd8be71d795df0a28e281584a2a5d2ce37ed26a1e2797dea44455558106d9188e91509bcf2be5fbf264bc339f7fc53
-DIST freeswitch-sounds-en-us-callie-48000-1.0.24.tar.gz 100018897 SHA256 d84230c7d7502ca18e9738e39fe05ad69651551035200d671bbda2e6d834294d SHA512 037d86f6afe9134a3316609e196ec7ddb514aeb0d45f9ec69165cc6e09224565a5fcfb08bdc6dd71bc2dcedd7370b26343a801f350b7d421dd90b52b86cff43b WHIRLPOOL 3b10c739d4b5628d7f50c754dc385d6390f36d8acaa2f21b228a4088553130211e34ac851d540f90c2afddcfc54b906c167c84ac8a87a1d9aff352f0c8848574
-DIST freeswitch-sounds-en-us-callie-48000-1.0.25.tar.gz 103860329 SHA256 673f37d35818cc33dee857f5912dbf6c965b6b1f871d46c2592f417939735dc9 SHA512 5afbc97e154d301fe525afc0d99b14ab4a4c08c1c88e98d47a0065fc04b5ff53bc0dbeda5afd5ed52dfbc37709bcc9b3a73570c5855c1b48a4bb5947367f3645 WHIRLPOOL 7b06bb63690edb879db2bf959c3564c84b3b5160393810ec49735ec04ecd5d9799fcdb16b261f0590ab1b639339f28bd450643e71f19d02f3a9c4ddbdb3a2e93
-DIST freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz 8483213 SHA256 053fd4abaf07f57232ce30fb41e1d4da50718064f060c2e456dbcc653afd8b43
-DIST freeswitch-sounds-en-us-callie-8000-1.0.12.tar.gz 8823973 SHA256 0d7ef143532c330050f27ffa537ced7e81437232d47ce11eee9596925da2c564
-DIST freeswitch-sounds-en-us-callie-8000-1.0.13.tar.gz 10139468 SHA256 6babf8bc376a81031eb28197393f39ab91be03f7addd2f87908a6e66f64749b0
-DIST freeswitch-sounds-en-us-callie-8000-1.0.14.tar.gz 11790398 SHA256 793cc1602878ac01b4475d8014944700b4278df57a9f8326a459c951ace88a64
-DIST freeswitch-sounds-en-us-callie-8000-1.0.16.tar.gz 12910395 SHA256 c88c360f4cf234597ba7ecbb9693be8ed42b31882ffc7ba02d10d180b2369899 SHA512 5ab66406a2651e28fca535cc903cf5f44bf346bf63f6d9b22a697626887ebd4d118bd1c3a5c087f83a6f8b03ac0b35ecbce80e26d72773bdd07f366e1d51ad6b WHIRLPOOL decacbb7d6e819cbb146408295e815239da4ac08569fc2ad4e965ea37e7d0a07452370e2e7cb90fee7b3f22a383fba772f79613b6d0ee23b7a274aaa638f75a3
-DIST freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz 14180974 SHA256 131b87a4c190d40ce3c5a67c2d2096158f11e85a1659eeb2bbf38e08bf7be812 SHA512 3e07d3d1d60fab1b61ca51b3c0b68d14161e79647d5c04ede0ff5c7c03e463215a9985e5626721c7f5f36bba11c3c5049556d8f656ff5466868be256ef82f89e WHIRLPOOL cd613b88e36c02d647df89828a4094a807b3cda75c048938cf2cec535dbd5b525114df3c150460993b77fdf5a6e5c9ba9462cb2669e31efbca7efa76fec353c8
-DIST freeswitch-sounds-en-us-callie-8000-1.0.20.tar.gz 15643920 SHA256 663b72ebf4f2b99202daf9783aafa3e056a67c1ec803f2b2f1d1e71207e3b2ec SHA512 8cc9d7c20507d1c07c7f707de8d97505896e0cb108837fb75493f2dec146fef04a1a543923a83be81d259c0141f3156a88c941967559e399e7e0e8286c6bacb8 WHIRLPOOL fa1fb9f09d918d623abfdad4bc5897fc264211fd88801b51aaba980b2de8fc948e6542d52a1893746b4a10419cdd645960a784a869424f79c2f649b28b8a5e28
-DIST freeswitch-sounds-en-us-callie-8000-1.0.22.tar.gz 16443424 SHA256 a7b2c0167cdd7d33a7b27fee3fd9df8cc8397c589596d2dea6013d0c404e65ea SHA512 68d02fded9a5d19a852b1ffad429ab7dcfdf34b58db2dce6e581bc5c501667cf7b17fd22ac7af7a1782824ff0bf8889ae066977ae9821ae4aa193f7fc2608880 WHIRLPOOL b23e22731294465024bb08fa71bd3c12f970640e1a6c626704e051d920571c25a1b54af5e143db026996d44bd6954d319fc8680b293c84dd4b5e0ffa34cabfd0
-DIST freeswitch-sounds-en-us-callie-8000-1.0.24.tar.gz 17741850 SHA256 52ef0747a13469696491c7ec16b3850a401af4b2dd19a146ff7996b2804f7866 SHA512 fce404fe4bd22beae093832450349ed95c43280e7bf0806aa062a90c2c177832448ca5f831b81cddbfddf302b9a2dbb90bee0140c251566dd3b7a4a671a0c87d WHIRLPOOL a1bad121224ce67bda13b25241ba4cef7b567a75c543f561c42a68ab6796148346b71a5699e1c2e7aac99000c28550f98853b4518fe72ff50ad4b10005091bc2
-DIST freeswitch-sounds-en-us-callie-8000-1.0.25.tar.gz 18409163 SHA256 02ac956d10b9005d02f15b7556f97a7705f17bd2f65187be7b01258e9ffde40b SHA512 17a0a470cde95f6bd90e980c6bcf769a77b05b643995e3fa6ee2cae723f6e38eeb5d611c0d64678787d424d2fde52708e11c6a1c9276b01542c324b38d3948c6 WHIRLPOOL 9a8d3db5b3b27367fb00e8a0d3079733d89d5c6777d246600c498f992ae092526d29eee0d7f898dd54b07d21c4963cea178433775fd644e0b4808428aec35f2e
-EBUILD freeswitch-sounds-en-1.0.11.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.12.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.13.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.14.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.16.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.18.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.20.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.22.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.24.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
-EBUILD freeswitch-sounds-en-1.0.25.ebuild 1091 SHA256 76647201f36c3e73d67ee2ece315c996fd385adfb741f6120e745ed7fcb27bd4 SHA512 7ac8b5cefa4c9a122a6e76fc29264ebf90148b2e305788e2f8ba0880ef4c4e9c9db2102646977061535d40f2ff8bafafcc8916d2f34e6dd4a54f656e34189f44 WHIRLPOOL b6eae0fb9c1bc3e40c127fcc7f0702c5616753e772e2b33a60b9a12b28243270639d1fd8d4eac682873b1d4104c52e584bd98f5cd1c3dd9deeabed8b81aef9e7
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild b/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
deleted file mode 100644
index 0fd17f2..0000000
--- a/net-misc/freeswitch-sounds-en/freeswitch-sounds-en-1.0.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="English soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-en-us-callie-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-en-us-callie-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-en-us-callie-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-en-us-callie-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-es/Manifest b/net-misc/freeswitch-sounds-es/Manifest
deleted file mode 100644
index fbf6695..0000000
--- a/net-misc/freeswitch-sounds-es/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST freeswitch-sounds-es-ES-cristina-48000-1.0.14.tar.gz 76454861 RMD160 f03e09984667b747d72361a033025c80ae998fce SHA1 484c5b1f39bad7c9ab02c72af58c1512aa33fd47 SHA256 890a474fbb012d470a4e76f2f3dde625cb296dad582a0a48b516124b17cf1e8c
-EBUILD freeswitch-sounds-es-1.0.14.ebuild 1151 RMD160 7479eed5ed58beea5534afc61062712d8cdb3942 SHA1 748e35260849f09388ab121611b2762361f8e3e6 SHA256 a0f72e6258367e653666b67d2d0816e445cefbb6233f034a47d079da44eb1c1a
diff --git a/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild b/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
deleted file mode 100644
index b066948..0000000
--- a/net-misc/freeswitch-sounds-es/freeswitch-sounds-es-1.0.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-#IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://www.wirelessmundi.com/freeswitch-sounds"
-
-DESCRIPTION="Spanish soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.wirelessmundi.com/"
-SRC_URI="${URI_BASE}-es-ES-cristina-48000-${MY_PV}.tar.gz"
-#	${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
-#	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
-#	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
-#	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
-
-LICENSE="CCPL-Attribution-3.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-fr/Manifest b/net-misc/freeswitch-sounds-fr/Manifest
deleted file mode 100644
index bbb432c..0000000
--- a/net-misc/freeswitch-sounds-fr/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz 18198669 SHA256 0dc4351534547994daf7b3bfdbb8df9b4bf75e8e4f576819468e6c708578b0a2
-DIST freeswitch-sounds-fr-ca-june-16000-1.0.15.tar.gz 21916469 SHA256 ce84313c4bd01a6f83e723bcf9d198f4f0297a8aff1508bcc0ef705764dccc31 SHA512 69d56262b30908e9a7641c06e233b2014f559a09a41a192084418980979e975828296d86611e05416b86872f42e12f29b820d7b4cba4bfa8e0954e949ee86ed4 WHIRLPOOL 94e9f1e4087bed4ef5d7698a0dad23fba24c8c296dde1896dec8e0efa33f8d084a79791018bcda7ce5fb0f69994430d057be672e34184186884dba31b8813510
-DIST freeswitch-sounds-fr-ca-june-16000-1.0.16.tar.gz 22007198 SHA256 4e00722c5487c25f403e432c21a7be72eded0347496490167b82494edc6b4682 SHA512 e5814f355546bc46e255feb383ea8210fe086992b2facbc8d33b185013595d716cf1255dec3f63ec5dfade54df35f4c7fd551cea77d47716a70fa316e198e484 WHIRLPOOL 3a2be93f2532b39d6b6135ea24d63b277537ea7b99c092e49a43d25fc2588a9d17f1c8fab7fb764be9f16bda2442a8366a06c478581167cdc3b213be1da9487b
-DIST freeswitch-sounds-fr-ca-june-16000-1.0.18.tar.gz 26607279 SHA256 5c4e45be5988e7763b196a453722f3a5dd41f79b280a37a8960cf65d390318a7 SHA512 d3306ad81ac9f3da3da6a526abbe1c315a0c50f89750ac3f930086dcd088a0de64a5dd6c06f0d58d28ba12f59abe871701cc2dcf838bb43a1d8d2ed85b5bff0a WHIRLPOOL e98097a7382ca268e1f39b48b180b3f6eb5973df1ae09ba9361bdfe9efee32b49164a7a06a3b470eab8e748031eaa86d54781e5425b06616278cdc14f116c7bb
-DIST freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz 35601264 SHA256 efb3842a638dcfa9376f602b80ef00416bfa4fc5922f05aea772009690a6792f
-DIST freeswitch-sounds-fr-ca-june-32000-1.0.15.tar.gz 42867314 SHA256 691803b82b48a5da2ebfb32f6b0371fc88128516b4f308725843549d5e2a44b9 SHA512 ff3de8c53813c2a343035ec4f7d7a7a926335f86a18f2370c37fcdf57dac54a45861b6bfde85b34d84645646a2dad1684077df04dea7fb3b86ee06ca6eeeab88 WHIRLPOOL 712290e049cc148da25fbaa38caa391d21514cf517f7309a23b8c90054db9853274b362c2dab69551978d078c90fec91f1ba81d8c572deae5eb072823ac93d4a
-DIST freeswitch-sounds-fr-ca-june-32000-1.0.16.tar.gz 43083229 SHA256 c5d986db76369062671bdd1c7adfbd26613ea42ec14f2ace3f007b54a18e4f7a SHA512 2cb4375716a269fa6e4d10e50872a1b791e654e7bd7ded1a672cbd5d23c3f1f184852f892f670d5a604e81afb3b905c19cb03366de6514ae1d3eafde944bd2fc WHIRLPOOL fcd83465eda4e402f29cdf0dd01248467579ae085870a01b0a7ddffe49450d0bffa61162739cf486e40bc72d3d89d45a1fd03c39090e6ffc2f3f6edc2e6bb748
-DIST freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz 52075212 SHA256 b0c30f112bfd40e0422a93b30d251072e9847274a39d3407a06f3528d8935bfe SHA512 5c49cfc7cd7ab28e947f5ce3e26270f9e2d939caeec928da48760c93b295eb03fe50c7b113a23df9d6f019f788431d0b445e6fc5af172fae239ee08cd288ba42 WHIRLPOOL 84d5b57849dbe4bd8f49302f18a586f84a0d2df880e693c9c7e67c7bdd71cbea4985e8a165ec66714fb409b3fb320659ef294ab9fa322369370d80b4927d507f
-DIST freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz 52402291 SHA256 a53f53604b38e5313637cb057f3f61e48bea335b312ad822165dde9bc8cfc6ff
-DIST freeswitch-sounds-fr-ca-june-48000-1.0.15.tar.gz 63103340 SHA256 ffa6b068088658dfe60a4ca7efda1db1b67058209d130bf0e41cb4d63199f218 SHA512 c915e55ea240fa4bb0cae6acb39e46569536ff36e3219e5d0ea89397812750f5644f8867ff1c194a9c3a01ec73c87f953db1b64643d28567c7a8467075a2ef21 WHIRLPOOL 33dec356464875e3cd998be885c3a5091d146965315b43ea1aca564686a2e5e3476cee38a75b1cf9b9a9208d01d99166f089b51e5a618e304dc57ba98cb266aa
-DIST freeswitch-sounds-fr-ca-june-48000-1.0.16.tar.gz 63475346 SHA256 5b689c85e08bc83d3c40c1829d250580e92c673587b14b7e20768efcd1afe55f SHA512 ad31ae44855ff561e3cc4c817b070a000101b7511525f0226ca1fd50e16355450e99dfcc39c04f1493cfb84b260421afca61edce4ddb25378f84c3a03ca6dc8e WHIRLPOOL b7e8ccb4dbde559f002d0edf5a0e629500aaa4f609c1b96b8ba277d6a8a6d90d35ca024555b60e78235019cb8cf3e5480d37f514ee9fd15b9c4bb2e54e27f61a
-DIST freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz 76712496 SHA256 4c7f6d373b72b5af5bad028b3b193d1b862abcee4466bb6f398f1d3f20befd0b SHA512 351fcec1fdd8f201af99d9ec63adacfbb2e16595287eca24c262cde853811669d52486c15eea3346a1c409a84aa837782aadea83ea269267a612592337f7bee4 WHIRLPOOL 9e48b52c04017e5bd07ed8c906ac07f4b2ae627526df6c61b157dcaa57b9dc05d4649870fd6b65153717304523f442c00941c33c13743a0cd308a36bd2d4db66
-DIST freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz 9203881 SHA256 2a10fdae75cdd6cbb12c5e99a854b01433221ebe99c49d6db024164fdc72d252
-DIST freeswitch-sounds-fr-ca-june-8000-1.0.15.tar.gz 11091802 SHA256 8e45543cad8025b0f977db1479157cbed3ac94c9f7ca27b5c35b2921af93e3ed SHA512 7df4e709a291da72c5d68a630bbfcda818929dce11e13febcfb2e95d2011bd397d28cbf3a9ae85982c2b3afc7983ff9c9f9f78ebc6991cb000bfe022aeece497 WHIRLPOOL b8bdb1cbf078170a6976eac35e291dad539b984e5e3cc1696e244a88dfc5c4578ed0b2eb6c209d7cab851fe83fafb3c11745c7eaccaff60a98e5b9f9fa342234
-DIST freeswitch-sounds-fr-ca-june-8000-1.0.16.tar.gz 11132039 SHA256 65f6a1bd385c6075e4203a637ecb85bbf97ec3b3ebe308cb2228920dc7b218d1 SHA512 1e9b71ac34f0ac2fb5f720a53eb159156d611b19fff85ab7fb3523f132232c05ec8943e1f2b491bad316717020e7bdc972c17499a48480fc86d76939460cd80c WHIRLPOOL aa947b63dfe1c25144e19f75ad472932192c9decfc082ce605203b8b96fbc2c29f6b60446cf91b41cf1a85437faa50d0f181ea595733db1e7e0f0cfed19ab76f
-DIST freeswitch-sounds-fr-ca-june-8000-1.0.18.tar.gz 13468498 SHA256 f7fd5c84ff9b1c1929167a4b33f38d6770a44c5bcad4e5f96b86e3165bfd05d4 SHA512 82640dda13288d911b21fd1beb83f08d5a8497d35e2cdb6438c072bdf81981b1836f91be098cfeb42eb10278170a923cfa120113e8d6329bc94742a1b184396b WHIRLPOOL c017a2710d2ea6a15a5b6a3b963ebda1dab524b0c53514cae23929d96b2efc19f3508b5ed240c3c1aa3e0d9805c63362f95d270b3b221b2859cf60e5057a30e4
-EBUILD freeswitch-sounds-fr-1.0.14.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
-EBUILD freeswitch-sounds-fr-1.0.15.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
-EBUILD freeswitch-sounds-fr-1.0.16.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
-EBUILD freeswitch-sounds-fr-1.0.18.ebuild 1077 SHA256 a593478de4f45d39416c8b00a16bf6098840d37ef4d28c92252f8a418e7c2ce3 SHA512 5d4058bf7d499392d828df189b894ef0cd9ea00c1bf19f812f35487b7101430ee12a70d9159174fe8a066561add02536f74abb6102f17ccdbcd80290dd009a11 WHIRLPOOL ff5ce71e71451f643ba0a246002302989f7dc195dbc1720018f1e2a18e1bab7678cbc26c7523eed74206d3c098631f8ba235db599aed99702189a05f41920536
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
deleted file mode 100644
index 918470c..0000000
--- a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="French soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
deleted file mode 100644
index 918470c..0000000
--- a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="French soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
deleted file mode 100644
index 918470c..0000000
--- a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="French soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild b/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
deleted file mode 100644
index 918470c..0000000
--- a/net-misc/freeswitch-sounds-fr/freeswitch-sounds-fr-1.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="French soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-fr-ca-june-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-fr-ca-june-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-fr-ca-june-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-fr-ca-june-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-pt/Manifest b/net-misc/freeswitch-sounds-pt/Manifest
deleted file mode 100644
index 25268de..0000000
--- a/net-misc/freeswitch-sounds-pt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST freeswitch-sounds-pt-BR-karina-48000-1.0.14.tar.gz 87795500 RMD160 f8d8e22a8b5818daa9449b72f905653f0eed1071 SHA1 eb7d2e8076b5afd89c71479182f0636f1bbbdd60 SHA256 33928bb325d9c3ab3f5e59b23027b30d618f4cc52d21cacf57d726269e382fd4
-EBUILD freeswitch-sounds-pt-1.0.14.ebuild 1160 RMD160 fe18ff8f1bad58a187bf2aa05d2b801bb8dfec32 SHA1 1f28d868b6c9f4d1c97d21a88d08db6eb3ccbdf0 SHA256 eb76afb8e6ad230b0e3cef8efb65cc9072466e1ca486568c4b2a479f11e52e03
diff --git a/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild b/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
deleted file mode 100644
index 1f04437..0000000
--- a/net-misc/freeswitch-sounds-pt/freeswitch-sounds-pt-1.0.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2011 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-#IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://www.wirelessmundi.com/freeswitch-sounds"
-
-DESCRIPTION="Portuguese soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.wirelessmundi.com/"
-SRC_URI="${URI_BASE}-pt-BR-karina-48000-${MY_PV}.tar.gz"
-#	${URI_BASE}-pt-BR-karina-8000-${MY_PV}.tar.gz
-#	 16k? ( ${URI_BASE}-pt-BR-karina-16000-${MY_PV}.tar.gz )
-#	 32k? ( ${URI_BASE}-pt-BR-karina-32000-${MY_PV}.tar.gz )
-#	 48k? ( ${URI_BASE}-pt-BR-karina-48000-${MY_PV}.tar.gz )"
-
-LICENSE="CCPL-Attribution-3.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-ru/Manifest b/net-misc/freeswitch-sounds-ru/Manifest
deleted file mode 100644
index fbc9c15..0000000
--- a/net-misc/freeswitch-sounds-ru/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST freeswitch-sounds-ru-RU-elena-16000-1.0.11.tar.gz 16673907 RMD160 929325a64115d85d33767a430e64581851bf6d2e SHA1 086050d78c02ad7bd234d6d1a5db068b7fb8588e SHA256 d9c8b0c98b4ccfbe67bac069cfea7b4f5c793ac12089eb9fc23d237331b64e83
-DIST freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz 17952582 RMD160 45bacc2fe1888a6b950c37749fa4ccf8f8b1c848 SHA1 4505cecc343ab018d2068a17d4e6dab2eea514cd SHA256 aef0d3dc7fed657bc9c9d5ebbb458bc28e55c62af0087623ad060f1b4de3c74c
-DIST freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz 28650196 RMD160 fdf15330ca1ab76507f24d311ddcfc37b4df0b18 SHA1 bff5ed02816b0d7e193503a980bc3dc7655e6564 SHA256 f68bf958625d7fec95ffdec374b197bdddceff372e43c01d6502f39a362a0e15
-DIST freeswitch-sounds-ru-RU-elena-32000-1.0.11.tar.gz 32661501 RMD160 780323d8907ba6ec449b7bdcb829654f4fa9992f SHA1 5d79f9a2be9bb3db2e7a7b6156fc3eef5cc3bd30 SHA256 36c63a0952930af1e56fa0881b9bd9bbdaaf4441c9b79146ec7b85da080a0d90
-DIST freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz 35345749 RMD160 ca5a8f3e49ce2f1ead3128bf8591100716717511 SHA1 9682a16d546e1c8aae3babb9b1f14515a05d368f SHA256 3be071456c03d8eac191f1a417ffcc48eb7100633cbb8d8cc62fde1c328ede08
-DIST freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz 56843560 RMD160 8ec35413af595e5b6f82c9ccab0ace10abb05c6b SHA1 4c1e0d8fecd999afac75170e5a2636e0d7acd7c0 SHA256 621fbe1d6d4c7bafc407aac9898676fe2807a74e5f907a27870095804f6f5652
-DIST freeswitch-sounds-ru-RU-elena-48000-1.0.11.tar.gz 47735322 RMD160 5ac4037e980d8b11f3861642f5e7a413ce24332d SHA1 977a8875c91e73ae3a8737782244229e402ff02d SHA256 c9708f92e5419788529455f04ea3a1b3436c2d0c6923cb49496e415df1da38be
-DIST freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz 51864057 RMD160 1fecd155957c2b5f7d628e1418450df2a01e7a2f SHA1 8741b07f7ab3fda00ae7e84f1a5729d386407d52 SHA256 12e164bbc99729a87d9a57bff557b6a190b5349b30cad71dcae458d92288aa3b
-DIST freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz 84394475 RMD160 f7a7481d6df7a0217dda8ba94d2f940686d94db1 SHA1 27dc9d953f41c351323a2068dfa22f98dfc31ea2 SHA256 f2db5f456e94e10f262ee08407484e4faf538a28e38c67867a8598636cca0d4a
-DIST freeswitch-sounds-ru-RU-elena-8000-1.0.11.tar.gz 8517299 RMD160 5ab7e93f985a5ab68060585fca8290cb94bbe31f SHA1 f6b0eb044373895a244d4eaab63b22f3416c9986 SHA256 d5c2fd2b0de7510d6b505b7716f5f52955bf7f13279aae3685b17b0882821065
-DIST freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz 9115259 RMD160 e7dd71f827e4c84c5801ba485a15ab10756bcc19 SHA1 31d17694661caa77c70bf9d07b02ed0d0b9f3ee7 SHA256 44db35574216af8ccbb48a7f1a08065df253adb4cebed8bc7ece7d0a4da920e7
-DIST freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz 14363334 RMD160 2e6902bdd848b0b5cd70463d217e717c4eb4e9fe SHA1 cff2da72b0dc53df781ac7526f3e035192f9065c SHA256 a04f0d33462a782c9fe8e81331a7c0928950c3fcc83f90cdf774974114bf1e53
-EBUILD freeswitch-sounds-ru-1.0.11.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
-EBUILD freeswitch-sounds-ru-1.0.12.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
-EBUILD freeswitch-sounds-ru-1.0.13.ebuild 1088 RMD160 0afecace9e868f943d089af00915df1ff84f7328 SHA1 e7a4af98acda371a50db287a9610e02e9d7f99e5 SHA256 b9d374eced17d2acc7774c06d053bb885d5d251857b067ef283d4f9514456c2c
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
deleted file mode 100644
index 5aa8adf..0000000
--- a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="Russian soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
deleted file mode 100644
index 5aa8adf..0000000
--- a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="Russian soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild b/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
deleted file mode 100644
index 5aa8adf..0000000
--- a/net-misc/freeswitch-sounds-ru/freeswitch-sounds-ru-1.0.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-
-EAPI="1"
-
-IUSE="+16k 32k 48k"
-
-MY_PV="${PV/_/.}"
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-DESCRIPTION="Russian soundfiles for FreeSWITCH"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI="${URI_BASE}-ru-RU-elena-8000-${MY_PV}.tar.gz
-	 16k? ( ${URI_BASE}-ru-RU-elena-16000-${MY_PV}.tar.gz )
-	 32k? ( ${URI_BASE}-ru-RU-elena-32000-${MY_PV}.tar.gz )
-	 48k? ( ${URI_BASE}-ru-RU-elena-48000-${MY_PV}.tar.gz )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/freeswitch"
-RDEPEND="${DEPEND}"
-
-
-src_install() {
-	#
-	# 1. Copy files
-	#
-	dodir /opt/freeswitch/sounds
-	mv "${WORKDIR}/"* "${D}/opt/freeswitch/sounds/" || die "Failed to copy sound files"
-
-	#
-	# 2. Fix permissions
-	#
-	einfo "Setting file and directory permissions..."
-
-	# prefix
-	chown -R root:freeswitch "${D}/opt/freeswitch"
-	chmod -R u=rwX,g=rX,o=   "${D}/opt/freeswitch"
-}
diff --git a/net-misc/freeswitch-sounds/Manifest b/net-misc/freeswitch-sounds/Manifest
deleted file mode 100644
index 5447e60..0000000
--- a/net-misc/freeswitch-sounds/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-EBUILD freeswitch-sounds-1.0.11.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
-EBUILD freeswitch-sounds-1.0.12.ebuild 669 SHA256 482da4bc4e60608db56b6adc005e1a3ca27382df7b52cd095e97caa288499938 SHA512 e24d4c2cf3e90cf1b50c07403731600f0b9cd9f243313a4c62012c79d26f522829f6c0c3ae0b7f3e26577a296d54210ba953fa086112ed76cc3ae60401f0f0c0 WHIRLPOOL 426af582eedc06649035223559ac790b5dbede0c16f485b2db96a7df0b6f0ad7e86ee11887af403363982510100fd497892765d31d7ff67fbbb08ed33a29ee83
-EBUILD freeswitch-sounds-1.0.13.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
-EBUILD freeswitch-sounds-1.0.14.ebuild 726 SHA256 55fccbd8da52fb7f0d8d5699fc4a0a540c70e73659882b2e53bf830763a602f2 SHA512 4f79c7655eda6c44fe745654ab50d6086409d8017be4f8e2ab04102d9e7e01afbd06a32491e72c5b287dc8c36cda555dcfd65458974716be3abdbd48282ccb54 WHIRLPOOL 37c47721568fb18ca5811fbb4e19d10c87fb673d48fc43788f76733ef96d6e8412b2c8bec0ccc6d1e77702f1033b64c2713921441060d634f666369fc65a9a0e
-EBUILD freeswitch-sounds-1.0.16.ebuild 996 SHA256 bfee8f1ed3bde09964c82b2d74378455f021c539ff2036cb1f5402fd4e0d05a5 SHA512 49c0b54b83b652b4a57bac49e65853ca5ad1a3f02b5f637d1eb3d32dd84bc20923787cb591f63ed9c068a74c124bfbfd123096a1819c71a67f2805c1399468d9 WHIRLPOOL 141bc4d8d99bc0af97a4a1e9e2cc7f78ce23bac3287e553f6a32f516a0246afcd5c177c1e7e417de8137b94a4d761a3087ffb116ee35731bfa354256f30fb403
-EBUILD freeswitch-sounds-1.0.18.ebuild 996 SHA256 a57bf64ba18ffddc51aff79064044d395f7852f51ace295ec6296eef81a12cc1 SHA512 29d50b87ed8d3c8cdf54a8ea4c058703be22d35ed481175c2ecad2220924fa90774e059f86b553427df445937c33b3ace178b84270189e382db231d8b2e50095 WHIRLPOOL 7eb8458eabbcd76a58dcd044be10648773a12d29ac3dd0104be6263d14a93919f84bb071d4e8ff7bda9ba56a060a3b5577a2dcaed4db10a8b10b5cc00f3a63fa
-EBUILD freeswitch-sounds-1.0.20.ebuild 996 SHA256 3d074edd3e1a1cbbfd6424df123293855aa084446b90a9e1dd295ba14317fc89 SHA512 ce7ad0e7f5b3979c8e2b15e44d311274f9019377be271ca71b21d61e510da6cc317785f46f10637eb4134e1234eff1f08a4217e0279339b09abf47e241b725a0 WHIRLPOOL bafe5929e2c30751cc28baccc494482cffd577e2b2be3cc8b2a6af1a1503b32f8f6cf41d3c29824be67c9efbb6a3cf0068c266241e5bda4b29b7361cdc01ca08
-EBUILD freeswitch-sounds-1.0.22.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
-EBUILD freeswitch-sounds-1.0.24.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
-EBUILD freeswitch-sounds-1.0.25.ebuild 996 SHA256 28bc9939a8b4e3f2d98fa68a4d7d29dfcc05c989a9df1660971fbe0a61d6f1dd SHA512 c9309608fc3a98887319afa82a85c6ec399d5adb4179f0bb061ac7c2d69b267d2cb9822b3d1d6cf6755d88c3aaaf30dce9f5302f98d9ef37a087d347f56045ad WHIRLPOOL 60e3410c1fc9f3ddb1583d92a33786809056265a01dd0715ee82999e20ad8d4a0212a417b4a5b12bbf0f37eb40abeb99746e5bda0bb2297487b88872fb9eb2c1
diff --git a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild b/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild
deleted file mode 100644
index fd90592..0000000
--- a/net-misc/freeswitch-sounds/freeswitch-sounds-1.0.25.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2008-2010 Stefan Knoblich <s.knoblich@axsentis.de>
-#
-# Distributed under the terms of the GNU General Public License 2
-# see http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt for
-# more information
-#
-EAPI="1"
-
-IUSE="+linguas_en linguas_es linguas_fr linguas_pt_BR linguas_ru"
-
-URI_BASE="http://files.freeswitch.org/freeswitch-sounds"
-
-RU_VERSION="1.0.13"
-FR_VERSION="1.0.18"
-ES_VERSION="1.0.14"
-PT_VERSION="1.0.14"
-EN_VERSION="${PV}"
-
-DESCRIPTION="Sounds for FreeSWITCH (Meta package)"
-HOMEPAGE="http://www.freeswitch.org/"
-SRC_URI=""
-
-
-DEPEND="
-	|| (
-		(
-		  linguas_en? ( >=${CATEGORY}/${PN}-en-${EN_VERSION} )
-		  linguas_es? ( >=${CATEGORY}/${PN}-es-${ES_VERSION} )
-		  linguas_fr? ( >=${CATEGORY}/${PN}-fr-${FR_VERSION} )
-		  linguas_pt_BR? ( >=${CATEGORY}/${PN}-pt-${PT_VERSION} )
-		  linguas_ru? ( >=${CATEGORY}/${PN}-ru-${RU_VERSION} )
-		)
-		>=${CATEGORY}/${PN}-en-${EN_VERSION}
-	)"
-
-
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-misc/freeswitch"

From 44cbd6e5f2c280a066f90aed0fc8b22de7c71187 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Mon, 29 Aug 2016 23:38:48 -0700
Subject: [PATCH 202/261] freeswitch 1.6.10 support, thx drew

---
 net-misc/freeswitch/Manifest                  |   6 +-
 .../files/freeswitch-1.6.10-no-werror.patch   |  18 +
 .../files/freeswitch-1.6.8-r1-no-werror.patch |  16 +
 net-misc/freeswitch/files/pax_fix.sh          |   5 +
 net-misc/freeswitch/freeswitch-1.6.10.ebuild  | 567 ++++++++++++++++++
 .../freeswitch/freeswitch-1.6.8-r1.ebuild     |   1 +
 6 files changed, 612 insertions(+), 1 deletion(-)
 create mode 100644 net-misc/freeswitch/files/freeswitch-1.6.10-no-werror.patch
 create mode 100644 net-misc/freeswitch/files/freeswitch-1.6.8-r1-no-werror.patch
 create mode 100755 net-misc/freeswitch/files/pax_fix.sh
 create mode 100644 net-misc/freeswitch/freeswitch-1.6.10.ebuild

diff --git a/net-misc/freeswitch/Manifest b/net-misc/freeswitch/Manifest
index c4158cf..d06ec1f 100644
--- a/net-misc/freeswitch/Manifest
+++ b/net-misc/freeswitch/Manifest
@@ -1,14 +1,18 @@
+AUX freeswitch-1.6.10-no-werror.patch 900 SHA256 cd20535d1113e0f6f8aaf0375880bec5bb37bcf0652c79bd1ba3a5ab281169d5 SHA512 7531a84c1c1b9f356129f282299832be6fbf7471804d8acb478e043184ed01e50ddbdd999517c9429e5652f0ba4f749dea8cd0276d4571fcb471ab7e1e778a7c WHIRLPOOL e7f5ad410ee6bdb9d08c12e62e88eb2a3eb33d0950dc827a97ea257caf02d5152a1cdfcc5f7cdde654ae7ff0dd38231d5c3f9ddf997cc854f74c77c2fc6f4f37
 AUX freeswitch-1.6.2-no-werror.patch 651 SHA256 4765ae29af553b5b032bae4f6462ca0f44f8fc37ca864b22b1a43ce7254a7b0d SHA512 71cfd5a71aa70d4711a35bb4678be74fb3fef187e71ac8d5b27fb7a474b0317e1bd6f8d08d049d3526d514abef0f8df4fc76fc2faf1589865f7a085fa7f3b3a4 WHIRLPOOL 220f62a0ce5280158ddf8df1a6cf924cbafec54fc7418fa28b5ab02725ced90626d15baaa3da46d9b289069ac36d2defd013f3a4f54033c62846d46430cb7aaa
 AUX freeswitch-1.6.8-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
+AUX freeswitch-1.6.8-r1-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
 DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
+DIST freeswitch-1.6.10.tar.xz 33487164 SHA256 b7beaaac29dc0a58cc34cfd402bf1c7e8ca06975722fd8ddb2983cbed17dd6e4 SHA512 366df80ff01e8225c379a67ce625cbed1a43f6b99b99a990dfc6bbbc15fdb0d22265031fab547f83415454e865fb35359c3ad1cc5599371aa62f83b0d874e385 WHIRLPOOL 70e18f6270c6ac07b6d04d5c1fb70f57346c43359c589bc2e46f25368e9cf6548bb230b66b68eb80a91351bd02cda9f321ec201da7ad530348f4e1c7a4886369
 DIST freeswitch-1.6.2.tar.xz 31212588 SHA256 cf26f491469d2f744fb48ba0a7e25cefd96305e0ef385eda09fca82c096bb48f SHA512 b85ebbdc0f4111f76e798b91d23d05b63966fe8ac273bc2581857c1b9b810f970f25fd244ce40884d4939e835c72d7700448ea663a4f2650eb34d67325aa0517 WHIRLPOOL e710903392490dc32a558d3bb27d4950da50c13f178f8de87465c9b95df85d6931ce9af64b19f6eabd0adc51ebe1d0ec97da85d1ea6c3d988385534b8739c1cf
 DIST freeswitch-1.6.8.tar.xz 33454900 SHA256 c17e0df66d8c6ffaa35523596721ebc983681ae386d564294d1852be5d34596e SHA512 245e2e3a20908b7f7b1c7054c3efbe68510f6577654186af3749e0da9def233b7b61f510d610500a6f7ae0b9fa6c5cd3cc19e1d980306b638f6d0df06120bcf2 WHIRLPOOL 2a3766f3ad77af43ce93b8f64e4d478894199074075236c3cb5d398dfb8624e68c08257c37543bfd01acca435416163b862322288e4c174f3ac5930bfa801f53
 EBUILD freeswitch-1.2.12.ebuild 28623 SHA256 4ce53d6e789a987d8dea70644a62b4a7a473bc74807ee7ffe983c7cd866ca25e SHA512 f54d36e8ac72de2ee1a55dc5558cd0fa0ad826c51bbf6b91a83c52269c601b398660e6001a542441b256a5d6f285bc47b9c7e0d0928049371c85e3028bd1aae2 WHIRLPOOL 553482448cee8b785408bed4a6c53231ad398f34e01ef88a0de4fc5fbc821f8cae2fcb21d1ed4ce708d49601e67b52adff47d11c6beddc421e931fbc7820bace
 EBUILD freeswitch-1.2.9999.ebuild 28607 SHA256 dccc283cfd45e4c4ad181250be888355b0d568c39f862f2a0e481704904cbb62 SHA512 70ecff7f3a7b6fcdb61799ebcbd96456f53dc999e9feec57840766ea873f7de03ff08a1d9f35c549cc326758dd6c84fcc50e7fec74af48cb75d4b2ee12ef5423 WHIRLPOOL 3fed7632f75d013cc40fc7cd868f6c905617785733b96c78dc3cd825fa94373c543b6dea41ba7b75847e612c2493b97be60e0948b272648efcdff616d036a7fb
+EBUILD freeswitch-1.6.10.ebuild 16133 SHA256 73d33d2d1096f574d1fa10cbe7f56f813e78d9c606affffbf99fd0cbecee9a28 SHA512 f4689b2f0101fb12d12e8cd7af160130e64b7b0793315422e6d09bcf23a0853446234cbe3eef03cc200224c3fedcb21a0bb496ab070daa0fd60298ffed5c1902 WHIRLPOOL b215822cce3b67e51fd9ab6d2b78e514ebfde1b8d8b1cd462e1a5706174141931772c31dba29bef7ee39d4b1069d80acb5461d80cde73eabb0f9e94d202126d2
 EBUILD freeswitch-1.6.2.ebuild 15690 SHA256 82bdb304a68ce044458b3e2fb80e242e1a631db24829e6362e887ad3ebbd3df9 SHA512 a443e2fa793bd9c047da32ffe7bfb927cbedd9ae7ef79ad92b37ae6bb187f319b3486272d41bbc33046a081ef9fde72dd99a63d06be8d24706b49a2f6a1f8c57 WHIRLPOOL 9ac7d4a8c75dd44a382ddf85e84962499fcc2e05d96e6e6fb34858c709ce285fc32b6d82539f95f35684f8e5359a93031924f845e96c2f90ef5f520503f16c8e
-EBUILD freeswitch-1.6.8-r1.ebuild 15699 SHA256 47acc03b753c37d9ceefb57abe8503077cc9cb5d9c79b332fd2481547988d782 SHA512 4222f3a908a2e86933bfeb22b938676ddfc3309ce822271b6ca64fccf6850922de44680b62b931279abebeae1c6d055110d19f6733b131328cda494c9371f31b WHIRLPOOL c2d1d2689bec50bf3fee0d5990ca5f037ea5d258c3aca4fb9ffe2ae660dcb70c103dd7073502e96e0f4df17eaf977733ef49877364721bc2d537172b6303647e
+EBUILD freeswitch-1.6.8-r1.ebuild 15714 SHA256 230a8d9c001e034ead3092128e99ec7a4484a13f6e63f2ab98b43ceb6a36f677 SHA512 52f3e73210413f83addd7b6a6190ff42251d2bf19fd1da94d7163f9a9736eda8363070d0f52f3963da015a3402f8464693934c7123f5762ca71544e7e558a44e WHIRLPOOL 403afc0431f9b9ee40280fe8a4d2542eaa03bf5b8d693dacda4c769ebdd567717a2e17648888bc4ec97cb3aa8556ad22d346706b4b6e1527a1799915a784fae9
 EBUILD freeswitch-1.6.8.ebuild 15828 SHA256 da4939263250476e380b4c342ae1c68dd406344bc5b9e710ee144711b3c83379 SHA512 2b4c664a0d7430ce2659d59f11a1bcc8b1101986f4e0879abb563a5786a2e831d0ade1987cfd664e5c90cf0d2182754c5a432f95d008b273ef67b7c18929d64f WHIRLPOOL c9306338867cf6e77f6caf551b335fe45b5e1587c00867c25e2bf501c7079328950ea800352763b8e4c7c566ee82e674c0f2d52f6d12d5b25636c504c34cae92
 EBUILD freeswitch-9999-r1.ebuild 29708 SHA256 dbed2a47cd588acac3d9850fa4d5175af1deaf036a86e8f99a3bef3c4f37f9b2 SHA512 7af9b25f895959ce579994259a769b01cba27c44f6289efcd7848243b3c30ecbab3cd5beda760edc9cc230465f8ea75fec78248a06dd76e048bbba79d63a070d WHIRLPOOL 3fddd04bec7a7d1b54f959554623f1cea28b4e9f84f55203b079b3b9bec6a3023f28490c2ed05435626960a4d212f9e90b54ecbac0ab93de8382fe1779d02a7b
 EBUILD freeswitch-9999.ebuild 28603 SHA256 ba4f40c300237488d18eae011cfc93e4d96f51dbce6737256dd470ce681dd3f4 SHA512 5c19d94a326f40169991cb80f53b7e618f9ce7674dc33c4abe9c3a23eb5d0266f70973b9f19fa090ac76123d1ea4039c2012656893a7cae1e7d39e37011ffbcc WHIRLPOOL fcd75a0c23894ae379ca98fa05fda6b2b700d6240cd3e8db5e3ec5ef7f3a2601609019f8c7b5af964d4a0f09ff3d4622a1574a4092606fcbe08e747e84ba195d
diff --git a/net-misc/freeswitch/files/freeswitch-1.6.10-no-werror.patch b/net-misc/freeswitch/files/freeswitch-1.6.10-no-werror.patch
new file mode 100644
index 0000000..375c63f
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch-1.6.10-no-werror.patch
@@ -0,0 +1,18 @@
+--- freeswitch-1.6.8/configure.ac	2016-05-05 20:42:20.000000000 +0000
++++ freeswitch-1.6.8.new/configure.ac	2016-05-25 19:34:00.823535317 +0000
+@@ -414,15 +414,10 @@
+ elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
+-    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
+-    fi
+     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
+       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
+     fi
diff --git a/net-misc/freeswitch/files/freeswitch-1.6.8-r1-no-werror.patch b/net-misc/freeswitch/files/freeswitch-1.6.8-r1-no-werror.patch
new file mode 100644
index 0000000..3a4a3d0
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch-1.6.8-r1-no-werror.patch
@@ -0,0 +1,16 @@
+--- configure.ac	2016-05-05 22:42:20.000000000 +0200
++++ configure.ac	2016-06-02 17:50:17.649780531 +0200
+@@ -414,13 +414,11 @@
+ elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
+     if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
+     fi
+     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
diff --git a/net-misc/freeswitch/files/pax_fix.sh b/net-misc/freeswitch/files/pax_fix.sh
new file mode 100755
index 0000000..1ccc320
--- /dev/null
+++ b/net-misc/freeswitch/files/pax_fix.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "Disabling memory pax check on /usr/bin/freeswitch"
+paxctl -m /usr/bin/freeswitch
+
+# done
diff --git a/net-misc/freeswitch/freeswitch-1.6.10.ebuild b/net-misc/freeswitch/freeswitch-1.6.10.ebuild
new file mode 100644
index 0000000..66ab5e0
--- /dev/null
+++ b/net-misc/freeswitch/freeswitch-1.6.10.ebuild
@@ -0,0 +1,567 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id:$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic python user java-pkg-opt-2
+
+DESCRIPTION="FreeSWITCH telephony platform"
+HOMEPAGE="http://www.freeswitch.org/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MPL-1.1"
+SLOT="0"
+
+SRC_URI="http://files.freeswitch.org/releases/freeswitch/${P}.tar.xz"
+# No idea what USE=libedit is actually good for
+IUSE="esl libedit odbc +resampler sctp +zrtp debug"
+
+LANGS="de en es es_ar fa fr he hr hu it ja nl pl pt ru sv th zh"
+
+FREETDM_MODULES="
+	libpri misdn r2 sng_isdn sng_ss7 wanpipe
+"
+
+ESL="perl python lua java managed"
+
+# TODO: Add support for mod_bert
+FM_APPLICATIONS="
+	abstraction avmd blacklist callcenter cidlookup cluechoo
+	+commands +conference curl +db directory distributor +dptools
+	easyroute +enum +esf esl +expr +fifo fsk fsv +hash +httapi
+	http_cache ladspa lcr +limit memcache mongo nibblebill
+	osp rad_auth random redis rss skel +sms snapshot
+	snom soundtouch +spandsp spy stress +valet_parking vmd
+	+voicemail voicemail_ivr amd
+"
+FM_TTS="
+	cepstral flite pocketsphinx tts_commandline unimrcp
+"
+FM_CODECS="
+	+amr amrwb +bv codec2 com_g729 dahdi_codec +g723_1 +g729
+	+h26x +ilbc isac mp4v +opus sangoma_codec silk siren skel_codec
+	theora
+"
+FM_DIALPLANS="
+	dialplan_asterisk +dialplan_directory +dialplan_xml
+"
+FM_DIRECTORIES="
+	ldap
+"
+FM_ENDPOINTS="
+	alsa dingaling freetdm gsmopen h323 khomp +loopback opal
+	portaudio reference rtc rtmp skinny skypopen +sofia unicall verto
+"
+FM_EVENT_HANDLERS="
+	+cdr_csv cdr_mongodb cdr_pg_csv cdr_sqlite erlang_event
+	event_multicast +event_socket event_test event_zmq json_cdr
+	radius_cdr snmp
+"
+FM_FORMATS="
+	+local_stream +native_file png portaudio_stream shell_stream
+	shout +sndfile +tone_stream vlc
+"
+FM_LANGUAGES="
+	java lua managed perl python yaml
+"
+FM_LOGGERS="
+	+console +logfile +syslog
+"
+FM_TIMERS="
+	posix_timer timerfd
+"
+FM_XML="
+	xml_cdr xml_curl xml_ldap xml_rpc xml_scgi
+"
+FM_EXTERNAL="
+	ssh
+"
+FM="
+	${FM_APPLICATIONS}
+	${FM_TTS}
+	${FM_CODECS}
+	${FM_DIALPLANS}
+	${FM_DIRECTORIES}
+	${FM_ENDPOINTS}
+	${FM_EVENT_HANDLERS}
+	${FM_FORMATS}
+	${FM_LANGUAGES}
+	${FM_LOGGERS}
+	${FM_TIMERS}
+	${FM_XML}
+"
+
+FM_BROKEN=""
+
+#? mod_mp4 -> want mp4.h (which was in older versions of libmp4v2
+
+REQUIRED_USE="
+	|| ( linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_he linguas_hr linguas_hu linguas_it linguas_ja linguas_nl linguas_pt linguas_ru linguas_th linguas_zh )
+	esl? ( freeswitch_modules_esl )
+	freeswitch_modules_esl? ( esl )
+	freeswitch_modules_limit? ( freeswitch_modules_db freeswitch_modules_hash )
+	freeswitch_modules_nibblebill? ( odbc )
+	freeswitch_modules_easyroute? ( odbc )
+	freeswitch_modules_lcr? ( odbc )
+	freeswitch_modules_gsmopen? ( freeswitch_modules_spandsp )
+	freeswitch_modules_portaudio_stream? ( freeswitch_modules_portaudio )
+	freeswitch_modules_freetdm? ( freetdm_modules_libpri )
+	freeswitch_modules_verto? ( freeswitch_modules_rtc )
+	freetdm_modules_libpri? ( freeswitch_modules_freetdm )
+	freetdm_modules_misdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_r2? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_isdn? ( freeswitch_modules_freetdm )
+	freetdm_modules_sng_ss7? ( freeswitch_modules_freetdm )
+	freetdm_modules_wanpipe? ( freeswitch_modules_freetdm )
+"
+
+# Though speex is obsolete (see https://wiki.freeswitch.org/wiki/Mod_speex), configure fails without it
+RDEPEND="virtual/libc
+	>=media-libs/speex-1.2_rc1
+	libedit? ( dev-libs/libedit )
+	odbc? ( dev-db/unixODBC )
+	esl_java? ( >=dev-java/oracle-jdk-bin-1.8:* )
+	esl_lua? ( || ( dev-lang/lua dev-lang/luajit:2 ) )
+	esl_managed? ( >=dev-lang/mono-1.9 )
+	esl_perl? ( dev-lang/perl )
+	esl_python? ( dev-lang/python:2.7 )
+	freeswitch_modules_alsa? ( media-libs/alsa-lib )
+	freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
+	freeswitch_modules_xml_curl? ( net-misc/curl )
+	freeswitch_modules_enum? ( >=net-libs/ldns-1.6.6 )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap )
+	freeswitch_modules_ldap? ( net-nds/openldap )
+	freeswitch_modules_java? ( >=dev-java/oracle-jdk-bin-1.8:* )
+	freeswitch_modules_h323? ( || ( net-libs/openh323 net-libs/ptlib ) )
+	freeswitch_modules_opal? ( net-libs/opal[h323,iax] )
+	freeswitch_modules_opus? ( media-libs/opus )
+	freeswitch_modules_osp? ( >=net-libs/osptoolkit-4.0.3 )
+	freeswitch_modules_perl? ( dev-lang/perl[ithreads] )
+	freeswitch_modules_python? ( dev-lang/python:2.7[threads] )
+	freeswitch_modules_managed? ( >=dev-lang/mono-1.9 )
+	freeswitch_modules_sndfile? ( media-libs/libsndfile )
+	freeswitch_modules_soundtouch? ( media-libs/libsoundtouch )
+	freeswitch_modules_skypopen? ( x11-base/xorg-server x11-apps/xhost net-im/skype media-fonts/font-misc-misc media-fonts/font-cursor-misc )
+	freeswitch_modules_memcache? ( net-misc/memcached )
+	freeswitch_modules_erlang_event? ( dev-lang/erlang )
+	freeswitch_modules_shout? ( media-libs/libogg >=media-sound/mpg123-1.20 media-libs/libshout media-sound/lame )
+	freeswitch_modules_spandsp? ( virtual/jpeg )
+	freeswitch_modules_redis? ( dev-db/redis )
+	freeswitch_modules_cdr_pg_csv? ( dev-db/postgresql )
+	freeswitch_modules_gsmopen? ( net-libs/ctb[-gpib] app-mobilephone/gsmlib )
+	freeswitch_modules_xml_ldap? ( net-nds/openldap[sasl] )
+	freeswitch_modules_ladspa? ( media-libs/ladspa-sdk )
+	freeswitch_modules_freetdm? (
+		freetdm_modules_misdn? ( >=net-dialup/misdnuser-2.0.0 )
+		freetdm_modules_libpri? ( >=net-libs/libpri-1.4.0 )
+		freetdm_modules_wanpipe? ( net-misc/wanpipe )
+		freetdm_modules_sng_isdn? ( net-libs/libsng-isdn )
+		freetdm_modules_sng_ss7? ( net-libs/libsng-ss7 )
+		freetdm_modules_r2? ( net-misc/openr2 )
+	)
+"
+#	freeswitch_modules_mp4? ( media-libs/libmp4v2 )
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10
+	virtual/pkgconfig
+	dev-lang/lua
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	esl_java? ( >=dev-java/oracle-jdk-bin-1.8:* >=dev-lang/swig-1.3.6:1 )
+	esl_lua? ( dev-lang/lua >=dev-lang/swig-1.3.26:1 )
+	esl_managed? ( =dev-lang/swig-2*:0 )
+	esl_perl? ( >=dev-lang/swig-1.1:1 )
+	esl_python? ( >=dev-lang/swig-1.1:1 )
+	freeswitch_modules_java? ( >=dev-java/oracle-jdk-bin-1.8:* )
+"
+
+PDEPEND="media-sound/freeswitch-sounds
+	media-sound/freeswitch-sounds-music
+	freeswitch_modules_ssh? ( net-voip/freeswitch-mod_ssh )
+"
+
+for x in ${FM} ${FM_EXTERNAL}; do
+	IUSE="${IUSE} ${x//[^+]/}freeswitch_modules_${x/+}"
+done
+for x in ${FREETDM_MODULES}; do
+	IUSE="${IUSE} ${x//[^+]/}freetdm_modules_${x/+}"
+done
+for x in ${ESL}; do
+	IUSE="${IUSE} esl_${x}"
+done
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+for x in ${FM_BROKEN}; do
+	IUSE="${IUSE//${x}}"
+done
+
+FREESWITCH_USER=${FREESWITCH_USER:-freeswitch}
+FREESWITCH_GROUP=${FREESWITCH_GROUP:-freeswitch}
+
+pkg_pretend() {
+	if use freeswitch_modules_h323; then
+		ewarn "You're about to using mod_h323, which depends on "
+		ewarn "'dead' openh323 library. We're suggest you to use mod_opal instead."
+		if has_version net-libs/ptlib; then
+			die "Can't use mod_h323 with net-libs/ptlib. Please, use mod_opal instead."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use freeswitch_modules_cepstral; then
+		SWIFT_HOME="${SWIFT_HOME:-/opt/swift}"
+
+		if [ ! -d "${SWIFT_HOME}" ]; then
+			eerror "No cepstral installation found in \"${SWIFT_HOME}\""
+			eerror 'Try to set SWIFT_HOME="/path/to/swift_tts_engine" in your make.conf'
+			die "No cepstral installation found in \"${SWIFT_HOME}\""
+		fi
+
+		if [ ! -e "${SWIFT_HOME}/lib/libswift.so" ]; then
+			eerror "Cepstral library not found in \"${SWIFT_HOME}\""
+			die "Cepstral library not found!"
+		fi
+
+		einfo "Cepstral installation found in \"${SWIFT_HOME}\""
+
+		export SWIFT_HOME
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup "${FREESWITCH_GROUP}"
+	enewuser "${FREESWITCH_USER}" -1 -1 "/var/lib/${PN}" "${FREESWITCH_GROUP}"
+}
+
+fs_set_module() {
+	local config="modules.conf"
+	local mod="$2"
+
+	case ${mod} in
+	mod_freetdm)
+		category="../../libs/freetdm"
+		;;
+	*)
+		category="$(ls -d src/mod/*/${mod} | cut -d'/' -f3)"
+		;;
+	esac
+
+	[ -z "${category}" ] && {
+		die "Unable to determine category for module \"${mod}\"."
+	}
+
+	case $1 in
+	enable)
+		einfo "  ++ Enabling ${mod}"
+		echo "${category}/${mod}" >> "${config}"
+		;;
+
+	disable)
+		einfo "  -- Disabling ${mod}"
+		echo "#${category}/${mod}" >> "${config}"
+		;;
+	*)
+		eerror "fs_set_module <enable|disable> <module_path>"
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+setup_modules() {
+	local x mod action
+
+	[ -f "modules.conf" ] && {
+		rm -f "modules.conf" || die "Failed to remove existing modules.conf"
+	}
+	einfo "Optional modules:"
+	for x in ${FM}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use freeswitch_modules_${mod} || action="disable"
+			fs_set_module "${action}" "mod_${mod}"
+		}
+	done
+
+	einfo "Language modules:"
+	for x in ${LANGS}; do
+		mod="${x/+}"
+		action="enable"
+
+		[ -n "${mod}" ] && {
+			use linguas_${mod} || action="disable"
+			fs_set_module "${action}" "mod_say_${mod}"
+		}
+	done
+}
+
+esl_modname() {
+	[ -z "$1" ] && return 1
+	case "$1" in
+	"python")
+		echo "pymod"
+		;;
+	*)
+		echo "${1#*-}mod"
+		;;
+	esac
+	return 0
+}
+
+esl_dopymod() {
+	(
+		insinto $(python_get_sitedir)
+
+		for x in ${@}; do
+			insopts -m644
+
+			[ "${x}" != "${x%.so}" ] && insopts -m755
+
+			doins "${x}" || die "failed to install ${x}"
+		done
+	) || die "failed to install $@"
+}
+
+esl_doluamod() {
+	(
+		insinto $(pkg-config lua --variable INSTALL_CMOD)
+		insopts -m755
+		doins "$@"
+	) || die "failed to install $@"
+}
+
+esl_doperlmod() {
+	(
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorarch)"
+		eval "$(${PERL:-/usr/bin/perl} -V:installvendorlib)"
+
+		for x in ${@}; do
+			target="lib"
+
+			[ "${x}" != "${x%.so}" ] && target="arch"
+
+			case "${target}" in
+			"lib")
+				insinto "${installvendorlib}"
+				insopts -m644
+				doins -r "${x}" || die "failed to install ${x}"
+				;;
+			"arch")
+				insinto "${installvendorarch}"
+				insopts -m755
+				doins "${x}" || die "failed to install ${x}"
+				;;
+			esac
+		done
+	) || die "failed to install $@"
+}
+
+src_prepare() {
+	# disable -Werror
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+
+	# Fix broken libtool?
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr/Makefile.in"
+	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr-util/Makefile.in"
+
+	einfo
+	einfo "Adding AMD module"
+	einfo
+	cp -R "${FILESDIR}/AMD" "${S}/src/mod/applications/mod_amd"
+
+
+	if use freeswitch_modules_freetdm
+	then
+		( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"
+	fi
+
+	if use esl_python; then
+		python_get_version &>/dev/null && PYVER=$(python_get_version) || die "Failed to determine current python version"
+		sed -i -e "/^LOCAL_/{ s:python-2\.[0-9]:python-${PYVER}:g; s:python2\.[0-9]:python${PYVER}:g }" \
+			libs/esl/python/Makefile || die "failed to change python locations in esl python module"
+	fi
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local java_opts config_opts
+	use freeswitch_modules_java && \
+		java_opts="--with-java=$(/usr/bin/java-config -O)"
+	use freetdm_modules_libpri && \
+		config_opts="--with-libpri"
+	use freetdm_modules_misdn && \
+		config_opts="--with-misdn"
+
+	use debug || config_opts="${config_opts} --disable-debug"
+
+	if use debug; then
+		export CFLAGS="-g -ggdb"
+		export MOD_CFLAGS="-g -ggdb"
+	fi
+
+	einfo "Configuring FreeSWITCH..."
+		touch noreg
+		FREESWITCH_HTDOCS="${FREESWITCH_HTDOCS:-/var/www/localhost/htdocs/${PN}}"
+		econf \
+		--disable-option-checking \
+		${CTARGET:+--target=${CTARGET}} \
+		$(use_enable libedit core-libedit-support) \
+		--localstatedir="/var" \
+		--sysconfdir="/etc" \
+		--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+		--with-rundir="/var/run/${PN}" \
+		--with-logfiledir="/var/log/${PN}" \
+		--with-dbdir="/var/lib/${PN}/db" \
+		--with-htdocsdir="/usr/share/${PN}/htdocs" \
+		--with-soundsdir="/usr/share/${PN}/sounds" \
+		--with-grammardir="/usr/share/${PN}/grammar" \
+		--with-scriptdir="/usr/share/${PN}/scripts" \
+		--with-recordingsdir="/var/lib/${PN}/recordings" \
+		--with-pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
+		$(use_enable sctp) \
+		$(use_enable zrtp) \
+		$(use_with freeswitch_modules_python python "$(PYTHON -a)") \
+		$(use_enable resampler resample) \
+		$(use_enable odbc core-odbc-support) \
+		${java_opts} ${config_opts} || die "failed to configure FreeSWITCH"
+
+	if use freeswitch_modules_freetdm; then
+		pushd "${S}/libs/freetdm"
+		einfo "Configuring FreeTDM..."
+		econf \
+			--with-modinstdir="/usr/$(get_libdir)/${PN}/mod" \
+			--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+			${config_opts} || die "failed to configure FreeTDM"
+		popd
+	fi
+	setup_modules
+}
+
+src_compile() {
+	local esl_lang
+
+	if use freeswitch_modules_freetdm; then
+#	# breaks freetdm:
+#	filter-flags -fvisibility-inlines-hidden
+		einfo "Building FreeTDM..."
+		emake -C libs/freetdm || die "failed to build FreeTDM"
+	fi
+	einfo "Building FreeSWITCH... (this can take a long time)"
+	emake MONO_SHARED_DIR="${T}" || die "failed to build FreeSWITCH"
+	for esl_lang in ${ESL}; do
+		use esl_${esl_lang} || continue
+
+		esl_lang="${esl_lang#*_}"
+
+		einfo "Building esl module for ${esl_lang}..."
+		emake -C libs/esl/"${esl_lang}" reswig || die "Failed to reswig esl module for language \"${esl_lang}\""
+		emake -C libs/esl "$(esl_modname ${esl_lang})" || die "Failed to build esl module for language \"${esl_lang}\""
+	done
+	if use esl; then
+		einfo "Building libesl..."
+		emake -C libs/esl || die "Failed to build libesl"
+	fi
+}
+
+src_install() {
+	local esl_lang
+	einfo "Installing freeswitch core and modules..."
+	emake install DESTDIR="${D}" MONO_SHARED_DIR="${T}" || die "Installation of freeswitch core failed"
+	einfo "Installing documentation and misc files..."
+	dodoc AUTHORS NEWS README ChangeLog INSTALL
+
+	insinto "/usr/share/${PN}/scripts/rss"
+	doins scripts/rss/rss2ivr.pl
+
+	keepdir /var/lib/"${PN}"/{cores,storage}
+
+	newinitd "${FILESDIR}"/freeswitch.initd freeswitch
+	newconfd "${FILESDIR}"/freeswitch.confd freeswitch
+
+	use freeswitch_modules_managed && keepdir "/usr/$(get_libdir)/${PN}/mod/managed"
+#	# TODO: install contributed stuff
+
+	if use freeswitch_modules_skypopen ; then
+		docinto skypopen
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/README"
+		dodoc   "${S}/src/mod/endpoints/mod_skypopen/configs/"*
+	fi
+
+	find "${ED}" -name "*.la" -delete || die "Failed to cleanup .la files"
+
+	if use esl_python; then
+		einfo "Installing esl module for python..."
+		esl_dopymod libs/esl/python/{_ESL.so,ESL.py}
+	fi
+
+	if use esl_lua; then
+		einfo "Installing esl module for lua..."
+		esl_doluamod libs/esl/lua/ESL.so
+	fi
+
+	if use esl_perl; then
+		einfo "Installing esl module for perl..."
+		esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
+	fi
+
+	if use esl_java; then
+		einfo "Installing esl module for java..."
+		java-pkg_dojar libs/esl/java/esl.jar
+		java-pkg_doso libs/esl/java/libesljni.so
+	fi
+
+	if use esl_managed; then
+		einfo "Installing esl module for Mono..."
+		insinto "/usr/$(get_libdir)/${PN}/mod/managed"
+		doins libs/esl/managed/ESL.so
+	fi
+
+	if use esl; then
+		einfo "Installing libesl..."
+		insinto "/usr/$(get_libdir)"
+		doins libs/esl/.libs/libesl.a
+	fi
+
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/etc/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/$(get_libdir)/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/run/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/log/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/usr/share/${PN}"
+	fowners -Rf ${FREESWITCH_USER}:${FREESWITCH_GROUP} "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	elog "setting paxctl flags on binaries"
+	sh "${FILESDIR}"/pax_fix.sh
+	elog "pax flags have been set"
+	einfo
+
+	einfo
+	einfo "FreeSWITCH has been successfully emerged!"
+	einfo
+	einfo "More information about FreeSWITCH and how to configure it"
+	einfo "can be found on one of these sites:"
+	einfo
+	einfo "    http://www.freeswitch.org/"
+	einfo "    http://wiki.freeswitch.org/"
+	einfo
+
+	if use freeswitch_modules_skypopen ; then
+		einfo "To setup the Skype endpoint module mod_skypopen and the Skype client,"
+		einfo "follow the instructions in the guide:"
+		einfo
+		einfo "  http://wiki.freeswitch.org/wiki/Skypiax"
+		einfo
+		einfo
+	fi
+}
diff --git a/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild b/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
index 14bb32b..1866ee0 100644
--- a/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
+++ b/net-misc/freeswitch/freeswitch-1.6.8-r1.ebuild
@@ -181,6 +181,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.60
 	>=sys-devel/automake-1.10
 	virtual/pkgconfig
+	net-libs/ldns
 	esl_java? ( >=virtual/jdk-1.5:* >=dev-lang/swig-2.0 )
 	esl_lua? ( >=dev-lang/swig-2.0 )
 	esl_managed? ( >=dev-lang/swig-2.0 )

From 0f1dbc6dbef9746a2e29614385b0d3c6ceb14462 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 16:54:21 -0700
Subject: [PATCH 203/261] updates

---
 net-misc/freeswitch/Manifest                 | 5 ++++-
 net-misc/freeswitch/freeswitch-1.6.10.ebuild | 8 +-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-misc/freeswitch/Manifest b/net-misc/freeswitch/Manifest
index d06ec1f..58e4734 100644
--- a/net-misc/freeswitch/Manifest
+++ b/net-misc/freeswitch/Manifest
@@ -1,16 +1,19 @@
+AUX CynerFreeswitch.jar 132542 SHA256 f6c64e7933bf3cb78f558cc0540ce311f9166632561dd4db7fdf09511938eef0 SHA512 8cd7573a8f47f84cbee73d098ff02eb16d1a26ca87b62df35c1308d26b31555c1b5aebc4f72b4ad33a9a212512d2ac34cdb7d35e9e185add07119899336156b5 WHIRLPOOL 66251f19f3b1474fbfb6193f95880b5df5032e789777a16622cc6f003d7151b1413c0c3d6f79ae37f140e4d19035f7158ca872e6bb09158b95b95c0650979d10
 AUX freeswitch-1.6.10-no-werror.patch 900 SHA256 cd20535d1113e0f6f8aaf0375880bec5bb37bcf0652c79bd1ba3a5ab281169d5 SHA512 7531a84c1c1b9f356129f282299832be6fbf7471804d8acb478e043184ed01e50ddbdd999517c9429e5652f0ba4f749dea8cd0276d4571fcb471ab7e1e778a7c WHIRLPOOL e7f5ad410ee6bdb9d08c12e62e88eb2a3eb33d0950dc827a97ea257caf02d5152a1cdfcc5f7cdde654ae7ff0dd38231d5c3f9ddf997cc854f74c77c2fc6f4f37
 AUX freeswitch-1.6.2-no-werror.patch 651 SHA256 4765ae29af553b5b032bae4f6462ca0f44f8fc37ca864b22b1a43ce7254a7b0d SHA512 71cfd5a71aa70d4711a35bb4678be74fb3fef187e71ac8d5b27fb7a474b0317e1bd6f8d08d049d3526d514abef0f8df4fc76fc2faf1589865f7a085fa7f3b3a4 WHIRLPOOL 220f62a0ce5280158ddf8df1a6cf924cbafec54fc7418fa28b5ab02725ced90626d15baaa3da46d9b289069ac36d2defd013f3a4f54033c62846d46430cb7aaa
 AUX freeswitch-1.6.8-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch-1.6.8-r1-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
+AUX freeswitch.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff114024fe502fda98e2c66e1d SHA512 71461857150ef4e2de97abc686e9911215087f6442965202312262f66d6240466e23abaa67c56322fa121b606dc2fb0ff5e43ba1b1139773517b32002fb07d45 WHIRLPOOL 1548ed227ccf87cab345ef7ca0b4d25f2165b146dd6125029c5e89c6949be5409f47651492c4e93611b1932809a0b4bcb858d9eeff7d132f7e16005b232d37ed
 AUX freeswitch.rc6 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
+AUX pax_fix.sh 107 SHA256 18c7cd745bfb8838ccc780b8be0a54cfc4402801a46af544238fdb9dda3d1883 SHA512 60173e55cbff2c71ee5cf11df66ec8a9c8812ac3b1d56ee1889652a363381d590520e1fe8b4b77e550247b1c379e91ae9f572d9ec2bc4a1f0cf1747b667c700f WHIRLPOOL 7bd67ae0fb321c7326aaf72510207fb08ff268db8b5bf709659e5047d4072023ddee08cad4a7585a8e0cb59f508de77271564afa11b1e0fec30f77fc5a62dc74
 DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
 DIST freeswitch-1.6.10.tar.xz 33487164 SHA256 b7beaaac29dc0a58cc34cfd402bf1c7e8ca06975722fd8ddb2983cbed17dd6e4 SHA512 366df80ff01e8225c379a67ce625cbed1a43f6b99b99a990dfc6bbbc15fdb0d22265031fab547f83415454e865fb35359c3ad1cc5599371aa62f83b0d874e385 WHIRLPOOL 70e18f6270c6ac07b6d04d5c1fb70f57346c43359c589bc2e46f25368e9cf6548bb230b66b68eb80a91351bd02cda9f321ec201da7ad530348f4e1c7a4886369
 DIST freeswitch-1.6.2.tar.xz 31212588 SHA256 cf26f491469d2f744fb48ba0a7e25cefd96305e0ef385eda09fca82c096bb48f SHA512 b85ebbdc0f4111f76e798b91d23d05b63966fe8ac273bc2581857c1b9b810f970f25fd244ce40884d4939e835c72d7700448ea663a4f2650eb34d67325aa0517 WHIRLPOOL e710903392490dc32a558d3bb27d4950da50c13f178f8de87465c9b95df85d6931ce9af64b19f6eabd0adc51ebe1d0ec97da85d1ea6c3d988385534b8739c1cf
 DIST freeswitch-1.6.8.tar.xz 33454900 SHA256 c17e0df66d8c6ffaa35523596721ebc983681ae386d564294d1852be5d34596e SHA512 245e2e3a20908b7f7b1c7054c3efbe68510f6577654186af3749e0da9def233b7b61f510d610500a6f7ae0b9fa6c5cd3cc19e1d980306b638f6d0df06120bcf2 WHIRLPOOL 2a3766f3ad77af43ce93b8f64e4d478894199074075236c3cb5d398dfb8624e68c08257c37543bfd01acca435416163b862322288e4c174f3ac5930bfa801f53
 EBUILD freeswitch-1.2.12.ebuild 28623 SHA256 4ce53d6e789a987d8dea70644a62b4a7a473bc74807ee7ffe983c7cd866ca25e SHA512 f54d36e8ac72de2ee1a55dc5558cd0fa0ad826c51bbf6b91a83c52269c601b398660e6001a542441b256a5d6f285bc47b9c7e0d0928049371c85e3028bd1aae2 WHIRLPOOL 553482448cee8b785408bed4a6c53231ad398f34e01ef88a0de4fc5fbc821f8cae2fcb21d1ed4ce708d49601e67b52adff47d11c6beddc421e931fbc7820bace
 EBUILD freeswitch-1.2.9999.ebuild 28607 SHA256 dccc283cfd45e4c4ad181250be888355b0d568c39f862f2a0e481704904cbb62 SHA512 70ecff7f3a7b6fcdb61799ebcbd96456f53dc999e9feec57840766ea873f7de03ff08a1d9f35c549cc326758dd6c84fcc50e7fec74af48cb75d4b2ee12ef5423 WHIRLPOOL 3fed7632f75d013cc40fc7cd868f6c905617785733b96c78dc3cd825fa94373c543b6dea41ba7b75847e612c2493b97be60e0948b272648efcdff616d036a7fb
-EBUILD freeswitch-1.6.10.ebuild 16133 SHA256 73d33d2d1096f574d1fa10cbe7f56f813e78d9c606affffbf99fd0cbecee9a28 SHA512 f4689b2f0101fb12d12e8cd7af160130e64b7b0793315422e6d09bcf23a0853446234cbe3eef03cc200224c3fedcb21a0bb496ab070daa0fd60298ffed5c1902 WHIRLPOOL b215822cce3b67e51fd9ab6d2b78e514ebfde1b8d8b1cd462e1a5706174141931772c31dba29bef7ee39d4b1069d80acb5461d80cde73eabb0f9e94d202126d2
+EBUILD freeswitch-1.6.10.ebuild 16025 SHA256 94af492787880e8cbf3c34e9966d5ce90d3d9a2a2292ae6ee78e9a038300cbe5 SHA512 a5e1a74eede02d7353232bab67007e89f8ddefefe7424b7041b0883a05b1c6ed943c3231193c6482625c1fc786ac29d6f153c346ae59d874118fa4cb4858263c WHIRLPOOL 85f8f3402482da05e6c8fb8bc48f8694151d7cc9d3ab9f90e04ee2cc052aae2a08400a2a4dcc6eb7571b0aedeaa79990db59ab78a807acc24a3650ab66249945
 EBUILD freeswitch-1.6.2.ebuild 15690 SHA256 82bdb304a68ce044458b3e2fb80e242e1a631db24829e6362e887ad3ebbd3df9 SHA512 a443e2fa793bd9c047da32ffe7bfb927cbedd9ae7ef79ad92b37ae6bb187f319b3486272d41bbc33046a081ef9fde72dd99a63d06be8d24706b49a2f6a1f8c57 WHIRLPOOL 9ac7d4a8c75dd44a382ddf85e84962499fcc2e05d96e6e6fb34858c709ce285fc32b6d82539f95f35684f8e5359a93031924f845e96c2f90ef5f520503f16c8e
 EBUILD freeswitch-1.6.8-r1.ebuild 15714 SHA256 230a8d9c001e034ead3092128e99ec7a4484a13f6e63f2ab98b43ceb6a36f677 SHA512 52f3e73210413f83addd7b6a6190ff42251d2bf19fd1da94d7163f9a9736eda8363070d0f52f3963da015a3402f8464693934c7123f5762ca71544e7e558a44e WHIRLPOOL 403afc0431f9b9ee40280fe8a4d2542eaa03bf5b8d693dacda4c769ebdd567717a2e17648888bc4ec97cb3aa8556ad22d346706b4b6e1527a1799915a784fae9
 EBUILD freeswitch-1.6.8.ebuild 15828 SHA256 da4939263250476e380b4c342ae1c68dd406344bc5b9e710ee144711b3c83379 SHA512 2b4c664a0d7430ce2659d59f11a1bcc8b1101986f4e0879abb563a5786a2e831d0ade1987cfd664e5c90cf0d2182754c5a432f95d008b273ef67b7c18929d64f WHIRLPOOL c9306338867cf6e77f6caf551b335fe45b5e1587c00867c25e2bf501c7079328950ea800352763b8e4c7c566ee82e674c0f2d52f6d12d5b25636c504c34cae92
diff --git a/net-misc/freeswitch/freeswitch-1.6.10.ebuild b/net-misc/freeswitch/freeswitch-1.6.10.ebuild
index 66ab5e0..dc9c03b 100644
--- a/net-misc/freeswitch/freeswitch-1.6.10.ebuild
+++ b/net-misc/freeswitch/freeswitch-1.6.10.ebuild
@@ -33,7 +33,7 @@ FM_APPLICATIONS="
 	http_cache ladspa lcr +limit memcache mongo nibblebill
 	osp rad_auth random redis rss skel +sms snapshot
 	snom soundtouch +spandsp spy stress +valet_parking vmd
-	+voicemail voicemail_ivr amd
+	+voicemail voicemail_ivr
 "
 FM_TTS="
 	cepstral flite pocketsphinx tts_commandline unimrcp
@@ -372,12 +372,6 @@ src_prepare() {
 	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr/Makefile.in"
 	sed -i "1i export to_tool_file_cmd=func_convert_file_noop" "${S}/libs/apr-util/Makefile.in"
 
-	einfo
-	einfo "Adding AMD module"
-	einfo
-	cp -R "${FILESDIR}/AMD" "${S}/src/mod/applications/mod_amd"
-
-
 	if use freeswitch_modules_freetdm
 	then
 		( cd "${S}/libs/freetdm" ; ./bootstrap ; ) || die "Failed to bootstrap FreeTDM"

From 8c1dd4930d7415bf9c07b5fbb4579dd897dd8eee Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 19:24:45 -0700
Subject: [PATCH 204/261] add

---
 net-misc/freeswitch/files/freeswitch.initd | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100755 net-misc/freeswitch/files/freeswitch.initd

diff --git a/net-misc/freeswitch/files/freeswitch.initd b/net-misc/freeswitch/files/freeswitch.initd
new file mode 100755
index 0000000..8f25571
--- /dev/null
+++ b/net-misc/freeswitch/files/freeswitch.initd
@@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+FREESWITCH_BIN="${FREESWITCH_BIN:-/usr/bin/freeswitch}"
+
+# get instance id
+INSTANCE="$( cut -d '.' -f 2 <<< "${SVCNAME}" )";
+
+
+depend() {
+	need net
+	use dahdi
+}
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	local OPTS
+
+	[ -n "${FREESWITCH_USER}" ] && \
+		OPTS="${OPTS} -u ${FREESWITCH_USER}"
+
+	[ -n "${FREESWITCH_GROUP}" ] && \
+		OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+
+	[ -n "${FREESWITCH_OPTS}" ] && \
+		OPTS="${OPTS} ${FREESWITCH_OPTS}"
+
+
+	ebegin "Starting Freeswitch instance ${INSTANCE}"
+
+	# set permissions
+	chown -R freeswitch:freeswitch /opt/freeswitch
+	cd /opt/freeswitch/scripts/
+
+	# start freeswitch mon
+	kill -9 $(pidof -x cynerwebmon.sh)
+	/opt/freeswitch/scripts/cynerwebmon.sh
+
+	# set limits
+	do_setlimits
+
+	start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
+		-conf /etc/freeswitch/${INSTANCE} \
+		-log /opt/freeswitch/log/${INSTANCE} \
+		-db /opt/freeswitch/db/${INSTANCE} \
+		-nc ${OPTS}
+	eend $?
+}
+
+stop() {
+
+	ebegin "Stopping Freeswitch instance ${INSTANCE}"
+	start-stop-daemon --stop \
+		--signal SIGILL \
+		--retry 5 --quiet \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
+        eend $?
+}

From 4e3b84fd98abcbf5cc1f14e48c18261305780529 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 20:10:25 -0700
Subject: [PATCH 205/261] updates

---
 net-misc/freeswitch-cyneric/Manifest          |  13 +-
 .../freeswitch-cyneric/files/cyneric.cron     |   3 -
 .../freeswitch-cyneric/files/cyneric.fstab    |  30 +++-
 .../files/freeswitch.1.6.10.initd             |  74 ++++++++++
 .../files/freeswitch.zabbix                   |   1 -
 .../files/zabbix-freeswitch.pl                | 137 ------------------
 .../freeswitch-cyneric-0.1.0.ebuild           |   9 --
 .../freeswitch-cyneric-1.6.10.ebuild          |  68 +++++++++
 net-misc/freeswitch/Manifest                  |   3 +-
 net-misc/freeswitch/files/freeswitch.initd    |  51 +------
 10 files changed, 180 insertions(+), 209 deletions(-)
 create mode 100755 net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
 delete mode 100644 net-misc/freeswitch-cyneric/files/freeswitch.zabbix
 delete mode 100755 net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl
 create mode 100644 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 6d4d217..1f9cbba 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,8 +1,9 @@
-AUX cyneric.cron 3344 SHA256 06c626ee726617df31f54db29b9ec72d69860950b8abf063bf62cd29e277a439 SHA512 df712655002e1189bb4501e6ef06d04c69a9f4c2ddccf36cd9818545e280dbff7afe211d4fe77cc35c478e35c4efa62dfaef21918adca3c7c566b8faa7822ecf WHIRLPOOL 7da6e4ddd9b3f0076f995cdcbc3ae31f0df4e2f810335b58507b4e6dbb08cd51d9d4b77c1dcb89187a143835a4b5ceec188f7cf016b608f5a6f62bf8ea8f7e04
-AUX cyneric.fstab 1183 SHA256 3c268d5a7381e32ca260b192e7e242bfa3b54a5bc9c31c459986bb8cf7977600 SHA512 c118fc8b36de20add478306fcbb1b9a551855c803c71a304f6b2b8721990f958fb004e14a3dd158c0a990a762a133c1e2683bb78024c254d0519423c79ea9c2b WHIRLPOOL 8822e27be06fdf2532762639936ea1753a8479d56b975cc38a4a599896518d4d1ac238aa3951f0bc78168236bdd22a006aa83cde0eac6b1943c4bee6fa8bce69
+AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
+AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
+AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff114024fe502fda98e2c66e1d SHA512 71461857150ef4e2de97abc686e9911215087f6442965202312262f66d6240466e23abaa67c56322fa121b606dc2fb0ff5e43ba1b1139773517b32002fb07d45 WHIRLPOOL 1548ed227ccf87cab345ef7ca0b4d25f2165b146dd6125029c5e89c6949be5409f47651492c4e93611b1932809a0b4bcb858d9eeff7d132f7e16005b232d37ed
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
-AUX freeswitch.zabbix 89 SHA256 e2d4e358fc632d19fe991f1cf99c39432d33de704ab22987448d921222ea3f3a SHA512 2cc960a7e52d63fdebdeef12fb0c0369dc0449d05cc8a11f86462f286f37e0105f86d64b4684c1017fa817bf81ca6f04b98b1755892e6e9164ee51de29633197 WHIRLPOOL 10743a8d6c9e1e8fd5eac001bf394f954fa1fee72b4c8ab3ac45683d8ef96a547af86a2d253757fbe8563b995eedb4db9769d3de5bd30873a09ec6ef8c2e53d6
-AUX zabbix-freeswitch.pl 4617 SHA256 a75744f667d60362b45a05f96e0422dc514cd6f7454083fb1e9323174580dd5c SHA512 ae3047e677e973a74a30cd3d00d4dbe42a8403c047511332e20678109673c4c089f158cb9360d968bd759720ca8337962cff4b09721f4aa999e6f6eae7b97b21 WHIRLPOOL 203868c16831df027f6a9baaa73f855adee6472aaf4ccf7bee2cfa12de121281cce2939a8fd94469c2168a83507f8510668bc74fcf832d6674770cd4e5408e83
-DIST freeswitch-cyneric-0.1.0.tar.gz 5903323 SHA256 84063583627ab4b8bf2819fd59320e41e6dbe3442b1234db0ad28573f8b9a869 SHA512 97f4f57d56d6e65f3522f250ab05f6c7b8ab70d013ffdabe1b5da24cfd190b6b4f2c51ba8d8a698145c8910dc530a583506b6478171b52e191b6baf90ed1cb44 WHIRLPOOL 2f4915d92d679651e8af773ab9326bccb156943856a83aab51e2b67ce77795e123e4aeef891b292a08f863c495386cb8719b34dedfa7328b69acf62d8b161eae
-EBUILD freeswitch-cyneric-0.1.0.ebuild 1809 SHA256 426ef2885abf307ab19ac6a6396e92010f08ca0b19701efcc299d310d9e70e4d SHA512 f6845b0f6f9f8158cb3a1aeb0298fff7bbdcc309898b34eda67d1759d9a97d4857becf8c2a4945442255f05d9381a56b002a22107f607dfcdb751a32d4408998 WHIRLPOOL 021c58c6a5892b52af82f6532d7ddbc85cff649b2521fd2db772d059d1352271f9e77dc8858a75e1fa2f1ea2c3115e58833e80d5f0bf86827160254bda5b43b2
+DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
+DIST freeswitch-cyneric-1.6.10.tar.gz 99630794 SHA256 03b59064e7111b5875f720e16dbca25763c2e7d645a338022c06dd192a0aaf07 SHA512 b54b9372ea778dee92afb46706ad987b3740fc420bb5a7d3bcc434fca8e57bd13d98a78ff95565f28eed8b49ccbb4511abe0cc234fc8752b338ccaea38ce608d WHIRLPOOL 806ae85c6fc7dadcb9f84c8c3fced531cecc8f9d4e4511d340be22f0026f76839b49e953670a71871043f8c44d96014513e8a369de8417f51d3bc52555bc99e0
+EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
+EBUILD freeswitch-cyneric-1.6.10.ebuild 1640 SHA256 680ac76e0a873a70549ef5ce707b5b69f927761eb7d78d9f434a808911b65469 SHA512 f9000de34c26fc2487e0ba032740098135afc84c441c4f1cca25b660c5e4cd7b9a2d85615086338f560ad36a1e371cb5cf6978a8999652de8d66c891b321b5ea WHIRLPOOL 93e5ba9488cb284a8bf7d90dc8a1062c01533b560b3c37e558d5af4348a4b76cc283ff86727d84f4d0678b3e48f31864ee69badf7e0aace3bda0afb40dfe3bde
diff --git a/net-misc/freeswitch-cyneric/files/cyneric.cron b/net-misc/freeswitch-cyneric/files/cyneric.cron
index fa60101..45cab7f 100644
--- a/net-misc/freeswitch-cyneric/files/cyneric.cron
+++ b/net-misc/freeswitch-cyneric/files/cyneric.cron
@@ -5,9 +5,6 @@
 # disk space
 #01,05,10,15,20,25,30,35,40,45,50,55 * * * *  root /opt/freeswitch/scripts/freeswitch.df.pl > /dev/null 2>&1
 
-# crontab sync
-#* *    * * *    root    /usr/bin/screen -d -m -S crontab_sync /usr/bin/ionice -c3 /usr/bin/nice -n 19 /usr/local/sbin/crontab_sync.php > /dev/null 2>&1
-
 # delete old log files
 #10 1   * * *   root    find /opt/freeswitch/log/a/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
 #10 1   * * *   root    find /opt/freeswitch/log/b/comprimidos  -type f -name "*.tar.gz*" -mtime +2 -exec rm {} \; 2>/dev/null
diff --git a/net-misc/freeswitch-cyneric/files/cyneric.fstab b/net-misc/freeswitch-cyneric/files/cyneric.fstab
index 703d505..2d4ba1f 100644
--- a/net-misc/freeswitch-cyneric/files/cyneric.fstab
+++ b/net-misc/freeswitch-cyneric/files/cyneric.fstab
@@ -2,19 +2,37 @@
 /dev/xvdb   /opt/freeswitch            ext4    noatime              0 1
 
 tmpfs            /opt/freeswitch/db/a               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/a/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/a/cdr-csv  tmpfs   size=10m,mode=0755     0       0
 
 tmpfs            /opt/freeswitch/db/b               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/b/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/b/cdr-csv  tmpfs   size=10m,mode=0755     0       0
 
 tmpfs            /opt/freeswitch/db/c               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/c/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/c/cdr-csv  tmpfs   size=10m,mode=0755     0       0
 
 tmpfs            /opt/freeswitch/db/d               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/d/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/d/cdr-csv  tmpfs   size=10m,mode=0755     0       0
 
 tmpfs            /opt/freeswitch/db/e               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/e/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/e/cdr-csv  tmpfs   size=10m,mode=0755     0       0
 
 tmpfs            /opt/freeswitch/db/f               tmpfs   size=10m,mode=0755     0       0
-tmpfs            /opt/freeswitch/log/f/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/f/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/g               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/g/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/h               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/h/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/i               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/i/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/j               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/j/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/k               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/k/cdr-csv  tmpfs   size=10m,mode=0755     0       0
+
+tmpfs            /opt/freeswitch/db/l               tmpfs   size=10m,mode=0755     0       0
+#tmpfs            /opt/freeswitch/log/l/cdr-csv  tmpfs   size=10m,mode=0755     0       0
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
new file mode 100755
index 0000000..8f25571
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+FREESWITCH_BIN="${FREESWITCH_BIN:-/usr/bin/freeswitch}"
+
+# get instance id
+INSTANCE="$( cut -d '.' -f 2 <<< "${SVCNAME}" )";
+
+
+depend() {
+	need net
+	use dahdi
+}
+
+do_setlimits() {
+        ulimit -c unlimited
+        ulimit -d unlimited
+        ulimit -f unlimited
+        ulimit -i unlimited
+        ulimit -n 999999
+        ulimit -q unlimited
+        ulimit -u unlimited
+        ulimit -v unlimited
+        ulimit -x unlimited
+        ulimit -l unlimited
+        return 0
+}
+
+start() {
+	local OPTS
+
+	[ -n "${FREESWITCH_USER}" ] && \
+		OPTS="${OPTS} -u ${FREESWITCH_USER}"
+
+	[ -n "${FREESWITCH_GROUP}" ] && \
+		OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+
+	[ -n "${FREESWITCH_OPTS}" ] && \
+		OPTS="${OPTS} ${FREESWITCH_OPTS}"
+
+
+	ebegin "Starting Freeswitch instance ${INSTANCE}"
+
+	# set permissions
+	chown -R freeswitch:freeswitch /opt/freeswitch
+	cd /opt/freeswitch/scripts/
+
+	# start freeswitch mon
+	kill -9 $(pidof -x cynerwebmon.sh)
+	/opt/freeswitch/scripts/cynerwebmon.sh
+
+	# set limits
+	do_setlimits
+
+	start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
+		-conf /etc/freeswitch/${INSTANCE} \
+		-log /opt/freeswitch/log/${INSTANCE} \
+		-db /opt/freeswitch/db/${INSTANCE} \
+		-nc ${OPTS}
+	eend $?
+}
+
+stop() {
+
+	ebegin "Stopping Freeswitch instance ${INSTANCE}"
+	start-stop-daemon --stop \
+		--signal SIGILL \
+		--retry 5 --quiet \
+		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
+        eend $?
+}
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.zabbix b/net-misc/freeswitch-cyneric/files/freeswitch.zabbix
deleted file mode 100644
index 572b828..0000000
--- a/net-misc/freeswitch-cyneric/files/freeswitch.zabbix
+++ /dev/null
@@ -1 +0,0 @@
-UserParameter=freeswitch[*],sudo -u zabbix sudo /opt/agents/zabbix-freeswitch.pl \$1 \$2
diff --git a/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl b/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl
deleted file mode 100755
index 58d3a6c..0000000
--- a/net-misc/freeswitch-cyneric/files/zabbix-freeswitch.pl
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/perl
-
-# gets stats for freeswitch
-# this graphs multiple instances
-
-use strict;
-use warnings;
-no warnings 'uninitialized';
-use Data::Dumper;
-use Storable qw(nstore retrieve);
-
-my @instanceData;
-my $instances = ();
-
-my $cacheTime = 30;
-my $storeFile = '/opt/freeswitch/tmp/zabbix-freeswitch';
-my $fscli = "/opt/freeswitch/bin/fs_cli";
-
-my ($name, $dset) = @ARGV;
-
-# check for cache file newer CACHETIME seconds ago
-if ( -f $storeFile && time - (stat( $storeFile ))[9] < $cacheTime) {
-        # use cached data
-	$instances = retrieve($storeFile);
-} else {
-        # grab the status URL (fresh data)
-	$instances = get_instances();
-	getSpace();
-	nstore($instances, $storeFile);
-}
-
-foreach my $instance (keys %{ $instances }) {
-	if ($name eq $instance) {
-		foreach my $key (keys %{ $instances->{$instance} }) {
-			if ($dset eq $key) {
-				print "$instances->{$instance}->{$key}\n";
-			}
-		}
-	}
-}
-
-# functions
-
-# gets all instances into a array hash
-sub get_instances {
-	my $instances = ();
-	open(LINE, 'netstat -nlp|grep tcp|grep 5060|grep freeswitch|');
-	while (<LINE>) {
-		if ($_ =~ /^tcp\s+\d+\s+\d+\s(\d+\.\d+\.\d+\.\d+)\:.*\s+.*LISTEN\s+(\d+)\/.*/) {
-			my $ip = $1;
-			my $pid = $2;
-			my $instance_name = `cat /proc/$2/cmdline`;
-
-			# 			/opt/freeswitch/bin/freeswitch-conf/opt/freeswitch/conf/f-log/opt/freeswitch/log/f-db/opt/freeswitch/db/f-nc-ufreeswitch
-			if ($instance_name =~ /.*opt\/freeswitch\/log\/(.*)\-db.*/) {
-				$instance_name = $1;
-				$instance_name =~ s/[^a-zA-Z0-9 _-]//g;
-
-			}
-			$instances->{$instance_name}->{'IP'} = $ip;
-			$instances->{$instance_name}->{'PID'} = $pid;
-		}
-	}
-	close(LINE);
-
-	# lets gather stats now
-	foreach my $instance_id (keys %$instances) {
-		my $status = `$fscli -H $instances->{$instance_id}->{'IP'} -x 'status'`;
-
-		if ($status =~ /(\d+)\s+session\(s\)\s+\-\s+peak.*/) {
-			$instances->{$instance_id}->{'Sessions'} = $1;
-		}
-
-		# /usr/local/freeswitch/bin/fs_cli -H ${server[$n]} -x 'show bridged_calls' | grep total
-		my $b_calls = `$fscli -H $instances->{$instance_id}->{'IP'} -x 'show bridged_calls'|grep total`;
-		if ($b_calls =~ /(\d+)\s+total\./) {
-			$instances->{$instance_id}->{'BridgedCalls'} = $1;
-		}
-		
-		$instances->{$instance_id}->{'CallAttempts'} = $instances->{$instance_id}->{'Sessions'} - ($instances->{$instance_id}->{'BridgedCalls'} * 2);
-
-		# sql established connections
-		my $sql_est = `netstat -putan | grep 1433 | grep ESTABLISHED | grep $instances->{$instance_id}->{'PID'} | wc -l`;
-		chomp $sql_est;
-		$instances->{$instance_id}->{'SQLest'} = $sql_est;
-
-		# sql connections
-		my $sql_con = `netstat -putan | grep 1433 | grep $instances->{$instance_id}->{'PID'} | wc -l`;
-		chomp $sql_con;
-		$instances->{$instance_id}->{'SQLcons'} = $sql_con;
-
-		$instances->{ 'ALL' }->{ 'Sessions' } = $instances->{ 'ALL' }->{ 'Sessions' } + $instances->{ $instance_id }->{ 'Sessions' };
-		$instances->{ 'ALL' }->{ 'BridgedCalls' } = $instances->{ 'ALL' }->{ 'BridgedCalls' } + $instances->{$instance_id}->{'BridgedCalls'};
-		$instances->{ 'ALL' }->{ 'CallAttempts' } = $instances->{ 'ALL' }->{ 'CallAttempts' } + $instances->{$instance_id}->{'CallAttempts'};
-		$instances->{ 'ALL' }->{ 'SQLest' } = $instances->{ 'ALL' }->{ 'SQLest' } + $instances->{$instance_id}->{'SQLest'};
-		$instances->{ 'ALL' }->{ 'SQLcons' } = $instances->{ 'ALL' }->{ 'SQLcons' } + $instances->{$instance_id}->{'SQLcons'};
-	}
-
-	return($instances);
-}
-
-sub getSpace {
-
-        # gets spaced used from df, for tmpfs mounted items
-        open(LINE, 'df | grep freeswitch | grep tmpfs |');
-        while (<LINE>) {
-                # tmpfs 10M  376K  9.7M   4% /opt/freeswitch/db/a
-                if ($_ =~ /tmpfs\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)%\s+(.*)/) {
-                        my $size = $1;
-                        my $used = $2;
-                        my $avail = $3;
-                        my $usedPCT = $4;
-                        my $path = $5;
-
-                        # lets split on / for instance id
-                        my @paths = split(/\//, $path);
-			my $inID = $paths[4];
-
-			if ($paths[3] eq "db") {
-				$instances->{$inID}->{'TMPFS_DB_size'} = $size;
-				$instances->{$inID}->{'TMPFS_DB_used'} = $used;
-				$instances->{$inID}->{'TMPFS_DB_avail'} = $avail;
-				$instances->{$inID}->{'TMPFS_DB_usedPCT'} = $usedPCT;
-			}
-
-			# log cdr-csv
-			if ($paths[3] eq "log") {
-				$instances->{$inID}->{'TMPFS_CDR_size'} = $size;
-				$instances->{$inID}->{'TMPFS_CDR_used'} = $used;
-				$instances->{$inID}->{'TMPFS_CDR_avail'} = $avail;
-				$instances->{$inID}->{'TMPFS_CDR_usedPCT'} = $usedPCT;
-			}
-                }
-        }
-        close(LINE);
-
-}
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
index bf47689..2f155dc 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-0.1.0.ebuild
@@ -55,15 +55,6 @@ pkg_postinst() {
         newinitd "${FILESDIR}"/freeswitch.rc6   freeswitch
         newconfd "${FILESDIR}"/freeswitch.confd freeswitch
 
-	einfo ""
-
-	einfo "adding zabbix stuff"
-	cp "${FILESDIR}"/freeswitch.zabbix /etc/zabbix/zabbix_agentd.d/freeswitch.conf
-	cp "${FILESDIR}"/zabbix-freeswitch.pl /opt/agents/
-	cp "${FILESDIR}"/cyneric.fstab /opt/freeswitch/
-	chown -R zabbix:zabbix /etc/zabbix
-	chmod +x /opt/agents/zabbix-freeswitch.pl
-
         einfo ""
         einfo "cyneric install completed"
         
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
new file mode 100644
index 0000000..62bcf7b
--- /dev/null
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright whoever
+# Free as in beer
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Cyneric overlay for freeswitch"
+HOMEPAGE="http://safesoft.us"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+LICENSE=""
+IUSE=""
+RESTRICT="mirror"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/cyneric/${P}.tar.gz"
+
+RDEPEND="dev-java/oracle-jdk-bin
+        net-misc/freeswitch
+	net-analyzer/netcat"
+
+DEPEND="${RDEPEND}"
+
+
+pkg_preinst() {
+        einfo "removing freeswitch configs"
+	rm -rf /opt/freeswitch/conf
+	rm -rf /etc/freeswitch
+	rm -rf /opt/freeswitch/log
+	mkdir /opt/freeswitch
+
+	einfo "installing new cyneric files"
+
+        cd ${WORKDIR}
+        cp -R * /opt/freeswitch/
+
+        einfo "updating configs"
+        ln -s /opt/freeswitch/conf /etc/freeswitch
+       	chown freeswitch:freeswitch /etc/freeswitch
+
+        einfo "all config files are now in /opt/freeswitch/conf and a symlink added to /etc/freeswitch"
+        einfo ""
+        einfo "adding a disabled cron in /etc/cron.d"
+     
+        cp "${FILESDIR}"/cyneric.cron /etc/cron.d/
+        
+}
+
+pkg_postinst() {
+        einfo ""
+        elog "updating /etc/init.d/freeswitch"
+        elog "because this is multi instance overlay"
+        elog "you'll need to symlink your instance name"
+        elog "for example ln -s /etc/init.d/freeswitch /etc/init.d/freeswitch.a"
+        einfo ""
+
+        newinitd "${FILESDIR}"/freeswitch.1.6.10.initd   freeswitch
+
+	einfo "adding zabbix stuff"
+	cp "${FILESDIR}"/cyneric.fstab /opt/freeswitch/
+
+        einfo ""
+        einfo "cyneric install completed"
+        
+        einfo "check /opt/freeswitch/cyneric.fstab for mounts
+        " 
+        
+}
diff --git a/net-misc/freeswitch/Manifest b/net-misc/freeswitch/Manifest
index 58e4734..f5229cb 100644
--- a/net-misc/freeswitch/Manifest
+++ b/net-misc/freeswitch/Manifest
@@ -1,10 +1,9 @@
-AUX CynerFreeswitch.jar 132542 SHA256 f6c64e7933bf3cb78f558cc0540ce311f9166632561dd4db7fdf09511938eef0 SHA512 8cd7573a8f47f84cbee73d098ff02eb16d1a26ca87b62df35c1308d26b31555c1b5aebc4f72b4ad33a9a212512d2ac34cdb7d35e9e185add07119899336156b5 WHIRLPOOL 66251f19f3b1474fbfb6193f95880b5df5032e789777a16622cc6f003d7151b1413c0c3d6f79ae37f140e4d19035f7158ca872e6bb09158b95b95c0650979d10
 AUX freeswitch-1.6.10-no-werror.patch 900 SHA256 cd20535d1113e0f6f8aaf0375880bec5bb37bcf0652c79bd1ba3a5ab281169d5 SHA512 7531a84c1c1b9f356129f282299832be6fbf7471804d8acb478e043184ed01e50ddbdd999517c9429e5652f0ba4f749dea8cd0276d4571fcb471ab7e1e778a7c WHIRLPOOL e7f5ad410ee6bdb9d08c12e62e88eb2a3eb33d0950dc827a97ea257caf02d5152a1cdfcc5f7cdde654ae7ff0dd38231d5c3f9ddf997cc854f74c77c2fc6f4f37
 AUX freeswitch-1.6.2-no-werror.patch 651 SHA256 4765ae29af553b5b032bae4f6462ca0f44f8fc37ca864b22b1a43ce7254a7b0d SHA512 71cfd5a71aa70d4711a35bb4678be74fb3fef187e71ac8d5b27fb7a474b0317e1bd6f8d08d049d3526d514abef0f8df4fc76fc2faf1589865f7a085fa7f3b3a4 WHIRLPOOL 220f62a0ce5280158ddf8df1a6cf924cbafec54fc7418fa28b5ab02725ced90626d15baaa3da46d9b289069ac36d2defd013f3a4f54033c62846d46430cb7aaa
 AUX freeswitch-1.6.8-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch-1.6.8-r1-no-werror.patch 790 SHA256 aa183b6f4e62b665c30faa3e428a267c3df691c7aac8b0657819564a85c1c291 SHA512 72e34ec33437bd7182bb58abc12213669956ce1de87d7bc230af6b10c42286c807d4adc35f2f8c471ef9d3b1d6cb444274a1e49f26c3e111707651f9b73c946f WHIRLPOOL 669b0c75bc22b87fa343ae8774067619f2742ad992eb4ce892b07f0dd5a5d7bea66a1ed8e710c5adb895f3eb02142668eef46aedbb1df8ec0045b088821f1447
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
-AUX freeswitch.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff114024fe502fda98e2c66e1d SHA512 71461857150ef4e2de97abc686e9911215087f6442965202312262f66d6240466e23abaa67c56322fa121b606dc2fb0ff5e43ba1b1139773517b32002fb07d45 WHIRLPOOL 1548ed227ccf87cab345ef7ca0b4d25f2165b146dd6125029c5e89c6949be5409f47651492c4e93611b1932809a0b4bcb858d9eeff7d132f7e16005b232d37ed
+AUX freeswitch.initd 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
 AUX freeswitch.rc6 721 SHA256 e6d481daf0066a149265f95fdc9719238fb05a6d0b03ab9b083f0471cc4e56b4 SHA512 62fd0503a7ae044e336931b52f78f43e76bf41fc882254a6a5a20d50075e67c70bdf27e6835c4bfc1c35af07cd22223c3aea3c91180b6d1677f463f07b2fda5d WHIRLPOOL 3449d4c47aabcb3e40ffb0b4347eecc3c8400a0bb0357677b1f31ae76d0d8eddf8b1664f6397248aa6def846e0d34304b09e126c1c8e28e352391a11ed4b90fb
 AUX pax_fix.sh 107 SHA256 18c7cd745bfb8838ccc780b8be0a54cfc4402801a46af544238fdb9dda3d1883 SHA512 60173e55cbff2c71ee5cf11df66ec8a9c8812ac3b1d56ee1889652a363381d590520e1fe8b4b77e550247b1c379e91ae9f572d9ec2bc4a1f0cf1747b667c700f WHIRLPOOL 7bd67ae0fb321c7326aaf72510207fb08ff268db8b5bf709659e5047d4072023ddee08cad4a7585a8e0cb59f508de77271564afa11b1e0fec30f77fc5a62dc74
 DIST freeswitch-1.2.12.tar.bz2 44032403 SHA256 58bc4e094f163e535c54e1ae163f221f6e076f8fcea706cc28272676d4200c63 SHA512 c814cecba924d56c7dd8c73fdd10327d1cf40930ad9cfbec9e231a828f2e45a8c521313e2f226b155a2475ab7c10032ab2573ddce4fe42f7c23323666b9f4ea7 WHIRLPOOL b3e09e8c7447409df8b08dcb06c336bc6578eff65ba92ed96fd8e0fa0a30c9f60e237c5ab9fa7de3eb61aa8d532499c9340c31ae60255bc9ff8ac2a992f7b240
diff --git a/net-misc/freeswitch/files/freeswitch.initd b/net-misc/freeswitch/files/freeswitch.initd
index 8f25571..89f23f0 100755
--- a/net-misc/freeswitch/files/freeswitch.initd
+++ b/net-misc/freeswitch/files/freeswitch.initd
@@ -3,31 +3,13 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Header: $
 
-FREESWITCH_BIN="${FREESWITCH_BIN:-/usr/bin/freeswitch}"
-
-# get instance id
-INSTANCE="$( cut -d '.' -f 2 <<< "${SVCNAME}" )";
-
+FREESWITCH_BIN="${FREESWITCH_BIN:-/opt/freeswitch/bin/freeswitch}"
 
 depend() {
 	need net
 	use dahdi
 }
 
-do_setlimits() {
-        ulimit -c unlimited
-        ulimit -d unlimited
-        ulimit -f unlimited
-        ulimit -i unlimited
-        ulimit -n 999999
-        ulimit -q unlimited
-        ulimit -u unlimited
-        ulimit -v unlimited
-        ulimit -x unlimited
-        ulimit -l unlimited
-        return 0
-}
-
 start() {
 	local OPTS
 
@@ -40,35 +22,14 @@ start() {
 	[ -n "${FREESWITCH_OPTS}" ] && \
 		OPTS="${OPTS} ${FREESWITCH_OPTS}"
 
-
-	ebegin "Starting Freeswitch instance ${INSTANCE}"
-
-	# set permissions
-	chown -R freeswitch:freeswitch /opt/freeswitch
-	cd /opt/freeswitch/scripts/
-
-	# start freeswitch mon
-	kill -9 $(pidof -x cynerwebmon.sh)
-	/opt/freeswitch/scripts/cynerwebmon.sh
-
-	# set limits
-	do_setlimits
-
+	ebegin "Starting Freeswitch"
 	start-stop-daemon --start --quiet --exec ${FREESWITCH_BIN} \
-		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid -- \
-		-conf /etc/freeswitch/${INSTANCE} \
-		-log /opt/freeswitch/log/${INSTANCE} \
-		-db /opt/freeswitch/db/${INSTANCE} \
-		-nc ${OPTS}
+		--pidfile /var/run/freeswitch.pid -- -nc ${OPTS}
 	eend $?
 }
 
 stop() {
-
-	ebegin "Stopping Freeswitch instance ${INSTANCE}"
-	start-stop-daemon --stop \
-		--signal SIGILL \
-		--retry 5 --quiet \
-		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
-        eend $?
+	ebegin "Stopping Freeswitch"
+	${FREESWITCH_BIN} -stop
+	eend $?
 }

From db417c081010d54e7f4895af8540ce6700fcc92b Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 20:13:58 -0700
Subject: [PATCH 206/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 1f9cbba..0d725f1 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 99630794 SHA256 03b59064e7111b5875f720e16dbca25763c2e7d645a338022c06dd192a0aaf07 SHA512 b54b9372ea778dee92afb46706ad987b3740fc420bb5a7d3bcc434fca8e57bd13d98a78ff95565f28eed8b49ccbb4511abe0cc234fc8752b338ccaea38ce608d WHIRLPOOL 806ae85c6fc7dadcb9f84c8c3fced531cecc8f9d4e4511d340be22f0026f76839b49e953670a71871043f8c44d96014513e8a369de8417f51d3bc52555bc99e0
+DIST freeswitch-cyneric-1.6.10.tar.gz 99570088 SHA256 45acf594653a996e76203e8ee93d8a5de202bbfb804538eb7f26f4707316ac46 SHA512 b5717f1bf465c68e19a0803d5141194c18b04d7c8c1ed9a60782bfd21eccd41d276e5b9b3d91e4b7811e3dedf2c8dd14b21c2cc3a84ebcd028468389b3c5c429 WHIRLPOOL c0f9dccc6eda61874270ad2a29e588619eaab88700ad85b112b7d347a4aeac036b21e1a494809901e7918563dda3b9384b1849e3093b9726e1d366fd12b425fc
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1640 SHA256 680ac76e0a873a70549ef5ce707b5b69f927761eb7d78d9f434a808911b65469 SHA512 f9000de34c26fc2487e0ba032740098135afc84c441c4f1cca25b660c5e4cd7b9a2d85615086338f560ad36a1e371cb5cf6978a8999652de8d66c891b321b5ea WHIRLPOOL 93e5ba9488cb284a8bf7d90dc8a1062c01533b560b3c37e558d5af4348a4b76cc283ff86727d84f4d0678b3e48f31864ee69badf7e0aace3bda0afb40dfe3bde

From 4dd8b05e538de0a3e0de3c859d12cb21b8a50d58 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 20:33:37 -0700
Subject: [PATCH 207/261] update

---
 net-misc/freeswitch-cyneric/Manifest                         | 4 ++--
 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 0d725f1..76e3d0f 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 99570088 SHA256 45acf594653a996e76203e8ee93d8a5de202bbfb804538eb7f26f4707316ac46 SHA512 b5717f1bf465c68e19a0803d5141194c18b04d7c8c1ed9a60782bfd21eccd41d276e5b9b3d91e4b7811e3dedf2c8dd14b21c2cc3a84ebcd028468389b3c5c429 WHIRLPOOL c0f9dccc6eda61874270ad2a29e588619eaab88700ad85b112b7d347a4aeac036b21e1a494809901e7918563dda3b9384b1849e3093b9726e1d366fd12b425fc
+DIST freeswitch-cyneric-1.6.10.tar.gz 4702436 SHA256 94eeed0dea6f3b8201b4b98055c7300bfa807c80c5f654123ad6fcbf9bbb69d5 SHA512 4c02fd037af94b201a446e01c27e4063b9b8e2615e67d3769a4f7fe1ae5e7f75b466afbdbc22402f08db5cb8b142dd5d58fef2ea5da9c3b9f3d50040aa107cf7 WHIRLPOOL 599de65af89bf6256d3e7e44a4ba92475db799340b400537233972a469efed82ad685b5d64e9fa93f6404d248875f626d845c83392b939f5a6c1249b88821ca3
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
-EBUILD freeswitch-cyneric-1.6.10.ebuild 1640 SHA256 680ac76e0a873a70549ef5ce707b5b69f927761eb7d78d9f434a808911b65469 SHA512 f9000de34c26fc2487e0ba032740098135afc84c441c4f1cca25b660c5e4cd7b9a2d85615086338f560ad36a1e371cb5cf6978a8999652de8d66c891b321b5ea WHIRLPOOL 93e5ba9488cb284a8bf7d90dc8a1062c01533b560b3c37e558d5af4348a4b76cc283ff86727d84f4d0678b3e48f31864ee69badf7e0aace3bda0afb40dfe3bde
+EBUILD freeswitch-cyneric-1.6.10.ebuild 1747 SHA256 086354d63306f1a5d85fc5e75eb9dc6ed9fbbe8e58c7768d97ae1c29cec83a2d SHA512 eaa3b0050218bf3b643428c4d9ea6185c45ccbe6126a129dcb8edc4c00cddf792b6e26f1b5bbcd93b4b968585e94fa404cacc7cd461bba61d2c439af36262e18 WHIRLPOOL b80f0af109acdc080fcfb4fa9565b2c314480b86cfb661a273094c00b2f2ddb7933e8866b48855c7f033ed486d1bad2715df6e83158950503c657ca63d4a9398
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
index 62bcf7b..e7cdb50 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
@@ -29,6 +29,8 @@ pkg_preinst() {
 	rm -rf /opt/freeswitch/log
 	mkdir /opt/freeswitch
 
+	cp -rp /usr/share/freeswitch/sounds /opt/freeswitch/
+
 	einfo "installing new cyneric files"
 
         cd ${WORKDIR}
@@ -37,6 +39,7 @@ pkg_preinst() {
         einfo "updating configs"
         ln -s /opt/freeswitch/conf /etc/freeswitch
        	chown freeswitch:freeswitch /etc/freeswitch
+       	chown freeswitch:freeswitch /opt/freeswitch
 
         einfo "all config files are now in /opt/freeswitch/conf and a symlink added to /etc/freeswitch"
         einfo ""

From 4cefc1e3fdf5f926b0d34678b4ff4e7f98820ba0 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Tue, 4 Oct 2016 20:37:11 -0700
Subject: [PATCH 208/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 76e3d0f..4893f83 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 4702436 SHA256 94eeed0dea6f3b8201b4b98055c7300bfa807c80c5f654123ad6fcbf9bbb69d5 SHA512 4c02fd037af94b201a446e01c27e4063b9b8e2615e67d3769a4f7fe1ae5e7f75b466afbdbc22402f08db5cb8b142dd5d58fef2ea5da9c3b9f3d50040aa107cf7 WHIRLPOOL 599de65af89bf6256d3e7e44a4ba92475db799340b400537233972a469efed82ad685b5d64e9fa93f6404d248875f626d845c83392b939f5a6c1249b88821ca3
+DIST freeswitch-cyneric-1.6.10.tar.gz 4018882 SHA256 4b569de4eaa766509c7efe7937cfcf6dfa2d310b5a8d5a9216c1aab6525c6393 SHA512 a3ef60175fa1054249688a04fc9464f731a2fd80a05518b6bc1f0c6e0a5db8f81510c92605550e63363a59d7d15cd4165e47c4492961b42d5d7a4d7c0cb24b04 WHIRLPOOL de2acd02d74d18b0016a956eaaa3ec6e0166a570b6c6bc23a58812c3a146ce48214d6870587293a46c7e67c4e858f612ba287078fefd02192660c98a295bf1ed
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1747 SHA256 086354d63306f1a5d85fc5e75eb9dc6ed9fbbe8e58c7768d97ae1c29cec83a2d SHA512 eaa3b0050218bf3b643428c4d9ea6185c45ccbe6126a129dcb8edc4c00cddf792b6e26f1b5bbcd93b4b968585e94fa404cacc7cd461bba61d2c439af36262e18 WHIRLPOOL b80f0af109acdc080fcfb4fa9565b2c314480b86cfb661a273094c00b2f2ddb7933e8866b48855c7f033ed486d1bad2715df6e83158950503c657ca63d4a9398

From f6db34ce68583a09a747674eacac69c4a7d14045 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Wed, 5 Oct 2016 17:46:59 -0700
Subject: [PATCH 209/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 4893f83..94682a7 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 4018882 SHA256 4b569de4eaa766509c7efe7937cfcf6dfa2d310b5a8d5a9216c1aab6525c6393 SHA512 a3ef60175fa1054249688a04fc9464f731a2fd80a05518b6bc1f0c6e0a5db8f81510c92605550e63363a59d7d15cd4165e47c4492961b42d5d7a4d7c0cb24b04 WHIRLPOOL de2acd02d74d18b0016a956eaaa3ec6e0166a570b6c6bc23a58812c3a146ce48214d6870587293a46c7e67c4e858f612ba287078fefd02192660c98a295bf1ed
+DIST freeswitch-cyneric-1.6.10.tar.gz 4090136 SHA256 3d0923c3fbfe98c69388ba41a06b2ac5233f14df561926a42316c3841acbbd91 SHA512 e5ec63624f678d43f8aa86e0071892f952e076d73389464b60dca7dd53c1fa53a01efe2569fd9864fca3595806f8c5fb834ee4b725b5c77f6dd1bc71f6cf96a6 WHIRLPOOL f5f17937b2c284aaacb72b5e43af913c41becb3b7123f98b6ca8954cc584681aad6558564a799670e1e30c794277a096b977f0e22439e90520fa7120ddaa163b
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1747 SHA256 086354d63306f1a5d85fc5e75eb9dc6ed9fbbe8e58c7768d97ae1c29cec83a2d SHA512 eaa3b0050218bf3b643428c4d9ea6185c45ccbe6126a129dcb8edc4c00cddf792b6e26f1b5bbcd93b4b968585e94fa404cacc7cd461bba61d2c439af36262e18 WHIRLPOOL b80f0af109acdc080fcfb4fa9565b2c314480b86cfb661a273094c00b2f2ddb7933e8866b48855c7f033ed486d1bad2715df6e83158950503c657ca63d4a9398

From 2ee3acccad997056d123bcccf46bdf978c036d21 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Wed, 5 Oct 2016 19:00:54 -0700
Subject: [PATCH 210/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 94682a7..9c17348 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 4090136 SHA256 3d0923c3fbfe98c69388ba41a06b2ac5233f14df561926a42316c3841acbbd91 SHA512 e5ec63624f678d43f8aa86e0071892f952e076d73389464b60dca7dd53c1fa53a01efe2569fd9864fca3595806f8c5fb834ee4b725b5c77f6dd1bc71f6cf96a6 WHIRLPOOL f5f17937b2c284aaacb72b5e43af913c41becb3b7123f98b6ca8954cc584681aad6558564a799670e1e30c794277a096b977f0e22439e90520fa7120ddaa163b
+DIST freeswitch-cyneric-1.6.10.tar.gz 4090152 SHA256 94040ff63de308a76802566519afed2c26cced7208225baa51f6b25c9ec3c088 SHA512 3eb509115e76fd457f7e69d1bab57398455c60a025f76e05716cc52171e75550cc55546d80e90aa33cfbc59a087a7c1eb6f2239300161e8e966a9bcd05d14b9d WHIRLPOOL 107c395ba559a6ed88a91da37af51320fb12f9554c05aedbd54657094a7bd702c3c7c5768259f86fba3e52ed33e795b5f69f5536f0dd04fcf05c65672145c35a
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1747 SHA256 086354d63306f1a5d85fc5e75eb9dc6ed9fbbe8e58c7768d97ae1c29cec83a2d SHA512 eaa3b0050218bf3b643428c4d9ea6185c45ccbe6126a129dcb8edc4c00cddf792b6e26f1b5bbcd93b4b968585e94fa404cacc7cd461bba61d2c439af36262e18 WHIRLPOOL b80f0af109acdc080fcfb4fa9565b2c314480b86cfb661a273094c00b2f2ddb7933e8866b48855c7f033ed486d1bad2715df6e83158950503c657ca63d4a9398

From ad1cfa6d462935e77313656ceeebf24a9c8f2380 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 13:58:48 -0700
Subject: [PATCH 211/261] update

---
 net-misc/freeswitch-cyneric/Manifest                         | 4 ++--
 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 9c17348..be1c59d 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 4090152 SHA256 94040ff63de308a76802566519afed2c26cced7208225baa51f6b25c9ec3c088 SHA512 3eb509115e76fd457f7e69d1bab57398455c60a025f76e05716cc52171e75550cc55546d80e90aa33cfbc59a087a7c1eb6f2239300161e8e966a9bcd05d14b9d WHIRLPOOL 107c395ba559a6ed88a91da37af51320fb12f9554c05aedbd54657094a7bd702c3c7c5768259f86fba3e52ed33e795b5f69f5536f0dd04fcf05c65672145c35a
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959627 SHA256 769edd97dc039fd2a0503ff45fa7fd233b7136fe5218973288637d8de50eff12 SHA512 957b18453882c074cfed0f500c33440f64a36499d9eaa93028fd471ff09d3fa3eb05a911605beca96a72a4214fbafe3dde0a4c8657753ae7dcbd03ef67c25eed WHIRLPOOL 8dc45d4bcabfdf1d81a5760371d284a235792f439f2db0f2a683a7bce9adb0e88f9cc67b94bda214ccdc48bd1e0d3ada2976f13488ce4fc72d297187ea79f55d
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
-EBUILD freeswitch-cyneric-1.6.10.ebuild 1747 SHA256 086354d63306f1a5d85fc5e75eb9dc6ed9fbbe8e58c7768d97ae1c29cec83a2d SHA512 eaa3b0050218bf3b643428c4d9ea6185c45ccbe6126a129dcb8edc4c00cddf792b6e26f1b5bbcd93b4b968585e94fa404cacc7cd461bba61d2c439af36262e18 WHIRLPOOL b80f0af109acdc080fcfb4fa9565b2c314480b86cfb661a273094c00b2f2ddb7933e8866b48855c7f033ed486d1bad2715df6e83158950503c657ca63d4a9398
+EBUILD freeswitch-cyneric-1.6.10.ebuild 1753 SHA256 4619294787a3a98ed3af7b849c5ca965142d8145ed1ea6c20224d2abcaa427be SHA512 29914ff3dc673bd082aa0804f735ac87ab1d678a5d83f50c8ecd3f4519329907d2711d3918e49df9303d2b0d9024048a78d599b51e08abd7489969d72567b5e1 WHIRLPOOL fa294322157d27fce96e6ba55d22e772e82169e85a73e2b7300db1f8ec34ffc18114f8279142ee7cc09e72544a90838c8ac8fcd5ff52a0b688e426bc3e32fe53
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
index e7cdb50..ded56b9 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
@@ -57,7 +57,7 @@ pkg_postinst() {
         elog "for example ln -s /etc/init.d/freeswitch /etc/init.d/freeswitch.a"
         einfo ""
 
-        newinitd "${FILESDIR}"/freeswitch.1.6.10.initd   freeswitch
+        cp "${FILESDIR}"/freeswitch.1.6.10.initd   /etc/init.d/freeswitch
 
 	einfo "adding zabbix stuff"
 	cp "${FILESDIR}"/cyneric.fstab /opt/freeswitch/

From e740ba80fc7922fbaddf043a8920d638aa35d54f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 15:37:57 -0700
Subject: [PATCH 212/261] update

---
 net-misc/freeswitch-cyneric/Manifest                         | 2 +-
 net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index be1c59d..87b209b 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -6,4 +6,4 @@ AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdb
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
 DIST freeswitch-cyneric-1.6.10.tar.gz 3959627 SHA256 769edd97dc039fd2a0503ff45fa7fd233b7136fe5218973288637d8de50eff12 SHA512 957b18453882c074cfed0f500c33440f64a36499d9eaa93028fd471ff09d3fa3eb05a911605beca96a72a4214fbafe3dde0a4c8657753ae7dcbd03ef67c25eed WHIRLPOOL 8dc45d4bcabfdf1d81a5760371d284a235792f439f2db0f2a683a7bce9adb0e88f9cc67b94bda214ccdc48bd1e0d3ada2976f13488ce4fc72d297187ea79f55d
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
-EBUILD freeswitch-cyneric-1.6.10.ebuild 1753 SHA256 4619294787a3a98ed3af7b849c5ca965142d8145ed1ea6c20224d2abcaa427be SHA512 29914ff3dc673bd082aa0804f735ac87ab1d678a5d83f50c8ecd3f4519329907d2711d3918e49df9303d2b0d9024048a78d599b51e08abd7489969d72567b5e1 WHIRLPOOL fa294322157d27fce96e6ba55d22e772e82169e85a73e2b7300db1f8ec34ffc18114f8279142ee7cc09e72544a90838c8ac8fcd5ff52a0b688e426bc3e32fe53
+EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6
diff --git a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
index ded56b9..1c14aeb 100644
--- a/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
+++ b/net-misc/freeswitch-cyneric/freeswitch-cyneric-1.6.10.ebuild
@@ -41,6 +41,9 @@ pkg_preinst() {
        	chown freeswitch:freeswitch /etc/freeswitch
        	chown freeswitch:freeswitch /opt/freeswitch
 
+
+	ln -s /opt/freeswitch/scripts/fscli.sh /usr/local/sbin/fscli
+
         einfo "all config files are now in /opt/freeswitch/conf and a symlink added to /etc/freeswitch"
         einfo ""
         einfo "adding a disabled cron in /etc/cron.d"

From a5b8b9c1f0062e9533a0e47bc851675a538379e0 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 15:48:43 -0700
Subject: [PATCH 213/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 87b209b..ccf9620 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3959627 SHA256 769edd97dc039fd2a0503ff45fa7fd233b7136fe5218973288637d8de50eff12 SHA512 957b18453882c074cfed0f500c33440f64a36499d9eaa93028fd471ff09d3fa3eb05a911605beca96a72a4214fbafe3dde0a4c8657753ae7dcbd03ef67c25eed WHIRLPOOL 8dc45d4bcabfdf1d81a5760371d284a235792f439f2db0f2a683a7bce9adb0e88f9cc67b94bda214ccdc48bd1e0d3ada2976f13488ce4fc72d297187ea79f55d
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959500 SHA256 21b163e963dad0eb094c92062c99e138f6b384def817c7c7002693fec672e3b2 SHA512 0b77f880aff20cf5ff4bdc7f7817f72389a8bf351f6ddaacca1942a2f1207f05d33f2fdc03f5175470c666f4bddc3978ab712b5a3a9bfcf9df411e765f9bcad6 WHIRLPOOL 4ca51591dc646177aee1c46e2f861e8742021313d35d230c6d79ad8639d3efa8fb2a585dca93b8e475335d4db8586a8e40cb18a6470e9fb616da304c989bc7f7
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 4c277bd8866c432319644b793617d364e9a255a1 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 16:27:28 -0700
Subject: [PATCH 214/261] update

---
 net-misc/freeswitch-cyneric/Manifest                  |  4 ++--
 .../freeswitch-cyneric/files/freeswitch.1.6.10.initd  | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index ccf9620..4476854 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,9 +1,9 @@
 AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
 AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
-AUX freeswitch.1.6.10.initd 1622 SHA256 83e6c9fc9476bba70803b88afc0274b9fdd752ff114024fe502fda98e2c66e1d SHA512 71461857150ef4e2de97abc686e9911215087f6442965202312262f66d6240466e23abaa67c56322fa121b606dc2fb0ff5e43ba1b1139773517b32002fb07d45 WHIRLPOOL 1548ed227ccf87cab345ef7ca0b4d25f2165b146dd6125029c5e89c6949be5409f47651492c4e93611b1932809a0b4bcb858d9eeff7d132f7e16005b232d37ed
+AUX freeswitch.1.6.10.initd 1633 SHA256 2d14b2ae53ae2f248320b4c681fe17a6f643faed5dcc6d1dd5e944b825ecf4f9 SHA512 79d28938c48fdc6416333fb9bc9aae4a9edce88ee0c677dd147b1b3980982e2d2c69541a96858a09809bf6bd0ef318d172dc5fb9a56f17b3cd98ee6900500135 WHIRLPOOL ff58f9d8ee2ea33f4c76c62f829297b1f47ba24eb436cbb31eda2dae0a9c35176d917c41200dab577bca908e38f8d9bd9b81d47d6bcb0a2b254ad863ed7461ef
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3959500 SHA256 21b163e963dad0eb094c92062c99e138f6b384def817c7c7002693fec672e3b2 SHA512 0b77f880aff20cf5ff4bdc7f7817f72389a8bf351f6ddaacca1942a2f1207f05d33f2fdc03f5175470c666f4bddc3978ab712b5a3a9bfcf9df411e765f9bcad6 WHIRLPOOL 4ca51591dc646177aee1c46e2f861e8742021313d35d230c6d79ad8639d3efa8fb2a585dca93b8e475335d4db8586a8e40cb18a6470e9fb616da304c989bc7f7
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959537 SHA256 ca2b2be07cdbbc1891023c9fed54763c13871604023b2e19494f2a07299b31e1 SHA512 329926f111e3a00d6ce829e6c98227fc465fcbbe791162447174e899c495d833331d034e68e4e97022335216bbcabe992ef5b007218af209ef3a730d7a34524d WHIRLPOOL 252acd45a1597e1bc63a8f6709afa1a1845f7bca67ae2f3255f88cfdd4938eb68db7dd808eadaa91130fdf26f49973145faac809ef412651298c988f8d63edc6
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
index 8f25571..52eb769 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -47,10 +47,6 @@ start() {
 	chown -R freeswitch:freeswitch /opt/freeswitch
 	cd /opt/freeswitch/scripts/
 
-	# start freeswitch mon
-	kill -9 $(pidof -x cynerwebmon.sh)
-	/opt/freeswitch/scripts/cynerwebmon.sh
-
 	# set limits
 	do_setlimits
 
@@ -61,6 +57,13 @@ start() {
 		-db /opt/freeswitch/db/${INSTANCE} \
 		-nc ${OPTS}
 	eend $?
+
+	sleep 3
+
+	# start freeswitch mon
+	kill -9 $(pidof -x cynerwebmon.sh)
+	/opt/freeswitch/scripts/cynerwebmon.sh
+
 }
 
 stop() {

From 8c2ce9efb27acb7292c8f346424404fad3545a18 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 16:28:57 -0700
Subject: [PATCH 215/261] update

---
 net-misc/freeswitch-cyneric/Manifest                      | 2 +-
 net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 4476854..f5a7ef7 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,6 +1,6 @@
 AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
 AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
-AUX freeswitch.1.6.10.initd 1633 SHA256 2d14b2ae53ae2f248320b4c681fe17a6f643faed5dcc6d1dd5e944b825ecf4f9 SHA512 79d28938c48fdc6416333fb9bc9aae4a9edce88ee0c677dd147b1b3980982e2d2c69541a96858a09809bf6bd0ef318d172dc5fb9a56f17b3cd98ee6900500135 WHIRLPOOL ff58f9d8ee2ea33f4c76c62f829297b1f47ba24eb436cbb31eda2dae0a9c35176d917c41200dab577bca908e38f8d9bd9b81d47d6bcb0a2b254ad863ed7461ef
+AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322e772792d93d7508a2288a7ab SHA512 4a3acddd7cea1bd8f60561f73dfd48326b7692a18a19a9afb7b73b91ee45d0fb0e0aa4a8ebee8c2cb40195b173e8d82766ac87a5f44c63d2e9b33e23c0139a4f WHIRLPOOL 8dcdd1c045b6fe2679474ffd9712b83db77ddc2fbb92c8ecf32448693d844bbc66d370e243a0252f6468c258b052dad68b9138ce9ae21b15f9123502348dbf85
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
index 52eb769..98a96b0 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -58,6 +58,7 @@ start() {
 		-nc ${OPTS}
 	eend $?
 
+        ebegin "Starting cynerwebmon.sh"
 	sleep 3
 
 	# start freeswitch mon

From a346ad8c13e607a3f9b0b6b565a5171aded76cd8 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 6 Oct 2016 19:41:19 -0700
Subject: [PATCH 216/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index f5a7ef7..4427012 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3959537 SHA256 ca2b2be07cdbbc1891023c9fed54763c13871604023b2e19494f2a07299b31e1 SHA512 329926f111e3a00d6ce829e6c98227fc465fcbbe791162447174e899c495d833331d034e68e4e97022335216bbcabe992ef5b007218af209ef3a730d7a34524d WHIRLPOOL 252acd45a1597e1bc63a8f6709afa1a1845f7bca67ae2f3255f88cfdd4938eb68db7dd808eadaa91130fdf26f49973145faac809ef412651298c988f8d63edc6
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959685 SHA256 7e7318ff10870f698e22e39649172f0e53188a4039190f611e67e8ff590dac75 SHA512 f9b3c8ef4468cdbda9437c168a644507811eb38ded3544a0412550a630d41a3c28c0e55047730b981d66790c3c34b645cbd2d87bc89a284baac9af48a0c9f71e WHIRLPOOL f78f06eb89c4fb2d2d0281cb568f59f4323bb585015df1de26894115135366f6af9ab4a51db3065897b224c9aa88e132a70036fce11ddf60ea2dd3f4632dbd6e
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From efbff6ef780fafff8fc470eb8cb1e79ed842bfd1 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Thu, 13 Oct 2016 17:11:24 -0700
Subject: [PATCH 217/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 4427012..766382c 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3959685 SHA256 7e7318ff10870f698e22e39649172f0e53188a4039190f611e67e8ff590dac75 SHA512 f9b3c8ef4468cdbda9437c168a644507811eb38ded3544a0412550a630d41a3c28c0e55047730b981d66790c3c34b645cbd2d87bc89a284baac9af48a0c9f71e WHIRLPOOL f78f06eb89c4fb2d2d0281cb568f59f4323bb585015df1de26894115135366f6af9ab4a51db3065897b224c9aa88e132a70036fce11ddf60ea2dd3f4632dbd6e
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959680 SHA256 c88abc0326c72926ce88d947a64330fcd07ac6b2b2376308d1ee33947636207f SHA512 5d57fb5530b501d7442f8007c9bae1779540eea487fe9eb7a3742982e83fec9220606ac472301ee7f74cb31daae7bc7f342bd4245e8bc808b5916ddc82b251fb WHIRLPOOL f260a1bde47af80bda3f83a204e50cbe49c62d298b0c745f15b12e035382c53703476aba8e5d16a6357e48ae3a438e1d662fcce6d3787eafdf9338aa50eefc60
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From ba8192e1e2b63b44dbcae3ae6d8c602474ac8514 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Wed, 19 Oct 2016 19:29:09 -0700
Subject: [PATCH 218/261] added kamailio

---
 net-misc/kamailio/ChangeLog              |  78 +++++
 net-misc/kamailio/Manifest               |  19 ++
 net-misc/kamailio/files/kamailio.default |  28 ++
 net-misc/kamailio/files/kamailio.service |  21 ++
 net-misc/kamailio/files/ser.confd        |  16 +
 net-misc/kamailio/files/ser.initd        |  34 +++
 net-misc/kamailio/kamailio-3.1.5.ebuild  | 250 ++++++++++++++++
 net-misc/kamailio/kamailio-3.1.6.ebuild  | 251 ++++++++++++++++
 net-misc/kamailio/kamailio-3.2.3.ebuild  | 251 ++++++++++++++++
 net-misc/kamailio/kamailio-3.2.4.ebuild  | 251 ++++++++++++++++
 net-misc/kamailio/kamailio-3.3.1.ebuild  | 255 ++++++++++++++++
 net-misc/kamailio/kamailio-3.3.2.ebuild  | 255 ++++++++++++++++
 net-misc/kamailio/kamailio-4.4.3.ebuild  | 354 +++++++++++++++++++++++
 13 files changed, 2063 insertions(+)
 create mode 100644 net-misc/kamailio/ChangeLog
 create mode 100644 net-misc/kamailio/Manifest
 create mode 100644 net-misc/kamailio/files/kamailio.default
 create mode 100644 net-misc/kamailio/files/kamailio.service
 create mode 100644 net-misc/kamailio/files/ser.confd
 create mode 100644 net-misc/kamailio/files/ser.initd
 create mode 100644 net-misc/kamailio/kamailio-3.1.5.ebuild
 create mode 100644 net-misc/kamailio/kamailio-3.1.6.ebuild
 create mode 100644 net-misc/kamailio/kamailio-3.2.3.ebuild
 create mode 100644 net-misc/kamailio/kamailio-3.2.4.ebuild
 create mode 100644 net-misc/kamailio/kamailio-3.3.1.ebuild
 create mode 100644 net-misc/kamailio/kamailio-3.3.2.ebuild
 create mode 100644 net-misc/kamailio/kamailio-4.4.3.ebuild

diff --git a/net-misc/kamailio/ChangeLog b/net-misc/kamailio/ChangeLog
new file mode 100644
index 0000000..dd14747
--- /dev/null
+++ b/net-misc/kamailio/ChangeLog
@@ -0,0 +1,78 @@
+# ChangeLog for net-misc/sip-router
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*sip-router-3.3.2 (17 Oct 2012)
+
+  17 Oct 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.3.2.ebuild:
+  Version bump (series 3.3.x).
+
+*sip-router-3.3.1 (5 Oct 2012)
+
+  5 Oct 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.3.1.ebuild:
+  Version bump (series 3.3.x).
+
+*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:
+  Version bump.
+
+*sip-router-3.2.2 (15 Feb 2012)
+
+  15 Feb 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.2.ebuild:
+  Version bump.
+
+*sip-router-3.2.1 (25 Jan 2012)
+
+  25 Jan 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.1.ebuild:
+  Version bump.
+
+*sip-router-3.1.5 (21 Sep 2011)
+
+  21 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.1.5.ebuild:
+  Version bump.
+
+  21 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> -sip-router-3.1.2.ebuild,
+  -sip-router-3.1.3.ebuild, -sip-router-3.1.4.ebuild, -sip-router-3.1.4-r1.ebuild,
+  -files/siprouter.confd, -files/siprouter.init:
+  Older versions than 3.1.4-r2 are no longer packaged.
+
+*sip-router-3.1.4 (13 Sep 2011)
+  
+  13 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> +sip-router-3.1.4-r2.ebuild,
+  +files/ser.confd, +files/ser.initd:
+  Fix installation paths and names based on flavour specified in the USE flag
+  (ser or kamailio).
+
+  24 Aug 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.4-r1.ebuild:
+  Added kamailio-specific groups (group_k*) in USE flags.
+
+  31 May 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.4.ebuild:
+  Version bump.
+
+*sip-router-3.1.3 (03 May 2011)
+  
+  03 May 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.3.ebuild:
+  Version bump.
+
+*sip-router-3.1.2 (21 Mar 2011)
+  
+  23 Mar 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.2.ebuild,
+  +metadata.xml:
+  Added flavours USE setup for kamailio/ser/sip-router options.
+  Also was added metadata file.
+
+  22 Mar 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.2.ebuild:
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way.
diff --git a/net-misc/kamailio/Manifest b/net-misc/kamailio/Manifest
new file mode 100644
index 0000000..f81b01c
--- /dev/null
+++ b/net-misc/kamailio/Manifest
@@ -0,0 +1,19 @@
+AUX kamailio.default 786 SHA256 41ac4d6de5e7b2a7cef34b717e1d89721df4041354c001f90359b266619313e2 SHA512 a305815955c8c8713de0a398471979f2c21a769d2f939573ce7a08a9a8a5432eebfb940213b3e5611ec54f8f8b46ee87e5e485ea8c2509ade9fe6ca013fe62be WHIRLPOOL 1c265ee3328777fd20cb95e1d1c2ce19a0cb883b6af830e08255c8d43ad0b85d08c454d64fa05175c5bce062a7b363edde11da828ad88aef963ba789e74ed706
+AUX kamailio.service 655 SHA256 096b7abbfaad568cc214e2b02f5b42ea75dadd7d524f9d14e33e8c1ba23ce782 SHA512 2c85b9ff19d50da54c180ca0735804b61c739104608c8168820c8a23f495b1eac4e60a6ce576e3079c701399ac776ba62b76523e08781274c912e7cc78eaebf6 WHIRLPOOL 9e3254031fbd37b96f3e0b92e5550951453d18bab2a0e4e052a1abbc6539790cfc20d39f164017b055e1a14f41132ee1f47d9320584de600425f568da4a1e86e
+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
+DIST kamailio-3.3.1_src.tar.gz 7468878 SHA256 45c153776efad809ec1f88710d7d3cd57c9f805050611378eaccf99bed63a122 SHA512 aa14c17fe113502266819f7824b377d8856aa48380ed4e66f2540d86a646cd19052b5e6da7f28f4b92fcbdd57b4182969536702f6f8f27119295a5c944242883 WHIRLPOOL c01fb645893284e7941f82dd61b3f79761600ac217dc8326614b16580c7d28d5a263c7235379901846948ec80dca695e69a6f617b2df5e1e0802d111432700bd
+DIST kamailio-3.3.2_src.tar.gz 7483530 SHA256 dae3ca1c6372ae5a01a7b8e9d49e297c1cee01032b77524d00e6d5082fbeef61 SHA512 4b1ed2d6b6028a3cc3c18ee7f5e54143c15a7d6a4fc6cf7710f3d70415355bfe2e893c7384b94acc0f67c09abf670b87ea15afce0917b085d0419a05b6e771b9 WHIRLPOOL df4a6497c221af621a0f72a84fecad0dc0c09eb485bb40444f35518406cab340fd6eceef6c558283e30c39901f44b0e22ba595503b3f2354dd329bb6adc3edc1
+DIST kamailio-4.4.3_src.tar.gz 11707809 SHA256 c3e5c312c99f15f68b201ba6c75db07b01e65199b792d4d8cf6ecfe3adc22e58 SHA512 392b6b5596ae0e0514d2cc9fc7c43ea7b8f54bb5874bcc42f0e3a959122b76b2156146435f21cf81d4e34cb4c024001c2467fcd17a4797c02f7af57e30d36106 WHIRLPOOL ef787df8ec1214e8b8eea38d48c9b5ba6c11f09a928d174b87e5a3dfb4de970e0cbc2bf3b9543228a8331ca04f938b8024ee17f5116b8f771645d10fdf39de11
+EBUILD kamailio-3.1.5.ebuild 8024 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78 SHA512 8e8bf4b491e9dd5c17230fdd338138188f16a584e9a4e22baea4ac22a767ff8e40860618a630afd959f57fcf0948d7081827ddbcc1a6b62d691518d4716e6a2f WHIRLPOOL 820bbfcb11137d0a9414a9f9ebbb5be6930b269d1341c1b323ea682a55d1514312b918f7150b33034722c4d239f2f4b66a8edf41bec587f382ad24a140278088
+EBUILD kamailio-3.1.6.ebuild 8106 SHA256 a2959cdeef926236cdbadf06b4c2340ffca7cde1338499a14ca511c60ab3556a SHA512 ac238b7dd0a669a16caa047c99d74c0d0425759340b59785b1a3e593ae9e245d1e8dcf71b052070d8681c5b0db03abf2e7250b7f20fb09837d727809272f2515 WHIRLPOOL d3d332d549b9e73a6e685bbbe8e093372d794fd506e0826103450cc8a59bfa4c7f939d3893dab09ed845541c74ff64d8d04c3aad24ffea9b6964457806e7d387
+EBUILD kamailio-3.2.3.ebuild 8115 SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f SHA512 e257ecf83f44f446098ec6fc7b0565e5ca6b7eb7dbeddc34baacb5592825065ef93a05ca24c3f85b6c817e4c23e407861e7c1bc79d883f4882f7153a88bbc928 WHIRLPOOL 0a44d52e6fbae7e79f2f69b115734174af30cd6b662205e81b84b92b92158e7fb94416fa4d35b5b3c0f6048f6ca7b269c46c860602a276c872b5605cd1b018f0
+EBUILD kamailio-3.2.4.ebuild 8155 SHA256 4efbbf1cea7d46f065947869723db90dc43453b6451b6830dcf5f5363a3ff5b8 SHA512 2c20dfdee22e54f8a429e4aedcc7c0771c2e03b53a7632a11fdc47335d81ed33fc89070d22775c7cba68f7874fec97ac8441338b44f62be30654092ac0f239af WHIRLPOOL 53a960bc2d8bbd3a1a0a4fc3eee5ded932fd2576b57f12e1030a58913aeab2b61e089a23849c5b65afb41abd299cb7aa9496db343a6f472fc5438de27ef7f67c
+EBUILD kamailio-3.3.1.ebuild 8327 SHA256 12ab91b617bda58321dfa4d256628f533e299bd78632f7617a1ee7d35800f416 SHA512 d1aba8330182465234f7d64969a64fd412fb1866c22b51ae02b7866aa1936eb2fbe462aa8f43379e1ae19b38e973d9e8663f1faf0412566ca776b6e214423442 WHIRLPOOL f8fb38968d94576f8191dbafdda2c0709511b7f98ae24b3855e53990c55abacb98cbca3bd6c1440656cc41ee5d81e9b57c0765fbaa2ca413d9ce98438ec7207b
+EBUILD kamailio-3.3.2.ebuild 8327 SHA256 12ab91b617bda58321dfa4d256628f533e299bd78632f7617a1ee7d35800f416 SHA512 d1aba8330182465234f7d64969a64fd412fb1866c22b51ae02b7866aa1936eb2fbe462aa8f43379e1ae19b38e973d9e8663f1faf0412566ca776b6e214423442 WHIRLPOOL f8fb38968d94576f8191dbafdda2c0709511b7f98ae24b3855e53990c55abacb98cbca3bd6c1440656cc41ee5d81e9b57c0765fbaa2ca413d9ce98438ec7207b
+EBUILD kamailio-4.4.3.ebuild 32769 SHA256 3a5cb6ad5f531cf69a4209cbe840974897102f156a07ef435ad7dab3b317be19 SHA512 666170119b7ed275053888499d2c3c6af78675480720b3650ce242094330bf6ad73d7b6cb8431a10e0992d36cedc7521ed3d228e08589dfc39375dab48f52f7b WHIRLPOOL 0ede2460d2765becdcdaece6ffd1f336609a533a0c19554a2ea235332582fe68e718cba693ff61e2fe5c28b646279712216f8e8ef03da82b2e3eb3fd14fa3c1c
+MISC ChangeLog 2480 SHA256 a8bdaddc1f1f468f25499b534236fae5980466ba0333a3aaad7fd8b406f37f9d SHA512 2fc633bfbf0363822764121de7f1dda66c2264ee122ff0843b7647b84b25ad45a04fd0ce3797d84883b35defbf525b17bd67d6b4afd33cdbcff4e22dcda5d7c5 WHIRLPOOL bec2be2ad6cecadadde47f8767d4640ceaae06fc6698fb12b27c174c27c5305199cf2de7c9b277ae53adc629043a5a3dce87e3617e103000b4991e1f2914f400
diff --git a/net-misc/kamailio/files/kamailio.default b/net-misc/kamailio/files/kamailio.default
new file mode 100644
index 0000000..8b20fc0
--- /dev/null
+++ b/net-misc/kamailio/files/kamailio.default
@@ -0,0 +1,28 @@
+#
+# Kamailio startup options
+#
+
+# Set to yes to enable kamailio, once configured properly.
+#RUN_KAMAILIO=yes
+
+# User to run as
+#USER=kamailio
+
+# Group to run as
+#GROUP=kamailio
+
+# Amount of shared and private memory to allocate
+# for the running Kamailio server (in Mb)
+#SHM_MEMORY=64
+#PKG_MEMORY=8
+
+# Config file
+#CFGFILE=/etc/kamailio/kamailio.cfg
+
+# Enable the server to leave a core file when it crashes.
+# Set this to 'yes' to enable Kamailio to leave a core file when it crashes
+# or 'no' to disable this feature. This option is case sensitive and only
+# accepts 'yes' and 'no' and only in lowercase letters.
+# On some systems it is necessary to specify a directory for the core files
+# to get a dump. Look into the kamailio init file for an example configuration.
+#DUMP_CORE=yes
diff --git a/net-misc/kamailio/files/kamailio.service b/net-misc/kamailio/files/kamailio.service
new file mode 100644
index 0000000..06c3334
--- /dev/null
+++ b/net-misc/kamailio/files/kamailio.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Kamailio (OpenSER) - the Open Source SIP Server
+After=network.target
+
+[Service]
+Type=forking
+Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
+Environment='SHM_MEMORY=64'
+Environment='PKG_MEMORY=8'
+Environment='USER=kamailio'
+Environment='GROUP=kamailio'
+EnvironmentFile=-/etc/default/kamailio
+EnvironmentFile=-/etc/default/kamailio.d/*
+# PIDFile requires a full absolute path
+PIDFile=/var/run/kamailio/kamailio.pid
+# ExecStart requires a full absolute path
+ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/kamailio/files/ser.confd b/net-misc/kamailio/files/ser.confd
new file mode 100644
index 0000000..4b1f248
--- /dev/null
+++ b/net-misc/kamailio/files/ser.confd
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Additional options to start Sip-Router with.
+#
+# see "sip-router -h" for a list of options
+#
+# default: run SER as user:group = ser:ser
+#
+MAIN_NAME="sip-router"
+SR_USER="sip-router"
+SR_GROUP="sip-router"
+CONFIGFILE="${CONFIGFILE:-/etc/${MAIN_NAME}/sip-router.cfg}"
+CONFIGDEFS="" # eg: "-A WITH_DEBUG -A WITH_NAT -A WITH_TLS"
+SR_OPTS="-u $SR_USER -g $SR_GROUP -f ${CONFIGFILE} ${CONFIGDEFS}"
diff --git a/net-misc/kamailio/files/ser.initd b/net-misc/kamailio/files/ser.initd
new file mode 100644
index 0000000..99d0fbe
--- /dev/null
+++ b/net-misc/kamailio/files/ser.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+}
+
+check_config() {
+	out=`(/usr/sbin/sip-router -f ${CONFIGFILE} -c > /dev/null || true) 2>&1`
+	echo "$out" | grep -q 'config file ok, exiting...'
+	if [ "$?" == 1 ]; then
+		echo -e "There are errors in the configuration. Please fix them first"
+		echo -e "\n$out\n"
+		return 1
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting sip-router"
+	start-stop-daemon --start --quiet --pidfile /var/run/sip-router.pid \
+		--exec /usr/sbin/sip-router -- -P /var/run/sip-router.pid \
+                ${SR_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sip-router"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sip-router.pid
+	eend $?
+}
+
diff --git a/net-misc/kamailio/kamailio-3.1.5.ebuild b/net-misc/kamailio/kamailio-3.1.5.ebuild
new file mode 100644
index 0000000..cd0f9a8
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.1.5.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2011 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.1.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
+acc acc_radius alias_db app_lua app_python 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
+debugger dialog dialplan dispatcher diversion domain domainpolicy drouting
+enum exec
+geoip group
+h350 htable imc iptrtpproxy jabber kex
+lcr ldap
+matrix maxfwd mediaproxy memcached misc_radius mi_datagram mi_fifo mi_rpc mi_xmlrpc mqueue msilo mtree
+nathelper nat_traversal
+osp
+path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route
+presence presence_conference presence_dialoginfo presence_mwi presence_xml
+pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp purple pv
+qos
+ratelimit regex registrar rls rtimer rr rtpproxy
+sanity seas 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"
+
+#osp? ( net-libs/osptoolkit )
+#pdb? ( pdb-server )
+#seas? ( www.wesip.eu )
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7
+	>=sys-libs/readline-6.1_p2
+	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 )
+	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_unixodbc? ( dev-db/unixODBC )
+	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 )
+	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"
+	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}/" \
+		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}"
+
+	has_version <="${CATEGORY}/ser-0.9.8"
+	previous_installed_version=$?
+	if [[ $previous_installed_version = 1 ]] ; then
+		elog "You have a previous version of SER on ${ROOT}etc/ser"
+		elog "Consider or verify to remove it (emerge -C ser)."
+		elog
+		elog "Sip-Router may not could be installed/merged. See your elog."
+	fi
+}
+
+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/kamailio/kamailio-3.1.6.ebuild b/net-misc/kamailio/kamailio-3.1.6.ebuild
new file mode 100644
index 0000000..8635ecc
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.1.6.ebuild
@@ -0,0 +1,251 @@
+# 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.1.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
+acc acc_radius alias_db app_lua app_python 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
+debugger dialog dialplan dispatcher diversion domain domainpolicy drouting
+enum exec
+geoip group
+h350 htable imc iptrtpproxy jabber kex
+lcr ldap
+matrix maxfwd mediaproxy memcached misc_radius mi_datagram mi_fifo mi_rpc mi_xmlrpc mqueue msilo mtree
+nathelper nat_traversal
+osp
+path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route
+presence presence_conference presence_dialoginfo presence_mwi presence_xml
+pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp purple pv
+qos
+ratelimit regex registrar rls rtimer rr rtpproxy
+sanity seas 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"
+
+#osp? ( net-libs/osptoolkit )
+#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/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 )
+	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 )
+	acc_radius? ( net-dialup/radiusclient-ng )
+	app_lua? ( >=dev-lang/lua-5.1 )
+	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_unixodbc? ( dev-db/unixODBC )
+	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 )
+	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"
+	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}/" \
+		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}"
+
+	has_version <="${CATEGORY}/ser-0.9.8"
+	previous_installed_version=$?
+	if [[ $previous_installed_version = 1 ]] ; then
+		elog "You have a previous version of SER on ${ROOT}etc/ser"
+		elog "Consider or verify to remove it (emerge -C ser)."
+		elog
+		elog "Sip-Router may not could be installed/merged. See your elog."
+	fi
+}
+
+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/kamailio/kamailio-3.2.3.ebuild b/net-misc/kamailio/kamailio-3.2.3.ebuild
new file mode 100644
index 0000000..6b00f62
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.2.3.ebuild
@@ -0,0 +1,251 @@
+# 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/kamailio/kamailio-3.2.4.ebuild b/net-misc/kamailio/kamailio-3.2.4.ebuild
new file mode 100644
index 0000000..9eae9c6
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.2.4.ebuild
@@ -0,0 +1,251 @@
+# 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 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 )
+	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-5.1 )
+	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/kamailio/kamailio-3.3.1.ebuild b/net-misc/kamailio/kamailio-3.3.1.ebuild
new file mode 100644
index 0000000..dcd11cd
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.3.1.ebuild
@@ -0,0 +1,255 @@
+# 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.3.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 app_mono 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 db_cassandra db_cluster
+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 msrp 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_profile 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 tmrec topoh
+uac uac_redirect uri_db userblacklist usrloc utils
+xcap_client xcap_server xhttp xhttp_rpc xlog xmlops xmlrpc xmpp"
+
+# FIXME: no ebuilds for them
+#db_cassandra? ( thrift dev-db/cassandra )
+#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 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 )
+	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-5.1 )
+	app_python? ( dev-lang/python )
+	app_mono? ( dev-lang/mono )
+	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/kamailio/kamailio-3.3.2.ebuild b/net-misc/kamailio/kamailio-3.3.2.ebuild
new file mode 100644
index 0000000..dcd11cd
--- /dev/null
+++ b/net-misc/kamailio/kamailio-3.3.2.ebuild
@@ -0,0 +1,255 @@
+# 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.3.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 app_mono 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 db_cassandra db_cluster
+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 msrp 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_profile 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 tmrec topoh
+uac uac_redirect uri_db userblacklist usrloc utils
+xcap_client xcap_server xhttp xhttp_rpc xlog xmlops xmlrpc xmpp"
+
+# FIXME: no ebuilds for them
+#db_cassandra? ( thrift dev-db/cassandra )
+#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 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 )
+	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-5.1 )
+	app_python? ( dev-lang/python )
+	app_mono? ( dev-lang/mono )
+	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/kamailio/kamailio-4.4.3.ebuild b/net-misc/kamailio/kamailio-4.4.3.ebuild
new file mode 100644
index 0000000..2e278dd
--- /dev/null
+++ b/net-misc/kamailio/kamailio-4.4.3.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs multilib user systemd
+
+DESCRIPTION="Sip-Router (Kamailio/SER) is an Open Source SIP Server"
+HOMEPAGE="http://kamailio.org/"
+SRC_URI="http://www.${PN}.org/pub/${PN}/${PV}/src/${P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#Documentation can be found here: http://www.kamailio.org/docs/modules/4.4.x/
+IUSE_KAMAILIO_MODULES="kamailio_modules_acc kamailio_modules_acc_radius kamailio_modules_alias_db kamailio_modules_app_java kamailio_modules_app_lua kamailio_modules_app_mono kamailio_modules_app_perl
+		       kamailio_modules_app_python kamailio_modules_async kamailio_modules_auth kamailio_modules_auth_ephemeral kamailio_modules_auth_identity kamailio_modules_auth_db
+		       kamailio_modules_auth_diameter kamailio_modules_auth_radius kamailio_modules_auth_xkeys kamailio_modules_avp kamailio_modules_avpops kamailio_modules_benchmark
+		       kamailio_modules_blst kamailio_modules_call_control kamailio_modules_carrierroute kamailio_modules_cdp kamailio_modules_cdp_avp kamailio_modules_cfg_db kamailio_modules_cfg_rpc
+		       kamailio_modules_cfgutils kamailio_modules_cfgt kamailio_modules_cnxcc kamailio_modules_corex kamailio_modules_counters kamailio_modules_cpl-c kamailio_modules_crypto
+		       kamailio_modules_ctl kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb
+		       kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text
+		       kamailio_modules_db_unixodbc kamailio_modules_db2_ldap kamailio_modules_db2_ops kamailio_modules_debugger kamailio_modules_dialog kamailio_modules_dialog_ng kamailio_modules_dialplan
+		       kamailio_modules_dispatcher kamailio_modules_diversion kamailio_modules_dmq kamailio_modules_dmq_usrloc kamailio_modules_dnssec kamailio_modules_domain kamailio_modules_domainpolicy
+		       kamailio_modules_drouting kamailio_modules_enum kamailio_modules_erlang kamailio_modules_evapi kamailio_modules_exec kamailio_modules_geoip kamailio_modules_geoip2
+		       kamailio_modules_group kamailio_modules_gzcompress kamailio_modules_h350 kamailio_modules_htable kamailio_modules_http_client kamailio_modules_http_async_client
+		       kamailio_modules_ims_auth kamailio_modules_ims_charging kamailio_modules_ims_dialog kamailio_modules_ims_icscf kamailio_modules_ims_isc kamailio_modules_ims_qos
+		       kamailio_modules_ims_registrar_pcscf kamailio_modules_ims_registrar_scscf kamailio_modules_ims_usrloc_pcscf kamailio_modules_ims_usrloc_scscf kamailio_modules_imc
+		       kamailio_modules_ipops kamailio_modules_iptrtpproxy kamailio_modules_jabber kamailio_modules_jansson kamailio_modules_janssonrpc-c kamailio_modules_json kamailio_modules_jsonrpc-c
+		       kamailio_modules_jsonrpc-s kamailio_modules_kazoo kamailio_modules_kex kamailio_modules_lcr kamailio_modules_ldap kamailio_modules_log_custom kamailio_modules_log_systemd
+		       kamailio_modules_malloc_test kamailio_modules_mangler kamailio_modules_matrix kamailio_modules_maxfwd kamailio_modules_mediaproxy kamailio_modules_memcached
+		       kamailio_modules_misc_radius kamailio_modules_mi_datagram kamailio_modules_mi_fifo kamailio_modules_mi_rpc kamailio_modules_mi_xmlrpc kamailio_modules_mohqueue
+		       kamailio_modules_mqueue kamailio_modules_msilo kamailio_modules_msrp kamailio_modules_mtree kamailio_modules_nathelper kamailio_modules_nat_traversal kamailio_modules_ndb_cassandra
+		       kamailio_modules_ndb_mongodb kamailio_modules_ndb_redis kamailio_modules_nosip kamailio_modules_osp kamailio_modules_outbound kamailio_modules_p_usrloc kamailio_modules_path kamailio_modules_pdb
+		       kamailio_modules_pdt kamailio_modules_peering kamailio_modules_permissions kamailio_modules_pike kamailio_modules_pipelimit kamailio_modules_prefix_route kamailio_modules_presence
+		       kamailio_modules_presence_conference kamailio_modules_presence_dialoginfo kamailio_modules_presence_mwi kamailio_modules_presence_profile kamailio_modules_presence_xml
+		       kamailio_modules_presence_reginfo kamailio_modules_print kamailio_modules_print_lib kamailio_modules_pua kamailio_modules_pua_bla kamailio_modules_pua_dialoginfo kamailio_modules_pua_mi
+		       kamailio_modules_pua_reginfo kamailio_modules_pua_usrloc kamailio_modules_pua_xmpp kamailio_modules_purple kamailio_modules_pv kamailio_modules_qos kamailio_modules_ratelimit
+		       kamailio_modules_regex kamailio_modules_registrar kamailio_modules_rls kamailio_modules_rr kamailio_modules_rtimer kamailio_modules_rtjson kamailio_modules_rtpengine
+		       kamailio_modules_rtpproxy kamailio_modules_sanity kamailio_modules_sca kamailio_modules_sctp kamailio_modules_sdpops kamailio_modules_seas kamailio_modules_sipcapture
+		       kamailio_modules_sipt kamailio_modules_siptrace kamailio_modules_siputils kamailio_modules_sl kamailio_modules_sms kamailio_modules_smsops kamailio_modules_snmpstats
+		       kamailio_modules_speeddial kamailio_modules_sqlops kamailio_modules_sst kamailio_modules_statistics kamailio_modules_statsc kamailio_modules_statsd kamailio_modules_stun
+		       kamailio_modules_tcpops kamailio_modules_textops kamailio_modules_textopsx kamailio_modules_timer kamailio_modules_tls kamailio_modules_tm kamailio_modules_tmrec kamailio_modules_tmx
+		       kamailio_modules_topoh kamailio_modules_topos kamailio_modules_tsilo kamailio_modules_uac kamailio_modules_uac_redirect kamailio_modules_uid_auth_db kamailio_modules_uid_avp_db
+		       kamailio_modules_uid_domain kamailio_modules_uid_gflags kamailio_modules_uid_uri_db kamailio_modules_uri_db kamailio_modules_userblacklist kamailio_modules_usrloc kamailio_modules_utils
+		       kamailio_modules_uuid kamailio_modules_websocket kamailio_modules_xcap_client kamailio_modules_xcap_server kamailio_modules_xhttp kamailio_modules_xhttp_pi kamailio_modules_xhttp_rpc
+		       kamailio_modules_xlog kamailio_modules_xmlops kamailio_modules_xmlrpc kamailio_modules_xmpp kamailio_modules_xprint
+"
+IUSE="${IUSE_KAMAILIO_MODULES} ipv6 debug"
+IUSE_EXPAND="KAMAILIO_MODULES"
+
+REQUIRED_USE="
+        kamailio_modules_acc?            ( kamailio_modules_tm kamailio_modules_rr kamailio_modules_dialog || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_acc_radius?     ( kamailio_modules_acc )
+        kamailio_modules_alias_db?       ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_app_perl?       ( kamailio_modules_sl )
+        kamailio_modules_async?          ( kamailio_modules_tm kamailio_modules_tmx )
+        kamailio_modules_auth_ephemeral? ( kamailio_modules_auth )
+        kamailio_modules_auth_db?        ( kamailio_modules_auth || ( kamailio_modules_db_mysql kamailio_modules_db_postgres kamailio_modules_db_text ) )
+        kamailio_modules_auth_diameter?  ( kamailio_modules_sl )
+        kamailio_modules_auth_radius?    ( kamailio_modules_auth )
+        kamailio_modules_call_control?   ( kamailio_modules_pv kamailio_modules_dialog )
+        kamailio_modules_carrierroute?   ( kamailio_modules_tm || ( kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_postgres kamailio_modules_db_unixodbc ) )
+        kamailio_modules_cdp_avp?        ( kamailio_modules_cdp )
+        kamailio_modules_cfg_db?         ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_cnxcc?          ( kamailio_modules_dialog )
+        kamailio_modules_cpl-c?          ( kamailio_modules_tm kamailio_modules_sl kamailio_modules_usrloc || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_db_cluster?     ( || ( kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_postgres kamailio_modules_db_unixodbc ) )
+        kamailio_modules_db_perlvdb?     ( kamailio_modules_app_perl )
+        kamailio_modules_dialog?         ( kamailio_modules_tm kamailio_modules_rr kamailio_modules_pv )
+        kamailio_modules_dialog_ng?      ( kamailio_modules_tm kamailio_modules_rr )
+        kamailio_modules_dialplan?       ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_dispatcher?     ( kamailio_modules_tm || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_dmq?            ( kamailio_modules_sl kamailio_modules_tm )
+        kamailio_modules_dmq_usrloc?     ( kamailio_modules_dmq kamailio_modules_usrloc )
+        kamailio_modules_domain?         ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_domainpolicy?   ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_drouting?       ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_evapi?          ( kamailio_modules_tm )
+        kamailio_modules_group?          ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_h350?           ( kamailio_modules_ldap )
+        kamailio_modules_http_async_client?      ( kamailio_modules_tm kamailio_modules_pv )
+        kamailio_modules_ims_auth?       ( kamailio_modules_tm kamailio_modules_cdp kamailio_modules_cdp_avp )
+        kamailio_modules_ims_charging?   ( kamailio_modules_ims_dialog kamailio_modules_tm kamailio_modules_cdp kamailio_modules_cdp_avp )
+        kamailio_modules_ims_dialog?     ( kamailio_modules_tm kamailio_modules_rr )
+        kamailio_modules_ims_icscf?      ( kamailio_modules_tm kamailio_modules_sl kamailio_modules_cdp kamailio_modules_cdp_avp )
+        kamailio_modules_ims_isc?        ( kamailio_modules_tm kamailio_modules_ims_usrloc_scscf )
+        kamailio_modules_ims_qos?        ( kamailio_modules_dialog_ng kamailio_modules_ims_usrloc_pcscf kamailio_modules_tm kamailio_modules_cdp kamailio_modules_cdp_avp )
+        kamailio_modules_ims_registrar_scscf?    ( kamailio_modules_cdp kamailio_modules_cdp_avp kamailio_modules_tm kamailio_modules_ims_usrloc_scscf )
+        kamailio_modules_ims_registrar_pcscf?    ( kamailio_modules_cdp kamailio_modules_cdp_avp kamailio_modules_tm kamailio_modules_ims_usrloc_pcscf )
+        kamailio_modules_imc?            ( kamailio_modules_db_mysql kamailio_modules_tm )
+        kamailio_modules_janssonrpc-c?   ( kamailio_modules_jansson kamailio_modules_tm )
+        kamailio_modules_jsonrpc-c?      ( kamailio_modules_tm )
+        kamailio_modules_jsonrpc-s?      ( kamailio_modules_xhttp )
+        kamailio_modules_lcr?            ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_mediaproxy?     ( kamailio_modules_dialog )
+        kamailio_modules_mohqueue?       ( kamailio_modules_tm kamailio_modules_sl kamailio_modules_rtpproxy || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_msilo?          ( kamailio_modules_tm || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_mtree?          ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_nathelper?      ( kamailio_modules_usrloc )
+        kamailio_modules_nat_traversal?  ( kamailio_modules_sl kamailio_modules_tm kamailio_modules_dialog )
+        kamailio_modules_osp?            ( kamailio_modules_sl kamailio_modules_tm kamailio_modules_rr kamailio_modules_textops kamailio_modules_siputils )
+        kamailio_modules_p_usrloc?       ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_path?           ( kamailio_modules_rr kamailio_modules_outbound )
+        kamailio_modules_pdt?            ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_pipelimit?      ( kamailio_modules_sl || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_presence?       ( kamailio_modules_sl kamailio_modules_tm || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_presence_conference?    ( kamailio_modules_presence )
+        kamailio_modules_presence_dialoginfo?    ( kamailio_modules_presence )
+        kamailio_modules_presence_mwi?   ( kamailio_modules_presence )
+        kamailio_modules_presence_profile?       ( kamailio_modules_presence )
+        kamailio_modules_presence_xml?   ( kamailio_modules_presence kamailio_modules_sl kamailio_modules_xcap_client || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_presence_reginfo?       ( kamailio_modules_presence )
+        kamailio_modules_pua?            ( kamailio_modules_tm || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_pua_bla?        ( kamailio_modules_usrloc kamailio_modules_pua kamailio_modules_presence )
+        kamailio_modules_pua_dialoginfo? ( kamailio_modules_dialog kamailio_modules_pua )
+        kamailio_modules_pua_mi?         ( kamailio_modules_pua )
+        kamailio_modules_pua_reginfo?    ( kamailio_modules_pua kamailio_modules_usrloc )
+        kamailio_modules_pua_usrloc?     ( kamailio_modules_usrloc kamailio_modules_pua )
+        kamailio_modules_pua_xmpp?       ( kamailio_modules_presence kamailio_modules_pua kamailio_modules_xmpp )
+        kamailio_modules_purple?         ( kamailio_modules_presence kamailio_modules_pua || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_qos?            ( kamailio_modules_dialog )
+        kamailio_modules_ratelimit?      ( kamailio_modules_sl )
+        kamailio_modules_registrar?      ( kamailio_modules_usrloc kamailio_modules_sl )
+        kamailio_modules_rls?            ( kamailio_modules_tm kamailio_modules_sl kamailio_modules_presence kamailio_modules_pua || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_rr?             ( kamailio_modules_outbound )
+        kamailio_modules_rtjson?         ( kamailio_modules_tm kamailio_modules_uac )
+        kamailio_modules_rtpengine?      ( kamailio_modules_tm )
+        kamailio_modules_rtpproxy?       ( kamailio_modules_tm )
+        kamailio_modules_sanity?         ( kamailio_modules_sl )
+        kamailio_modules_sca?            ( kamailio_modules_sl kamailio_modules_tm || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_seas?           ( kamailio_modules_tm )
+        kamailio_modules_sipcapture?     ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_siptrace?       ( kamailio_modules_tm kamailio_modules_sl || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_siputils?       ( kamailio_modules_sl )
+        kamailio_modules_sms?            ( kamailio_modules_tm )
+        kamailio_modules_snmpstats?      ( kamailio_modules_usrloc || ( kamailio_modules_dialog kamailio_modules_dialog_ng ) )
+        kamailio_modules_speeddial?      ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_sqlops?         ( || ( kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_unixodbc ) )
+        kamailio_modules_sst?            ( kamailio_modules_sl || ( kamailio_modules_dialog kamailio_modules_dialog_ng ) )
+        kamailio_modules_tmx?            ( kamailio_modules_tm )
+        kamailio_modules_topoh?          ( kamailio_modules_rr )
+        kamailio_modules_topos?          ( kamailio_modules_rr || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_tsilo?          ( kamailio_modules_registrar kamailio_modules_tm kamailio_modules_usrloc kamailio_modules_sl )
+        kamailio_modules_uac?            ( kamailio_modules_tm kamailio_modules_rr kamailio_modules_dialog )
+        kamailio_modules_uac_redirect?   ( kamailio_modules_tm kamailio_modules_acc )
+        kamailio_modules_auth_db?        ( kamailio_modules_auth || ( kamailio_modules_db_mysql kamailio_modules_db_postgres kamailio_modules_db_text ) )
+        kamailio_modules_uri_db?         ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_userblacklist?  ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_usrloc?         ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_utils?          ( || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_websocket?      ( kamailio_modules_sl kamailio_modules_tm kamailio_modules_msrp || ( kamailio_modules_nathelper kamailio_modules_outbound ) )
+        kamailio_modules_xcap_server?    ( kamailio_modules_sl kamailio_modules_xhttp || ( kamailio_modules_db_berkeley kamailio_modules_db_cassandra kamailio_modules_db_cluster kamailio_modules_db_flatstore kamailio_modules_db_mongodb kamailio_modules_db_mysql kamailio_modules_db_oracle kamailio_modules_db_perlvdb kamailio_modules_db_postgres kamailio_modules_db_sqlite kamailio_modules_db_text kamailio_modules_db_unixodbc ) )
+        kamailio_modules_xhttp?          ( kamailio_modules_sl )
+        kamailio_modules_xhttp_pi?       ( kamailio_modules_xhttp )
+        kamailio_modules_xhttp_rpc?      ( kamailio_modules_xhttp )
+        kamailio_modules_xlog?           ( kamailio_modules_pv )
+        kamailio_modules_xmlrpc?         ( kamailio_modules_sl )
+        kamailio_modules_xmpp?           ( kamailio_modules_tm )
+"
+
+DEPEND="app-text/docbook2X
+	kamailio_modules_acc? 		( >=net-dialup/radiusclient-ng-0.5.0 )
+	kamailio_modules_app_java?	( >=virtual/jdk-1.6
+					  dev-java/gcj-jdk )
+	kamailio_modules_app_lua?	( dev-lang/lua )
+	kamailio_modules_app_mono?	( dev-lang/mono )
+	kamailio_modules_app_perl?	( dev-lang/perl
+					  dev-perl/perl-ldap
+					  dev-perl/IPC-Shareable )
+	kamailio_modules_app_python?	( dev-lang/python:2.7 )
+	kamailio_modules_auth_ephemeral?	( dev-libs/openssl )
+	kamailio_modules_auth_identity?	( >dev-libs/openssl-0.9.8
+					  net-misc/curl )
+	kamailio_modules_auth_radius?	( >=net-dialup/radiusclient-ng-0.5.0 )
+	kamailio_modules_carrierroute?	( dev-libs/confuse )
+	kamailio_modules_cnxcc?		( dev-libs/hiredis
+					  dev-libs/libevent )
+	kamailio_modules_cpl-c?		( dev-libs/libxml2 )
+	kamailio_modules_crypto?	( dev-libs/openssl )
+	kamailio_modules_db_berkeley?	( sys-libs/db )
+	kamailio_modules_db_cassandra?	( dev-libs/thrift )
+	kamailio_modules_db_mongodb?	( dev-libs/mongo-c-driver )
+	kamailio_modules_db_mysql?	( virtual/libmysqlclient )
+	kamailio_modules_db_unixodbc?	( dev-db/unixODBC )
+	kamailio_modules_db_oracle?	( dev-db/oracle-instantclient )
+	kamailio_modules_db_postgres?	( dev-db/postgresql )
+	kamailio_modules_db_sqlite?	( dev-db/sqlite:3[tools] )
+	kamailio_modules_dialplan?	( dev-libs/libpcre )
+	kamailio_modules_dnssec?	( net-dns/dnssec-tools )
+	kamailio_modules_erlang?	( dev-lang/erlang )
+	kamailio_modules_evapi?		( dev-libs/libev )
+	kamailio_modules_geoip?		( dev-libs/geoip )
+	kamailio_modules_geoip2?	( dev-libs/libmaxminddb )
+	kamailio_modules_gzcompress?	( sys-libs/zlib )
+	kamailio_modules_h350?		( net-nds/openldap )
+	kamailio_modules_http_client?	( net-misc/curl )
+	kamailio_modules_http_async_client?	( net-misc/curl
+						  dev-libs/libev )
+	kamailio_modules_ims_registrar_scscf?	( dev-libs/libxml2 )
+	kamailio_modules_jansson?	( dev-libs/jansson )
+	kamailio_modules_janssonrpc-c?	( dev-libs/jansson
+					  dev-libs/libevent )
+	kamailio_modules_json?		( dev-libs/json-c )
+	kamailio_modules_jsonrpc-c?	( dev-libs/json-c
+					  dev-libs/libevent
+					  sys-libs/glibc )
+	kamailio_modules_kazoo?		( dev-libs/json-c
+					  net-misc/rabbitmq-server
+					  dev-erlang/uuid )
+	kamailio_modules_lcr?		( dev-libs/libpcre )
+	kamailio_modules_ldap?		( net-nds/openldap )
+	kamailio_modules_log_systemd?	( sys-apps/systemd )
+	kamailio_modules_mediaproxy?	( net-proxy/mediaproxy )
+	kamailio_modules_memcached?	( dev-libs/libmemcached
+					  net-misc/memcached )
+	kamailio_modules_misc_radius?	( >=net-dialup/radiusclient-ng-0.5.0 )
+	kamailio_modules_mi_xmlrpc?	( dev-libs/libxml2
+					  dev-libs/xmlrpc-c[abyss] )
+	kamailio_modules_ndb_cassandra?	( dev-libs/thrift )
+	kamailio_modules_ndb_mongodb?	( dev-libs/mongo-c-driver )
+	kamailio_modules_ndb_redis?	( dev-libs/hiredis )
+	kamailio_modules_osp?		( net-libs/osptoolkit )
+	kamailio_modules_outbound?	( dev-libs/openssl )
+	kamailio_modules_peering?	( >=net-dialup/radiusclient-ng-0.5.0 )
+	kamailio_modules_presence?	( dev-libs/libxml2 )
+	kamailio_modules_presence_conference?	( dev-libs/libxml2 )
+	kamailio_modules_presence_xml?	( dev-libs/libxml2 )
+	kamailio_modules_pua?		( dev-libs/libxml2 )
+	kamailio_modules_pua_bla?	( dev-libs/libxml2 )
+	kamailio_modules_pua_dialoginfo?	( dev-libs/libxml2 )
+	kamailio_modules_pua_usrloc?	( dev-libs/libxml2 )
+	kamailio_modules_pua_xmpp?	( dev-libs/libxml2 )
+	kamailio_modules_purple?		( net-im/pidgin )
+	kamailio_modules_regex?		( dev-libs/libpcre )
+	kamailio_modules_rls?		( dev-libs/libxml2 )
+	kamailio_modules_sctp?		( net-misc/lksctp-tools )
+	kamailio_modules_snmpstats?	( net-analyzer/net-snmp )
+	kamailio_modules_utils?		( net-misc/curl )
+	kamailio_modules_uuid?		( dev-libs/ossp-uuid )
+	kamailio_modules_websocket?	( dev-libs/openssl
+					  dev-libs/libunistring )
+	kamailio_modules_xcap_client?	( net-misc/curl
+					  dev-libs/libxml2 )
+	kamailio_modules_xcap_server?	( dev-libs/libxml2 )
+	kamailio_modules_xhttp_pi?	( dev-libs/libxml2 )
+	kamailio_modules_xmlops?	( dev-libs/libxml2 )
+	kamailio_modules_xmlrpc?	( dev-libs/expat )
+"
+
+RDEPEND="${DEPEND}
+	>=sys-devel/bison-1.35
+	>=sys-devel/flex-2.5.4a
+	>=sys-libs/ncurses-5.7
+	>=sys-libs/readline-6.1_p2
+"
+
+pkg_setup() {
+        use kamailio_modules_app_python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+        cd "${S}"
+        for i in ${IUSE_KAMAILIO_MODULES};
+	do
+	if use $i; then
+		KAMODULES="${KAMODULES} $(echo $i | sed -e 's/kamailio_modules_//g')"
+	else
+		EXCMODULES="${EXCMODULES} $(echo $i | sed -e 's/kamailio_modules_//g')"
+	fi
+	done
+
+	KAMODULES=${KAMODULES:1}
+	EXCMODULES=${EXCMODULES:1}
+
+	if use kamailio_modules_tls; then
+		tls_hooks=1
+	else
+		tls_hooks=0
+	fi
+
+	if use debug; then
+		mode=debug
+	else
+		mode=release
+	fi
+
+	if use kamailio_modules_sctp; then
+		sctp=1
+	else
+		sctp=0
+	fi
+
+	emake \
+		prefix="/" \
+		include_modules="${KAMODULES}" \
+		exclude_modules="${EXCMODULES}" \
+		SCTP="${sctp}" \
+		mode="${mode}" \
+		TLS_HOOKS="${tls_hooks}" \
+		cfg_prefix="${D}" \
+                cfg_dir="/etc/${PN}/" \
+                cfg_target="/etc/${PN}/" \
+                mode="release" \
+                doc_dir="share/doc/${P}/" \
+		cfg
+}
+
+src_compile() {
+        use amd64 && append-cflags "-fPIC"
+        emake \
+                CC="$(tc-getCC)" \
+                CPU_TYPE="$(get-flag march)" \
+                all || die
+}
+
+src_install () {
+        emake \
+		BASEDIR="${D}" \
+		prefix="/" \
+		bin_dir=/usr/sbin/ \
+		cfg_dir=/etc/${PN}/ \
+		lib_dir=/usr/$(get_libdir)/${PN}/ \
+		modules_dir="/usr/$(get_libdir)/${PN}/" \
+		man_dir="/usr/share/man/" \
+		doc_dir="/usr/share/doc/${flavour}/" \
+		share_dir="/usr/share/${flavour}/" \
+		data_dir="/usr/share/${flavour}/" \
+                install || die
+}
+
+pkg_preinst() {
+        ebegin "Creating ${PN} user and group"
+        enewgroup ${PN}
+	enewuser  ${PN} -1 -1 /var/run/${PN} ${PN}
+        eend $?
+
+        chown -R root:${PN}  ${D}/etc/${PN}
+        chmod -R u=rwX,g=rX,o= ${D}/etc/${PN}
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+        insinto /etc/default
+        newins "${FILESDIR}/${PN}.default" ${PN}
+}
+
+pkg_postinst() {
+        ewarn "**************************** Warning! ******************************"
+        ewarn "Preliminary ebuild - Use with caution"
+        ewarn "**************************** Warning! ******************************"
+}

From c309992bc45003e60f485ef304a249d7f98faa49 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 19 Oct 2016 20:55:48 -0700
Subject: [PATCH 219/261] working kamailio

---
 net-misc/kamailio/Manifest              |  6 ++---
 net-misc/kamailio/files/ser.confd       | 16 ------------
 net-misc/kamailio/files/ser.initd       | 34 -------------------------
 net-misc/kamailio/kamailio-4.4.3.ebuild |  9 ++++---
 4 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 net-misc/kamailio/files/ser.confd
 delete mode 100644 net-misc/kamailio/files/ser.initd

diff --git a/net-misc/kamailio/Manifest b/net-misc/kamailio/Manifest
index f81b01c..80fc674 100644
--- a/net-misc/kamailio/Manifest
+++ b/net-misc/kamailio/Manifest
@@ -1,7 +1,7 @@
+AUX kamailio.confd 534 SHA256 7cddcc909ad9692ec4c82c69b69a62041bf80292a9b6c4dac297b19883159b50 SHA512 717ec01e3d052596c0587a3830152510244bedd2eb8aeee2eac2b3e560676c4f62b52f18ec2097781e09cab4885b62b979cd63cd650bdfbbe12300986b3818e5 WHIRLPOOL 101cced125343ac4b56ada9eb7f9eb43f9e3af2112a4e7c59cade53b47092f56338c51de4913d7326c64bc29448032dad3e9013255b21cc7fd362496da5f9145
 AUX kamailio.default 786 SHA256 41ac4d6de5e7b2a7cef34b717e1d89721df4041354c001f90359b266619313e2 SHA512 a305815955c8c8713de0a398471979f2c21a769d2f939573ce7a08a9a8a5432eebfb940213b3e5611ec54f8f8b46ee87e5e485ea8c2509ade9fe6ca013fe62be WHIRLPOOL 1c265ee3328777fd20cb95e1d1c2ce19a0cb883b6af830e08255c8d43ad0b85d08c454d64fa05175c5bce062a7b363edde11da828ad88aef963ba789e74ed706
+AUX kamailio.initd 858 SHA256 f3276ac521ab5f0bbbc4d908651e0019540247db9d00f043c414cb486bde5c23 SHA512 d1bcbf1f0af1ddde410f724a7fd6b80142e15870db4b5961be2e017ab702da0fff1bec2508cd304b217af3bfb5dea0bf6368f087d207e90373fd0f99a4144687 WHIRLPOOL 257b0b4b7f0a8196d62e85886586223df211ee19ee9a46318bd4b5bf0a22aab91f3b941469512782f7d4d56fa2071ae9ad79e92e09c9e5033c1fa6c58fac81b7
 AUX kamailio.service 655 SHA256 096b7abbfaad568cc214e2b02f5b42ea75dadd7d524f9d14e33e8c1ba23ce782 SHA512 2c85b9ff19d50da54c180ca0735804b61c739104608c8168820c8a23f495b1eac4e60a6ce576e3079c701399ac776ba62b76523e08781274c912e7cc78eaebf6 WHIRLPOOL 9e3254031fbd37b96f3e0b92e5550951453d18bab2a0e4e052a1abbc6539790cfc20d39f164017b055e1a14f41132ee1f47d9320584de600425f568da4a1e86e
-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
@@ -15,5 +15,5 @@ EBUILD kamailio-3.2.3.ebuild 8115 SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b4526
 EBUILD kamailio-3.2.4.ebuild 8155 SHA256 4efbbf1cea7d46f065947869723db90dc43453b6451b6830dcf5f5363a3ff5b8 SHA512 2c20dfdee22e54f8a429e4aedcc7c0771c2e03b53a7632a11fdc47335d81ed33fc89070d22775c7cba68f7874fec97ac8441338b44f62be30654092ac0f239af WHIRLPOOL 53a960bc2d8bbd3a1a0a4fc3eee5ded932fd2576b57f12e1030a58913aeab2b61e089a23849c5b65afb41abd299cb7aa9496db343a6f472fc5438de27ef7f67c
 EBUILD kamailio-3.3.1.ebuild 8327 SHA256 12ab91b617bda58321dfa4d256628f533e299bd78632f7617a1ee7d35800f416 SHA512 d1aba8330182465234f7d64969a64fd412fb1866c22b51ae02b7866aa1936eb2fbe462aa8f43379e1ae19b38e973d9e8663f1faf0412566ca776b6e214423442 WHIRLPOOL f8fb38968d94576f8191dbafdda2c0709511b7f98ae24b3855e53990c55abacb98cbca3bd6c1440656cc41ee5d81e9b57c0765fbaa2ca413d9ce98438ec7207b
 EBUILD kamailio-3.3.2.ebuild 8327 SHA256 12ab91b617bda58321dfa4d256628f533e299bd78632f7617a1ee7d35800f416 SHA512 d1aba8330182465234f7d64969a64fd412fb1866c22b51ae02b7866aa1936eb2fbe462aa8f43379e1ae19b38e973d9e8663f1faf0412566ca776b6e214423442 WHIRLPOOL f8fb38968d94576f8191dbafdda2c0709511b7f98ae24b3855e53990c55abacb98cbca3bd6c1440656cc41ee5d81e9b57c0765fbaa2ca413d9ce98438ec7207b
-EBUILD kamailio-4.4.3.ebuild 32769 SHA256 3a5cb6ad5f531cf69a4209cbe840974897102f156a07ef435ad7dab3b317be19 SHA512 666170119b7ed275053888499d2c3c6af78675480720b3650ce242094330bf6ad73d7b6cb8431a10e0992d36cedc7521ed3d228e08589dfc39375dab48f52f7b WHIRLPOOL 0ede2460d2765becdcdaece6ffd1f336609a533a0c19554a2ea235332582fe68e718cba693ff61e2fe5c28b646279712216f8e8ef03da82b2e3eb3fd14fa3c1c
+EBUILD kamailio-4.4.3.ebuild 32751 SHA256 0dd00beaebfca7a4bb7fcf1c1b43c9582989ed0909840668568e7875b0e58491 SHA512 f4b2b9344f02e76c9d3fa9259e5630486af2368c5f0f8983e71e35f1a997bdb542bf141837988834db4b9e77e86969100499bc4d5a5e4524bba6f76b5f810fbb WHIRLPOOL 69d6faf41e8dc972becb35d3ded3b64e9fb55aefa367cdfef99a3120da4cf70a04e67af7bbc4edee9244d4e92198f741c01975069637c61fd0d67ec27bb0ae92
 MISC ChangeLog 2480 SHA256 a8bdaddc1f1f468f25499b534236fae5980466ba0333a3aaad7fd8b406f37f9d SHA512 2fc633bfbf0363822764121de7f1dda66c2264ee122ff0843b7647b84b25ad45a04fd0ce3797d84883b35defbf525b17bd67d6b4afd33cdbcff4e22dcda5d7c5 WHIRLPOOL bec2be2ad6cecadadde47f8767d4640ceaae06fc6698fb12b27c174c27c5305199cf2de7c9b277ae53adc629043a5a3dce87e3617e103000b4991e1f2914f400
diff --git a/net-misc/kamailio/files/ser.confd b/net-misc/kamailio/files/ser.confd
deleted file mode 100644
index 4b1f248..0000000
--- a/net-misc/kamailio/files/ser.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Additional options to start Sip-Router with.
-#
-# see "sip-router -h" for a list of options
-#
-# default: run SER as user:group = ser:ser
-#
-MAIN_NAME="sip-router"
-SR_USER="sip-router"
-SR_GROUP="sip-router"
-CONFIGFILE="${CONFIGFILE:-/etc/${MAIN_NAME}/sip-router.cfg}"
-CONFIGDEFS="" # eg: "-A WITH_DEBUG -A WITH_NAT -A WITH_TLS"
-SR_OPTS="-u $SR_USER -g $SR_GROUP -f ${CONFIGFILE} ${CONFIGDEFS}"
diff --git a/net-misc/kamailio/files/ser.initd b/net-misc/kamailio/files/ser.initd
deleted file mode 100644
index 99d0fbe..0000000
--- a/net-misc/kamailio/files/ser.initd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-check_config() {
-	out=`(/usr/sbin/sip-router -f ${CONFIGFILE} -c > /dev/null || true) 2>&1`
-	echo "$out" | grep -q 'config file ok, exiting...'
-	if [ "$?" == 1 ]; then
-		echo -e "There are errors in the configuration. Please fix them first"
-		echo -e "\n$out\n"
-		return 1
-	fi
-}
-
-start() {
-	check_config || return 1
-	ebegin "Starting sip-router"
-	start-stop-daemon --start --quiet --pidfile /var/run/sip-router.pid \
-		--exec /usr/sbin/sip-router -- -P /var/run/sip-router.pid \
-                ${SR_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sip-router"
-	start-stop-daemon --stop --quiet --pidfile /var/run/sip-router.pid
-	eend $?
-}
-
diff --git a/net-misc/kamailio/kamailio-4.4.3.ebuild b/net-misc/kamailio/kamailio-4.4.3.ebuild
index 2e278dd..931cf14 100644
--- a/net-misc/kamailio/kamailio-4.4.3.ebuild
+++ b/net-misc/kamailio/kamailio-4.4.3.ebuild
@@ -330,6 +330,11 @@ src_install () {
 		share_dir="/usr/share/${flavour}/" \
 		data_dir="/usr/share/${flavour}/" \
                 install || die
+
+
+        newinitd ${FILESDIR}/"${PN}".initd "${PN}"
+        newconfd ${FILESDIR}/"${PN}".confd "${PN}"
+
 }
 
 pkg_preinst() {
@@ -341,10 +346,6 @@ pkg_preinst() {
         chown -R root:${PN}  ${D}/etc/${PN}
         chmod -R u=rwX,g=rX,o= ${D}/etc/${PN}
 
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-        insinto /etc/default
-        newins "${FILESDIR}/${PN}.default" ${PN}
 }
 
 pkg_postinst() {

From e36f7f97132c007afdf7c6e3b89d68c8b7cef33e Mon Sep 17 00:00:00 2001
From: root <root@webnode10.safesoftsolutions.com>
Date: Wed, 19 Oct 2016 22:49:41 -0700
Subject: [PATCH 220/261] yipppy

---
 app-emulation/xe-guest-utilities/ChangeLog    |  69 ++++++++++
 .../xe-guest-utilities/ChangeLog-2015         |  18 +++
 app-emulation/xe-guest-utilities/Manifest     |  16 +++
 .../xe-guest-utilities/files/xe-daemon.initd  |  28 ++++
 ...-guest-utilities-5.6.100_p651-gentoo.patch |  35 +++++
 ...ties-5.6.100_p651-update-guest-attrs.patch |  11 ++
 ...ilities-6.2.0_p1120-Guest-Attributes.patch | 127 ++++++++++++++++++
 ...ities-6.2.0_p1120-Linux-Distribution.patch |  77 +++++++++++
 app-emulation/xe-guest-utilities/metadata.xml |  19 +++
 .../xe-guest-utilities-5.6.0_p595.ebuild      |  57 ++++++++
 .../xe-guest-utilities-6.1.0_p1033.ebuild     |  57 ++++++++
 .../xe-guest-utilities-6.2.0_p1120.ebuild     |  57 ++++++++
 .../xe-guest-utilities-7.0.0.ebuild           |  52 +++++++
 13 files changed, 623 insertions(+)
 create mode 100644 app-emulation/xe-guest-utilities/ChangeLog
 create mode 100644 app-emulation/xe-guest-utilities/ChangeLog-2015
 create mode 100644 app-emulation/xe-guest-utilities/Manifest
 create mode 100644 app-emulation/xe-guest-utilities/files/xe-daemon.initd
 create mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch
 create mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch
 create mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
 create mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
 create mode 100644 app-emulation/xe-guest-utilities/metadata.xml
 create mode 100644 app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
 create mode 100644 app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
 create mode 100644 app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
 create mode 100644 app-emulation/xe-guest-utilities/xe-guest-utilities-7.0.0.ebuild

diff --git a/app-emulation/xe-guest-utilities/ChangeLog b/app-emulation/xe-guest-utilities/ChangeLog
new file mode 100644
index 0000000..709febf
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/ChangeLog
@@ -0,0 +1,69 @@
+# ChangeLog for app-emulation/xe-guest-utilities
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*xe-guest-utilities-6.2.0_p1120 (09 Aug 2015)
+*xe-guest-utilities-6.1.0_p1033 (09 Aug 2015)
+*xe-guest-utilities-5.6.0_p595 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +files/xe-daemon.initd,
+  +files/xe-guest-utilities-5.6.100_p651-gentoo.patch,
+  +files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch,
+  +files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch,
+  +files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch,
+  +metadata.xml, +xe-guest-utilities-5.6.0_p595.ebuild,
+  +xe-guest-utilities-6.1.0_p1033.ebuild,
+  +xe-guest-utilities-6.2.0_p1120.ebuild:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+  29 Oct 2015; Ian Delaney <idella4@gentoo.org> metadata.xml:
+  update maintainer's email address in metadata
+
+  Package-Manager: portage-2.2.23
+
diff --git a/app-emulation/xe-guest-utilities/ChangeLog-2015 b/app-emulation/xe-guest-utilities/ChangeLog-2015
new file mode 100644
index 0000000..bc3d551
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/ChangeLog-2015
@@ -0,0 +1,18 @@
+# ChangeLog for app-emulation/xe-guest-utilities
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xe-guest-utilities/ChangeLog,v 1.1 2014/06/23 14:30:35 robbat2 Exp $
+
+*xe-guest-utilities-5.6.0_p595 (23 Jun 2014)
+*xe-guest-utilities-6.1.0_p1033 (23 Jun 2014)
+*xe-guest-utilities-6.2.0_p1120 (23 Jun 2014)
+
+  23 Jun 2014; Robin H. Johnson <robbat2@gentoo.org> +files/xe-daemon.initd,
+  +files/xe-guest-utilities-5.6.100_p651-gentoo.patch,
+  +files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch,
+  +files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch,
+  +files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch, +metadata.xml,
+  +xe-guest-utilities-5.6.0_p595.ebuild, +xe-guest-utilities-6.1.0_p1033.ebuild,
+  +xe-guest-utilities-6.2.0_p1120.ebuild:
+  Initial commit, based off Chris Camisa's work in his OpenStack overlay:
+  https://github.com/Camisa/OpenStack-Overlay/tree/master/sys-cluster/xe-guest-
+  utilities; I intend to proxy further commits from him.
diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
new file mode 100644
index 0000000..4148b06
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -0,0 +1,16 @@
+AUX xe-daemon.initd 634 SHA256 24728f20907958c340e11d90bb8c0b69b968a1c68a2ed07bf7f04b8f04f96bc2 SHA512 0e94efd92d8a379f09e513d610c0ea140a4efd6108a9c65e2f10a2897c87787147314ae55d588f23a0c125474a3b4939b8f12583505ee9203dd0b1b12f57eb74 WHIRLPOOL dcf0bbcff83555452dbc1280d8a06ef712cece95735e52d215266b087f3bcc6c9aae08e72e2cfb88c92878855d0c792d30526277b61ba78951bcafb98d568aa2
+AUX xe-guest-utilities-5.6.100_p651-gentoo.patch 1004 SHA256 54a97383693c3b0802370594509142b3bd9701f8b8d82ee0139177042284e89a SHA512 c420d4304f749ef4c52a56ba8fb08b4979dc1334d32cc22793afe39f3494bda66dc291970474c1aa1345179e60399f37dcf82b09e7e408ad772bfd214bf9e0ed WHIRLPOOL 8edfe92d6e72ffb9b65c67f2d8cc7d52b424c08b6d80fa833905ba7898b693741e2a72e645f4919058fb899810068caeb70bfaec7b4fd7b9772a5561824a6a1f
+AUX xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch 558 SHA256 e2047e6164e1d5fd1d97922933f837fddb5b7f1183f3b29b4f14ba65baa8dddc SHA512 84fb3d8f231e9597616770960e6c0bae8a4bed2d165dd185cccbd6b64d72836f2271d17574f8cbf524e39c0090a7d5a6f646959d214c38d3074e930fde2e9852 WHIRLPOOL 9d42bd7f496963b02e60fdaeb83ec075944f23c5a609add89c844c4b891cb205043a241f584e450f27f4c75f352b4178992b44b97bf390ae04d5220b20a6ac75
+AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 SHA256 aebe218113a450711013535133a0da2eac5d4adc52bac925b790cf2e1c9f2feb SHA512 c9147d9a93b45d7300441b6c398c27bf3c38d39c0a6908f80a2708b8c26329c9b138522ca3b7ae7b4af2ace3b43ededda03dd39b9c8cafd31dbe32beae739690 WHIRLPOOL 6d16a2a3cab647bf1be5b99ed334be2c203bfddfaa5696d6da73f315f2b6afaacf6d2272913f608f251d38911aec14391bda87344fb8b9acfc8da82c0cae70a8
+AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 SHA256 4a8838b003a6144de5581fc33453721beaf7ef28f3d328212a21e21af4916bf1 SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de WHIRLPOOL 23cd7e7182638f4ff7924e2f1f16b4b35938cecd678e2fd28c7d37dc900eb420e56b758f3e4a74c0842a335314b947be17661e800e05d254f3096c00a0e05ef8
+DIST xe-guest-utilities-5.6.0-595.src.rpm 454569 SHA256 88082b9703b7af5eda345b471bef9f2a8a4bdc0ab6acc7e6b6a623a9d03e4516 SHA512 967f7708f074f4382c95a823e24dcf07c677e44d75a97e57078d63284584c85d2acf24e0a4b58ec2f26ba034ccaa1baad5793391f736fa4d72c04f7511bd78aa WHIRLPOOL cac2562b598ca49dfacd5146197f293b14fed56038275e1af1253dd299dab6d67dd413fda17de6fa872657fc49d1b1bdfdddd976d5d78df50db61d1f4b94e752
+DIST xe-guest-utilities-6.1.0-1033.src.rpm 554621 SHA256 a9b210dc8a7e9a2efc13bc2db3459242dba509df1b5468e7fa48ac3fe801d594 SHA512 65ab85974fb5e73619aa3bac22c861cf989d6256e4f856da3c14767a0e8fe8f1c34713db32166c6f901c589e61f2fcc3c285bd8eded4925daa829e4adb07e9e2 WHIRLPOOL 6a4af1bd3c50650a71d28c8f6b00231da30c6db2bd424485ae0cba5edf51b22ef78890f40f34c2bb85e6597feca11cc7a858415e69eb090ce779d275949bd45d
+DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 SHA256 8aabd8770a69684b9f5ab601f7e2b204763c3ab2c71f1e9c60a5374ebdad11e1 SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880 WHIRLPOOL 80b2612d4db43ef6c43282b283eb9f8cb74517e02f1473e93bb2a62e02c65adfae09459805aa98577e8548727d1adb5b43d1f30d7280e178cd713e994a67a7a3
+DIST xe-guest-utilities-7.0.0-24.x86_64.rpm 693247 SHA256 410200274dfb25289af15569071a77f6ae527aef5de6277a7831913234aa94de SHA512 2a12e66d7901e1d4a83fe6f1165fe0c7c882a2036cd4d1d5e46bceeaeffb33222f7e61f4ccf020d56d45f465a8dd455b2895141d8071c5ecc3598c7209aebb24 WHIRLPOOL 53c8a4e692e29b25c25b45d0dcc95a79f6091f54c36d093f50593049e756727e6bfda878191d855f79eb7e3dc40b285fe567f4c4832a1c4680f5609d6cc4d51d
+EBUILD xe-guest-utilities-5.6.0_p595.ebuild 1496 SHA256 f6e37b6a1d2ab9359acabce626534c197bffe08ec6bec0498c188837a3cf2ee5 SHA512 aeac86133278d690682e1557bb9378d3e0a051c99d91db254f010295793758df7cd91ee198790f45638ee3cebf703be7d1659ceecf4187085596cd28616fbc0b WHIRLPOOL 532150094ec2f56b16d9a581e4879dd89b667b2b53869b67d229344d76c459d8a8c0732b9f4d7e10ad21a8546eaf5835f8c21b69e5c42bda09dd37753bb7424a
+EBUILD xe-guest-utilities-6.1.0_p1033.ebuild 1504 SHA256 1570e93c385af564f9f3fe16c57249e379650724a1a83740306eac5938f44f32 SHA512 11106fda3887ec6671a42f681bad66f61dd8399258ec332dd6cf147e15b1e66c62813c33e824c79120ebe7a3449e888cc8fbd2abf92938a2e8ff0d408a2d8ac5 WHIRLPOOL e14ea7f43d4c090c7b18d037d33ae08d6e6d56b4cda0432eceedee892a8e8b1b45aee0ce2ff43a1b8e121b9546c4f8e6c2fcf6e0570a9ac2c51ed1de1c0c95e6
+EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1504 SHA256 1570e93c385af564f9f3fe16c57249e379650724a1a83740306eac5938f44f32 SHA512 11106fda3887ec6671a42f681bad66f61dd8399258ec332dd6cf147e15b1e66c62813c33e824c79120ebe7a3449e888cc8fbd2abf92938a2e8ff0d408a2d8ac5 WHIRLPOOL e14ea7f43d4c090c7b18d037d33ae08d6e6d56b4cda0432eceedee892a8e8b1b45aee0ce2ff43a1b8e121b9546c4f8e6c2fcf6e0570a9ac2c51ed1de1c0c95e6
+EBUILD xe-guest-utilities-7.0.0.ebuild 1369 SHA256 1d391aea583439c8d33151bb703e61ca2dd4230c50bbcdad5304d3661e6948c2 SHA512 143e4ddcb31544e00a6a6f6b73565068830eb6ba5fbed51582cdf6fd204db990ebf6837a8c40ec91f300bfd9b75e53ad662b423e864e419c5dd1bca83e8d9ff1 WHIRLPOOL 3023515c13e752e7f278eae4cc214babcb9f0549f9f201806551adf822c5b2afe14ae34613ce268ebd377f337b803eb1d96862fda9b5f0cb5abffc538a2a96f1
+MISC ChangeLog 2696 SHA256 8c5b0079eb8115db5276bc29dc38c009f2032f51106d24882143516803d0ec9c SHA512 202284381279fa0ea7acb12574610965212a5e52216564aafb4f4d15d0164c2f989a6ac34f7085e7d4da31a60d5d7fe0827eda7b91f356c2e9fc718f172b2607 WHIRLPOOL 889ef8e1e79d9e1f4449376c2e85aa58f165f88507a22e4d87728da47e61660d5924f6817573e98343bab921b8af41dfc584c59dd8bb7094f67ccf0c78855bad
+MISC ChangeLog-2015 1054 SHA256 f3fdeb5e5e41004f87de79c012e0c0553fdd6d2c2b636a18da3ee2ad6e118f6b SHA512 bf5de07fd7f6211cfc1363cdcf683277b737ae9d7b374c3f7cdbca1dc0dd08b17f2d5c3085db41fc921f7da70040d63965cfc690be31889d7b7a9d47a6f672d4 WHIRLPOOL d3a5ba97a27b6ec18afce7a690af4ce7f5b9ba1ce9a2f1dcf9d41419cf32fbfe2dff075d6cad4c01ad9dfd9ec5714a2ab0727b976b77f14fc2fab12f64c8da77
+MISC metadata.xml 603 SHA256 e1d1b0ce616e7b1c95f1948769611ec2dec7fba14fbb076d197ccc1f285b13cf SHA512 056a2483a5903f4aa7e447bc68dffb6dfbc54a41a8989689103a1f3d16fb5da552500c8dec1712461789a60676734509d4e12f8aeadb9ab228c783de6c543092 WHIRLPOOL 8aa909cc6ef8ba9b74df6701197817d5618fee69b22104604da6b292a3110045443706da1bafb5e8c150c7ef8be8df93accac9845defb9e71fe6c5c4f0d3d51b
diff --git a/app-emulation/xe-guest-utilities/files/xe-daemon.initd b/app-emulation/xe-guest-utilities/files/xe-daemon.initd
new file mode 100644
index 0000000..0ce568d
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-daemon.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+  need localmount
+  after bootmisc
+}
+
+start() {
+  einfo "Detecting Linux distribution version"
+  /usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution
+
+  ebegin "Starting xe daemon"
+  start-stop-daemon --start --exec /usr/sbin/xe-daemon \
+  --pidfile /var/run/xe-daemon.pid \
+  --background \
+  -- -p /var/run/xe-daemon.pid
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping xe daemon"
+  start-stop-daemon --stop --exec /usr/sbin/xe-daemon \
+  --pidfile /var/run/xe-daemon.pid
+  eend $?
+}
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch
new file mode 100644
index 0000000..ee9b86e
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch
@@ -0,0 +1,35 @@
+--- usr/sbin/xe-linux-distribution.orig	2011-04-18 10:56:30.000000000 -0500
++++ usr/sbin/xe-linux-distribution	2013-12-31 01:35:51.995831278 -0600
+@@ -249,6 +249,24 @@
+     write_to_output "${distro}" "${major}" "${minor}" "${description}"
+ }
+ 
++identify_gentoo()
++{
++	gentoo_release="$1"
++	if [ ! -e "${gentoo_release}" ] ; then
++		return 1
++	fi
++	distro="gentoo"
++	eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' )
++	if [ -z "${release}" ] ; then
++		return 1
++	fi
++	eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' )
++	if [ -z "${major}" -o -z "$minor" ] ; then
++		return 1
++	fi
++	write_to_output "${distro}" "${major}" "${minor}" "${distro}"
++}
++
+ if [ $# -eq 1 ] ; then
+     exec 1>"$1"
+ fi
+@@ -258,6 +276,7 @@
+     identify_sles   /etc/SuSE-release   && exit 0
+     identify_lsb    lsb_release         && exit 0
+     identify_debian /etc/debian_version && exit 0
++    identify_gentoo /etc/gentoo-release && exit 0
+ 
+     if [ $# -eq 1 ] ; then
+ 	rm -f "$1"
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch
new file mode 100644
index 0000000..c60994e
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch
@@ -0,0 +1,11 @@
+--- usr/sbin/xe-update-guest-attrs.orig	2011-04-18 10:56:30.000000000 -0500
++++ usr/sbin/xe-update-guest-attrs	2013-12-31 04:34:57.750083257 -0600
+@@ -172,7 +172,7 @@
+ #           collisions:0 txqueuelen:0 
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-eval $(/sbin/ifconfig | \
++eval $(/bin/ifconfig | \
+         sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
+                -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
+                -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
new file mode 100644
index 0000000..d431cdf
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
@@ -0,0 +1,127 @@
+--- usr/sbin/xe-update-guest-attrs.orig	2013-06-14 07:57:18.000000000 -0500
++++ usr/sbin/xe-update-guest-attrs	2014-04-19 13:38:14.627477193 -0500
+@@ -1,6 +1,7 @@
+ #!/bin/sh
+ 
+ # Copyright (C) 2009  Citrix Systems Inc.
++# Copyright (C) 2014  Christopher J. Camisa
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -51,10 +52,10 @@
+ 
+ # parse command line opts
+ 
+-MEMORY_MODE=0 # do not update memory stats 
+-while [ $# -ge 1 ] ; do 
++MEMORY_MODE=0 # do not update memory stats
++while [ $# -ge 1 ] ; do
+     if [ "$1" = "--memory" ] ; then
+-	MEMORY_MODE=1	# update only memory stats 
++	MEMORY_MODE=1	# update only memory stats
+     fi
+     shift
+ done
+@@ -71,12 +72,12 @@
+ 	fi
+     else
+ 	# cache does not exist
+-	if [ -e $cache ] ; then 
++	if [ -e $cache ] ; then
+ 	    # something (directory?) in its way
+ 	    rm -rf $cache
+ 	fi
+     fi
+-    
++
+     # try to write and update cache if successful
+     if $XENSTORE write "$key" "$newval" ; then
+ 	mkdir -p $(dirname "$cache")
+@@ -119,8 +120,8 @@
+ xenstore_list_interfaces_cached() {
+     topdir=$XS_CACHE/attr
+     if [ -d $topdir ] ; then
+-	cd $topdir 
+-	for dir in * ; do 
++	cd $topdir
++	for dir in * ; do
+ 	    [ -f $dir/ip ] && echo $dir
+ 	done
+     fi
+@@ -131,7 +132,7 @@
+     eval $(cat /proc/meminfo | \
+ 	sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \
+         -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;')
+-    
++
+     xenstore_write_cached "data/meminfo_total" "${memtotal}"
+     xenstore_write_cached "data/meminfo_free" "${memfree}"
+ fi
+@@ -140,17 +141,17 @@
+ 
+ # e.g.
+ # $ ip addr show
+-# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue 
++# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
+ #     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+ #     inet 127.0.0.1/8 scope host lo
+-#     inet6 ::1/128 scope host 
++#     inet6 ::1/128 scope host
+ #        valid_lft forever preferred_lft forever
+ # 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
+ #     link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff
+ #     inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0
+-#     inet6 fe80::213:20ff:fe95:e874/64 scope link 
++#     inet6 fe80::213:20ff:fe95:e874/64 scope link
+ #        valid_lft forever preferred_lft forever
+-# 3: sit0: <NOARP> mtu 1480 qdisc noop 
++# 3: sit0: <NOARP> mtu 1480 qdisc noop
+ #     link/sit 0.0.0.0 brd 0.0.0.0
+ 
+ #eval $(ip addr show | \
+@@ -158,26 +159,26 @@
+ #	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
+ 
+ # e.g.
+-# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74  
++# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74
+ #           inet addr:172.31.0.57  Bcast:172.31.15.255  Mask:255.255.240.0
+ #           inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link
+ #           UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+ #           RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0
+ #           TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0
+-#           collisions:0 txqueuelen:1000 
++#           collisions:0 txqueuelen:1000
+ #           RX bytes:35864034092 (33.4 GiB)  TX bytes:27544025180 (25.6 GiB)
+-#           Interrupt:177 
+-# 
+-# lo        Link encap:Local Loopback  
++#           Interrupt:177
++#
++# lo        Link encap:Local Loopback
+ #           inet addr:127.0.0.1  Mask:255.0.0.0
+ #           inet6 addr: ::1/128 Scope:Host
+ #           UP LOOPBACK RUNNING  MTU:16436  Metric:1
+ #           RX packets:32928 errors:0 dropped:0 overruns:0 frame:0
+ #           TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0
+-#           collisions:0 txqueuelen:0 
++#           collisions:0 txqueuelen:0
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \
++ifs=`/bin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \
+     -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \
+     -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \
+ while read tag value; do
+@@ -225,9 +226,9 @@
+ # build time addons
+ xenstore_write_cached "attr/PVAddons/MajorVersion" "6"
+ xenstore_write_cached "attr/PVAddons/MinorVersion" "2"
+-xenstore_write_cached "attr/PVAddons/MicroVersion" "0" 
++xenstore_write_cached "attr/PVAddons/MicroVersion" "0"
+ xenstore_write_cached "attr/PVAddons/BuildVersion" "70442"
+-xenstore_write_cached "attr/PVAddons/Installed" "1" 
++xenstore_write_cached "attr/PVAddons/Installed" "1"
+ 
+ # update xenstore if necessary
+ if [ $XENSTORE_UPDATED -eq 1 ] ; then
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
new file mode 100644
index 0000000..45b0bbc
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
@@ -0,0 +1,77 @@
+--- usr/sbin/xe-linux-distribution.orig	2013-06-14 07:57:18.000000000 -0500
++++ usr/sbin/xe-linux-distribution	2014-04-19 13:54:13.270477193 -0500
+@@ -1,6 +1,7 @@
+ #! /bin/sh
+ 
+ # Copyright (C) 2009  Citrix Systems Inc.
++# Copyright (C) 2014  Christopher J. Camisa
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -68,7 +69,7 @@
+     eval $(awk -F. '/^[0-9]*\.[0-9]*/ \
+                         { print "major="$1 ; print "minor="$2 ; exit 0 }' \
+                    "${debian_version}")
+-    
++
+     if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then
+ 	return 1
+     fi
+@@ -118,7 +119,7 @@
+     # Enterprise Linux Enterprise Linux Server release 5 (Carthage)
+     # Enterprise Linux Enterprise Linux Server release 5.5 (Carthage)
+     # Oracle Linux Server release 5.6
+-    
++
+     if [ ! -f "${redhat_release}" ] ; then
+ 	return 1
+     fi
+@@ -236,7 +237,7 @@
+     if [ ! -x "${lsb_release}" ] ; then
+ 	return 1
+     fi
+-    
++
+     distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z')
+     description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g')
+     release=$(${lsb_release} --short --release)
+@@ -254,6 +255,31 @@
+     write_to_output "${distro}" "${major}" "${minor}" "${description}"
+ }
+ 
++identify_gentoo()
++{
++    gentoo_release="$1"
++
++    if [ ! -e "${gentoo_release}" ] ; then
++	return 1
++    fi
++
++    distro="gentoo"
++
++    eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' )
++
++    if [ -z "${release}" ] ; then
++	return 1
++    fi
++
++    eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' )
++
++    if [ -z "${major}" -o -z "$minor" ] ; then
++	return 1
++    fi
++
++    write_to_output "${distro}" "${major}" "${minor}" "${distro}"
++}
++
+ if [ $# -eq 1 ] ; then
+     exec 1>"$1"
+ fi
+@@ -265,6 +291,7 @@
+     identify_sles   /etc/SuSE-release   && exit 0
+     identify_lsb    lsb_release         && exit 0
+     identify_debian /etc/debian_version && exit 0
++    identify_gentoo /etc/gentoo-release && exit 0
+ 
+     if [ $# -eq 1 ] ; then
+ 	rm -f "$1"
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
new file mode 100644
index 0000000..789adce
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>openstack</herd>
+<herd>virtualization</herd>
+<herd>xen</herd>
+<maintainer>
+	<email>bugs@camisa.org</email>
+	<name>Christopher J. Camisa</name>
+	<description>proxy maintainer</description>
+</maintainer>
+<maintainer>
+	<email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>XenServer Virtual Machine Tools</longdescription>
+<use>
+	<flag name="xenstore">Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
new file mode 100644
index 0000000..cf272c4
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="http://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.6.100_p651-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.100_p651-update-guest-attrs.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
new file mode 100644
index 0000000..21d0af8
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="http://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
new file mode 100644
index 0000000..21d0af8
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="http://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-7.0.0.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-7.0.0.ebuild
new file mode 100644
index 0000000..6d324ee
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-7.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="http://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/app-emulation/xe-guest-utilities/xe-guest-utilities-7.0.0-24.x86_64.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}

From d91d279c8e744046aa6f1cee90f2ad193f65d8a5 Mon Sep 17 00:00:00 2001
From: root <root@webnode10.safesoftsolutions.com>
Date: Wed, 19 Oct 2016 23:09:47 -0700
Subject: [PATCH 221/261] u[date

---
 app-emulation/xen-tools/ChangeLog             |  294 +++
 app-emulation/xen-tools/ChangeLog-2015        | 1750 +++++++++++++++++
 app-emulation/xen-tools/Manifest              |   24 +
 .../xen-tools/files/gentoo-patches.conf       |  117 ++
 app-emulation/xen-tools/files/stubs-32.h      |   20 +
 .../xen-tools/files/xen-consoles.logrotate    |    5 +
 .../xen-tools/files/xencommons.confd          |    4 +
 .../xen-tools/files/xencommons.initd          |   80 +
 .../xen-tools/files/xenconsoled.confd         |    2 +
 .../xen-tools/files/xenconsoled.initd         |   34 +
 .../xen-tools/files/xendomains-screen.confd   |   25 +
 .../xen-tools/files/xendomains.confd          |    9 +
 .../xen-tools/files/xendomains.initd-r2       |  118 ++
 .../xen-tools/files/xenqemudev.confd          |    7 +
 .../xen-tools/files/xenqemudev.initd          |   85 +
 app-emulation/xen-tools/files/xenstored.confd |    2 +
 app-emulation/xen-tools/files/xenstored.initd |   44 +
 app-emulation/xen-tools/metadata.xml          |   18 +
 .../xen-tools/xen-tools-4.7.0-r2.ebuild       |  458 +++++
 19 files changed, 3096 insertions(+)
 create mode 100644 app-emulation/xen-tools/ChangeLog
 create mode 100644 app-emulation/xen-tools/ChangeLog-2015
 create mode 100644 app-emulation/xen-tools/Manifest
 create mode 100644 app-emulation/xen-tools/files/gentoo-patches.conf
 create mode 100644 app-emulation/xen-tools/files/stubs-32.h
 create mode 100644 app-emulation/xen-tools/files/xen-consoles.logrotate
 create mode 100644 app-emulation/xen-tools/files/xencommons.confd
 create mode 100644 app-emulation/xen-tools/files/xencommons.initd
 create mode 100644 app-emulation/xen-tools/files/xenconsoled.confd
 create mode 100644 app-emulation/xen-tools/files/xenconsoled.initd
 create mode 100644 app-emulation/xen-tools/files/xendomains-screen.confd
 create mode 100644 app-emulation/xen-tools/files/xendomains.confd
 create mode 100644 app-emulation/xen-tools/files/xendomains.initd-r2
 create mode 100644 app-emulation/xen-tools/files/xenqemudev.confd
 create mode 100644 app-emulation/xen-tools/files/xenqemudev.initd
 create mode 100644 app-emulation/xen-tools/files/xenstored.confd
 create mode 100644 app-emulation/xen-tools/files/xenstored.initd
 create mode 100644 app-emulation/xen-tools/metadata.xml
 create mode 100644 app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
new file mode 100644
index 0000000..01e723a
--- /dev/null
+++ b/app-emulation/xen-tools/ChangeLog
@@ -0,0 +1,294 @@
+# ChangeLog for app-emulation/xen-tools
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*xen-tools-4.5.1-r3 (09 Aug 2015)
+*xen-tools-4.2.5-r10 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +files/gentoo-patches.conf, +files/stubs-32.h,
+  +files/xen-consoles.logrotate, +files/xencommons.confd,
+  +files/xencommons.initd, +files/xenconsoled.confd, +files/xenconsoled.initd,
+  +files/xendomains-screen.confd, +files/xendomains.confd,
+  +files/xendomains.initd-r2, +files/xenqemudev.confd,
+  +files/xenqemudev.initd, +files/xenstored.confd, +files/xenstored.initd,
+  +metadata.xml, +xen-tools-4.2.5-r10.ebuild, +xen-tools-4.5.1-r3.ebuild:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  09 Aug 2015; Ulrich Müller <ulm@gentoo.org> files/xenstored.initd:
+  [QA] Remove executable bit from files, bug 550434.
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  xen-tools-4.2.5-r10.ebuild, xen-tools-4.5.1-r3.ebuild:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+*xen-tools-4.6.0 (09 Oct 2015)
+
+  09 Oct 2015; Yixun Lan <dlan@gentoo.org> files/gentoo-patches.conf,
+  +xen-tools-4.6.0.ebuild:
+  version bump to 4.6.0
+
+  Package-Manager: portage-2.2.22
+
+*xen-tools-4.6.0-r1 (05 Nov 2015)
+*xen-tools-4.5.2 (05 Nov 2015)
+*xen-tools-4.2.5-r11 (05 Nov 2015)
+
+  05 Nov 2015; Yixun Lan <dlan@gentoo.org> files/gentoo-patches.conf,
+  +xen-tools-4.2.5-r11.ebuild, +xen-tools-4.5.2.ebuild,
+  -xen-tools-4.6.0.ebuild, +xen-tools-4.6.0-r1.ebuild:
+  security bump, fix XSA-153
+
+  Gentoo bug: #564472
+
+  Package-Manager: portage-2.2.23
+
+  10 Nov 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r11.ebuild,
+  xen-tools-4.5.2.ebuild:
+  amd64 stable wrt bug #564472
+
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="amd64"
+
+  10 Nov 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r11.ebuild:
+  x86 stable wrt bug #564472
+
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="x86"
+
+*xen-tools-4.6.0-r2 (25 Nov 2015)
+
+  25 Nov 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.6.0-r2.ebuild:
+  bump seabios, fix sdl bug
+
+  0) bump seabios to 1.8.2, to keep sync with upstream
+  1) introduce USE=sdl to fix automagic dependency bug
+  Gentoo-Bug: 565750
+
+  Package-Manager: portage-2.2.24
+
+  29 Nov 2015; Ian Delaney <idella4@gentoo.org> -xen-tools-4.5.1-r3.ebuild,
+  -xen-tools-4.6.0-r1.ebuild:
+  clean old vns.: 4.5.1-r3, 4.6.0-r1
+
+  Package-Manager: portage-2.2.24
+
+*xen-tools-4.6.0-r3 (30 Nov 2015)
+*xen-tools-4.5.2-r1 (30 Nov 2015)
+
+  30 Nov 2015; Ian Delaney <idella4@gentoo.org> +xen-tools-4.5.2-r1.ebuild,
+  +xen-tools-4.6.0-r3.ebuild:
+  revbumps vns. 4.5.2-r1, 4.6.0-r3
+
+  security patches (2) added from XSA-162, initally set as embargoed
+  security patches, publicly released today wrt the gentoo bug
+
+  Gentoo bug: #566838
+
+  Package-Manager: portage-2.2.24
+
+  01 Dec 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.2-r1.ebuild:
+  amd64 stable wrt bug #566838
+
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="amd64"
+
+  03 Dec 2015; Ian Delaney <idella4@gentoo.org> xen-tools-4.6.0-r3.ebuild:
+  add missed sec patches to vn. 4.6.0-r3
+
+  Already added to xen-4.5.2-r1, fixes gentoo bug.
+  Fix apparent typo re sec. patches in ebuild of 4.6.0-r3 only
+
+  Gentoo bug: #567190
+
+  Package-Manager: portage-2.2.24
+
+  03 Dec 2015; Ian Delaney <idella4@gentoo.org> -xen-tools-4.5.2.ebuild,
+  -xen-tools-4.6.0-r2.ebuild:
+  clean vulnerable versions wrt security bug #566838
+
+  Gentoo bug : #566838
+
+  Package-Manager: portage-2.2.24
+
+  04 Dec 2015; Doug Goldstein <cardoe@gentoo.org> xen-tools-4.5.2-r1.ebuild,
+  xen-tools-4.6.0-r3.ebuild:
+  fix up bad dependency
+
+  markdown is only used when building the docs. I've confirmed this by
+  checking the makefiles.
+
+  04 Dec 2015; Doug Goldstein <cardoe@gentoo.org> xen-tools-4.6.0-r3.ebuild:
+  drop udev usage
+
+  Xen 4.6.0 and newer no longer use or ship udev rules. The functionality
+  is implemented by running 'xl devd', which I'll add a script for on the
+  next bump.
+
+  06 Dec 2015; Doug Goldstein <cardoe@gentoo.org> xen-tools-4.6.0-r3.ebuild:
+  multiple clean ups
+
+  - switch to git from mercurial for live ebuild
+  - improve description
+  - add sub-slot to avoid ABI breaks when upgrading/downgrading
+  - update inherit line
+  - fix dependency on iproute2
+  - fix USE=-custom-cflags to not override some FLAGS
+  - fix up Python dependencies
+
+  Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
+
+*xen-tools-4.6.0-r4 (09 Dec 2015)
+*xen-tools-4.5.2-r2 (09 Dec 2015)
+
+  09 Dec 2015; Ian Delaney <idella4@gentoo.org> +xen-tools-4.5.2-r2.ebuild,
+  +xen-tools-4.6.0-r4.ebuild:
+  revbumps -> vns. 4.5.2-r2, 4.6.0-r3 wrt sec. bugs
+
+  Addition of patches XSA-158 (#566844), XSA-{159,160} (#566842), fixing all
+  corresponding security issues, patches made avaialable for public release
+  as of yesterday (08/12). Patches compressed into my devspace then combined
+  with those of dlan insource. This format will do for now. Not to be
+  adjusted without prior discussion. All patches pass runtests
+
+  Gentoo bugs: #566842 #566844
+
+  Package-Manager: portage-2.2.24
+
+  09 Dec 2015; Ian Delaney <idella4@gentoo.org> -xen-tools-4.5.2-r1.ebuild,
+  -xen-tools-4.6.0-r3.ebuild:
+  clean vulnerable vns. wrt #566842 #566844
+
+  Package-Manager: portage-2.2.24
+
+*xen-tools-4.5.2-r1 (09 Dec 2015)
+
+  09 Dec 2015; Ian Delaney <idella4@gentoo.org> +xen-tools-4.5.2-r1.ebuild:
+  re-add xen-tools-4.5.2-r1.ebuild
+
+  Package-Manager: portage-2.2.24
+  RepoMan-Options: --force
+
+*xen-tools-4.6.0-r5 (17 Dec 2015)
+*xen-tools-4.5.2-r3 (17 Dec 2015)
+
+  17 Dec 2015; Ian Delaney <idella4@gentoo.org> +xen-tools-4.5.2-r3.ebuild,
+  +xen-tools-4.6.0-r5.ebuild:
+  revbumps to vns. 4.5.2-r3, 4.6.0-r5
+
+  security patches added of xsa 164,165,166, and those effecting qemu (4)
+  from xsa-155 re security  Bug 567962
+
+  Gentoo bug: #567962
+
+  Package-Manager: portage-2.2.24
+
+  22 Dec 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.2-r2.ebuild:
+  amd64 stable wrt bug #566842
+
+  Package-Manager: portage-2.2.24
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
+  23 Dec 2015; Ian Delaney <idella4@gentoo.org> -xen-tools-4.5.2-r1.ebuild:
+  clean vn. 4.5.2-r1 re sec bug #566842
+
+  Package-Manager: portage-2.2.24
+
+  31 Dec 2015; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.5-r10.ebuild,
+  xen-tools-4.2.5-r11.ebuild, xen-tools-4.5.2-r2.ebuild,
+  xen-tools-4.5.2-r3.ebuild, xen-tools-4.6.0-r4.ebuild,
+  xen-tools-4.6.0-r5.ebuild:
+  Make use of new python_gen_impl_dep function
+
+  05 Jan 2016; Ian Delaney <idella4@gentoo.org> xen-tools-4.5.2-r3.ebuild,
+  xen-tools-4.6.0-r5.ebuild:
+  re-add keyword x86 to latest of vns. 4.2.5, 4.2.6
+
+  These should never have been set to -x86 in xen-tools because they support
+  xen guests of x86
+
+  Package-Manager: portage-2.2.26
+
+  05 Jan 2016; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.2-r3.ebuild,
+  xen-tools-4.6.0-r5.ebuild:
+  amd64 stable wrt bug #570932
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
+  05 Jan 2016; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.2-r3.ebuild,
+  xen-tools-4.6.0-r5.ebuild:
+  x86 stable wrt bug #570932
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="x86"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
+  06 Jan 2016; Ian Delaney <idella4@gentoo.org> xen-tools-4.5.2-r3.ebuild,
+  xen-tools-4.6.0-r5.ebuild:
+  re-add deps to support x86 reported in #570974
+
+  Gentoo bug: #570974
+
+  Package-Manager: portage-2.2.26
+
+  07 Jan 2016; Doug Goldstein <cardoe@gentoo.org> -xen-tools-4.2.5-r10.ebuild,
+  -xen-tools-4.2.5-r11.ebuild:
+  remove unsupported 4.2.x series
+
+  Package-Manager: portage-2.2.24
+  Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
+
+*xen-tools-4.6.0-r6 (12 Jan 2016)
+
+  12 Jan 2016; Ian Delaney <idella4@gentoo.org> +xen-tools-4.6.0-r6.ebuild:
+  app-emulation/xen:-tools revbump to 4.6.0-r6 from addition of 1 upstream
+  patch
+
+  Package-Manager: portage-2.2.26
+
diff --git a/app-emulation/xen-tools/ChangeLog-2015 b/app-emulation/xen-tools/ChangeLog-2015
new file mode 100644
index 0000000..4c96873
--- /dev/null
+++ b/app-emulation/xen-tools/ChangeLog-2015
@@ -0,0 +1,1750 @@
+# ChangeLog for app-emulation/xen-tools
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.312 2015/08/06 01:28:03 dlan Exp $
+
+  06 Aug 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r9.ebuild,
+  -xen-tools-4.5.1-r2.ebuild:
+  cleanup old vulnerable versions, bug 556304
+
+  05 Aug 2015; Mikle Kolyada <zlogene@gentoo.org> xen-tools-4.5.1-r3.ebuild:
+  amd64 stable wrt bug #556304
+
+  05 Aug 2015; Mikle Kolyada <zlogene@gentoo.org> xen-tools-4.2.5-r10.ebuild:
+  Mark stable wrt bug #556304
+
+*xen-tools-4.5.1-r3 (05 Aug 2015)
+*xen-tools-4.2.5-r10 (05 Aug 2015)
+
+  05 Aug 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r10.ebuild,
+  +xen-tools-4.5.1-r3.ebuild:
+  security bump, bug 556304, fix XSA139,140
+
+  31 Jul 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r8.ebuild,
+  -xen-tools-4.5.1-r1.ebuild:
+  clean vulnerable ebuilds due to security bug #555532
+
+  30 Jul 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r9.ebuild:
+  Stable for x86, wrt bug #555532
+
+  30 Jul 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r9.ebuild,
+  xen-tools-4.5.1-r2.ebuild:
+  Stable for amd64, wrt bug #555532
+
+  30 Jul 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r9.ebuild:
+  Stable for amd64, wrt bug #555532
+
+*xen-tools-4.5.1-r2 (30 Jul 2015)
+*xen-tools-4.2.5-r9 (30 Jul 2015)
+
+  30 Jul 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r9.ebuild,
+  +xen-tools-4.5.1-r2.ebuild:
+  security bump, bug 555532; bump ovmf to 2015/06/29, commit
+  cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd
+
+  12 Jul 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r7.ebuild,
+  -xen-tools-4.5.0-r6.ebuild, -xen-tools-4.5.1.ebuild:
+  drop old vulnerables, bug 553664
+
+  10 Jul 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r8.ebuild,
+  xen-tools-4.5.1-r1.ebuild:
+  Stable for amd64, wrt bug #553664
+
+  10 Jul 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r8.ebuild:
+  Stable for x86, wrt bug #553664
+
+*xen-tools-4.5.1-r1 (10 Jul 2015)
+*xen-tools-4.2.5-r8 (10 Jul 2015)
+
+  10 Jul 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r8.ebuild,
+  +xen-tools-4.5.1-r1.ebuild:
+  security bump, XSA-137, bug 553664
+
+*xen-tools-4.5.1 (06 Jul 2015)
+
+  06 Jul 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.5.1.ebuild,
+  files/gentoo-patches.conf:
+  bump version to 4.5.1
+
+  30 Jun 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r6.ebuild,
+  -xen-tools-4.4.2-r3.ebuild, -xen-tools-4.4.2-r4.ebuild,
+  -xen-tools-4.5.0-r5.ebuild:
+  clean vulnerable ebuild, drop 4.2.x series
+
+  16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r7.ebuild:
+  Stable for x86, wrt bug #550658
+
+  16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r7.ebuild,
+  xen-tools-4.5.0-r6.ebuild:
+  Stable for amd64, wrt bug #550658
+
+*xen-tools-4.5.0-r6 (15 Jun 2015)
+*xen-tools-4.4.2-r4 (15 Jun 2015)
+*xen-tools-4.2.5-r7 (15 Jun 2015)
+
+  15 Jun 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r7.ebuild,
+  +xen-tools-4.4.2-r4.ebuild, +xen-tools-4.5.0-r6.ebuild:
+  security bump, fix bug 550658, XSA-135
+
+  09 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.0-r5.ebuild:
+  Stable for x86, wrt bug #551346
+
+  08 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.5.0-r5.ebuild:
+  Stable for amd64, wrt bug #551346
+
+  06 Jun 2015; Ian Delaney <idella4@gentoo.org> -xen-tools-4.2.5-r5.ebuild,
+  -xen-tools-4.4.2-r2.ebuild, -xen-tools-4.5.0-r4.ebuild:
+  cleanup old wrt Bug #549950
+
+  03 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r6.ebuild,
+  xen-tools-4.4.2-r3.ebuild:
+  Stable for x86, wrt bug #549950
+
+  03 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r6.ebuild,
+  xen-tools-4.4.2-r3.ebuild:
+  Stable for amd64, wrt bug #549950
+
+*xen-tools-4.5.0-r5 (03 Jun 2015)
+*xen-tools-4.4.2-r3 (03 Jun 2015)
+*xen-tools-4.2.5-r6 (03 Jun 2015)
+
+  03 Jun 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r6.ebuild,
+  +xen-tools-4.4.2-r3.ebuild, +xen-tools-4.5.0-r5.ebuild:
+  security bump, bug 549950, XSA-{128,129,130,131}
+
+  14 May 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r4.ebuild,
+  -xen-tools-4.4.2-r1.ebuild, -xen-tools-4.5.0-r3.ebuild:
+  drop old vulnerable versions
+
+  14 May 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r5.ebuild:
+  Stable for x86, wrt bug #549200
+
+  14 May 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r5.ebuild,
+  xen-tools-4.4.2-r2.ebuild:
+  Stable for amd64, wrt bug #549200
+
+*xen-tools-4.5.0-r4 (14 May 2015)
+*xen-tools-4.4.2-r2 (14 May 2015)
+*xen-tools-4.2.5-r5 (14 May 2015)
+
+  14 May 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r5.ebuild,
+  +xen-tools-4.4.2-r2.ebuild, +xen-tools-4.5.0-r4.ebuild,
+  files/gentoo-patches.conf:
+  handle ovmf dep, bug 546580; fix gcc-5.x build err; bump security patch,
+  547202, 549200
+
+  08 Apr 2015; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.5-r4.ebuild:
+  Remove old Python implementations
+
+  03 Apr 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r3.ebuild,
+  -xen-tools-4.4.2.ebuild, -xen-tools-4.5.0-r2.ebuild:
+  drop old after new stabilization
+
+  03 Apr 2015; Agostino Sarubbo <ago@gentoo.org> -xen-tools-4.4.1-r7.ebuild:
+  Remove old
+
+  03 Apr 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r4.ebuild:
+  Stable for x86, wrt bug #545144
+
+  03 Apr 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r4.ebuild,
+  xen-tools-4.4.2-r1.ebuild:
+  Stable for amd64, wrt bug #545144
+
+*xen-tools-4.5.0-r3 (03 Apr 2015)
+*xen-tools-4.4.2-r1 (03 Apr 2015)
+*xen-tools-4.2.5-r4 (03 Apr 2015)
+
+  03 Apr 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r4.ebuild,
+  +xen-tools-4.4.2-r1.ebuild, +xen-tools-4.5.0-r3.ebuild:
+  security bump, bug 545144, fix XSA-125,126,127
+
+*xen-tools-4.4.2 (28 Mar 2015)
+
+  28 Mar 2015; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.5-r3.ebuild,
+  -xen-tools-4.3.3-r5.ebuild, +xen-tools-4.4.2.ebuild,
+  xen-tools-4.5.0-r2.ebuild, files/gentoo-patches.conf:
+  drop 4.3.x, bump 4.4.2, prepare security patch setting
+
+  26 Mar 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r2.ebuild,
+  -xen-tools-4.4.1-r6.ebuild:
+  drop old vulnerable versions, bug 543304
+
+  16 Mar 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r3.ebuild:
+  Stable for x86, wrt bug #543304
+
+  16 Mar 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r3.ebuild,
+  xen-tools-4.4.1-r7.ebuild:
+  Stable for amd64, wrt bug #543304
+
+*xen-tools-4.5.0-r2 (14 Mar 2015)
+*xen-tools-4.4.1-r7 (14 Mar 2015)
+*xen-tools-4.3.3-r5 (14 Mar 2015)
+*xen-tools-4.2.5-r3 (14 Mar 2015)
+
+  14 Mar 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.5-r1.ebuild,
+  +xen-tools-4.2.5-r3.ebuild, -xen-tools-4.3.3-r1.ebuild,
+  -xen-tools-4.3.3-r3.ebuild, -xen-tools-4.3.3-r4.ebuild,
+  +xen-tools-4.3.3-r5.ebuild, -xen-tools-4.4.1-r3.ebuild,
+  +xen-tools-4.4.1-r7.ebuild, -xen-tools-4.5.0-r1.ebuild,
+  +xen-tools-4.5.0-r2.ebuild:
+  security bump, fix XSA-119
+
+  13 Mar 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r2.ebuild,
+  xen-tools-4.4.1-r6.ebuild:
+  Stable for amd64, wrt bug #542266
+
+  13 Mar 2015; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r2.ebuild:
+  Stable for x86, wrt bug #542266
+
+*xen-tools-4.5.0-r1 (15 Feb 2015)
+*xen-tools-4.4.1-r6 (15 Feb 2015)
+*xen-tools-4.3.3-r4 (15 Feb 2015)
+
+  15 Feb 2015; Yixun Lan <dlan@gentoo.org> -xen-tools-4.3.3-r2.ebuild,
+  +xen-tools-4.3.3-r4.ebuild, -xen-tools-4.4.1-r4.ebuild,
+  -xen-tools-4.4.1-r5.ebuild, +xen-tools-4.4.1-r6.ebuild,
+  -xen-tools-4.5.0.ebuild, +xen-tools-4.5.0-r1.ebuild:
+  minor revision bump, also drop old
+
+*xen-tools-4.5.0 (21 Jan 2015)
+*xen-tools-4.4.1-r5 (21 Jan 2015)
+*xen-tools-4.3.3-r3 (21 Jan 2015)
+*xen-tools-4.2.5-r2 (21 Jan 2015)
+
+  21 Jan 2015; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r2.ebuild,
+  +xen-tools-4.3.3-r3.ebuild, +xen-tools-4.4.1-r5.ebuild,
+  -xen-tools-4.5.0_rc4.ebuild, +xen-tools-4.5.0.ebuild,
+  files/gentoo-patches.conf:
+  version bump
+
+*xen-tools-4.5.0_rc4 (19 Dec 2014)
+
+  19 Dec 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.5.0_rc4.ebuild,
+  files/gentoo-patches.conf:
+  add 4.5.0_rc4 for testing, with keywords dropped to alter user
+
+*xen-tools-4.4.1-r4 (26 Nov 2014)
+*xen-tools-4.3.3-r2 (26 Nov 2014)
+
+  26 Nov 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.3.3-r2.ebuild,
+  -xen-tools-4.4.1-r1.ebuild, -xen-tools-4.4.1-r2.ebuild,
+  +xen-tools-4.4.1-r4.ebuild:
+  security version bump, bug 530182
+
+*xen-tools-4.4.1-r3 (06 Nov 2014)
+
+  06 Nov 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.4.1-r3.ebuild,
+  files/gentoo-patches.conf, files/xenqemudev.initd, metadata.xml:
+  enable ovmf bios support, bug 526080
+
+*xen-tools-4.4.1-r2 (01 Nov 2014)
+
+  01 Nov 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.5-r1.ebuild,
+  xen-tools-4.3.3-r1.ebuild, -xen-tools-4.4.1.ebuild,
+  +xen-tools-4.4.1-r2.ebuild, files/gentoo-patches.conf:
+  fix bashcomp problem, bug 472438, fix ncurses[tinfo] build failure, bug
+  526526
+
+  15 Oct 2014; Yixun Lan <dlan@gentoo.org> metadata.xml:
+  drop USE xend
+
+  15 Oct 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r6.ebuild,
+  -xen-tools-4.2.4-r7.ebuild, -xen-tools-4.2.5.ebuild,
+  -xen-tools-4.3.2-r5.ebuild, -xen-tools-4.3.2-r6.ebuild,
+  -xen-tools-4.3.3.ebuild,
+  -files/*.patch,
+  clean old version, also patches move to devspace
+
+  14 Oct 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r1.ebuild:
+  Stable for x86, wrt bug #524200
+
+  14 Oct 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.5-r1.ebuild,
+  xen-tools-4.3.3-r1.ebuild:
+  Stable for amd64, wrt bug #524200
+
+*xen-tools-4.4.1-r1 (10 Oct 2014)
+*xen-tools-4.3.3-r1 (10 Oct 2014)
+*xen-tools-4.2.5-r1 (10 Oct 2014)
+
+  10 Oct 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5-r1.ebuild,
+  +xen-tools-4.3.3-r1.ebuild, +xen-tools-4.4.1-r1.ebuild:
+  version bump, fix bug 522642, 494604
+
+  07 Oct 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.2-r5.ebuild,
+  xen-tools-4.3.2-r6.ebuild, xen-tools-4.3.3.ebuild, xen-tools-4.4.1.ebuild:
+  correction to dep dev-python/markdown in all versions
+
+  12 Sep 2014; Yixun Lan <dlan@gentoo.org> -files/xen-tools-4.2-pod-docs.patch,
+  -files/xen-tools-4.2-pod-utf8-chars.patch, -files/xen-tools-4.2-pod-xl.patch,
+  -files/xend.initd-r1:
+  drop patches/no-need file since move to devspace
+
+  12 Sep 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.5.ebuild,
+  xen-tools-4.3.3.ebuild, -xen-tools-4.4.0-r9.ebuild, xen-tools-4.4.1.ebuild,
+  +files/gentoo-patches.conf:
+  shrink patches, move to devspace; drop USE=xend for 4.2.5 4.3.3
+
+*xen-tools-4.4.1 (11 Sep 2014)
+*xen-tools-4.3.3 (11 Sep 2014)
+*xen-tools-4.2.5 (11 Sep 2014)
+
+  11 Sep 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.5.ebuild,
+  +xen-tools-4.3.3.ebuild, +xen-tools-4.4.1.ebuild,
+  +files/xen-tools-4.2-pod-docs.patch,
+  +files/xen-tools-4.2-pod-utf8-chars.patch, +files/xen-tools-4.2-pod-xl.patch:
+  version bump, fix 4.2.x pod2man build error
+
+*xen-tools-4.4.0-r9 (19 Aug 2014)
+*xen-tools-4.3.2-r6 (19 Aug 2014)
+*xen-tools-4.2.4-r7 (19 Aug 2014)
+
+  19 Aug 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r7.ebuild,
+  +xen-tools-4.3.2-r6.ebuild, -xen-tools-4.4.0-r8.ebuild,
+  +xen-tools-4.4.0-r9.ebuild:
+  bump upstream patches
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> xen-tools-4.2.4-r6.ebuild,
+  xen-tools-4.3.2-r5.ebuild, xen-tools-4.4.0-r8.ebuild:
+  Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
+  version.
+
+*xen-tools-4.4.0-r8 (29 Jul 2014)
+
+  29 Jul 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r7.ebuild,
+  +xen-tools-4.4.0-r8.ebuild:
+  bug 518136, disable build x86_emulator under nomultilib profile
+
+  12 Jul 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r2.ebuild,
+  -xen-tools-4.2.4-r4.ebuild, -xen-tools-4.2.4-r5.ebuild,
+  -xen-tools-4.3.2-r2.ebuild, -xen-tools-4.3.2-r3.ebuild,
+  -xen-tools-4.3.2-r4.ebuild:
+  cleanup after stabilization
+
+  12 Jul 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.2-r5.ebuild:
+  Stable for amd64, wrt bug #513824
+
+  12 Jul 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r6.ebuild:
+  Stable for x86, wrt bug #513824
+
+  12 Jul 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r6.ebuild:
+  Stable for amd64, wrt bug #513824
+
+*xen-tools-4.4.0-r7 (09 Jul 2014)
+*xen-tools-4.3.2-r5 (09 Jul 2014)
+*xen-tools-4.2.4-r6 (09 Jul 2014)
+
+  09 Jul 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r6.ebuild,
+  +xen-tools-4.3.2-r5.ebuild, -xen-tools-4.4.0-r5.ebuild,
+  -xen-tools-4.4.0-r6.ebuild, +xen-tools-4.4.0-r7.ebuild:
+  bump stable/security patches
+
+  15 Jun 2014; Robin H. Johnson <robbat2@gentoo.org> files/xendomains.initd-r2,
+  files/xenstored.initd:
+  Fix bashisms.
+
+*xen-tools-4.4.0-r6 (14 Jun 2014)
+*xen-tools-4.3.2-r4 (14 Jun 2014)
+*xen-tools-4.2.4-r5 (14 Jun 2014)
+
+  14 Jun 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r5.ebuild,
+  +xen-tools-4.3.2-r4.ebuild, +xen-tools-4.4.0-r6.ebuild:
+  bump upstream security patches
+
+  30 May 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.4-r4.ebuild,
+  xen-tools-4.3.2-r3.ebuild, xen-tools-4.4.0-r5.ebuild:
+  fix hvm buf for no-multilib profile, bug #351648, thanks Zoltán Halassy,
+  Spooky Ghost
+
+*xen-tools-4.4.0-r5 (23 May 2014)
+*xen-tools-4.3.2-r3 (23 May 2014)
+*xen-tools-4.2.4-r4 (23 May 2014)
+
+  23 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r3.ebuild,
+  +xen-tools-4.2.4-r4.ebuild, +xen-tools-4.3.2-r3.ebuild,
+  -xen-tools-4.4.0-r4.ebuild, +xen-tools-4.4.0-r5.ebuild,
+  +files/xen-tools-4-anti-seabios-download.patch:
+  re-introduce bundled seabios with USE=system-seabios flag, bug #510052,
+  #510492, #510680
+
+*xen-tools-4.2.4-r3 (22 May 2014)
+
+  22 May 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r3.ebuild,
+  +files/xen-tools-4.2.4-udev-rules.patch:
+  fix missing udev rules, bug #510976, thanks Tomoatsu Shimada
+
+  17 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.3-r1.ebuild,
+  -xen-tools-4.2.4-r1.ebuild, -xen-tools-4.3.1-r5.ebuild,
+  -xen-tools-4.3.1-r6.ebuild, -xen-tools-4.3.2-r1.ebuild,
+  -files/xen-4-CVE-2012-6075-XSA-41.patch,
+  -files/xen-tools-4-CVE-2014-1950-XSA-88.patch,
+  -files/xen-4.2.0-anti-download.patch, -files/xen-4-CVE-XSA-86.patch,
+  -files/xen-4.3-anti-download.patch:
+  clean old ebuilds
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r2.ebuild:
+  Stable for x86, wrt bug #509054
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r2.ebuild,
+  xen-tools-4.3.2-r2.ebuild:
+  Stable for amd64, wrt bug #509054
+
+*xen-tools-4.4.0-r4 (16 May 2014)
+
+  16 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r3.ebuild,
+  +xen-tools-4.4.0-r4.ebuild:
+  force depend on >=seabios-1.7.4, fix bug #510492, thanks Tomas Mozes
+
+*xen-tools-4.4.0-r3 (14 May 2014)
+
+  14 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r2.ebuild,
+  +xen-tools-4.4.0-r3.ebuild:
+  upstream patches bump, fix security bug #510312
+
+  11 May 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.4.0-r2.ebuild:
+  silent QA warning, bug #510072, thanks iamnr3
+
+*xen-tools-4.4.0-r2 (09 May 2014)
+*xen-tools-4.3.2-r2 (09 May 2014)
+*xen-tools-4.2.4-r2 (09 May 2014)
+
+  09 May 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r2.ebuild,
+  +xen-tools-4.3.2-r2.ebuild, +xen-tools-4.4.0-r2.ebuild,
+  +files/xen-tools-4-qemu-fix-po-collision.patch:
+  1) bump security patches, bug 508510, 508424, 509054, 509176 2) fix file
+  collision with app-emulation/qemu, bug 508302 3) drop old
+
+  12 Apr 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.1-r5.ebuild,
+  xen-tools-4.3.1-r6.ebuild, xen-tools-4.3.2.ebuild, xen-tools-4.4.0.ebuild:
+  minor correction to deps
+
+*xen-tools-4.4.0-r1 (12 Apr 2014)
+*xen-tools-4.3.2-r1 (12 Apr 2014)
+*xen-tools-4.2.4-r1 (12 Apr 2014)
+
+  12 Apr 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r1.ebuild,
+  +xen-tools-4.3.2-r1.ebuild, +xen-tools-4.4.0-r1.ebuild:
+  bump upstream patches, add IUSE=system-qemu to 4.4.x
+
+  04 Apr 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.4.0.ebuild:
+  Add revised configure option, fixes Bug #506072 by Sven
+
+  24 Mar 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.4.0.ebuild:
+  re bump; keyword ~arm, update deps, drop py2.6 support, drop IUSE xend,
+  improvements to configure phase, tidy up and style improvements by dlan. Re-
+  set SLOT for libgcrypt, drop leftover elog msg re xend
+
+*xen-tools-4.4.0 (23 Mar 2014)
+
+  23 Mar 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.4.0.ebuild,
+  +files/xen-tools-4.4-api-fix.patch, +files/xen-4.4-nostrip.patch,
+  +files/xen-4.4-qemu-bridge.patch, files/xenstored.initd:
+  bump to 4.4.0
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.3-r1.ebuild,
+  xen-tools-4.2.4.ebuild, xen-tools-4.3.1-r5.ebuild, xen-tools-4.3.1-r6.ebuild,
+  xen-tools-4.3.2.ebuild:
+  Update libgcrypt dep to use slot :0.
+
+  23 Feb 2014; Yixun Lan <dlan@gentoo.org> files/xenstored.initd:
+  fix bug #502056, thanks KK <klaus.kreil at univie.ac.at>
+
+  21 Feb 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.3-r1.ebuild,
+  xen-tools-4.2.4.ebuild, xen-tools-4.3.2.ebuild:
+  correct typos, tidy
+
+  20 Feb 2014; Yixun Lan <dlan@gentoo.org>
+  -files/xen-4-CVE-2013-0215-XSA-38.patch,
+  -files/xen-4-CVE-2013-1919-XSA-46.patch,
+  -files/xen-4-CVE-2013-1922-XSA-48.patch,
+  -files/xen-4-CVE-2013-1952-XSA-49.patch,
+  -files/xen-4-CVE-2013-1952-XSA_49.patch,
+  -files/xen-4-CVE-2013-2072-XSA-56.patch,
+  -files/xen-4.2-CVE-2013-1-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-12to13-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-14-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-16-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-17-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-18to19-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-2-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-20to23-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-3-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-4-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-5to7-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-6-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-7-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-9to10-XSA-55.patch, -files/xen-4.2-CVE-XSA-57.patch,
+  -files/xen-tools-4-CVE-2013-4369-XSA-68.patch,
+  -files/xen-tools-4-CVE-2013-4370-XSA-69.patch,
+  -files/xen-tools-4-CVE-2013-4371-XSA-70.patch,
+  -files/xen-tools-4-CVE-2013-4416-XSA-72.patch:
+  clean up unused XSA patches
+
+  20 Feb 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.2-r3.ebuild,
+  -xen-tools-4.2.2-r7.ebuild, -xen-tools-4.2.3.ebuild:
+  drop old ebuild, clean up
+
+  20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.3-r1.ebuild:
+  Stable for x86, wrt bug #500530
+
+  20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.3-r1.ebuild:
+  Stable for amd64, wrt bug #500530
+
+*xen-tools-4.3.2 (19 Feb 2014)
+*xen-tools-4.2.4 (19 Feb 2014)
+
+  19 Feb 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4.ebuild,
+  +xen-tools-4.3.2.ebuild:
+  revision bump 4.2.4, 4.3.2
+
+*xen-tools-4.3.1-r6 (18 Feb 2014)
+*xen-tools-4.2.3-r1 (18 Feb 2014)
+
+  18 Feb 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.3-r1.ebuild,
+  -xen-tools-4.3.1-r3.ebuild, xen-tools-4.3.1-r5.ebuild,
+  +xen-tools-4.3.1-r6.ebuild, +files/xen-tools-4-unbundle-ipxe.patch,
+  +files/xen-tools-4-unbundle-seabios.patch, metadata.xml:
+  fix bug #496708, thanks Radoslaw Szkodzinski
+
+  15 Feb 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.1-r5.ebuild:
+  Stable for x86, wrt bug #500530
+
+  15 Feb 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.1-r5.ebuild:
+  Stable for amd64, wrt bug #500530
+
+*xen-tools-4.2.3 (14 Feb 2014)
+
+  14 Feb 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.3.ebuild:
+  bumped, fix security bugs, see #500530 for details
+
+*xen-tools-4.3.1-r5 (13 Feb 2014)
+*xen-tools-4.2.2-r7 (13 Feb 2014)
+
+  13 Feb 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.2-r6.ebuild,
+  +xen-tools-4.2.2-r7.ebuild, -xen-tools-4.3.1-r4.ebuild,
+  +xen-tools-4.3.1-r5.ebuild, +files/xen-tools-4-CVE-2014-1950-XSA-88.patch,
+  +files/xen-tools-4.2.2-rt-link.patch, files/xenconsoled.initd:
+  fix sec bug #500530, #501080, missing -lrt bug #463840, glib deps bug #500604
+
+*xen-tools-4.3.1-r4 (08 Feb 2014)
+
+  08 Feb 2014; Ian Delaney <idella4@gentoo.org> +files/xen-4-CVE-XSA-86.patch,
+  +xen-tools-4.3.1-r4.ebuild:
+  revbump; only to 4.3.1 (for now), add sec. patch XSA-86 patch wrt bug #500530
+
+*xen-tools-4.2.2-r6 (07 Feb 2014)
+
+  07 Feb 2014; Ian Delaney <idella4@gentoo.org> +xen-tools-4.2.2-r6.ebuild,
+  -xen-tools-4.2.2-r5.ebuild:
+  revbump; add xencommons init scripts to 4.2.2, rm 4.2.2-r5, fixes Bug #499992
+
+  28 Jan 2014; Yixun Lan <dlan@gentoo.org> files/xenstored.initd:
+  fix local variable  collision, thanks Cyril Nahon
+
+  27 Jan 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.2-r5.ebuild,
+  xen-tools-4.3.1-r3.ebuild, files/xenstored.initd:
+  fix QA warning, create /var/run/,/var/lock dynamically
+
+  24 Jan 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.3.0-r3.ebuild:
+  ebuild clean, drop 4.3.0
+
+  23 Jan 2014; Yixun Lan <dlan@gentoo.org> files/xenconsoled.initd,
+  -files/xendomains.initd-r1:
+  bug #498720, shutdown all domUs
+
+  02 Jan 2014; Ian Delaney <idella4@gentoo.org> files/xend.initd-r1,
+  files/xend.initd-r2:
+  Remove un-needed var 'opts' from xend init scripts noted by mva
+
+  22 Dec 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0-r3.ebuild,
+  xen-tools-4.3.1-r3.ebuild:
+  set pygrub in REQUIRED_USE paired with python, fixes Bug #494908 by K. Agouros
+
+  10 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.1-r3.ebuild:
+  Stable for x86, wrt bug #486354
+
+  10 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.3.1-r3.ebuild:
+  Stable for amd64, wrt bug #486354
+
+*xen-tools-4.3.1-r3 (09 Dec 2013)
+
+  09 Dec 2013; Ian Delaney <idella4@gentoo.org> +xen-tools-4.3.1-r3.ebuild,
+  -xen-tools-4.3.1-r2.ebuild:
+  revbump; fix to Bug #493232, update of xen guide page @ the gentoo wiki
+
+  08 Dec 2013; Ian Delaney <idella4@gentoo.org> -files/xenstoredorig.confd:
+  remove leftover wrong files
+
+  07 Dec 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.3.1-r1.ebuild,
+  -xen-tools-4.3.1.ebuild:
+  rm superseded 4.3.1 ebuilds
+
+  07 Dec 2013; Ian Delaney <idella4@gentoo.org> files/xencommons.confd,
+  files/xenconsoled.initd, files/xenqemudev.initd, files/xenstored.confd,
+  files/xenstored.initd, xen-tools-4.3.1-r1.ebuild, xen-tools-4.3.1-r2.ebuild:
+  corrections to previous patch by dlan, tested by him
+
+*xen-tools-4.3.1-r2 (06 Dec 2013)
+
+  06 Dec 2013; Ian Delaney <idella4@gentoo.org> +files/xencommons.confd,
+  +files/xencommons.initd, +files/xenqemudev.confd, +files/xenqemudev.initd,
+  +xen-tools-4.3.1-r2.ebuild, files/xenconsoled.initd, files/xenstored.initd,
+  xen-tools-4.3.1-r1.ebuild:
+  revbump; the gentoo styling of xencommon script split into the new 4 files,
+  patching prepared by up and coming dlan
+
+*xen-tools-4.3.1-r1
+
+  1 Dec 2013; Ian Delaney <idella4@gentoo.org>
+  +xen-tools-4.3.1-r1:
+  revbump; install provisioned xencommons script with elog msg 
+  @ pkg_postinst  
+
+*xen-tools-4.3.1 (24 Nov 2013)
+
+  24 Nov 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4.3-anti-download.patch, +xen-tools-4.3.1.ebuild,
+  -files/xen-4.3.0-anti-download.patch, xen-tools-4.3.0-r3.ebuild:
+  renamed xen-4.3-anti-download.patch to xen-4.3.0-anti-download.patch, bump
+
+  09 Nov 2013; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.2-r3.ebuild,
+  xen-tools-4.2.2-r5.ebuild, xen-tools-4.3.0-r3.ebuild:
+  Add missing PYTHON_REQUIRED_USE.
+
+*xen-tools-4.3.0-r3 (07 Nov 2013)
+*xen-tools-4.2.2-r5 (07 Nov 2013)
+
+  07 Nov 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4-CVE-2013-4369-XSA-68.patch,
+  +files/xen-tools-4-CVE-2013-4370-XSA-69.patch,
+  +files/xen-tools-4-CVE-2013-4371-XSA-70.patch,
+  +files/xen-tools-4-CVE-2013-4416-XSA-72.patch, +xen-tools-4.2.2-r5.ebuild,
+  +xen-tools-4.3.0-r3.ebuild, -xen-tools-4.2.2-r4.ebuild,
+  -xen-tools-4.3.0-r2.ebuild:
+  revbumps; add security patches XSA-68-70/72, remove old ebuilds
+
+*xen-tools-4.3.0-r2 (04 Nov 2013)
+
+  04 Nov 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.3.0.ebuild,
+  -xen-tools-4.3.0-r1.ebuild, metadata.xml, xen-tools-4.2.2-r4.ebuild, 
+  +xen-tools-4.3.0-r2.ebuild:
+  revbump; add IUSE pam, fixes Bug #488660 by Pat Erley
+
+  04 Nov 2013; Ian Delaney <idella4@gentoo.org> +files/fix-gold-ld.patch,
+  xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0-r1.ebuild:
+  Add patch by dlan, fixes Bug 379537 by flameeyes
+
+*xen-tools-4.3.0-r1 (04 Nov 2013)
+
+  04 Nov 2013; Ian Delaney <idella4@gentoo.org> +xen-tools-4.3.0-r1.ebuild,
+  metadata.xml:
+  ocaml deps findlib, ocaml combined & re-located under DEPEND, stable fault
+  unfixable due to sole reliance on assigned maintainer of Bug 486076 submitting
+  a dev-lang/ocaml-4x for stable. Electing for now not to purge IUSE ocaml and
+  related deps though flagged as a future option.
+
+  04 Oct 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.2.1-r5.ebuild,
+  xen-tools-4.2.2-r3.ebuild, xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0.ebuild:
+  remove old, remove ocaml from stable due to ocaml-4 being ~, add libgcrypt to
+  DEPEND and remove antiquated CDEPEND thanks to dev steev
+
+  23 Aug 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r5.ebuild,
+  xen-tools-4.2.2-r3.ebuild, xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0.ebuild:
+  substitute wiki page with xen's offical wiki page, fixes Bug #482114 by a3li
+
+  04 Aug 2013; Ian Delaney <idella4@gentoo.org> +files/xenstoredorig.confd,
+  files/xenstored.confd, xen-tools-4.3.0.ebuild:
+  Upgrade to IUSE ocaml with shift of findlib behind IUSE ocaml and consequent
+  upgrade to configure, substitute xenstored conf.d script resultant of Bug
+  #478776, orginal conf.d script retained by rename to xenstoredorig.confd
+
+  01 Aug 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  Reverting transfig to previous place behind IUSE doc, fixes Bug #479226 by
+  Sven
+
+  31 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.2-r4.ebuild:
+  upgrade emake in complile phase to match 4.3.0
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xend.initd-r1,
+  files/xend.initd-r2:
+  Add var extra_commands matching xendomain init scripts, requested by mva
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  files/xen-tools-4.2.2-install.patch:
+  extend xen-tools-4.2.2-install.patch with patch by D. Lan via Bug 478708,
+  hopefully fixes the bug
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xendomains-screen.confd:
+  Take out duplicate AUTODIR && PARALLEL_SHUTDOWN from xendomains-screen.confd
+  wrt Bug #478234
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4.2.2-install.patch, xen-tools-4.2.2-r4.ebuild:
+  alternate fix to Bug #472976 by patch by Andreas Kinzler wrt to Bug #472976 by
+  Andreas Kinzler
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  verbosity level hard set in src_compile, fixes Bug #477678 by hasufell
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.2-r4.ebuild,
+  xen-tools-4.3.0.ebuild:
+  previous mentioned fix to #445986 appears not to have gone through, repeat +
+  applied to 4.2.2-r4
+
+  27 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  Add dep markdown, make dep transfig unconditional, sed statement to correct
+  locale failure in build of seabios, fixes Bug #445986
+
+  27 Jul 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4.3-jserver.patch,
+  files/xenconsoled.initd, files/xend.initd-r1, files/xend.initd-r2,
+  files/xenstored.initd, xen-tools-4.3.0.ebuild:
+  for 4.3.0; upgrade jserver.patch, substitute with correct code to set IUSE
+  api, flask capable builds, rm whitespace in init script, thanks for support
+  from mva
+
+  27 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xendomains.initd-r1,
+  files/xendomains.initd-r2:
+  Correction to xendomains.initd scripts wrt Bug #477824
+
+  26 Jul 2013; Ian Delaney <idella4@gentoo.org> +files/qemu-bridge.patch,
+  xen-tools-4.3.0.ebuild:
+  Alternate fix of file collision with qemu-bridge-helper with corresponding
+  patch wrt Bug #478064
+
+  25 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xenstored.initd,
+  xen-tools-4.3.0.ebuild:
+  Correction to xenstored.initd fix, set app-emulation/qemu as an antagonist dep
+  to IUSE qemu wrt Bug #478064 by uen
+
+  25 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xenstored.initd:
+  Edit to xenstored.initd wrt Bug #476572 & #475204
+
+  24 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  Add dep for IUSE qemu build, fixes Bug #477878 by 'a.m.', again
+
+  24 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  Correction to install with IUSE qemu, fixes Bug #477884, fixes Bug #477884
+
+  24 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
+  correct tools' Makefile re IUSE pygrub, add python use flag and corresponding
+  sed to Makefile, fixes Bug #477880 by 'a.m'
+
+  23 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4.3-ar-cc.patch, -files/xen-tools-4.3-ar.patch,
+  xen-tools-4.3.0.ebuild:
+  renamed patch to capture ar & cc, extended the patch to honour tc-getCC,
+  almost fixes Bug #477676
+
+  23 Jul 2013; Ian Delaney <idella4@gentoo.org> +files/xen-tools-4.3-ar.patch,
+  xen-tools-4.3.0.ebuild:
+  patch to correct AR use wrt Bug #477676
+
+  23 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xendomains.initd-r1,
+  files/xendomains.initd-r2:
+  Correct xendomains.init(s) to POSIX compliant, fixes Bug #477824
+
+  22 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  files/xen-4.3-fix_dotconfig-gcc.patch, xen-tools-4.3.0.ebuild:
+  Extend purging of Werror CFLAG in xen-4.3-fix_dotconfig-gcc.patch, fixes Bug
+  #477674
+
+  22 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  files/xen-4-fix_dotconfig-gcc.patch, files/xen-4.2.0-anti-download.patch,
+  xen-tools-4.3.0.ebuild:
+  Add vars AR, RANLIB to build, addresses Bug #477676
+
+  21 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  files/xen-4-fix_dotconfig-gcc.patch, files/xen-4.2.0-anti-download.patch,
+  xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0.ebuild:
+  Rm antiquated line from elog, add antagonist dep behind IUSE hvm, fixes Bug
+  #475634
+
+*xen-tools-4.2.2-r4 (21 Jul 2013)
+
+  21 Jul 2013; Ian Delaney <idella4@gentoo.org> +xen-tools-4.2.2-r4.ebuild,
+  files/xen-4-fix_dotconfig-gcc.patch, files/xen-4.2.0-anti-download.patch,
+  xen-tools-4.2.2-r3.ebuild, xen-tools-4.3.0.ebuild:
+  revbump; correct install of qemu files folders with IUSE qemu, fixes Bug
+  #472976, upgrade instances of ED to D in revbumped & 4.3.0
+
+*xen-tools-4.3.0 (20 Jul 2013)
+
+  20 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4.3-fix_dotconfig-gcc.patch, +files/xen-4.3.0-anti-download.patch,
+  +xen-tools-4.3.0.ebuild, files/xen-4-fix_dotconfig-gcc.patch,
+  files/xen-4.2.0-anti-download.patch, files/xenstored.initd:
+  bump; required culling sec patches, edit to configure and upgrading 2 patches,
+  correction to xenstored.initd wrt Bug #476572 by Spooky Ghost
+
+  04 Jul 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.2.1-r3.ebuild,
+  -xen-tools-4.2.1-r4.ebuild, -xen-tools-4.2.2-r1.ebuild,
+  -xen-tools-4.2.2-r2.ebuild, files/xenstored.initd:
+  correction
+
+  02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.2-r3.ebuild:
+  Stable for x86, wrt bug #472214
+
+  02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.2-r3.ebuild:
+  Stable for amd64, wrt bug #472214
+
+  01 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.1-r4.ebuild, xen-tools-4.2.1-r5.ebuild,
+  xen-tools-4.2.2-r1.ebuild, xen-tools-4.2.2-r2.ebuild,
+  xen-tools-4.2.2-r3.ebuild:
+  Re-remove redundant pyxml, origin Bug #45673
+
+  01 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xenstored.initd,
+  xen-tools-4.2.1-r3.ebuild, xen-tools-4.2.1-r4.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  remove major slow-down in starting xenstored, put forward by 'a.m.' in Bug
+  #475204
+
+*xen-tools-4.2.2-r3 (28 Jun 2013)
+*xen-tools-4.2.1-r5 (28 Jun 2013)
+
+  28 Jun 2013; Ian Delaney <idella4@gentoo.org> +xen-tools-4.2.1-r5.ebuild,
+  +xen-tools-4.2.2-r3.ebuild, xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.1-r4.ebuild, xen-tools-4.2.2-r1.ebuild,
+  xen-tools-4.2.2-r2.ebuild:
+  rm stray line, revbumps; set correct install location wrt Bug #472438
+
+  28 Jun 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.1-r4.ebuild, xen-tools-4.2.2-r1.ebuild,
+  xen-tools-4.2.2-r2.ebuild:
+  correct setting of libdir, fixes Bug #474914 by keytoaster
+
+  27 Jun 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4.2-configsxp.patch,
+  xen-tools-4.2.1-r3.ebuild, xen-tools-4.2.1-r4.ebuild,
+  xen-tools-4.2.2-r1.ebuild, xen-tools-4.2.2-r2.ebuild:
+  Set dom0-min-mem to kb wrt Bug #472982 by PatomaS
+
+  27 Jun 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.1-r4.ebuild, xen-tools-4.2.2-r1.ebuild,
+  xen-tools-4.2.2-r2.ebuild:
+  drop dep texinfo-5, fixes faulty install, Bug #472976 by Andreas Kinzler
+
+  27 Jun 2013; Ian Delaney <idella4@gentoo.org>
+  -files/xen-4.2-CVE-2013-11-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-15-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-8-XSA-55.patch, xen-tools-4.2.1-r4.ebuild,
+  xen-tools-4.2.2-r1.ebuild, xen-tools-4.2.2-r2.ebuild:
+  rm of re-located patches
+
+*xen-tools-4.2.2-r2 (26 Jun 2013)
+*xen-tools-4.2.1-r4 (26 Jun 2013)
+
+  26 Jun 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4.2-CVE-2013-1-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-11-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-12to13-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-14-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-15-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-16-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-17-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-18to19-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-2-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-20to23-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-3-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-4-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-5to7-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-6-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-7-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-8-XSA-55.patch,
+  +files/xen-4.2-CVE-2013-9to10-XSA-55.patch, +files/xen-4.2-CVE-XSA-57.patch,
+  +xen-tools-4.2.1-r4.ebuild, +xen-tools-4.2.2-r2.ebuild,
+  -files/xen-4-CVE-2012-4544-XSA-25.patch, -files/xen-tools-3.3.0-nostrip.patch,
+  -files/xen-tools-4-add-nopie.patch, -files/xen-tools-4.1.1-curl.patch,
+  -files/xen-tools-4.1.1-libxl-tap.patch, -files/xen-tools-4.1.2-pyxml.patch,
+  -xen-tools-4.2.0-r3.ebuild, -xen-tools-4.2.1-r1.ebuild,
+  -xen-tools-4.2.1-r2.ebuild, -xen-tools-4.2.1.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  revbumps; add security patches XSA-55,56 to 4.2.1, 4.2.2, remove old ebuilds +
+  disused patches
+
+  23 May 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.1-r3.ebuild:
+  Stable for x86, wrt bug #464724
+
+  23 May 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.1-r3.ebuild:
+  Stable for amd64, wrt bug #464724
+
+  18 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4-CVE-2013-2072-XSA-56.patch, xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  Add XSA-56 / CVE-2072 sec. patch
+
+  17 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4-qemu-xen-doc.patch, xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  patch to fix build issue with qemu.doc.html, fixes Bug #470048 by Tomas Mozes
+  who sourced the patch, re-add ocaml in IUSE for now
+
+  16 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4.2-xen_disk_leak.patch, xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  Fix to leak in qemu-system, reported in Bug #467200 and tested by László
+  Szalma, patch from [Qemu-devel], closes said bug
+
+*xen-tools-4.2.2-r1 (15 May 2013)
+
+  15 May 2013; Jason A. Donenfeld <zx2c4@gentoo.org> +xen-tools-4.2.2-r1.ebuild,
+  -xen-tools-4.2.2.ebuild:
+  xl requires lzo now; otherwise it won't run.
+
+  15 May 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.2.ebuild:
+  epatch_user helper added wrt Bug #464052
+
+*xen-tools-4.2.2 (15 May 2013)
+*xen-tools-4.2.1-r3 (15 May 2013)
+
+  15 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4-CVE-2013-0215-XSA-38.patch,
+  +files/xen-4-CVE-2013-1919-XSA-46.patch,
+  +files/xen-4-CVE-2013-1922-XSA-48.patch,
+  +files/xen-4-CVE-2013-1952-XSA-49.patch,
+  +files/xen-4-CVE-2013-1952-XSA_49.patch, +files/xen-4-ulong.patch,
+  +xen-tools-4.2.1-r3.ebuild, +xen-tools-4.2.2.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  4.2.1-r1; re-invoked ipxe-nopie.patch, revbump 4.2.1-r3; updated security
+  patches, bump 4.2.2; updated security patches, dropped ocaml use flag made
+  redundant by build
+
+  15 May 2013; Ian Delaney <idella4@gentoo.org> files/xenstored.initd:
+  Fix to xenstored.initd wrt Bug #459082
+
+  16 Mar 2013; Ian Delaney <idella4@gentoo.org> files/xenstored.initd:
+  update depend() in xenstored.initd, fixes Bug #461632 by a.m
+
+  05 Mar 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r2.ebuild:
+  Fix paths for qemu files, fixes Bug #458818 by Tomoatsu Shimada
+
+  24 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xendomains.initd-r1,
+  files/xendomains.initd-r2:
+  Updated xendomains init scripts, ack to Tomas Mozes, fixes Bug #420067
+
+  22 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  Update the dependency yajl to current version, thx to 'BT' from Bug #458576
+
+  12 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r2.ebuild:
+  Fixed copy header file, Bug #456884
+
+  11 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r2.ebuild:
+  Removed redundant dep pyxml, closes Bug #45673 by Oleg
+
+  11 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild, xen-tools-4.2.1-r2.ebuild:
+  Reset REQUIRED_USE
+
+  11 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild, xen-tools-4.2.1-r2.ebuild:
+  Fix to install with use qemu
+
+  11 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild:
+  the manifests
+
+*xen-tools-4.2.1-r2 (11 Feb 2013)
+
+  11 Feb 2013; Ian Delaney <idella4@gentoo.org> +files/stubs-32.h,
+  +xen-tools-4.2.1-r2.ebuild, xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  revbump, added a header flag wrt Bug #351648
+
+  09 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xendomains-screen.confd,
+  files/xendomains.initd-r2, xen-tools-4.2.1-r1.ebuild:
+  Added xendomains.confd to start of xendomains-screen.confd suggested in Bug
+  #455622, edited xendomains.initd-r2 wrt suggestion from Bug #455626, fixes
+  both bugs by Tomas Mozes
+
+  03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> -xen-tools-4.1.1-r6.ebuild,
+  -xen-tools-4.1.2-r3.ebuild, -xen-tools-4.2.0-r2.ebuild:
+  Remove old
+
+  02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.0-r3.ebuild:
+  Stable for x86, wrt bug #454314
+
+  02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.0-r3.ebuild:
+  Stable for amd64, wrt bug #454314
+
+  01 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  Reversed/Re-added bin86 & dev86 to DEPEND in -4.2.0-r3 -4,2.2-r1 subsequent to
+  arch testing
+
+  31 Jan 2013; Ian Delaney <idella4@gentoo.org> files/ipxe-nopie.patch,
+  xen-tools-4.2.0-r2.ebuild, xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  Re-setting/correcting ipxe-nopie.patch to match source content in 4.2.0-r3 and
+  disabling the patch in -4.2.1-r1 (pending further testing) consequent to Bug
+  #447716, removed redunadant 4-add-nopie.patch
+
+*xen-tools-4.2.0-r3 (30 Jan 2013)
+*xen-tools-4.2.1-r1 (30 Jan 2013)
+
+  30 Jan 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4-CVE-2012-4544-XSA-25.patch,
+  +files/xen-4-CVE-2012-6075-XSA-41.patch, +files/xen-4-fix_dotconfig-gcc.patch,
+  +files/xen-tools-4-add-nopie.patch, +files/xen-tools-4-docfix.patch,
+  +xen-tools-4.2.0-r3.ebuild, +xen-tools-4.2.1-r1.ebuild,
+  -files/xen-tools-3.4.2-as-needed.patch, files/ipxe-nopie.patch,
+  xen-tools-4.2.0-r2.ebuild:
+  revbump;-4.2.0-r3; adjustments to DEPS, implementation of ocaml flag courtesy
+  of user known as 'a.m' wrt Bug #447716, reconstitution of ipxe-nopie with
+  subsequent add of -4-add-nopie.patch, new use ocaml added and implemented
+  (possible to rename), sed statements reduced to patches, 2 sec. patches
+  applied, build & install of docs corrected/upgrade. 4.2.1-r1; changes mirrored
+  those to 4.2.0-r3, add of 1 valid sec. patch. Drop un-needed -3.4.2-as-
+  needed.patch
+
+  24 Jan 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.1.2-r2.ebuild,
+  -xen-tools-4.2.0-r1.ebuild, xen-tools-4.2.0-r2.ebuild, xen-tools-4.2.1.ebuild:
+  4.2.0-r2, correct DEPS, thanks OP of Bug #447716, 4.2.1, rm white space, drop
+  old
+
+*xen-tools-4.2.1 (24 Jan 2013)
+
+  24 Jan 2013; Ian Delaney <idella4@gentoo.org> +xen-tools-4.2.1.ebuild,
+  metadata.xml:
+  bump
+
+  23 Jan 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.1.1-r6.ebuild:
+  patch from razamatan applied, fixes Bug #413493
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r2.ebuild,
+  xen-tools-4.1.2-r3.ebuild, xen-tools-4.2.0-r1.ebuild,
+  xen-tools-4.2.0-r2.ebuild:
+  Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt
+  #145809
+
+  20 Jan 2013; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.0-r2.ebuild:
+  Drop python2.5 because of lxml.
+
+  20 Dec 2012; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.0-r2.ebuild:
+  Use python_fix_shebang() to fix shebangs.
+
+  18 Dec 2012; Ian Delaney <idella4@gentoo.org> files/ipxe-nopie.patch:
+  patched patch ipxe-nopie.patch, thanks to patch submitted by user uen in Bug
+  #446022
+
+  17 Dec 2012; Michał Górny <mgorny@gentoo.org> xen-tools-4.2.0-r2.ebuild:
+  Bump to EAPI=5 to make Paludis happy, bug #447524.
+
+*xen-tools-4.2.0-r2 (16 Dec 2012)
+
+  16 Dec 2012; Michał Górny <mgorny@gentoo.org> +xen-tools-4.2.0-r2.ebuild:
+  Migrate to python-r1, clean up a bit. Acked by idella4.
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r3.ebuild,
+  xen-tools-4.2.0-r1.ebuild:
+  Move sys-power/iasl dependency from USE="hvm" to always required because
+  econf won't pass without it. Use udev.eclass to install udev rules into
+  correct directory. Convert to virtual/udev again after it was mistakenly
+  reverted 05 Dec 2012 by idella4.
+
+  04 Dec 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
+  Change maintainer tag (bug #390951).
+
+  04 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> xen-tools-4.1.1-r6.ebuild:
+  This is supposed to be stable amd64 and x86. We do not remove stable keywords
+  just for fun.
+
+  05 Dec 2012; Ian Delaney <idella4@gentoo.org> xen-tools-4.1.1-r6.ebuild:
+  Correction to amd64 keyword in 4.4.4-r6
+
+*xen-tools-4.2.0-r1 (05 Dec 2012)
+
+  05 Dec 2012; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4.2.0-anti-download.patch, +files/xen-4.2.0-jserver.patch,
+  +files/xen-4.2.0-nostrip.patch, +xen-tools-4.2.0-r1.ebuild,
+  -files/xen-tools-3.3.1-sandbox-fix.patch,
+  -files/xen-tools-3.4.2-fix-definitions.patch,
+  -files/xen-tools-3.4.2-fix-include.patch,
+  -files/xen-tools-3.4.2-ldflags-respect.patch,
+  -files/xen-tools-3.4.2-remove-default-cflags.patch,
+  -files/xen-tools-3.4.2-werror-idiocy-v2.patch,
+  -files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch,
+  -xen-tools-3.4.2-r3.ebuild, -xen-tools-3.4.2-r5.ebuild,
+  -xen-tools-4.1.1-r5.ebuild, metadata.xml, xen-tools-4.1.1-r6.ebuild,
+  xen-tools-4.1.2-r3.ebuild:
+  initial 4.2.0 found in virtual overlay, bump to 4.2.0-r1, added patches fixing
+  QA issues, added edits to build of external packages
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xen-tools-3.4.2-r3.ebuild, xen-tools-3.4.2-r5.ebuild,
+  xen-tools-4.1.1-r5.ebuild, xen-tools-4.1.1-r6.ebuild,
+  xen-tools-4.1.2-r2.ebuild, xen-tools-4.1.2-r3.ebuild:
+  Use virtual/udev instead of sys-fs/udev wrt #444398
+
+*xen-tools-4.1.2-r3 (10 Jul 2012)
+
+  10 Jul 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +xen-tools-4.1.2-r3.ebuild:
+  Updated ebuild for selinux dependancy xen-tools-4.1.2-r3.ebuild
+
+  29 May 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
+  Use <description> field in order to provide more compact <name>
+
+  08 May 2012; Kacper Kowalik <xarthisius@gentoo.org> xen-tools-3.4.2-r3.ebuild,
+  xen-tools-3.4.2-r5.ebuild, xen-tools-4.1.1-r5.ebuild,
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r2.ebuild:
+  Fix building with app-text/texi2html-5, commited on behalf of Ian Delaney.
+  Fixes bug 409333. Thanks to Joerg Neikes <xenoist@midlandgate.de> for the
+  report and patch
+
+  12 Jan 2012; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.2-r2.ebuild,
+  files/xendomains.initd-r2:
+  re-expand newinitd, fixes Bug 392403, patch prepared by Ian Delaney
+
+*xen-tools-4.1.2-r2 (28 Nov 2011)
+
+  28 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-4.1.2-r2.ebuild,
+  -xen-tools-4.1.2-r1.ebuild, -xen-tools-9999.ebuild, files/xendomains.initd-r2:
+  Move -9999 to virtualization overlay and revbump xen-tools to EAPI4
+
+*xen-tools-4.1.2-r1 (11 Nov 2011)
+
+  11 Nov 2011; Jesus Rivero <neurogeek@gentoo.org> -xen-tools-4.1.2.ebuild,
+  +xen-tools-4.1.2-r1.ebuild:
+  Revision bump wrt bug #311207
+
+  11 Nov 2011; Jesus Rivero <neurogeek@gentoo.org> xen-tools-4.1.2.ebuild:
+  Fix for improving Python-related code (bug #311207). Proxying for idella4
+
+  10 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  files/xen-tools-4.1.2-pyxml.patch:
+  Fix pyxml patch
+
+  07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/xen-tools-4.1.2-pyxml.patch, files/xen-tools-4.1.1-curl.patch,
+  xen-tools-4.1.2.ebuild:
+  Fix to pyxml, add dep pypam, fixes  Bug 367735, patch by Arfrever, repair to
+  curl patch, Bug #386487, repiared by Ian Delaney aka idella4
+
+  01 Nov 2011; Tony Vroon <chainsaw@gentoo.org> xen-tools-4.1.1-r6.ebuild:
+  Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
+  Lazkani & Ian "idella4" Delaney in bug #360621.
+
+*xen-tools-4.1.2 (25 Oct 2011)
+
+  25 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-3.4.2-r5.ebuild,
+  +xen-tools-4.1.2.ebuild:
+  Version bump prepared by Ian Delaney aka idella4
+
+  24 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r6.ebuild,
+  +files/xen-tools-4.1.1-bridge.patch, +files/xen-tools-4.1.1-curl.patch:
+  Patch to curl config, fixes Bug #386487, tiny change to bridging fixes Bug
+  #362575 by Klas Meder Boqvist, patch prepared by Ian Delaney aka idella4
+
+  23 Oct 2011; Patrick Lauer <patrick@gentoo.org> xen-tools-9999.ebuild:
+  Bump for #386461, thanks to Ian Delaney
+
+*xen-tools-4.1.1-r6 (22 Oct 2011)
+
+  22 Oct 2011; Magnus Granberg <zorry@gentoo.org> +xen-tools-4.1.1-r6.ebuild, 
+  +files/ipxe-nopie.patch:
+  Fix hardened compile failure #360805 don't compile ipxe with pie.
+  Thanks Ian Delaney and Ralf Glauberman
+
+  13 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-3.4.2.ebuild,
+  xen-tools-4.1.1-r5.ebuild, files/xendomains.initd-r1:
+  Sabayon Tinderbox build failuire, fixes bug #377557. patch by Tobias Heinlein
+  aka keytoaster, full diff prepared by Ian Delaney. Use toolchain function
+  instead of calling LD directly, copy fix from bug #384359, fix to invoke
+  correct compiler, copy from bug #383973, patches by Ian Delaney aka idella4
+
+  05 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-3.4.2-r5.ebuild,
+  xen-tools-4.1.1-r5.ebuild, metadata.xml:
+  Change use ioemu to qemu and edit metadata.xml, fixes Bug 383337, add rdep
+  packages for use flag doc, fixes Bug 384357, add elog meassage re /.config,
+  fixes Bug 376819. Pathces by by Ian Delaney aka idella4
+
+  29 Sep 2011; Thomas Kahle <tomka@gentoo.org> xen-tools-3.4.2-r3.ebuild:
+  x86 stable per bug 379241
+
+  27 Sep 2011; Tony Vroon <chainsaw@gentoo.org> xen-tools-3.4.2-r5.ebuild:
+  Patch by Ian "idella4" Delaney closes bug #384349 by Agostino "ago" Sarubbo.
+
+*xen-tools-3.4.2-r5 (27 Sep 2011)
+
+  27 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -xen-tools-3.4.2-r4.ebuild,
+  +xen-tools-3.4.2-r5.ebuild, +files/xen-tools-3.4.2-ldflags-respect.patch:
+  Proxy commit for Ian "idella4" Delaney. LDFLAGS respect closes bug #384351.
+  Removal of static libraries closes bug #384355. Use toolchain function
+  instead of calling LD directly, closes bug #384359.
+
+*xen-tools-3.4.2-r4 (25 Sep 2011)
+
+  25 Sep 2011; Tony Vroon <chainsaw@gentoo.org> +xen-tools-3.4.2-r4.ebuild,
+  +files/xen-tools-3.4.2-remove-default-cflags.patch:
+  Proxy commit for Ian "idella4" Delaney. Be more thorough for custom-cflags
+  and use a diff instead of sed magic, closes bug #383975. Use toolchain-funcs
+  to invoke correct compiler, closes bug #383973.
+
+  25 Sep 2011; Tony Vroon <chainsaw@gentoo.org> xen-tools-3.4.2-r3.ebuild:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian
+  "idella4" Delaney in security bug #379241.
+
+  25 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xen-tools-4.1.1-r5.ebuild:
+  x86 stable wrt bug #360621
+
+  25 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xen-tools-4.1.1-r5.ebuild:
+  x86 stable wrt bug #360621
+
+*xen-tools-3.4.2-r3 (24 Sep 2011)
+
+  24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -xen-tools-3.4.2-r2.ebuild,
+  +xen-tools-3.4.2-r3.ebuild, -files/xen-tools-3.4.2-werror-idiocy.patch,
+  +files/xen-tools-3.4.2-werror-idiocy-v2.patch:
+  Revised patch by Ian "idella4" Delaney resolves building on GCC 4.5 & 4.6;
+  closes bug #383977.
+
+*xen-tools-3.4.2-r2 (23 Sep 2011)
+
+  23 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -xen-tools-3.4.2-r1.ebuild,
+  +xen-tools-3.4.2-r2.ebuild, +files/xen-tools-3.4.2-werror-idiocy.patch:
+  Patch by Ian "idella4" Delaney to clear -Werror, stopping GCC 4.5 build
+  failures. Closes bug #383977. Moved to using a PATCHES array and the base
+  eclass.
+
+  21 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  files/xen-tools-3.4.2-fix-definitions.patch,
+  files/xen-tools-3.4.2-fix-include.patch:
+  Fix xen3 patches by Ian Delaney aka idell4
+
+*xen-tools-3.4.2-r1 (21 Sep 2011)
+
+  21 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-3.4.2-r1.ebuild,
+  +files/xen-tools-3.4.2-fix-definitions.patch,
+  +files/xen-tools-3.4.2-fix-include.patch:
+  Fix borken emerge due to system header changes; bug #379815. Input from Ian
+  Delaney aka idell4
+
+  18 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r5.ebuild:
+  Fix patch name. Thanks to Sven Köhler
+
+*xen-tools-4.1.1-r5 (18 Sep 2011)
+
+  18 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r4.ebuild,
+  +xen-tools-4.1.1-r5.ebuild, +files/xen-tools-4.1.1-libxl-tap.patch,
+  +files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch:
+  Fix bugs #380343 and #382329
+
+*xen-tools-4.1.1-r4 (12 Sep 2011)
+
+  12 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r3.ebuild,
+  +xen-tools-4.1.1-r4.ebuild:
+  Prevent downloading during compile, fixes bug #366125; Thanks to Ian Delaney
+  aka idella4
+
+  11 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r3.ebuild,
+  xen-tools-9999.ebuild:
+  Fix build
+
+*xen-tools-4.1.1-r3 (11 Sep 2011)
+
+  11 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r2.ebuild,
+  +xen-tools-4.1.1-r3.ebuild, xen-tools-9999.ebuild, metadata.xml:
+  Sync live ebuild with 4.1.1, drop acm since its deprecated upstream. Make
+  xend optional. Input from Ian Delaney aka idell4
+
+*xen-tools-4.1.1-r2 (10 Sep 2011)
+
+  10 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r1.ebuild,
+  +xen-tools-4.1.1-r2.ebuild, files/xend.initd-r2, files/xendomains.initd-r2:
+  Uncomment xl settings, fix bug 370817, adjust init.d scripts to work for xl;
+  Thanks to Ian Delaney aka idella4
+
+  05 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r1.ebuild,
+  metadata.xml:
+  Fix use doc #347942. Thanks to Ian Delaney aka idella4
+
+*xen-tools-4.1.1-r1 (31 Aug 2011)
+
+  31 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.0-r1.ebuild,
+  -xen-tools-4.1.1.ebuild, +xen-tools-4.1.1-r1.ebuild:
+  Drop old version
+
+  23 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> xen-tools-4.1.1.ebuild:
+  fix src_install, remove rm -r
+
+  09 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-9999.ebuild:
+  Drop patch
+
+  09 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-9999.ebuild:
+  Sync 9999 and 4.1.1
+
+*xen-tools-4.1.1 (29 Jul 2011)
+
+  29 Jul 2011; Patrick Lauer <patrick@gentoo.org> +xen-tools-4.1.1.ebuild:
+  Bump for #372259
+
+  29 Jul 2011; Patrick Lauer <patrick@gentoo.org> xen-tools-4.1.0-r1.ebuild:
+  Dep fix for #363139
+
+*xen-tools-9999 (06 Apr 2011)
+
+  06 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-9999.ebuild:
+  Add live version
+
+  05 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.0-r1.ebuild,
+  +files/xend.initd-r2, +files/xendomains.initd-r2, -files/xend.initd,
+  -files/xendomains.initd, -files/xendomains.initd-xl, files/xenstored.initd:
+  Clean up and fix init script deps
+
+*xen-tools-4.1.0-r1 (05 Apr 2011)
+
+  05 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.0.ebuild,
+  +xen-tools-4.1.0-r1.ebuild, +files/xenconsoled.confd,
+  +files/xenconsoled.initd, +files/xendomains.initd-xl, +files/xenstored.confd,
+  +files/xenstored.initd:
+  Clean up. Add support for new xl framework. No need for xend
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.0.ebuild:
+  Fix build on some platforms
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.0.ebuild:
+  Fix bug #360561
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-3.4.3.ebuild,
+  -files/xen-tools-4.0.0-asneeded.patch, -xen-tools-4.0.1.ebuild:
+  Clean up
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/xen-tools-3.0.4_p1--as-needed.patch,
+  -files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch,
+  -files/xen-tools-3.1.0-xen-detect-nopie-fix.patch,
+  -files/xen-tools-3.1.3-bzimage.patch,
+  -files/xen-tools-3.1.3-network-bridge-broadcast.patch:
+  Clean up
+
+*xen-tools-4.1.0 (26 Mar 2011)
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-3.1.3.ebuild,
+  -xen-tools-3.1.3-r1.ebuild, -xen-tools-3.2.1.ebuild,
+  -files/xen-tools-3.2.1-qemu-nodocs.patch,
+  -files/xen-tools-3.3.0--as-needed.patch,
+  -files/xen-tools-3.3.0-warning-fix.patch,
+  -files/xen-tools-3.3.0-xen-detect-nopie-fix.patch, -xen-tools-3.4.0.ebuild,
+  -xen-tools-3.4.0-r1.ebuild, -files/xen-tools-3.4.0-udevinfo.patch,
+  -xen-tools-3.4.1.ebuild, -xen-tools-3.4.1-r1.ebuild,
+  -files/xen-tools-3.4.1-xc_core-memset.patch, xen-tools-3.4.2.ebuild,
+  xen-tools-3.4.3.ebuild, -xen-tools-4.0.0.ebuild, xen-tools-4.0.1.ebuild,
+  +xen-tools-4.1.0.ebuild:
+  Version bump & clean up
+
+*xen-tools-4.0.1 (03 Dec 2010)
+
+  03 Dec 2010; Patrick Lauer <patrick@gentoo.org> +xen-tools-4.0.1.ebuild:
+  Bump
+
+  16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  xen-tools-3.4.0.ebuild, xen-tools-3.4.0-r1.ebuild, xen-tools-3.4.1.ebuild,
+  xen-tools-3.4.1-r1.ebuild, xen-tools-3.4.2.ebuild, xen-tools-3.4.3.ebuild,
+  xen-tools-4.0.0.ebuild:
+  Update EAPI. Unset PYTHON_MODNAME variable, which is used only by
+  distutils.eclass, which isn't inherited here. Fix calls to
+  python_mod_optimize() and python_mod_cleanup() (bug #329141).
+
+*xen-tools-3.4.3 (11 Jul 2010)
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.4.3.ebuild:
+  Bump for #325091
+
+  25 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  xen-tools-4.0.0.ebuild, -files/xen-tools-4.0.0-as-needed.patch,
+  +files/xen-tools-4.0.0-asneeded.patch:
+  Fixing build with --as-neeed wrt bug 320339. Thanks to Diego for
+  reporting.
+
+  24 Jun 2010; Christoph Mende <angelos@gentoo.org> xen-tools-3.4.2.ebuild:
+  Stable on amd64 wrt bug #293714
+
+  09 Jun 2010; Patrick Lauer <patrick@gentoo.org> xen-tools-4.0.0.ebuild:
+  Adding iasl dep for hvm useflag. Fixes #318471
+
+*xen-tools-4.0.0 (12 Apr 2010)
+
+  12 Apr 2010; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-4.0.0.ebuild,
+  +files/xen-tools-4.0.0-as-needed.patch:
+  Version bump per bug #313791
+
+  07 Apr 2010; Patrick Lauer <patrick@gentoo.org>
+  files/xen-tools-3.4.0-network-bridge-broadcast.patch:
+  Fixing xen-tools-3.4.0-network-bridge-broadcast.patch for #258378
+
+  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+  xen-tools-3.4.2.ebuild:
+  stable x86, bug 293714
+
+  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+  xen-tools-3.4.2.ebuild, +files/xen-tools-3.4.2-as-needed.patch:
+  fix issues with --as-needed, patch by Kacper Kowalik in bug 296631
+
+*xen-tools-3.4.2 (01 Dec 2009)
+
+  01 Dec 2009; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.4.2.ebuild:
+  Bump
+
+  05 Nov 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.4.1-r1.ebuild:
+  Adding gettext depend for #287935
+
+  27 Oct 2009; Patrick Lauer <patrick@gentoo.org> -xen-tools-3.3.0.ebuild,
+  -xen-tools-3.3.1.ebuild:
+  Removing old versions for #287936
+
+  11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
+  xen-tools-3.4.1-r1.ebuild:
+  Replace built_with_use with has_version.
+
+*xen-tools-3.4.1-r1 (01 Sep 2009)
+
+  01 Sep 2009; Wolfram Schlich <wschlich@gentoo.org> +files/xend.initd-r1,
+  +files/xendomains.initd-r1, +xen-tools-3.4.1-r1.ebuild:
+  fix bugs 248771, 248797, 248917
+
+  19 Aug 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.4.1.ebuild:
+  Changing python dep (use=ssl) for #279917
+
+*xen-tools-3.4.1 (17 Aug 2009)
+
+  17 Aug 2009; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.4.1.ebuild,
+  +files/xen-tools-3.4.1-xc_core-memset.patch:
+  Bump to 3.4.1. Fixes #280773. Patch by Sergey Morozov
+
+  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.1.3.ebuild,
+  xen-tools-3.1.3-r1.ebuild, xen-tools-3.2.1.ebuild, xen-tools-3.3.0.ebuild,
+  xen-tools-3.3.1.ebuild, xen-tools-3.4.0.ebuild, xen-tools-3.4.0-r1.ebuild:
+  Fixing link to gentoo-wiki.com, fixes #275219
+
+*xen-tools-3.4.0-r1 (22 Jun 2009)
+
+  22 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +xen-tools-3.4.0-r1.ebuild, +files/xen-tools-3.4.0-udevinfo.patch:
+  Udev rules fix, closes #236819. Thanks to Frank Ridderbusch for the shiny
+  patch
+
+*xen-tools-3.4.0 (22 Jun 2009)
+
+  22 Jun 2009; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.4.0.ebuild,
+  +files/xen-tools-3.4.0-network-bridge-broadcast.patch:
+  Bump to 3.4.0. Closes #271173. Patch and ebuild fixes by Sergey Morozov
+
+  28 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/xen-tools-3.3.1-sandbox-fix.patch, xen-tools-3.3.1:
+  Small sandbox fix, closes 253134. Patch originally from RB.
+
+  27 Apr 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.3.1:
+  Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764
+
+*xen-tools-3.3.1 (26 Apr 2009)
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.3.1.ebuild:
+  Bump to 3.3.1. Fixes half of #254931
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/xen-tools-3.3.0-warning-fix.patch, xen-tools-3.3.0:
+  Fix gcc 4.3 compile failure, part of #259670
+
+  28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
+  custom-cflags is a global USE-flag
+
+*xen-tools-3.1.3-r1 (16 Jan 2009)
+
+  16 Jan 2009; Lance Albertson <ramereth@gentoo.org>
+  +files/xen-tools-3.1.3-bzimage.patch, +xen-tools-3.1.3-r1.ebuild:
+  New patch for 3.1.3 which adds bzImage >=v2.08 support to xen. This allows
+  Fedora 10 to run as a DomU for this version. Patch is originally from
+  https://bugzilla.redhat.com/457199
+
+*xen-tools-3.3.0 (01 Sep 2008)
+
+  01 Sep 2008; Robert Buchholz <rbu@gentoo.org>
+  +files/xen-tools-3.3.0--as-needed.patch,
+  +files/xen-tools-3.3.0-nostrip.patch,
+  +files/xen-tools-3.3.0-xen-detect-nopie-fix.patch, files/xendomains.confd,
+  files/xendomains.initd, metadata.xml, -xen-tools-3.2.0.ebuild,
+  +xen-tools-3.3.0.ebuild:
+  Version bump to Xen 3.3 (bug #201792). Fixes bugs:
+   * Add USE flags for ACM and FLASK Xen Security Modules
+   * Properly compile and uninstall python bytecode
+   * RDEPEND on pyxml (bug #201255)
+   * Remove libvncserver dependency
+   * Shutdown xendomains in reverse start order (bug #210445)
+   * Allow for parallel shutdown of xendomains (bug #162833)
+   * Check that python is built with threading (bug #236092)
+
+  30 Jul 2008; Robert Buchholz <rbu@gentoo.org> xen-tools-3.2.1.ebuild:
+  Set VARTEXFONTS so LaTeX does not try to write out of the sandbox (bug #233120)
+
+  28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  add GLEP 56 USE flag desc from use.local.desc
+
+*xen-tools-3.2.1 (04 May 2008)
+
+  04 May 2008; Robert Buchholz <rbu@gentoo.org>
+  +files/xen-tools-3.2.1-qemu-nodocs.patch, -xen-tools-3.1.2.ebuild,
+  +xen-tools-3.2.1.ebuild:
+  Version bump to the Xen 3.2.1 release (bug #219339), thanks to Troy Bowman
+  for testig. Disable magic building of QEMU documentation (bug #192427).
+
+*xen-tools-3.2.0 (08 Feb 2008)
+
+  08 Feb 2008; Michael Marineau <marineam@gentoo.org>
+  +xen-tools-3.2.0.ebuild:
+  Add version 3.2.0
+
+*xen-tools-3.1.3 (03 Feb 2008)
+
+  03 Feb 2008; Michael Marineau <marineam@gentoo.org>
+  +files/xen-tools-3.1.3-network-bridge-broadcast.patch,
+  +xen-tools-3.1.3.ebuild:
+  Version bump to 3.1.3
+
+  14 Dec 2007; Robert Buchholz <rbu@gentoo.org> xen-tools-3.1.2.ebuild:
+  Added a check for USE=ncurses in python in case we use pygrub
+
+*xen-tools-3.1.2 (17 Nov 2007)
+
+  17 Nov 2007; Michael Marineau <marineam@gentoo.org>
+  -files/xen-tools-3.0.4_p1-pygrub-security-fix.patch,
+  -files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch,
+  -files/xen-tools-3.0.4_p1-vnclisten.patch,
+  -files/xen-tools-3.1.0-pygrub-security-fix.patch,
+  -files/xen-tools-3.1.0-python-site-packages.patch,
+  -files/xen-tools-3.1.1-insecure-file-creation-fix.patch,
+  -xen-tools-3.0.4_p1-r2.ebuild, -xen-tools-3.1.0-r2.ebuild,
+  -xen-tools-3.1.1-r1.ebuild, +xen-tools-3.1.2.ebuild:
+  Bump to 3.1.2. Clean out old versions.
+
+*xen-tools-3.1.1-r1 (23 Oct 2007)
+*xen-tools-3.1.0-r2 (23 Oct 2007)
+*xen-tools-3.0.4_p1-r2 (23 Oct 2007)
+
+  23 Oct 2007; Michael Marineau <marineam@gentoo.org>
+  +files/xen-tools-3.1.1-insecure-file-creation-fix.patch,
+  -xen-tools-3.0.4_p1-r1.ebuild, +xen-tools-3.0.4_p1-r2.ebuild,
+  -xen-tools-3.1.0-r1.ebuild, +xen-tools-3.1.0-r2.ebuild,
+  -xen-tools-3.1.1.ebuild, +xen-tools-3.1.1-r1.ebuild:
+  Fix an insecure temp file creation, bug #196824, CVE-2007-3919
+
+*xen-tools-3.1.1 (15 Oct 2007)
+
+  15 Oct 2007; Michael Marineau <marineam@gentoo.org>
+  +xen-tools-3.1.1.ebuild:
+  Version bump.
+
+  02 Oct 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.1.0-r1.ebuild:
+  Fix build on gcc 4.2.0, fixes bug #191172.
+  Warn user if iproute2 was built with USE=minimal, fixes bug #194224.
+  Minor cleanups, etc.
+
+*xen-tools-3.1.0-r1 (26 Sep 2007)
+*xen-tools-3.0.4_p1-r1 (26 Sep 2007)
+
+  26 Sep 2007; Michael Marineau <marineam@gentoo.org>
+  +files/xen-tools-3.0.4_p1-pygrub-security-fix.patch,
+  +files/xen-tools-3.1.0-pygrub-security-fix.patch,
+  -xen-tools-3.0.4_p1.ebuild, +xen-tools-3.0.4_p1-r1.ebuild,
+  -xen-tools-3.1.0.ebuild, +xen-tools-3.1.0-r1.ebuild:
+  Security Bump: Guest domains could execute code on Dom0 via pygrub.
+  Bug #193808 and CVE-2007-4993
+
+  03 Sep 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.0.4_p1.ebuild, xen-tools-3.1.0.ebuild:
+  Fix documentation dependencies.
+
+  27 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.0.4_p1.ebuild, xen-tools-3.1.0.ebuild:
+  Die if both x86 and amd64 are set in USE.
+
+  26 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  +files/xen-tools-3.1.0-xen-detect-nopie-fix.patch, xen-tools-3.1.0.ebuild:
+  Fix build on x86 hardened.
+
+*xen-tools-3.1.0 (24 Aug 2007)
+
+  24 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  -files/xen-tools-3.0.2--as-needed.patch,
+  -files/xen-tools-3.0.2-bxclobber.patch,
+  -files/xen-tools-3.0.2-pushpop.patch,
+  -files/xen-tools-3.0.2-pygrub-progsreiserfs-0.3.1.patch,
+  -files/xen-tools-3.0.2-test-uuid.patch,
+  -files/xen-tools-3.0.2-test-xauthority.patch,
+  -files/xen-tools-3.0.2-xc_ptrace.patch,
+  +files/xen-tools-3.1.0-python-site-packages.patch, -files/xend-init,
+  -xen-tools-3.0.2-r4.ebuild, +xen-tools-3.1.0.ebuild:
+  Copy Xen 3.1.0 related ebuilds over from the Xen project overlay.
+  Remove Xen 3.0.2.
+
+  10 Jul 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.0.4_p1.ebuild:
+  Remove unneeded hardened flag checking and add some more info to the post
+  install message.
+
+  25 Jun 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.0.4_p1.ebuild:
+  Fix typo in -fno-pie flag.
+
+  16 May 2007; Michael Marineau <marineam@gentoo.org>
+  xen-tools-3.0.4_p1.ebuild:
+  Only depend on xproto when ioemu is enabled. Bug #177110.
+
+*xen-tools-3.0.4_p1 (02 May 2007)
+
+  02 May 2007; Michael Marineau <marineam@gentoo.org>
+  -files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch,
+  -files/3.0.2-r4/xc_ptrace.patch, -files/3.0.2-r4/xend.initd,
+  -files/3.0.2-r4/xendomains.initd, +files/xen-tools-3.0.2-xc_ptrace.patch,
+  +files/xen-tools-3.0.2-pygrub-progsreiserfs-0.3.1.patch,
+  +files/xen-tools-3.0.4_p1--as-needed.patch,
+  +files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch,
+  +files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch,
+  +files/xen-tools-3.0.4_p1-vnclisten.patch, +files/xend.initd,
+  +files/xendomains.initd, -files/xendomains-conf, -files/xendomains-init,
+  -xen-tools-3.0.2-r2.ebuild, -xen-tools-3.0.2-r3.ebuild,
+  xen-tools-3.0.2-r4.ebuild, +xen-tools-3.0.4_p1.ebuild:
+  Add Xen 3.0.4_1 from the marineam-xen overlay.
+  Clean out some old ebuilds and clean up the files dir.
+
+  13 Mar 2007; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r3.ebuild,
+  xen-tools-3.0.2-r4.ebuild:
+  Use "type" instead of "which", as per
+  http://archives.gentoo.org/gentoo-dev/msg_143424.xml
+
+  16 Dec 2006; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r4.ebuild:
+  Narrow dep on app-emulation/xen to match version of xen-tools.
+
+*xen-tools-3.0.2-r4 (13 Oct 2006)
+
+  13 Oct 2006; <aross@gentoo.org>
+  +files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch,
+  +files/3.0.2-r4/xc_ptrace.patch, +files/3.0.2-r4/xendomains.initd,
+  +files/3.0.2-r4/xend.initd, +xen-tools-3.0.2-r4.ebuild:
+  Fix a PTRACE_* compilation error, thanks to Thomas Veith <th_veith@web.de>
+  in #151014.
+  
+  Introduce the pygrub local USE flag and fix a compile error when
+  sys-fs/progsreiserfs is installed, thanks to M. Edward Borasky
+  <znmeb@cesmail.net> and Mauricio Zambrano <mauro@webdb.homelinux.net> in
+  #137137.
+  
+  Make ntp-client start after xend, thanks to Harris Landgarten
+  <harrisl@lhjonline.com> in #144057.
+  
+  Make /etc/init.d/xendomains correctly handle domains with numbers, periods
+  and/or hyphens, thanks to Robert S <robert_s@emailme.net.au> in #148628.
+  
+  Fix a compile error with python-2.5, thanks to Charlie Shepherd
+  <masterdriverz@gmail.com> and Marien Zwart <marienz@gentoo.org> in #149138.
+  
+  Fix a compilation error on AMD64 with a 64 bit kernel and 32 bit userland,
+  thanks to tonich <tonich@artparade.ru> and Sven Wegener
+  <swegener@gentoo.org> in #143999.
+  
+  Make /etc/init.d/xend fail gracefully when started in a non-privileged
+  domain or unmodified kernel, thanks to Christian Hesse <mail@earthworm.de>
+  and Robert S <robert_s@emailme.net.au> in #148486.
+  
+  Only warn instead of dying when python is build with stack smashing
+  protection (ssp), thanks to Tuan Van <langthang@gentoo.org>, Raimonds Cicans
+  <ray@apollo.lv>, Brad Plant <bplant@westnet.com.au> and Sven Wegener
+  <swegener@gentoo.org> in #141866.
+  
+  Replace the hardened USE flag with test-flag-CC from flag-o-matic.eclass to
+  avoid compile errors with gcc-4.1 and USE=hardened, thanks to Richard
+  Benjamin Voigt <bvoigt@kas.com> in #147876.
+
+*xen-tools-3.0.2-r3 (15 Aug 2006)
+
+  15 Aug 2006; Andrew Ross <aross@gentoo.org> +files/xen-consoles.logrotate,
+  -files/xend-conf, +files/xendomains.confd, +files/xendomains.initd,
+  +files/xendomains-screen.confd, metadata.xml, -xen-tools-3.0.2-r1.ebuild,
+  xen-tools-3.0.2-r2.ebuild, +xen-tools-3.0.2-r3.ebuild:
+  Fix bugs #141981, #142011, #141866, and #137886. Thanks to Brad Plant
+  <bplant@westnet.com.au>, Nedd Ludd <solar@gentoo.org>, Nick Devito
+  <nick125@gmail.com>, and Mike Williams <mike@gaima.co.uk>.
+
+  10 Aug 2006; Sven Wegener <swegener@gentoo.org>
+  +files/xen-tools-3.0.2-bxclobber.patch,
+  +files/xen-tools-3.0.2-pushpop.patch, -files/hardened-bx-clobber.patch,
+  metadata.xml, xen-tools-3.0.2-r2.ebuild:
+  Fix push and pop usage for amd64, bug #142682. Disable the 32bit-only
+  vmxassist, if we can't compile x86 32bit code, bug #138314.
+
+  10 Aug 2006; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r2.ebuild:
+  Fix minor bug (debug USE flag ignored) introduced by the fix for bug #124361
+
+  10 Aug 2006; Andrew Ross <aross@gentoo.org>
+  +files/xen-tools-3.0.2-test-uuid.patch,
+  +files/xen-tools-3.0.2-test-xauthority.patch, metadata.xml,
+  xen-tools-3.0.2-r1.ebuild, xen-tools-3.0.2-r2.ebuild:
+  Fix bug #141233 and add myself as a maintainer.
+
+*xen-tools-3.0.2-r2 (04 Aug 2006)
+
+  04 Aug 2006; Chris Bainbridge <chrb@gentoo.org>
+  +xen-tools-3.0.2-r2.ebuild:
+  Add support for vnc and sdl - thanks to Nick Devito and Andrew Ross in bug
+  #124361
+
+*xen-tools-3.0.2-r1 (09 Jun 2006)
+
+  09 Jun 2006; Chris Bainbridge <chrb@gentoo.org> -xen-tools-3.0.2.ebuild,
+  +xen-tools-3.0.2-r1.ebuild:
+  Clean up .pyc files, thanks to Andrew Ross, bug #136159
+
+  02 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  +files/xen-tools-3.0.2--as-needed.patch, -xen-tools-3.0.1.ebuild,
+  -xen-tools-3.0.1_p9029.ebuild, xen-tools-3.0.2.ebuild:
+  Add patch to enable --as-needed LDFLAG, #135145
+
+  26 Apr 2006; Aron Griffis <agriffis@gentoo.org> xen-tools-3.0.1.ebuild,
+  xen-tools-3.0.1_p9029.ebuild, xen-tools-3.0.2.ebuild:
+  Remove ~ia64 since this ebuild deps on app-emulation/xen, which won't have
+  ia64 keywords for a while yet
+
+  11 Apr 2006; <chrb@gentoo.org> +files/hardened-bx-clobber.patch,
+  xen-tools-3.0.2.ebuild:
+  add hardened patch and IUSE flag, #129491
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  Fix hardened flags for hvmloader and vmxassist, #129491
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  removed the hardened stripping flags - now that the hypervisor is split out,
+  the tools should be compilable with hardened flags. There is currently a bug
+  with register clobbering which has been filed at bugzilla.xensource.com #609
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  add some extra man pages, #129189
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  remove sed fix, #129429
+
+  10 Apr 2006; <chrb@gentoo.org> files/digest-xen-tools-3.0.2, Manifest:
+  new digest
+
+*xen-tools-3.0.2 (09 Apr 2006)
+
+  09 Apr 2006; <chrb@gentoo.org> +xen-tools-3.0.2.ebuild:
+  bump, #129191
+
+  01 Apr 2006; Aron Griffis <agriffis@gentoo.org> xen-tools-3.0.1.ebuild,
+  xen-tools-3.0.1_p9029.ebuild:
+  Add warning regarding dev-lang/python built without USE=ncurses #128175
+
+*xen-tools-3.0.1_p9029 (24 Mar 2006)
+*xen-tools-3.0.1 (24 Mar 2006)
+
+  24 Mar 2006; Aron Griffis <agriffis@gentoo.org> +files/xend-conf,
+  +files/xend-init, +files/xendomains-conf, +files/xendomains-init,
+  +metadata.xml, +xen-tools-3.0.1.ebuild, +xen-tools-3.0.1_p9029.ebuild:
+  Split xen-tools from xen; this package installs xend and the tools, but not
+  the hypervisor or include files. Unify the release and snapshot ebuilds for
+  easier maintenance. Switch to a snapshot versioning scheme that keeps
+  release/snapshot versions in order. Add myself as an additional maintainer
+  in metadata.xml
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
new file mode 100644
index 0000000..2935eb0
--- /dev/null
+++ b/app-emulation/xen-tools/Manifest
@@ -0,0 +1,24 @@
+AUX gentoo-patches.conf 3289 SHA256 b45e8ba9e67672b723201e159e390122158f47b225ced9bf3efdbf7be376afbe SHA512 51abaee90e699501e792735b3055081c792564f38c3491e83cfda02b9327d666c7071b2359cb529f72def0eaa7058d1240190f1baddfb1db398602802aba89a6 WHIRLPOOL 60be98fd6a4c20ddbe66bd3284e613c79002453ee2aa8c71631a119cf9f06f10d143dec99a14ad72f1bd1ab824feeb063b58c429188c6967e2af376bfae27546
+AUX stubs-32.h 537 SHA256 4c903162da80cefd394404cb8cd9963a6ef6e3ad6c7adcbaa450a002d929bfc5 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 WHIRLPOOL 9c006e266bea6bb9d623e76011a4eac07c5fe4fdf76a041cc42a2289a7e9163988bad0fb2f458e300e45aabf9fb864ec764a496d7f89d58e57a506bac206a5f1
+AUX xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 WHIRLPOOL be108bf298202851de434af513ac8c03a533e7621623c2a7e8f26d498074b3eec81b85b2ae29ad2ec67f4fe9937c88bd78c5f5e260793e7e69ec964d4adb989e
+AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74
+AUX xencommons.initd 1457 SHA256 564b3a2d9d456f919bf35b5cf1820c7d1503c4925f9a8bd37a24cfd27c237232 SHA512 d45fe1a874ff34fb40a1f1a2e0f859e0247f0f2a0a469738a11c87d20218f1bbf62dfcae95b8f4950f2b893274107f1f9369905a47f624d0aea436d3d94b41b0 WHIRLPOOL c8dafb7609e01fc85919509d33f9002895ad5047c6a94dffd1ae14bbba9ebb8ac0ae5630c2e18dc5b035e9539d2d148a7313842c9107b75be03a4887af1db141
+AUX xenconsoled.confd 44 SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d WHIRLPOOL 503f7b48842724e69e7e4ae752d0570c339b7214b5a5fa1db51300e65470803bb383524f6de6c5c08849a961f628f6db7764e3eddcc19accbd209777a0f27d68
+AUX xenconsoled.initd 789 SHA256 c94ac34f67f49189c6d4ad47285b98106b275916cd10ffac14575ceaf3241ca2 SHA512 cd5faa5e39827aaa2e96b93e554c67e151a84e7e054b74d99aa30d795fcefeb60aa15478ad0ce05502b9fc9ac8375c419dd24792bcd46aa8720e3cbc0d1da967 WHIRLPOOL 4f757bba30c8d3a5232ac83dc6eebe7f3d37f36d8ca0574115249d9ac1e832b6fc1325d7d3a4b60eb22eee2346efbdbbd60dd81307f951b1159db980e4485f07
+AUX xendomains-screen.confd 890 SHA256 10ae16108a73cc1ddecfae3bd8dc0e7e739f3f9d845249a2ec23ca03ea02fdb1 SHA512 fb7bfc1806608c6e30bb7db367afe9cf75d44e809556c3ba2794cb3ce0c9f35bcfd7f2bfc4a15a8d805f3d57ff082fe9a525cbac3306e64cbbd0ee5cef554505 WHIRLPOOL 014bef2bf120733482a54811f97ea680ce4d585df1cefde96a0ad90de1e167986f8ebdc0726717128c5835b8f8d55eddef79a36ab86e39ac2a43be70562eeb07
+AUX xendomains.confd 291 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc SHA512 8ad255d39fc0b390c854a64ed82333b6a3041e1247b7a3934cd8274710c168c0017ef2dddbe32c120268d7ea946f8c1b148d7d06a3a4bf415a77eeec36dce2da WHIRLPOOL cea26f5b0c88d644a8906cb2cc9ea8fe5071d6dfd7fc1020d1ce795a389c01b26209cdde04f61e4755494455a1b60c4652e45734c8f5463f2108ea4700e4f336
+AUX xendomains.initd-r2 2811 SHA256 075c921756b306070a5e3116725b23683b8b32804194711016d30d193d067f4f SHA512 74c1850068379b5b2b7b8e48937d67a9ceafc8843491daa9795287789350e90ac6a5fff7caec3acd496168322ba13cb2c05c6313c49794540e2d8da15a840347 WHIRLPOOL 9ef41a8eec8c2742b0ec837336eed29df9409e58a07ef91b976cebe33fa687dbe861061575fc6be9837e4df7cb9c7dfd310f4245e6b0f8a296f3b39a01ef3fde
+AUX xenqemudev.confd 156 SHA256 61c5ff72464c5098d9cad50e5dc94a090dd107b4831bb60a4260cf0a3d12ce81 SHA512 d3cdeaed625e65e60fb22128baf24dceb45143ddf494d7db26464497abc42dbba0c0c9878f1e3908e2910557f4c4d600939824e944938aa251609ec5a1a86ee4 WHIRLPOOL 9633789dcc4dc4eaf7f2198385930bf5474c7a9e531746db89bcae50b8ed78313133a124d4a2b38fb5021337f43cfbd260e4ae391e26d063c68e7aff354be4c2
+AUX xenqemudev.initd 1834 SHA256 52c75aa11daba6f6039ab52dc0898b40d084e4b250f35a00dfa17e813bbaf60b SHA512 d45499e445631b716fa9c57eba88399a162bb136b307dc850ac98b8995664963f624e0e01cf865077b17e0c8fc4174681a4e2bf0a9e65a25d4917e2697f6e424 WHIRLPOOL 805769512ff3823853995e6d879aeb8a82350f3f3a559721bb7b911b85e0505c5455cc749dc56a21e5adb2bb6bbfb19071d1dbdfa6e8b48b1bb34db00f490c8f
+AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 WHIRLPOOL df46f3fde8b13c3427f445bcf08eb4c660f6000164a01e461cff85cf93ce1195009fc3b4457181788da8eef8dec9125b41ace233ec6f169919be64337a57ebb8
+AUX xenstored.initd 1057 SHA256 15c22c41ade7a329f8a2b5c857cab865fb89752413b427c651ce5cffb45bc8fe SHA512 e74d3e95af079b96b4f2bbf3e436d2cebd84726f9c098ec1fad3dd9015a45cb2dac97fa5ee1ef9fe1f6bf332e97f1cbd38601c397a1a513cde60039ee15c8925 WHIRLPOOL 5071b02be32fe6fc1ca0eb07ad81d46e03ddd1b3344cdabf632552b87b8c2a4d45c58ba148f6706a1140e30525c1ee68394e1cbad8442886d697b3e033038a6d
+DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
+DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
+DIST xen-4.7.0.tar.gz 20702550 SHA256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921 WHIRLPOOL 9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f
+DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 96e774bd03c9df341fdb2f5d6cf231549c8d7a004c3c902c07b5cb690428d4c6 SHA512 7f4966bb7dad02b213a3cbefcc312573039feaec964a2deaa6aa7f8fa488b6e31176834a4e2cf6ac380548f1b8251c7700d16d1cbc7b88fcee440f6cccd7f177 WHIRLPOOL a41cae3441370e0e18fbf28ac7a780adfaa0d6af12dc62f1dfe90f52f01ebbd8055e3b5b399ae11602b29b8a206aafe2cbecb79948233bd072e73294468f3b08
+DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
+DIST xen-security-patches-16.tar.xz 7368 SHA256 3301514f20cc106f75ad84a2352f573b8d807ddeedfc57d2d5fda8c13e63bc1b SHA512 5d83107ce9972e8ab4c2aa3e6285c3cfae04b11768b7d55baf9cbe4a63fdf5175a0bbb7685641df15af4f98d6d095ff2b35b7c9fd6be6355a777547d8106874c WHIRLPOOL 3747b209ca1fead0dc7e791caed040e033b52933695e190d97bbd3f4abba957dbfaafc84e11a7f51aeb45bad3884d8b341d136351db145985f27b152aa25aa79
+EBUILD xen-tools-4.7.0-r2.ebuild 14043 SHA256 6ff91df0858a23b921483c164bd67e285390a9e722ac785dca74abe94a3555e1 SHA512 0c5eb55526b254ecb1b19a2b36d311b9f221572217c846e00e19285ac61a7843fe28fffe0a883c6d8941b1ac629f22705eaaae04e5217c5227308a61f39bda9a WHIRLPOOL ed1d003aa70908764d5998681a7576d2583f52b37a56a1072b4b5f4ad64d3a57867c092454fa57ab4277c0fa440d8edd89c39ec9e899ada2e66e1d64c60ab1ce
+MISC ChangeLog 9735 SHA256 63d79fc0452e7f1f6727c3d388249d49f0383e6a59ee2a61d7052553817a88be SHA512 9716b35c7e423d8d59afbaf74d941994380a6bbc7907e57b02294b9bf7154e89349f1eee0022754c202a39008a060840377182d316aaf71e9cfc52731e4e4205 WHIRLPOOL 8c6c0051f32caa12ca74460b5bb328f5ede774beed031ab68bcae091525bef78c388779427a754e01ac6eabf82f82e91fe29ad946b8af451e8708712d6be478c
+MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07
+MISC metadata.xml 1016 SHA256 c308885b5aaa9733dcc866837e1847a89ef6085cf360a32a819cc38436d3569f SHA512 d93403690acb20d330e3af8e76b0a63daf69abce63f41e2edb7268158fafa15aa2c3f58fa1b6ec5f4667e55262685840bd1e47c12b2dfb95f702a7ecf7926390 WHIRLPOOL f02be8f37834b7d01328f99664268a0f6a47876c520f4bb36690b70c436a65e1a34cc6fed9e3429a804f1668c8e6c379bff39bf7375842d0b6c1efe3c01f756d
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
new file mode 100644
index 0000000..942f157
--- /dev/null
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -0,0 +1,117 @@
+# Drop .config, fixes to gcc-4.6
+_gx001=" xen-4-fix_dotconfig-gcc.patch"
+_gx020=" xen-4.3-fix_dotconfig-gcc.patch"
+
+# Fix texi2html build error with new texi2html, qemu.doc.html
+_gx002=" xen-tools-4-docfix.patch"
+_gx003=" xen-tools-4-qemu-xen-doc.patch"
+
+_gx004=" xen-tools-4.2-pod-utf8-chars.patch"
+_gx005=" xen-tools-4.2-pod-docs.patch"
+_gx006=" xen-tools-4.2-pod-xl.patch"
+
+# Fix network broadcast on bridged networks
+_gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch"
+
+# Bug 496708
+_gx008=" xen-tools-4-unbundle-ipxe.patch"
+#use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+
+# Fix bridge by idella4, bug #362575
+_gx009=" xen-tools-4.1.1-bridge.patch"
+
+# Conditional patch, fix in ebuild
+# Don't build ipxe with pie on hardened, Bug #360805
+#if gcc-specs-pie; then
+#	epatch "${FILESDIR}"/ipxe-nopie.patch
+#fi
+
+# Prevent double stripping of files at install
+_gx010=" xen-4.2.0-nostrip.patch"
+_gx024+=" xen-4.4-nostrip.patch"
+
+# fix jobserver in Makefile
+_gx011=" xen-4.2.0-jserver.patch"
+_gx021=" xen-4.3-jserver.patch"
+
+# add missing header, Bug #467200
+_gx012=" xen-4-ulong.patch"
+_gx013=" xen-tools-4.2-xen_disk_leak.patch"
+
+# Set dom0-min-mem to kb; Bug #472982
+_gx014=" xen-4.2-configsxp.patch"
+
+# Bug 463840
+_gx015=" xen-tools-4.2.2-install.patch"
+_gx016=" xen-tools-4.2.2-rt-link.patch"
+
+# Bug 379537
+_gx017=" fix-gold-ld.patch"
+
+# Bug 510976
+_gx018=" xen-tools-4.2.4-udev-rules.patch"
+
+# bundled seabios
+_gx019=" xen-tools-4-anti-seabios-download.patch"
+_gx032=" xen-tools-4.5-anti-seabios-download.patch"
+
+# Bug 477676
+_gx022=" xen-tools-4.3-ar-cc.patch"
+
+# Prevent file collision with qemu package Bug 478064
+_gx023=" qemu-bridge.patch"
+_gx025=" xen-4.4-qemu-bridge.patch"
+_gx031=" xen-4.5-qemu-bridge.patch"
+#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+_gx026=" xen-tools-4.4-api-fix.patch"
+
+# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
+_gx027=" xen-tools-4-qemu-fix-po-collision.patch"
+
+# Fix build failure with ncurses[tinfo], bug 526526
+_gx028=" xen-tools-4.4.1-tinfo.patch"
+
+# Don't download ovmf, use pre-released
+_gx029=" xen-tools-4-anti-ovmf-download.patch"
+
+# fix build err while using gcc-4.5.x, c99
+_gx033=" xen-tools-4.4.2-gcc99.patch"
+_gx034=" xen-tools-4.5.0-gcc99.patch"
+
+_gx035=" xen-tools-4.2-pod-docs-r1.patch"
+# xen-tools-4.2.5 patches set
+_gpv_xen_tools_425_0="
+${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
+${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010}
+${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015}
+${_gx016} ${_gx017} ${_gx018} ${_gx019}
+"
+_gpv_xen_tools_425_1="
+${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx035}
+${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010}
+${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015}
+${_gx016} ${_gx017} ${_gx018} ${_gx019}
+"
+
+# xen-tools-4.5.1 patches set
+_gpv_xen_tools_451_0="
+${_gx008} ${_gx024} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029} ${_gx034}
+"
+# xen-tools-4.5.2 patches set
+_gpv_xen_tools_452_0="
+${_gx008} ${_gx024} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029} ${_gx034}
+"
+# xen-tools-4.6.0 patches set
+_gpv_xen_tools_460_0="
+${_gx008} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029}
+"
diff --git a/app-emulation/xen-tools/files/stubs-32.h b/app-emulation/xen-tools/files/stubs-32.h
new file mode 100644
index 0000000..a421528
--- /dev/null
+++ b/app-emulation/xen-tools/files/stubs-32.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.
+   It defines a symbol `__stub_FUNCTION' for each function
+   in the C library which is a stub, meaning it will fail
+   every time called, usually setting errno to ENOSYS.  */
+
+#ifdef _LIBC
+ #error Applications may not define the macro _LIBC
+#endif
+
+#define __stub_chflags
+#define __stub_fattach
+#define __stub_fchflags
+#define __stub_fdetach
+#define __stub_gtty
+#define __stub_lchmod
+#define __stub_revoke
+#define __stub_setlogin
+#define __stub_sigreturn
+#define __stub_sstk
+#define __stub_stty
diff --git a/app-emulation/xen-tools/files/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate
new file mode 100644
index 0000000..c644523
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-consoles.logrotate
@@ -0,0 +1,5 @@
+/var/log/xen-consoles/*.log {
+	rotate 7
+	missingok
+	compress
+}
diff --git a/app-emulation/xen-tools/files/xencommons.confd b/app-emulation/xen-tools/files/xencommons.confd
new file mode 100644
index 0000000..b9e2248
--- /dev/null
+++ b/app-emulation/xen-tools/files/xencommons.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/xencommons
+
+# Load xen's kernel modules, and this will override defaults
+XEN_KERNEL_MODULES=""
diff --git a/app-emulation/xen-tools/files/xencommons.initd b/app-emulation/xen-tools/files/xencommons.initd
new file mode 100644
index 0000000..0ce192f
--- /dev/null
+++ b/app-emulation/xen-tools/files/xencommons.initd
@@ -0,0 +1,80 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	before xenstored
+}
+
+is_privileged_domain() {
+	grep -qsE '^control_d$' /proc/xen/capabilities
+	return $?
+}
+
+handle_kernel_modules() {
+	local XEN_DEFAULT_KERNEL_MODULES="
+		xen-evtchn
+		xen-gntdev
+		xen-gntalloc
+		xen-blkback
+		xen-netback
+		xen-pciback
+		gntdev
+		netbk
+		blkbk
+		xen-scsibk
+		usbbk
+		pciback
+		xen-acpi-processor
+		blktap2
+		blktap
+	"
+
+	[ "$1" = "remove" ] && OPTS="-r"
+
+	XEN_KERNEL_MODULES="${XEN_KERNEL_MODULES:-${XEN_DEFAULT_KERNEL_MODULES}}"
+	for i in ${XEN_KERNEL_MODULES}; do
+		modprobe ${OPTS} $i 2>/dev/null
+	done
+	return 0
+}
+
+start() {
+	ebegin "Starting xencommons daemon"
+
+	# not running in Xen dom0 or domU
+	if [ ! -d /proc/xen ]; then
+		eend 1 "Not running in Xen mode"
+		return 1
+	fi
+
+	# mount xenfs in dom0 or domU with a pv_ops kernel
+	if ! test -f /proc/xen/capabilities && \
+	   ! grep '^xenfs ' /proc/mounts >/dev/null;
+	then
+		mount -t xenfs xenfs /proc/xen
+	fi
+
+	if ! is_privileged_domain; then
+		eend 1 "Not running on a privileged domain. xencommons not started"
+		return 1
+	fi
+
+	handle_kernel_modules
+
+	eend $? "Failed to start xencommons"
+}
+
+stop () {
+	ebegin "Stopping xencommons"
+	if ! is_privileged_domain; then
+		eend 1 "Not running on a privileged domain. xencommons not started"
+		return 1
+	fi
+
+	handle_kernel_modules remove
+
+	eend $? "Failed to stop xencommons"
+}
+
diff --git a/app-emulation/xen-tools/files/xenconsoled.confd b/app-emulation/xen-tools/files/xenconsoled.confd
new file mode 100644
index 0000000..b2e194b
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenconsoled.confd
@@ -0,0 +1,2 @@
+# /etc/conf.d/xenstored
+XENCONSOLED_OPTS=""
diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd
new file mode 100644
index 0000000..342af40
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenconsoled.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need xenstored
+	after lvm
+}
+
+# bug #498720
+shutdown_all_domU() {
+	# Note: shutdown all domU, including manually started ones
+	local V=$(xl info| awk "/xen_minor/ { print \$3 }")
+	# 4.2.2 do not support "-a" option
+	[ $V -gt 2 ] && xl shutdown -a -w >/dev/null
+}
+
+start() {
+	ebegin "Starting xenconsoled daemon"
+	start-stop-daemon --start --exec /usr/sbin/xenconsoled \
+		--pidfile /run/xenconsoled.pid \
+		-- --pid-file=/run/xenconsoled.pid \
+		${XENCONSOLED_OPTS}
+	eend $*
+}
+
+stop() {
+	ebegin "Stopping xenconsoled daemon"
+	shutdown_all_domU
+	start-stop-daemon --stop --exec /usr/sbin/xenconsoled \
+		--pidfile /run/xenconsoled.pid
+	eend $*
+}
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
new file mode 100644
index 0000000..e75e19d
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains-screen.confd
@@ -0,0 +1,25 @@
+# /etc/conf.d/xendomains
+
+# Directory of domains to boot. AUTODIR should contain one or more symlinks
+# to domain config files in /etc/xen
+# AUTODIR=/etc/xen/auto
+
+# Send shutdown commands to all domains in parallel instead of waiting for
+# each to shutdown individually
+# PARALLEL_SHUTDOWN=yes
+
+# When SCREEN="yes", domains in AUTODIR have their consoles connected to a
+# screen session named SCREEN_NAME, with output logged to individual files 
+# named after each domain and written to /var/log/xen-consoles/ . These files
+# are rotated (using app-admin/logrotate) every time xendomains is started.
+
+SCREEN="yes"
+SCREEN_NAME="xen"
+
+# Number of seconds between writes to screen's logfiles.
+#
+# Lower values mean more disk activity and hence a possible performance
+# impact, but higher values mean a greater chance of loosing some output
+# in the event of a crash.
+
+SCREEN_LOG_INTERVAL="1"
diff --git a/app-emulation/xen-tools/files/xendomains.confd b/app-emulation/xen-tools/files/xendomains.confd
new file mode 100644
index 0000000..90c1f52
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains.confd
@@ -0,0 +1,9 @@
+# /etc/conf.d/xendomains
+
+# Directory of domains to boot. AUTODIR should contain one or more symlinks
+# to domain config files in /etc/xen
+AUTODIR=/etc/xen/auto
+
+# Send shutdown commands to all domains in parallel instead of waiting for
+# each to shutdown individually
+PARALLEL_SHUTDOWN=yes
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
new file mode 100644
index 0000000..899a9b8
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -0,0 +1,118 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="status"
+
+depend() {
+	need xenstored
+	after dhcp xend xenconsoled
+}
+
+get_domname() {
+	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+	if [ -z ${name_from_file} ] ; then
+		basename "${1}"
+	else
+		echo ${name_from_file}	
+	fi
+}
+
+is_running() {
+	/usr/sbin/xl list "${1}" >/dev/null 2>&1
+}
+
+using_screen() {
+	[ "${SCREEN}" = "yes" -o "${SCREEN}" = "YES" ]
+}
+
+set_screen_cmd() {
+	screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X"
+}
+
+start() {
+	set_screen_cmd
+
+	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	if using_screen ; then
+		ebegin "Creating screen session to hold domain consoles"
+		(  screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& sleep 5 \
+		&& ${screen_cmd} zombie dr \
+		&& logrotate -f /etc/xen/xen-consoles.logrotate \
+		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
+		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
+		&& ${screen_cmd} log on \
+		&& ${screen_cmd} deflog on ) >/dev/null
+		if [ $? -ne 0 ] ; then
+			eend 1
+			return 1
+		else
+			eend
+		fi
+	fi
+	# Create all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
+		name=$(get_domname ${dom})
+		if ! is_running ${name} ; then
+			ebegin "  Starting domain ${name}"
+			if using_screen ; then
+				${screen_cmd} screen -t ${name} xl create ${dom} -c
+			else
+				xl create --quiet ${dom}
+			fi
+			eend $?
+		else
+			einfo "  Not starting domain ${name} - already running"
+		fi
+	done
+}
+
+stop() {
+	set_screen_cmd
+
+	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	# Stop all domains with config files in AUTODIR.
+	DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)"
+
+	if [ "$PARALLEL_SHUTDOWN" = "yes" ] ; then
+		for dom in $DOMAINS ; do
+			name=$(get_domname ${dom})
+			if is_running ${name} ; then
+				ebegin "  Asking domain ${name} to shutdown in the background..."
+				xl shutdown -w ${name} >/dev/null &
+			else
+				einfo "  Not stopping domain ${name} - not running"
+			fi
+		done
+		einfo "  Waiting for shutdown of domains that are still running"
+		wait
+		eend $?
+	else
+		for dom in $DOMAINS ; do
+			name=$(get_domname ${dom})
+			if is_running ${name} ; then
+				ebegin "  Waiting for domain ${name} to shutdown"
+				xl shutdown -w ${name} >/dev/null
+				eend $?
+			else
+				einfo "  Not stopping domain ${name} - not running"
+			fi
+		done
+	fi
+	if using_screen ; then
+		if ${screen_cmd} sleep 0 >/dev/null 2>&1 ; then
+			ebegin "Closing screen session ${SCREEN_NAME}"
+			${screen_cmd} quit
+			eend $?
+		else
+			eend 0
+		fi
+	fi
+}
+
+status() {
+	/usr/sbin/xl list
+}
diff --git a/app-emulation/xen-tools/files/xenqemudev.confd b/app-emulation/xen-tools/files/xenqemudev.confd
new file mode 100644
index 0000000..5b49520
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenqemudev.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/xenqemudev
+
+# To enable QEMU file backend, set to 'yes'
+XENQEMUDEV_FILE_BACKEND_ENABLE=""
+
+# Common options for xenqemudev
+XENQEMUDEV_OPTS=""
diff --git a/app-emulation/xen-tools/files/xenqemudev.initd b/app-emulation/xen-tools/files/xenqemudev.initd
new file mode 100644
index 0000000..07dadeb
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenqemudev.initd
@@ -0,0 +1,85 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need xencommons xenstored xenconsoled
+}
+
+is_privileged_domain() {
+	grep -qsE '^control_d$' /proc/xen/capabilities
+	return $?
+}
+
+xen_setvars() {
+	. /etc/xen/scripts/hotplugpath.sh
+
+	XENQEMUDEV_PIDFILE=/run/xenqemudev.pid
+
+	# xen-4.5 change the path
+	XEN_QEMU="${LIBEXEC}/qemu-system-i386"
+	[ -e ${XEN_QEMU} ] && return
+	XEN_QEMU="${LIBEXEC_BIN}/qemu-system-i386"
+}
+
+xen_qemu_start() {
+	if [ -z "${XENQEMUDEV_FILE_BACKEND_ENABLE}" ]; then
+		ewarn " QEMU disk backend not enabled"
+		ewarn " enable XENQEMUDEV_FILE_BACKEND_ENABLE in /etc/conf.d/xenqemudev"
+		return 1
+	fi
+
+	xen_setvars
+
+	if [ ! -c /dev/xen/gntdev ]; then
+		einfo " Xen gntdev driver not loaded"
+		return 1
+	fi
+
+	if [ -e "${XEN_QEMU}" ]; then
+		einfo " Starting QEMU as disk backend for dom0"
+
+		XENQEMUDEV_DEFAULT_OPTS="-xen-domid 0 -xen-attach -name dom0 \
+			-nographic -M xenpv -daemonize \
+			-monitor /dev/null -serial /dev/null -parallel /dev/null"
+
+		XENQEMUDEV_OPTS=${XENQEMUDEV_OPTS:-${XENQEMUDEV_DEFAULT_OPTS}}
+
+		start-stop-daemon --start --exec ${XEN_QEMU} \
+			--pidfile ${XENQEMUDEV_PIDFILE} \
+			-- -pidfile ${XENQEMUDEV_PIDFILE} \
+			${XENQEMUDEV_OPTS}
+		return $?
+	fi
+}
+
+start() {
+	ebegin "Starting xenqemudev daemon"
+
+	# not running in Xen dom0 or domU
+	if [ ! -d /proc/xen ]; then
+		eend 1 "Not running in Xen mode"
+		return 1
+	fi
+
+	if ! is_privileged_domain; then
+		eend 1 "Not running on a privileged domain. xenqemudev not started"
+		return 1
+	fi
+
+	xen_qemu_start
+
+	eend $? "Failed to start xenqemudev"
+}
+
+stop () {
+	ebegin "Stopping xenqemudev"
+
+	xen_setvars
+
+	start-stop-daemon --stop --exec ${XEN_QEMU} \
+		--pidfile ${XENQEMUDEV_PIDFILE}
+
+	eend $? "Stopping xenqemudev, as it cannot be restarted."
+}
diff --git a/app-emulation/xen-tools/files/xenstored.confd b/app-emulation/xen-tools/files/xenstored.confd
new file mode 100644
index 0000000..31b9293
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenstored.confd
@@ -0,0 +1,2 @@
+# /etc/conf.d/xenstored
+XENSTORED_OPTS=""
diff --git a/app-emulation/xen-tools/files/xenstored.initd b/app-emulation/xen-tools/files/xenstored.initd
new file mode 100644
index 0000000..05bcbb2
--- /dev/null
+++ b/app-emulation/xen-tools/files/xenstored.initd
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+	need xencommons
+}
+
+xenstored_dir_check() {
+	# create dir dynamically
+	local i
+	for i in /var/lock/subsys /run/xen /run/xend/boot /run/xenstored; do
+		[ -x $i ] || mkdir -p $i
+	done
+}
+
+start() {
+	ebegin "Starting xenstored daemon"
+	xenstored_dir_check
+	start-stop-daemon --start --exec /usr/sbin/xenstored \
+		--pidfile /run/xenstored.pid \
+		-- --pid-file=/run/xenstored.pid \
+		$XENSTORED_OPTS
+	until xenstore-exists / || $((15 < ++i))
+	do
+		echo -n .
+		sleep 1
+	done
+	einfo "Setting domain0 name record"
+	/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
+	local V=$(xl info| awk "/xen_minor/ { print \$3 }")
+	[ $V -ge 4 ] && /usr/bin/xenstore-write "/local/domain/0/domid" 0
+
+	eend $*
+}
+
+stop() {
+	ebegin "Stopping xenstored daemon"
+	start-stop-daemon --stop --exec /usr/sbin/xenstored \
+		--pidfile /run/xenstored.pid
+	eend $?
+}
+
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
new file mode 100644
index 0000000..dfd18d1
--- /dev/null
+++ b/app-emulation/xen-tools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>xen</herd>
+	<use>
+		<flag name='api'>Build the C libxenapi bindings</flag>
+		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
+		<flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
+		<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
+		<flag name='pygrub'>Install the pygrub boot loader</flag>
+		<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
+		<flag name='system-qemu'>Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
+		<flag name='system-seabios'>Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag>
+		<flag name='ocaml'>Enable support for the ocaml language</flag>
+		<flag name='ovmf'>Enable support to boot UEFI guest vm, needed by hvm</flag>
+		<flag name='pam'>Enable pam support</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild
new file mode 100644
index 0000000..33db117
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=16
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=6
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.8.2
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? ( $(python_gen_impl_dep sqlite) )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}

From dd480a0ce912f07ee7affbe11fb1b7b612529c98 Mon Sep 17 00:00:00 2001
From: root <root@webnode10.safesoftsolutions.com>
Date: Wed, 19 Oct 2016 23:23:43 -0700
Subject: [PATCH 222/261] added old kernel

---
 sys-kernel/hardened-sources/ChangeLog         |  644 ++++
 sys-kernel/hardened-sources/ChangeLog-2011    | 3133 +++++++++++++++++
 sys-kernel/hardened-sources/ChangeLog-2013    | 2811 +++++++++++++++
 sys-kernel/hardened-sources/ChangeLog-2015    | 2169 ++++++++++++
 sys-kernel/hardened-sources/Manifest          |   11 +
 .../hardened-sources-4.4.8-r1.ebuild          |   45 +
 sys-kernel/hardened-sources/metadata.xml      |   17 +
 7 files changed, 8830 insertions(+)
 create mode 100644 sys-kernel/hardened-sources/ChangeLog
 create mode 100644 sys-kernel/hardened-sources/ChangeLog-2011
 create mode 100644 sys-kernel/hardened-sources/ChangeLog-2013
 create mode 100644 sys-kernel/hardened-sources/ChangeLog-2015
 create mode 100644 sys-kernel/hardened-sources/Manifest
 create mode 100644 sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
 create mode 100644 sys-kernel/hardened-sources/metadata.xml

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
new file mode 100644
index 0000000..7e9d436
--- /dev/null
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -0,0 +1,644 @@
+# ChangeLog for sys-kernel/hardened-sources
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*hardened-sources-4.1.4 (09 Aug 2015)
+*hardened-sources-4.1.3-r3 (09 Aug 2015)
+*hardened-sources-4.1.3-r2 (09 Aug 2015)
+*hardened-sources-4.0.8 (09 Aug 2015)
+*hardened-sources-3.18.9 (09 Aug 2015)
+*hardened-sources-3.14.49 (09 Aug 2015)
+*hardened-sources-3.14.48-r3 (09 Aug 2015)
+*hardened-sources-3.14.48-r2 (09 Aug 2015)
+*hardened-sources-3.14.48 (09 Aug 2015)
+*hardened-sources-3.14.43-r3 (09 Aug 2015)
+*hardened-sources-3.2.69-r13 (09 Aug 2015)
+*hardened-sources-3.2.69-r12 (09 Aug 2015)
+*hardened-sources-3.2.69-r11 (09 Aug 2015)
+*hardened-sources-3.2.69-r4 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +hardened-sources-3.2.69-r4.ebuild, +hardened-sources-3.2.69-r11.ebuild,
+  +hardened-sources-3.2.69-r12.ebuild, +hardened-sources-3.2.69-r13.ebuild,
+  +hardened-sources-3.14.43-r3.ebuild, +hardened-sources-3.14.48.ebuild,
+  +hardened-sources-3.14.48-r2.ebuild, +hardened-sources-3.14.48-r3.ebuild,
+  +hardened-sources-3.14.49.ebuild, +hardened-sources-3.18.9.ebuild,
+  +hardened-sources-4.0.8.ebuild, +hardened-sources-4.1.3-r2.ebuild,
+  +hardened-sources-4.1.3-r3.ebuild, +hardened-sources-4.1.4.ebuild,
+  +metadata.xml:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  09 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.2.69-r13.ebuild:
+  3.2.69-r13 stable on amd64 and x86
+
+  Package-Manager: portage-2.2.20
+
+  09 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.14.49.ebuild:
+  3.14.49 stable on amd64 and x86
+
+  Package-Manager: portage-2.2.20
+
+  09 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-4.1.4.ebuild:
+  4.1.4 stable on amd64 and x86
+
+  Package-Manager: portage-2.2.20
+
+  09 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.69-r12.ebuild, -hardened-sources-3.14.48-r2.ebuild,
+  -hardened-sources-3.14.48-r3.ebuild, -hardened-sources-4.1.3-r2.ebuild,
+  -hardened-sources-4.1.3-r3.ebuild:
+  remove older unstable versions.
+
+  Package-Manager: portage-2.2.20
+
+  09 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.69-r4.ebuild, -hardened-sources-3.14.43-r3.ebuild,
+  -hardened-sources-3.18.9.ebuild:
+  remove oldest stable versions.
+
+  Package-Manager: portage-2.2.20
+
+*hardened-sources-3.2.70 (12 Aug 2015)
+
+  12 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.70.ebuild:
+  add 3.2.70
+
+  vanilla-3.2.70 + genpatches-3.2-16 + grsecurity-3.1-3.2.70-201508102127
+
+  Package-Manager: portage-2.2.20
+
+*hardened-sources-3.14.50 (12 Aug 2015)
+
+  12 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.50.ebuild:
+  add 3.14.50
+
+  vanilla-3.14.50 + genpatches-3.14-55 + grsecurity-3.1-3.14.50-201508102128
+
+  Package-Manager: portage-2.2.20
+
+*hardened-sources-4.1.5 (12 Aug 2015)
+
+  12 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.5.ebuild:
+  add 4.1.5
+
+  vanill-4.1.5 + genpatches-4.1-8 + grsecurity-3.1-4.1.5-201508102129
+
+  Package-Manager: portage-2.2.20
+
+  13 Aug 2015; Mike Gilbert <floppym@gentoo.org>
+  hardened-sources-3.2.70.ebuild, hardened-sources-3.14.50.ebuild,
+  hardened-sources-4.1.5.ebuild:
+  Replace $Header: $ with $Id$ where it has accidentally been reverted
+
+*hardened-sources-3.2.71 (15 Aug 2015)
+
+  15 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.71.ebuild:
+  add 3.2.71
+
+  vanilla-3.2.71 + genpatches-3.2-16 + grsecurity-3.1-3.2.71-201508142231
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-3.14.50-r1 (15 Aug 2015)
+
+  15 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.50-r1.ebuild:
+  add 3.14.50-r1
+
+  vanilla-3.14.50 + genpatches-3.14-55 + grsecurity-3.1-3.14.50-201508142232
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.1.5-r1 (15 Aug 2015)
+
+  15 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.5-r1.ebuild:
+  add 4.1.5-r1
+
+  vanilla-4.1.5 + genpatches-4.1-8 + grsecurity-3.1-4.1.5-201508142233
+
+  Package-Manager: portage-2.2.20.1
+
+  15 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.2.71.ebuild, hardened-sources-3.14.50-r1.ebuild,
+  hardened-sources-4.1.5-r1.ebuild:
+  fix malformed headers
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-3.14.51 (19 Aug 2015)
+
+  19 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.51.ebuild:
+  add 3.14.51
+
+  vanilla-3.14.51 + genpatches-3.14-56 + grsecurity-3.1-3.14.51-201508181951
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.1.6 (19 Aug 2015)
+
+  19 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.6.ebuild:
+  add 4.1.6
+
+  vanilla-4.1.6 + genpatches-4.1-9 + grsecurity-3.1-4.1.6-201508181953
+
+  Package-Manager: portage-2.2.20.1
+
+  22 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-4.1.6.ebuild:
+  4.1.6 stable on amd64 and x86.
+
+  Gentoo-Bug: 558282
+
+  Package-Manager: portage-2.2.20.1
+
+  22 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.1.4.ebuild, -hardened-sources-4.1.5.ebuild,
+  -hardened-sources-4.1.5-r1.ebuild:
+  remove older 4.1 series.
+
+  Package-Manager: portage-2.2.20.1
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org>
+  hardened-sources-3.2.69-r11.ebuild, hardened-sources-3.2.69-r13.ebuild,
+  hardened-sources-3.2.70.ebuild, hardened-sources-3.2.71.ebuild,
+  hardened-sources-3.14.48.ebuild, hardened-sources-3.14.49.ebuild,
+  hardened-sources-3.14.50.ebuild, hardened-sources-3.14.50-r1.ebuild,
+  hardened-sources-3.14.51.ebuild, hardened-sources-4.0.8.ebuild,
+  hardened-sources-4.1.6.ebuild, metadata.xml:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+*hardened-sources-4.1.6-r1 (24 Aug 2015)
+
+  24 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.6-r1.ebuild:
+  add 4.1.6-r1
+
+  vanilla-4.1.6 + genpatches-4.1-9 + grsecurity-3.1-4.1.6-201508230818
+
+  Package-Manager: portage-2.2.20.1
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+*hardened-sources-4.1.6-r2 (12 Sep 2015)
+
+  12 Sep 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.6-r2.ebuild:
+  version bump 4.1.6-r2
+
+  Package-Manager: portage-2.2.20.1
+
+  12 Sep 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.2.71.ebuild, hardened-sources-3.14.51.ebuild:
+  3.2.71 and 3.14.51 stable on amd64 and x86.
+
+  Package-Manager: portage-2.2.20.1
+
+  12 Sep 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.69-r11.ebuild, -hardened-sources-3.2.70.ebuild,
+  -hardened-sources-3.14.48.ebuild, -hardened-sources-3.14.50.ebuild,
+  -hardened-sources-3.14.50-r1.ebuild:
+  remove older stable and testing
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.1.7 (16 Sep 2015)
+
+  16 Sep 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.7.ebuild:
+  version bump to 4.1.7
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.1.7-r1 (21 Sep 2015)
+
+  21 Sep 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.7-r1.ebuild:
+  version bump to 4.1.7-r1
+
+  Package-Manager: portage-2.2.20.1
+
+  04 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-4.1.7-r1.ebuild:
+  4.1.7-r1 stable for amd64 and x86.
+
+  Package-Manager: portage-2.2.20.1
+
+  04 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.1.6-r1.ebuild, -hardened-sources-4.1.6-r2.ebuild,
+  -hardened-sources-4.1.7.ebuild:
+  remove unstable versions.
+
+  Package-Manager: portage-2.2.20.1
+
+  04 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.69-r13.ebuild, -hardened-sources-3.14.49.ebuild,
+  -hardened-sources-4.0.8.ebuild, -hardened-sources-4.1.6.ebuild:
+  remove older stable version.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3 (08 Oct 2015)
+
+  08 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.3.ebuild:
+  version bump 4.2.3
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3-r1 (12 Oct 2015)
+
+  12 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.3-r1.ebuild:
+  bump 4.2.3-r1
+
+  vanilla-4.2.3 + genpatches-4.2-6 + grsecurity-3.1-4.2.3-201510092347
+
+  Package-Manager: portage-2.2.20.1
+
+  12 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.3.ebuild:
+  remove older 4.2.3
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3-r2 (13 Oct 2015)
+
+  13 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.3-r2.ebuild:
+  version bump 4.2.3-r2
+
+  vanilla-4.2.3 + genpatches-4.2-6 + grsecurity-3.1-4.2.3-201510111839
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3-r3 (15 Oct 2015)
+
+  15 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.3-r3.ebuild:
+  version bump 4.2.3-r3
+
+  vanilla-4.2.3 + genpatches-4.2-6 + grsecurity-3.1-4.2.3-201510130858
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3-r4 (18 Oct 2015)
+
+  18 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.3-r4.ebuild:
+  version bump 4.2.3-r4
+
+  vanilla-4.2.3 + genpatches-4.2-6 + grsecurity-3.1-4.2.3-201510171105.patch
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.3-r5 (21 Oct 2015)
+
+  21 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.3-r4.ebuild, +hardened-sources-4.2.3-r5.ebuild:
+  version bump to 4.2.3-r5
+
+  vanilla-4.2.3 + genpatches-4.2-6 + grsecurity-3.1-4.2.3-201510200858
+
+  Package-Manager: portage-2.2.20.1
+
+  21 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.3-r1.ebuild, -hardened-sources-4.2.3-r2.ebuild:
+  remove older unstable version.
+
+  Package-Manager: portage-2.2.20.1
+
+  24 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.71.ebuild, -hardened-sources-3.14.51.ebuild:
+  remove unsupported 3.x versions
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.4 (24 Oct 2015)
+
+  24 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.4.ebuild:
+  version bump to 4.2.4
+
+  vanilla-4.2.4 + genpatches-4.2-6 + grsecurity-3.1-4.2.4-201510222059
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.4-r1 (25 Oct 2015)
+
+  25 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.4-r1.ebuild:
+  version bump to 4.2.4-r1
+
+  vanilla-4.2.4 + genpatches-4.2-6 + grsecurity-3.1-4.2.4-201510240907
+
+  Package-Manager: portage-2.2.20.1
+
+  25 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.3-r3.ebuild, -hardened-sources-4.2.3-r5.ebuild,
+  -hardened-sources-4.2.4.ebuild:
+  remove buggy versions, bug #563804.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.4-r2 (26 Oct 2015)
+
+  26 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.4-r2.ebuild:
+  bump to 4.2.4-r2, should resolve bug #563804.
+
+  vanilla-4.2.4 + genpatches-4.2-6 + grsecurity-3.1-4.2.4-201510251836
+
+  Package-Manager: portage-2.2.20.1
+
+  26 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.4-r1.ebuild:
+  remove 4.2.4-r1 which exhibits bug #563804.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.5 (29 Oct 2015)
+
+  29 Oct 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.5.ebuild:
+  bump to 4.2.5
+
+  vanilla-4.2.5 + genpatches-4.2-8 + grsecurity-3.1-4.2.5-201510290852
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.5-r1 (03 Nov 2015)
+
+  03 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.5-r1.ebuild:
+  bump to 4.2.5-r1
+
+  vanilla-4.2.5 + genpatches-4.2-8 + grsecurity-3.1-4.2.5-201511021814
+
+  Package-Manager: portage-2.2.20.1
+
+  03 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.4-r2.ebuild, -hardened-sources-4.2.5.ebuild:
+  remove older unstable versions.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.5-r2 (09 Nov 2015)
+
+  09 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.5-r2.ebuild:
+  version bump to 4.2.5-r2
+
+  vanilla-4.2.5 + genpatches-4.2-8 + grsecurity-3.1-4.2.5-201511081815
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6 (11 Nov 2015)
+
+  11 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6.ebuild:
+  version bump to 4.2.6
+
+  vanilla-4.2.6 + genpatches-4.2-8 + grsecurity-3.1-4.2.6-201511092040
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r1 (13 Nov 2015)
+
+  13 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r1.ebuild:
+  version bump to 4.2.6-r1
+
+  vanilla-4.2.6 + genpatches-4.2-8 + grsecurity-3.1-4.2.6-201511122040
+
+  Package-Manager: portage-2.2.20.1
+
+  13 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.5-r1.ebuild, -hardened-sources-4.2.5-r2.ebuild,
+  -hardened-sources-4.2.6.ebuild:
+  remove older unstable versions.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r2 (15 Nov 2015)
+
+  15 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r2.ebuild:
+  version bump to 4.2.6-r2
+
+  vanilla-4.2.6 + genpatches-4.2-8 + grsecurity-3.1-4.2.6-201511141543
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r3 (15 Nov 2015)
+
+  15 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.6-r2.ebuild, +hardened-sources-4.2.6-r3.ebuild:
+  fix 4.2.6-r2
+
+  The wrong value of $HGPV was used.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r4 (19 Nov 2015)
+
+  19 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r4.ebuild:
+  version bump to 4.2.6-r4
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.6-201511172005
+
+  Package-Manager: portage-2.2.20.1
+
+  19 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.6-r1.ebuild, -hardened-sources-4.2.6-r3.ebuild:
+  remove older unstable versions.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r5 (23 Nov 2015)
+
+  23 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r5.ebuild:
+  version bump to 4.2.6-r5
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.6-201511182042
+
+  Package-Manager: portage-2.2.20.1
+
+  24 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.6-r4.ebuild:
+  remove older unstable version.
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r6 (24 Nov 2015)
+
+  24 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r6.ebuild:
+  version bump to 4.2.6-r6
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.6-201511232037
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r7 (30 Nov 2015)
+
+  30 Nov 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r7.ebuild:
+  version bump to 4.2.6-r7
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.6-201511282239
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.6-r8 (06 Dec 2015)
+
+  06 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.6-r8.ebuild:
+  version bump to 4.2.6-r8
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.6-201512051918
+
+  Package-Manager: portage-2.2.20.1
+
+*hardened-sources-4.2.7 (12 Dec 2015)
+
+  12 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.2.7.ebuild:
+  version bump to 4.2.7
+
+  vanilla-4.2.6 + genpatches-4.2-9 + grsecurity-3.1-4.2.7-201512092320
+
+  Package-Manager: portage-2.2.24
+
+*hardened-sources-4.3.3 (16 Dec 2015)
+
+  16 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.3.3.ebuild:
+  version bump to 4.3.3
+
+  vanilla-4.3.3 + genpatches-4.3-1 + grsecurity-3.1-4.3.3-201512151908
+
+  Package-Manager: portage-2.2.24
+
+*hardened-sources-4.3.3-r1 (17 Dec 2015)
+
+  17 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.3.3.ebuild, +hardened-sources-4.3.3-r1.ebuild:
+  bump to version 4.3.3-r1
+
+  vanilla-4.3.3 + genpatches-4.3-1 + grsecurity-3.1-4.3.3-201512162141
+
+  Package-Manager: portage-2.2.24
+
+*hardened-sources-4.3.3-r2 (23 Dec 2015)
+
+  23 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.3.3-r2.ebuild:
+  version bump to 4.3.3-r2
+
+  vanilla-4.3.3 + genpatches-4.3-3 + grsecurity-3.1-4.3.3-201512222129
+
+  Package-Manager: portage-2.2.24
+
+  23 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.6-r5.ebuild, -hardened-sources-4.2.6-r6.ebuild,
+  -hardened-sources-4.2.6-r7.ebuild, -hardened-sources-4.3.3-r1.ebuild:
+  remove older unstable versions
+
+  Package-Manager: portage-2.2.24
+
+*hardened-sources-4.3.3-r3 (31 Dec 2015)
+
+  31 Dec 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.3.3-r3.ebuild:
+  version bump to 4.3.3-r3
+
+  vanilla-4.3.3 + genpatches-4.3-3 + grsecurity-3.1-4.3.3-201512282134
+
+  Package-Manager: portage-2.2.24
+
+*hardened-sources-4.3.3-r4 (06 Jan 2016)
+
+  06 Jan 2016; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.3.3-r4.ebuild:
+  version bump to 4.3.3-r4
+
+  vanilla-4.3.3 + genpatches-4.3-4 + grsecurity-3.1-4.3.3-201601051958
+
+  Package-Manager: portage-2.2.24
+
+  07 Jan 2016; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.2.6-r8.ebuild, -hardened-sources-4.2.7.ebuild,
+  -hardened-sources-4.3.3-r2.ebuild, -hardened-sources-4.3.3-r3.ebuild:
+  remove older buggy versions
+
+  Package-Manager: portage-2.2.26
+
+*hardened-sources-4.3.3-r5 (17 Jan 2016)
+
+  17 Jan 2016; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.3.3-r5.ebuild:
+  version bump to 4.3.3-r5
+
+  vanilla-4.3.3 + genpatches-4.3-4 + grsecurity-3.1-4.3.3-201601161757
+
+  Package-Manager: portage-2.2.26
+
+  17 Jan 2016; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-4.3.3-r4.ebuild:
+  4.3.3-r4 stable on amd64 and x86
+
+  Package-Manager: portage-2.2.26
+
diff --git a/sys-kernel/hardened-sources/ChangeLog-2011 b/sys-kernel/hardened-sources/ChangeLog-2011
new file mode 100644
index 0000000..73ea9ab
--- /dev/null
+++ b/sys-kernel/hardened-sources/ChangeLog-2011
@@ -0,0 +1,3133 @@
+# ChangeLog for sys-kernel/hardened-sources
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog-2011,v 1.1 2012/01/01 20:57:23 dilfridge Exp $
+
+  29 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r82.ebuild:
+  Missing bump to 2.6.32.51
+
+*hardened-sources-2.6.32-r83 (29 Dec 2011)
+
+  29 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r83.ebuild:
+  Based on 2.6.32.51 + genpatches-2.6.32-46 +
+  grsecurity-2.2.2-2.6.32.51-201112222105
+
+*hardened-sources-3.1.6 (27 Dec 2011)
+
+  27 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.6.ebuild:
+  Based on 3.1.6 + genpatches-3.1-8 + grsecurity-2.2.2-3.1.6-201112222105
+
+*hardened-sources-2.6.32-r82 (27 Dec 2011)
+
+  27 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r82.ebuild:
+  Based on 2.6.32.50 + genpatches-2.6.32-46 +
+  grsecurity-2.2.2-2.6.32.51-201112222105
+
+  15 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r73.ebuild, -hardened-sources-3.0.8.ebuild:
+  Remove deprecated versions, bug #390363
+
+*hardened-sources-3.1.5 (15 Dec 2011)
+
+  15 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.5.ebuild:
+  Based on 3.1.5 + genpatches-3.1-8 + grsecurity-2.2.2-3.1.5-201112101853
+
+*hardened-sources-2.6.32-r81 (15 Dec 2011)
+
+  15 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r81.ebuild:
+  Based on 2.6.32.50 + genpatches-2.6.32-46 +
+  grsecurity-2.2.2-2.6.32.50-201112102010
+
+*hardened-sources-3.1.4-r1 (10 Dec 2011)
+
+  10 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.4-r1.ebuild:
+  Based on 3.1.4 + genpatches-3.1-6 + grsecurity-2.2.2-3.1.4-201112082139
+
+*hardened-sources-2.6.32-r80 (10 Dec 2011)
+
+  10 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r80.ebuild:
+  Based on 2.6.32.49 + genpatches-2.6.32-45 +
+  grsecurity-2.2.2-2.6.32.49-201112082138
+
+*hardened-sources-3.1.4 (04 Dec 2011)
+
+  04 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.4.ebuild:
+  Based on 3.1.4 + genpatches-3.1-6 + grsecurity-2.2.2-3.1.4-201112021740
+
+*hardened-sources-2.6.32-r79 (04 Dec 2011)
+
+  04 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r79.ebuild:
+  Based on 2.6.32.49 + genpatches-2.6.32-45 +
+  grsecurity-2.2.2-2.6.32.49-201111292107
+
+  01 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.0.4-r5.ebuild:
+  Stable amd64, x86
+
+*hardened-sources-3.1.3 (30 Nov 2011)
+
+  30 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.3.ebuild:
+  Based on 3.1.3 + genpatches-3.1-6 + grsecurity-2.2.2-3.1.3-201111262001
+
+*hardened-sources-2.6.32-r78 (30 Nov 2011)
+
+  30 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r78.ebuild:
+  Based on 2.6.32.49 + genpatches-2.6.32-45 +
+  grsecurity-2.2.2-2.6.32.49-201111262001
+
+*hardened-sources-3.1.1-r1 (23 Nov 2011)
+
+  23 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.1-r1.ebuild:
+  Based on 3.1.1 + genpatches-3.1-4 + grsecurity-2.2.2-3.1.1-201111201943
+
+*hardened-sources-2.6.32-r77 (23 Nov 2011)
+
+  23 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r77.ebuild:
+  Based on 2.6.32.48 + genpatches-2.6.32-44 +
+  grsecurity-2.2.2-2.6.32.48-201111201943
+
+  23 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r69.ebuild, -hardened-sources-2.6.32-r70.ebuild,
+  -hardened-sources-2.6.32-r71.ebuild, -hardened-sources-2.6.32-r72.ebuild,
+  -hardened-sources-3.0.7.ebuild, -hardened-sources-3.0.7-r1.ebuild:
+  Remove deprecated versions, bug #388381
+
+  23 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r31.ebuild, -hardened-sources-2.6.32-r34.ebuild,
+  -hardened-sources-2.6.36-r6.ebuild:
+  Removed old stable versions
+
+*hardened-sources-3.1.1 (19 Nov 2011)
+
+  19 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.1.ebuild:
+  Based on 3.1.1 + genpatches-3.1-4 + grsecurity-2.2.2-3.1.1-201111181902
+
+*hardened-sources-2.6.32-r76 (19 Nov 2011)
+
+  19 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r76.ebuild:
+  Based on 2.6.32.48 + genpatches-2.6.32-44 +
+  grsecurity-2.2.2-2.6.32.48-201111181902
+
+  19 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.0.9.ebuild:
+  Broken module handling
+
+  17 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r22.ebuild, -hardened-sources-2.6.32-r23.ebuild,
+  -hardened-sources-2.6.34-r6.ebuild, -hardened-sources-2.6.35-r7.ebuild:
+  Remove older grsecurity-2.2.0 based kernels
+
+*hardened-sources-3.0.9 (15 Nov 2011)
+
+  15 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.9.ebuild:
+  Based on 3.0.9 + genpatches-3.0-9 + grsecurity-2.2.2-3.0.9-201111121310
+
+*hardened-sources-3.0.8-r1 (15 Nov 2011)
+
+  15 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.8-r1.ebuild:
+  Based on 3.0.8 + genpatches-3.0-9 + grsecurity-2.2.2-3.0.8-201111010529
+
+*hardened-sources-2.6.32-r75 (15 Nov 2011)
+
+  15 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r75.ebuild:
+  Based on 2.6.32.48 + genpatches-2.6.32-44 +
+  grsecurity-2.2.2-2.6.32.48-201111121310
+
+*hardened-sources-2.6.32-r74 (15 Nov 2011)
+
+  15 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r74.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201111010529
+
+*hardened-sources-3.0.8 (30 Oct 2011)
+
+  30 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.8.ebuild:
+  Based on 3.0.8 + genpatches-3.0-9 + grsecurity-2.2.2-3.0.8-201110250925
+
+*hardened-sources-2.6.32-r73 (30 Oct 2011)
+
+  30 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r73.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201110250925
+
+*hardened-sources-2.6.32-r72 (30 Oct 2011)
+
+  30 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r72.ebuild:
+  Add deblob support, bug #388241
+
+*hardened-sources-3.0.7-r1 (30 Oct 2011)
+
+  30 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.7-r1.ebuild:
+  Add deblob support, bug #388241
+
+*hardened-sources-3.0.7 (23 Oct 2011)
+
+  23 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.7.ebuild:
+  Based on 3.0.7 + genpatches-3.0-8 + grsecurity-2.2.2-3.0.7-201110200052
+
+*hardened-sources-2.6.32-r71 (23 Oct 2011)
+
+  23 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r71.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201110200052
+
+  23 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.0.4-r2.ebuild, -hardened-sources-3.0.4-r3.ebuild:
+  Removed, bug #387877
+
+  23 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.0.4-r4.ebuild:
+  Stable amd64, x86. Bug #387877
+
+  19 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r67.ebuild, -hardened-sources-3.0.4-r1.ebuild:
+  Removed buggy versions, bug #371021
+
+  19 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.0.4-r2.ebuild:
+  Stable on amd64 and x86
+
+  19 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r68.ebuild:
+  Stable on amd64 and x86
+
+  09 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r65.ebuild, -hardened-sources-2.6.32-r66.ebuild,
+  -hardened-sources-3.0.3-r1.ebuild, -hardened-sources-3.0.4.ebuild:
+  Remove deprecated versions
+
+*hardened-sources-3.0.4-r5 (08 Oct 2011)
+
+  08 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4-r5.ebuild:
+  Based on 3.0.4 + genpatches-3.0-7 + grsecurity-2.2.2-3.0.4-201110080819
+
+*hardened-sources-2.6.32-r70 (08 Oct 2011)
+
+  08 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r70.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201110080819
+
+  08 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.0.4-r1.ebuild:
+  Stable on amd64 and x86
+
+  08 Oct 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r67.ebuild:
+  Stable on amd64 and x86
+
+*hardened-sources-3.0.4-r4 (27 Sep 2011)
+
+  27 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4-r4.ebuild:
+  Based on 3.0.4 + genpatches-3.0-5 + grsecurity-2.2.2-3.0.4-201109261052
+
+*hardened-sources-2.6.32-r69 (27 Sep 2011)
+
+  27 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r69.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201109261052
+
+*hardened-sources-3.0.4-r3 (22 Sep 2011)
+
+  22 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4-r3.ebuild:
+  Based on 3.0.4 + genpatches-3.0-5 + grsecurity-2.2.2-3.0.4-201109190917
+
+  17 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r6.ebuild:
+  Reintroduce 2.6.39-r6 for more testing, requested by dman777
+
+*hardened-sources-3.0.4-r2 (15 Sep 2011)
+
+  15 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4-r2.ebuild:
+  Based on 3.0.4 + genpatches-3.0-5 + grsecurity-2.2.2-3.0.4-201109150655
+
+*hardened-sources-2.6.32-r68 (15 Sep 2011)
+
+  15 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r68.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201109150655
+
+  13 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r64.ebuild, -hardened-sources-2.6.39-r12.ebuild,
+  -hardened-sources-2.6.39-r13.ebuild, -hardened-sources-3.0.3.ebuild:
+  Removed deprecated versions
+
+*hardened-sources-3.0.4-r1 (04 Sep 2011)
+
+  04 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4-r1.ebuild:
+  Based on 3.0.4 + genpatches-3.0-5 + grsecurity-2.2.2-3.0.4-201109011725
+
+*hardened-sources-2.6.32-r67 (04 Sep 2011)
+
+  04 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r67.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201109021814
+
+  01 Sep 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Fix gpg signiture on Manifest
+
+*hardened-sources-3.0.4 (01 Sep 2011)
+
+  01 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.4.ebuild:
+  Based on 3.0.4 + genpatches-3.0-4 + grsecurity-2.2.2-3.0.4-201108301903
+
+*hardened-sources-2.6.32-r66 (01 Sep 2011)
+
+  01 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r66.ebuild:
+  Based on 2.6.32.46 + genpatches-2.6.32-43 +
+  grsecurity-2.2.2-2.6.32.46-201108301903
+
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r59.ebuild, -hardened-sources-2.6.32-r60.ebuild,
+  -hardened-sources-2.6.32-r61.ebuild, -hardened-sources-2.6.32-r62.ebuild,
+  -hardened-sources-2.6.32-r63.ebuild, -hardened-sources-2.6.39-r10.ebuild,
+  -hardened-sources-2.6.39-r11.ebuild:
+  Remove old versions
+
+*hardened-sources-3.0.3-r1 (28 Aug 2011)
+
+  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.3-r1.ebuild:
+  Based on 3.0.3 + genpatches-3.0-3 + grsecurity-2.2.2-3.0.3-201108262310
+
+*hardened-sources-2.6.32-r65 (28 Aug 2011)
+
+  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r65.ebuild:
+  Based on 2.6.32.45 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.45-201108262310
+
+*hardened-sources-3.0.3 (25 Aug 2011)
+
+  25 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.0.3.ebuild:
+  Based on 3.0.3 + genpatches-3.0-3 + grsecurity-2.2.2-3.0.3-201108232250
+
+*hardened-sources-2.6.32-r64 (25 Aug 2011)
+
+  25 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r64.ebuild:
+  Based on 2.6.32.45 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.45-201108232250
+
+*hardened-sources-2.6.39-r13 (24 Aug 2011)
+
+  24 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r13.ebuild:
+  Based on 2.6.39.4 + genpatches-2.6.39-6 +
+  grsecurity-2.2.2-2.6.39.4-201108211939
+
+*hardened-sources-2.6.32-r63 (24 Aug 2011)
+
+  24 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r63.ebuild:
+  Based on 2.6.32.45 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.45-201108211939
+
+*hardened-sources-2.6.39-r12 (16 Aug 2011)
+
+  16 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r12.ebuild:
+  Based on 2.6.39.4 + genpatches-2.6.39-6 +
+  grsecurity-2.2.2-2.6.39.4-201108141242
+
+*hardened-sources-2.6.32-r62 (16 Aug 2011)
+
+  16 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r62.ebuild:
+  Based on 2.6.32.44 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.44-201108141242
+
+*hardened-sources-2.6.39-r11 (15 Aug 2011)
+
+  15 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r11.ebuild:
+  Based on 2.6.39.4 + genpatches-2.6.39-6 +
+  grsecurity-2.2.2-2.6.39.4-201108132040
+
+*hardened-sources-2.6.32-r61 (12 Aug 2011)
+
+  12 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r61.ebuild:
+  Based on 2.6.32.44 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.44-201108111959
+
+  12 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.39-r8.ebuild:
+  Stable on amd64 and x86
+
+  12 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r58.ebuild:
+  Stable on amd64 and x86
+
+  10 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.39-r9.ebuild:
+  Remove broken kernel, bug #378449
+
+  09 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r56.ebuild, -hardened-sources-2.6.32-r57.ebuild,
+  -hardened-sources-2.6.39-r6.ebuild, -hardened-sources-2.6.39-r7.ebuild:
+  Remove old versions
+
+*hardened-sources-2.6.39-r10 (09 Aug 2011)
+
+  09 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r10.ebuild:
+  Based on 2.6.39.4 + genpatches-2.6.39-6 +
+  grsecurity-2.2.2-2.6.39.4-201108071438
+
+*hardened-sources-2.6.32-r60 (09 Aug 2011)
+
+  09 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r60.ebuild:
+  Based on 2.6.32.43 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.43-201108071948
+
+*hardened-sources-2.6.39-r9 (07 Aug 2011)
+
+  07 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r9.ebuild:
+  Based on 2.6.39.4 + genpatches-2.6.39-5 +
+  grsecurity-2.2.2-2.6.39.4-201108052113
+
+*hardened-sources-2.6.32-r59 (07 Aug 2011)
+
+  07 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r59.ebuild:
+  Based on 2.6.32.43 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.43-201108052033
+
+  25 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r53.ebuild, -hardened-sources-2.6.32-r54.ebuild,
+  -hardened-sources-2.6.32-r55.ebuild, -hardened-sources-2.6.39-r3.ebuild,
+  -hardened-sources-2.6.39-r4.ebuild, -hardened-sources-2.6.39-r5.ebuild:
+  Removed old versions
+
+*hardened-sources-2.6.39-r8 (25 Jul 2011)
+
+  25 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r8.ebuild:
+  Based on 2.6.39.3 + genpatches-2.6.39-5 +
+  grsecurity-2.2.2-2.6.39.3-201107191826
+
+*hardened-sources-2.6.32-r58 (25 Jul 2011)
+
+  25 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r58.ebuild:
+  Based on 2.6.32.43 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.43-201107191826
+
+*hardened-sources-2.6.39-r7 (18 Jul 2011)
+
+  18 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r7.ebuild:
+  Based on 2.6.39.3 + genpatches-2.6.39-5 +
+  grsecurity-2.2.2-2.6.39.3-201107161559
+
+*hardened-sources-2.6.32-r57 (18 Jul 2011)
+
+  18 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r57.ebuild:
+  Based on 2.6.32.43 + genpatches-2.6.32-40 +
+  grsecurity-2.2.2-2.6.32.43-201107142110
+
+  13 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r50.ebuild, -hardened-sources-2.6.32-r51.ebuild,
+  -hardened-sources-2.6.32-r52.ebuild, -hardened-sources-2.6.39.ebuild,
+  -hardened-sources-2.6.39-r1.ebuild, -hardened-sources-2.6.39-r2.ebuild:
+  Removed deprecated versions
+
+*hardened-sources-2.6.39-r6 (13 Jul 2011)
+
+  13 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r6.ebuild:
+  Based on 2.6.39.3 + genpatches-2.6.39-4 +
+  grsecurity-2.2.2-2.6.39.3-201107090923
+
+*hardened-sources-2.6.32-r56 (13 Jul 2011)
+
+  13 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r56.ebuild:
+  Based on 2.6.32.42 + genpatches-2.6.32-39 +
+  grsecurity-2.2.2-2.6.32.42-201107090923
+
+*hardened-sources-2.6.39-r5 (06 Jul 2011)
+
+  06 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r5.ebuild:
+  Based on 2.6.39.2 + genpatches-2.6.39-4 +
+  grsecurity-2.2.2-2.6.39.2-201107011911
+
+*hardened-sources-2.6.32-r55 (06 Jul 2011)
+
+  06 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r55.ebuild:
+  Based on 2.6.32.42 + genpatches-2.6.32-39 +
+  grsecurity-2.2.2-2.6.32.42-201107011911
+
+*hardened-sources-2.6.39-r4 (29 Jun 2011)
+
+  29 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r4.ebuild:
+  Based on 2.6.39.2 + genpatches-2.6.39-4 +
+  grsecurity-2.2.2-2.6.39.2-201106281648
+
+*hardened-sources-2.6.32-r54 (29 Jun 2011)
+
+  29 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r54.ebuild:
+  Based on 2.6.32.42 + genpatches-2.6.32-39 +
+  grsecurity-2.2.2-2.6.32.42-201106281648
+
+*hardened-sources-2.6.39-r3 (24 Jun 2011)
+
+  24 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r3.ebuild:
+  Based on 2.6.39.1 + genpatches-2.6.39-2 +
+  grsecurity-2.2.2-2.6.39.1-201106211740
+
+*hardened-sources-2.6.32-r53 (24 Jun 2011)
+
+  24 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r53.ebuild:
+  Based on 2.6.32.41 + genpatches-2.6.32-38 +
+  grsecurity-2.2.2-2.6.32.41-201106211740
+
+*hardened-sources-2.6.39-r2 (17 Jun 2011)
+
+  17 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r2.ebuild:
+  Based on 2.6.39.1 + genpatches-2.6.39-2 +
+  grsecurity-2.2.2-2.6.39.1-201106132135
+
+*hardened-sources-2.6.32-r52 (17 Jun 2011)
+
+  17 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r52.ebuild:
+  Based on 2.6.32.41 + genpatches-2.6.32-38 +
+  grsecurity-2.2.2-2.6.32.41-201106132135
+
+  11 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.37-r5.ebuild, -hardened-sources-2.6.37-r6.ebuild:
+  Removed deprecated versions
+
+*hardened-sources-2.6.39-r1 (11 Jun 2011)
+
+  11 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39-r1.ebuild:
+  Based on 2.6.39.1 + genpatches-2.6.39-2 +
+  grsecurity-2.2.2-2.6.39.1-201106071941
+
+*hardened-sources-2.6.32-r51 (11 Jun 2011)
+
+  11 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r51.ebuild:
+  Based on 2.6.32.41 + genpatches-2.6.32-38 +
+  grsecurity-2.2.2-2.6.32.41-201106071941
+
+*hardened-sources-2.6.39 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.39.ebuild:
+  Based on 2.6.39.1 + genpatches-2.6.39-1 +
+  grsecurity-2.2.2-2.6.39.1-201106061957
+
+*hardened-sources-2.6.32-r50 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r50.ebuild:
+  Based on 2.6.32.41 + genpatches-2.6.32-38 +
+  grsecurity-2.2.2-2.6.32.41-201106061735
+
+  03 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r46.ebuild, -hardened-sources-2.6.32-r47.ebuild,
+  -hardened-sources-2.6.32-r48.ebuild, -hardened-sources-2.6.38.ebuild,
+  -hardened-sources-2.6.38-r4.ebuild, -hardened-sources-2.6.38-r5.ebuild:
+  Removed deprecated versions
+
+  03 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r49.ebuild, hardened-sources-2.6.38-r6.ebuild:
+  Stable amd64 x86
+
+*hardened-sources-2.6.38-r6 (25 May 2011)
+
+  25 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r6.ebuild:
+  Based on 2.6.38.7 + genpatches-2.6.38-7 +
+  grsecurity-2.2.2-2.6.38.7-201105222331
+
+*hardened-sources-2.6.32-r49 (25 May 2011)
+
+  25 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r49.ebuild:
+  Based on 2.6.32.40 + genpatches-2.6.32-37 +
+  grsecurity-2.2.2-2.6.32.40-201105222331
+
+*hardened-sources-2.6.38-r5 (20 May 2011)
+
+  20 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r5.ebuild:
+  Based on 2.6.38.6 + genpatches-2.6.38-6 +
+  grsecurity-2.2.2-2.6.38.6-201105182052
+
+*hardened-sources-2.6.32-r48 (20 May 2011)
+
+  20 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r48.ebuild:
+  Based on 2.6.32.40 + genpatches-2.6.32-37 +
+  grsecurity-2.2.2-2.6.32.40-201105182052
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r41.ebuild, -hardened-sources-2.6.32-r43.ebuild,
+  -hardened-sources-2.6.32-r44.ebuild, -hardened-sources-2.6.32-r45.ebuild:
+  Removed deprecated versions
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.38-r3.ebuild:
+  Bug #365871
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.38-r1.ebuild, -hardened-sources-2.6.38-r2.ebuild:
+  See bugs #365871, #365915, #366281
+
+*hardened-sources-2.6.38-r4 (12 May 2011)
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r4.ebuild:
+  Based on 2.6.38.6 + genpatches-2.6.38-6 +
+  grsecurity-2.2.2-2.6.38.6-201105111839
+
+*hardened-sources-2.6.32-r47 (12 May 2011)
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r47.ebuild:
+  Based on 2.6.32.40 + genpatches-2.6.32-37 +
+  grsecurity-2.2.2-2.6.32.40-201105111839
+
+*hardened-sources-2.6.38-r3 (11 May 2011)
+
+  11 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r3.ebuild:
+  Based on 2.6.38.4 + genpatches-2.6.38-4 +
+  grsecurity-2.2.2-2.6.38.4-201105021909
+
+*hardened-sources-2.6.32-r46 (11 May 2011)
+
+  11 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r46.ebuild:
+  Based on 2.6.32.39 + genpatches-2.6.32-36 +
+  grsecurity-2.2.2-2.6.32.39-201104301754
+
+*hardened-sources-2.6.38-r2 (28 Apr 2011)
+
+  28 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r2.ebuild:
+  Based on 2.6.38.4 + genpatches-2.6.38-4 +
+  grsecurity-2.2.2-2.6.38.4-201104232142
+
+*hardened-sources-2.6.32-r45 (28 Apr 2011)
+
+  28 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r45.ebuild:
+  Based on 2.6.32.39 + genpatches-2.6.32-36 +
+  grsecurity-2.2.2-2.6.32.39-201104232142
+
+*hardened-sources-2.6.38-r1 (20 Apr 2011)
+
+  20 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38-r1.ebuild:
+  Based on 2.6.38.3 + genpatches-2.6.38-3 +
+  grsecurity-2.2.2-2.6.38.3-201104191737
+
+*hardened-sources-2.6.32-r44 (20 Apr 2011)
+
+  20 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r44.ebuild:
+  Based on 2.6.32.38 + genpatches-2.6.32-36 +
+  grsecurity-2.2.2-2.6.32.38-201104191737
+
+  19 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r42.ebuild:
+  Stable on ppc64
+
+  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.37-r7.ebuild:
+  Stable on amd64, x86
+
+  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r42.ebuild:
+  Stable on amd64, x86
+
+  29 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.37.ebuild, -hardened-sources-2.6.37-r1.ebuild,
+  -hardened-sources-2.6.37-r2.ebuild, -hardened-sources-2.6.37-r3.ebuild,
+  -hardened-sources-2.6.37-r4.ebuild:
+  Removed deprecated hardened-sources-2.6.37-rX versions
+
+  29 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r35.ebuild, -hardened-sources-2.6.32-r36.ebuild,
+  -hardened-sources-2.6.32-r37.ebuild, -hardened-sources-2.6.32-r38.ebuild,
+  -hardened-sources-2.6.32-r39.ebuild, -hardened-sources-2.6.32-r40.ebuild:
+  Removed deprecated hardened-sources-2.6.32-rX versions
+
+*hardened-sources-2.6.38 (29 Mar 2011)
+
+  29 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.38.ebuild:
+  Based on 2.6.38.2 + genpatches-2.6.38.2 +
+  grsecurity-2.2.2-2.6.38.2-201103281752
+
+*hardened-sources-2.6.32-r43 (29 Mar 2011)
+
+  29 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r43.ebuild:
+  Based on 2.6.32.36 + genpatches-2.6.32.36 +
+  grsecurity-2.2.2-2.6.32.36-201103281752
+
+*hardened-sources-2.6.37-r7 (22 Mar 2011)
+
+  22 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r7.ebuild:
+  Based on vanilla 2.6.37.4 + genpatches-2.6.37.5 +
+  grsecurity-2.2.1-2.6.37.4-201103211735
+
+*hardened-sources-2.6.32-r42 (22 Mar 2011)
+
+  22 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r42.ebuild:
+  Based on vanilla 2.6.32.33 + genpatches-2.6.32.34 +
+  grsecurity-2.2.1-2.6.32.33-201103211735
+
+*hardened-sources-2.6.32-r41 (19 Mar 2011)
+
+  19 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r41.ebuild:
+  Based on vanilla 2.6.32.32 + genpatches-2.6.32.34 +
+  grsecurity-2.2.1-2.6.32.32-201103122250
+
+*hardened-sources-2.6.37-r6 (19 Mar 2011)
+
+  19 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r6.ebuild:
+  Based on vanilla 2.6.37.3 + genpatches-2.6.37.4 +
+  grsecurity-2.2.1-2.6.37.3-201103122250
+
+*hardened-sources-2.6.37-r5 (07 Mar 2011)
+
+  07 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r5.ebuild:
+  Based on vanilla 2.6.37.2 + genpatches-2.6.37.2 +
+  grsecurity-2.2.1-2.6.37.2-201103021740
+
+*hardened-sources-2.6.32-r40 (07 Mar 2011)
+
+  07 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r40.ebuild:
+  Based on vanilla 2.6.32.30 + genpatches-2.6.32-32 +
+  grsecurity-2.2.1-2.6.32.30-201103021740
+
+  04 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r39.ebuild, hardened-sources-2.6.37-r4.ebuild:
+  Fixed minor error to pkg_postinst() message.
+
+*hardened-sources-2.6.37-r4 (01 Mar 2011)
+
+  01 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r4.ebuild:
+  Based on vanilla 2.6.37.2 + genpatches-2.6.37-2 +
+  grsecurity-2.2.1-2.6.37.2-201102271552
+
+*hardened-sources-2.6.32-r39 (01 Mar 2011)
+
+  01 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r39.ebuild:
+  Based on vanilla 2.6.32.29 + genpatches-2.6.32-31 +
+  grsecurity-2.2.1-2.6.32.29-201102271552
+
+*hardened-sources-2.6.37-r3 (21 Feb 2011)
+
+  21 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r3.ebuild:
+  Same codebase as hardened-sources-2.6.37-r2, updated predefined GRSEC/PaX
+
+*hardened-sources-2.6.32-r38 (21 Feb 2011)
+
+  21 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r38.ebuild:
+  Same codebase as hardened-sources-2.6.32-r37, updated predefined GRSEC/PaX
+  settings
+
+*hardened-sources-2.6.37-r2 (18 Feb 2011)
+
+  18 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r2.ebuild:
+  Based on vanilla 2.6.37 + genpatches-2.6.37-1 +
+  grsecurity-2.2.1-2.6.37-201102152009
+
+*hardened-sources-2.6.32-r37 (18 Feb 2011)
+
+  18 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r37.ebuild:
+  Based on vanilla 2.6.32.28 + genpatches-2.6.32-30 +
+  grsecurity-2.2.1-2.6.32.28-201102151944
+
+  08 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.34-r6.ebuild:
+  Dropped stable amd64 keyword.
+
+  03 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.36-r9.ebuild:
+  Stable on amd64, ppc64, x86
+
+  03 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r34.ebuild:
+  Stable on amd64, ppc64, x86
+
+*hardened-sources-2.6.37-r1 (29 Jan 2011)
+
+  29 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37-r1.ebuild:
+  Based on vanilla 2.6.37 + genpatches-2.6.37-1 +
+  grsecurity-2.2.1-2.6.37-201101272240
+
+*hardened-sources-2.6.32-r36 (29 Jan 2011)
+
+  29 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r36.ebuild:
+  Based on vanilla 2.6.32.28 + genpatches-2.6.32-30 +
+  grsecurity-2.2.1-2.6.32.28-201101272313
+
+  28 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r30.ebuild, -hardened-sources-2.6.32-r32.ebuild,
+  -hardened-sources-2.6.32-r33.ebuild, -hardened-sources-2.6.36-r5.ebuild,
+  -hardened-sources-2.6.36-r7.ebuild, -hardened-sources-2.6.36-r8.ebuild:
+  Removed deprecated versions
+
+  20 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.28-r9.ebuild:
+  Deprecated
+
+*hardened-sources-2.6.37 (20 Jan 2011)
+
+  20 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.37.ebuild:
+  Based on vanilla 2.6.37 + genpatches-2.6.37-1 +
+  grsecurity-2.2.1-2.6.37-201101172105
+
+*hardened-sources-2.6.32-r35 (20 Jan 2011)
+
+  20 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r35.ebuild:
+  Based on vanilla 2.6.32.28 + genpatches-2.6.32-30 +
+  grsecurity-2.2.1-2.6.32.28-201101170305
+
+*hardened-sources-2.6.36-r9 (15 Jan 2011)
+
+  15 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r9.ebuild:
+  Based on vanilla 2.6.36.3 + genpatches-2.6.36-10 +
+  grsecurity-2.2.1-2.6.36.3-201101131705
+
+*hardened-sources-2.6.32-r34 (15 Jan 2011)
+
+  15 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r34.ebuild:
+  Based on vanilla 2.6.32.28 + genpatches-2.6.32-30 +
+  grsecurity-2.2.1-2.6.32.28-201101131705
+
+*hardened-sources-2.6.36-r8 (07 Jan 2011)
+
+  07 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r8.ebuild:
+  Based on vanilla 2.6.36.2 + genpatches-2.6.36-8 +
+  grsecurity-2.2.1-2.6.36.2-201101052002
+
+*hardened-sources-2.6.32-r33 (07 Jan 2011)
+
+  07 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r33.ebuild:
+  Based on vanilla 2.6.32.27 + genpatches-2.6.32-29 +
+  grsecurity-2.2.1-2.6.32.27-201101052002
+
+*hardened-sources-2.6.36-r7 (27 Dec 2010)
+
+  27 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r7.ebuild:
+  Based on vanilla 2.6.36.2 + genpatches-2.6.36-7 +
+  grsecurity-2.2.1-2.6.36.2-201012221906
+
+*hardened-sources-2.6.32-r32 (27 Dec 2010)
+
+  27 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r32.ebuild:
+  Based on vanilla 2.6.32.27 + genpatches-2.6.32-29 +
+  grsecurity-2.2.1-2.6.32.27-201012182005
+
+  21 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r24.ebuild, -hardened-sources-2.6.32-r25.ebuild,
+  -hardened-sources-2.6.32-r26.ebuild, -hardened-sources-2.6.32-r27.ebuild,
+  -hardened-sources-2.6.32-r29.ebuild, -hardened-sources-2.6.35-r4.ebuild,
+  -hardened-sources-2.6.35-r5.ebuild, -hardened-sources-2.6.35-r6.ebuild,
+  -hardened-sources-2.6.36.ebuild, -hardened-sources-2.6.36-r1.ebuild,
+  -hardened-sources-2.6.36-r2.ebuild, -hardened-sources-2.6.36-r4.ebuild:
+  Removed deprecated versions
+
+  20 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r31.ebuild, hardened-sources-2.6.36-r6.ebuild:
+  amd64, ppc64, x86 fast track stabilization. See CVE-2010-4258,
+  CVE-2010-3849, CVE-2010-3850
+
+*hardened-sources-2.6.36-r6 (14 Dec 2010)
+
+  14 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r6.ebuild:
+  Based on vanilla 2.6.36.2 + genpatches-2.6.36-7 +
+  grsecurity-2.2.1-2.6.36.2-201012121726
+
+*hardened-sources-2.6.32-r31 (14 Dec 2010)
+
+  14 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r31.ebuild:
+  Based on vanilla 2.6.32.27 + genpatches-2.6.32-29 +
+  grsecurity-2.2.1-2.6.32.27-201012130740
+
+  09 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r30.ebuild, hardened-sources-2.6.36-r5.ebuild:
+  Fixed bug #348238
+
+*hardened-sources-2.6.36-r5 (09 Dec 2010)
+
+  09 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r5.ebuild:
+  Based on vanilla-2.6.36.1 + genpatches-2.6.36-6 +
+  grsecurity-2.2.1-2.6.36.1-201012040057
+
+*hardened-sources-2.6.32-r30 (09 Dec 2010)
+
+  09 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r30.ebuild:
+  Based on vanilla-2.6.32.26 + genpatches-2.6.32-28 +
+  grsecurity-2.2.1-2.6.32.26-201012040057
+
+*hardened-sources-2.6.36-r4 (02 Dec 2010)
+
+  02 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r4.ebuild:
+  Based on vanilla-2.6.36.1 + genpatches-.2.6.36-5 +
+  grsecurity-2.2.1-2.6.36.1-201011280939
+
+*hardened-sources-2.6.32-r29 (02 Dec 2010)
+
+  02 Dec 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r29.ebuild:
+  Based on vanilla-2.6.32.26 + genpatches-2.6.32-27 +
+  grsecurity-2.2.1-2.6.32.26-201011280939
+
+  30 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r28.ebuild, -hardened-sources-2.6.36-r3.ebuild:
+  Removed because of multiple breakage (pulseaudio, install, etc).
+
+*hardened-sources-2.6.36-r3 (29 Nov 2010)
+
+  29 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r3.ebuild:
+  hardened-sources-2.6.36-r3 based on 2.6.36.1 + genpatches +
+  grsecurity-2.2.1-2.6.36.1-201011261834
+
+*hardened-sources-2.6.32-r28 (29 Nov 2010)
+
+  29 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r28.ebuild:
+  hardened-sources-2.6.32-r28 based on 2.6.32.26 + genpatches +
+  grsecurity-2.2.1-2.6.32.26-201011261834
+
+  28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> Manifest:
+  Update Manifest for deblob 2.6.36.
+
+*hardened-sources-2.6.36-r2 (18 Nov 2010)
+
+  18 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r2.ebuild:
+  hardened-sources-2.6.36-r2 based on 2.6.36 + genpatches +
+  grsecurity-2.2.0-2.6.36-201011151726
+
+*hardened-sources-2.6.32-r27 (18 Nov 2010)
+
+  18 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r27.ebuild:
+  hardened-sources-2.6.32-r27 based on 2.6.32.25 + genpatches +
+  grsecurity-2.2.0-2.6.32.25-201011151726
+
+*hardened-sources-2.6.36-r1 (14 Nov 2010)
+
+  14 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36-r1.ebuild:
+  hardened-sources-2.6.36-r1 based on 2.6.36 + genpatches +
+  grsecurity-2.2.0-2.6.36-201011131640
+
+*hardened-sources-2.6.32-r26 (14 Nov 2010)
+
+  14 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r26.ebuild:
+  hardened-sources-2.6.32-r26 based on 2.6.32.25 + genpatches +
+  grsecurity-2.2.0-2.6.32.25-201011131640
+
+*hardened-sources-2.6.36 (07 Nov 2010)
+
+  07 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.36.ebuild:
+  hardened-sources-2.6.36 based on 2.6.36 + genpatches +
+  grsecurity-2.2.0-2.6.36-201011062054
+
+*hardened-sources-2.6.35-r7 (07 Nov 2010)
+
+  07 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.35-r7.ebuild:
+  hardened-sources-2.6.35-r7 based on 2.6.35.8 + genpatches +
+  grsecurity-2.2.0-2.6.35.8-201011062054
+
+*hardened-sources-2.6.32-r25 (07 Nov 2010)
+
+  07 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r25.ebuild:
+  hardened-sources-2.6.32-r25 based on 2.6.32.25 + genpatches +
+  grsecurity-2.2.0-2.6.32.25-201011062054
+
+*hardened-sources-2.6.35-r6 (02 Nov 2010)
+*hardened-sources-2.6.32-r24 (02 Nov 2010)
+
+  02 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r24.ebuild, +hardened-sources-2.6.35-r6.ebuild:
+  hardened-sources-2.6.32-r24 based on 2.6.32.25 + genpatches +
+  grsecurity-2.2.0-2.6.32.25-201010311944
+  hardened-sources-2.6.35-r6 based on 2.6.35.8 + genpatches +
+  grsecurity-2.2.0-2.6.35.8-201010311944
+
+  02 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r23.ebuild:
+  ppc64 stable, bug #343535
+
+*hardened-sources-2.6.35-r5 (24 Oct 2010)
+*hardened-sources-2.6.32-r23 (24 Oct 2010)
+
+  24 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r23.ebuild, +hardened-sources-2.6.35-r5.ebuild:
+  hardened-sources-2.6.32-r23 based on 2.6.32.24 + genpatches +
+  grsec-2.2.0-2.6.32.24-201010232009
+  hardened-sources-2.6.35-r5 based on 2.6.35.7 + genpatches +
+  grsec-2.2.0-2.6.35.7-201010232009
+
+  24 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r22.ebuild:
+  Broken on ppc/ppc64, bug #341915#c6
+
+  24 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r16.ebuild, -hardened-sources-2.6.32-r17.ebuild,
+  -hardened-sources-2.6.32-r18.ebuild, -hardened-sources-2.6.32-r19.ebuild,
+  -hardened-sources-2.6.32-r20.ebuild, -hardened-sources-2.6.32-r21.ebuild,
+  -hardened-sources-2.6.34-r4.ebuild, -hardened-sources-2.6.34-r5.ebuild,
+  -hardened-sources-2.6.35.ebuild, -hardened-sources-2.6.35-r1.ebuild,
+  -hardened-sources-2.6.35-r2.ebuild, -hardened-sources-2.6.35-r3.ebuild:
+  Removing vulnerable kernels where possible, bug #341801
+
+  21 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r22.ebuild:
+  x86 stable, bug #341915
+
+  20 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r22.ebuild:
+  amd64 stable, bug #341915
+
+*hardened-sources-2.6.35-r4 (20 Oct 2010)
+*hardened-sources-2.6.32-r22 (20 Oct 2010)
+
+  20 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r22.ebuild, +hardened-sources-2.6.35-r4.ebuild:
+  hardened-sources-2.6.32-r22 based on 2.6.32.24 + genpatches +
+  grsec-2.2.0-2.6.32.24-201010191911
+  hardened-sources-2.6.35-r4 based on 2.6.35.7 + genpatches +
+  grsec-2.2.0-2.6.35.7-201010191911
+  Addresses security bug #341801
+
+*hardened-sources-2.6.35-r3 (16 Oct 2010)
+*hardened-sources-2.6.32-r21 (16 Oct 2010)
+
+  16 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r21.ebuild, +hardened-sources-2.6.35-r3.ebuild:
+  hardened-sources-2.6.32-r21 based on 2.6.32.24 + genpatches +
+  grsec-2.2.0-2.6.32.24-201010121028
+  hardened-sources-2.6.35-r3 based on 2.6.35.7 + genpatches +
+  grsec-2.2.0-2.6.35.7-201010121028
+
+*hardened-sources-2.6.35-r2 (07 Oct 2010)
+
+  07 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.35-r2.ebuild:
+  hardened-sources-2.6.35-r2 based on 2.6.35.7 + genpatches +
+  grsec-2.2.0-2.6.35.7-201010021153
+
+*hardened-sources-2.6.32-r20 (06 Oct 2010)
+
+  06 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r20.ebuild:
+  hardened-sources-2.6.32-r20 based on 2.6.32.24 + genpatches +
+  grsec-2.2.0-2.6.32.24-201010021153 
+
+*hardened-sources-2.6.35-r1 (30 Sep 2010)
+*hardened-sources-2.6.32-r19 (30 Sep 2010)
+
+  30 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r19.ebuild, +hardened-sources-2.6.35-r1.ebuild:
+  hardened-sources-2.6.32-r19 based on 2.6.32.23 + genpatches +
+  grsec-2.2.0-2.6.32.23-201009272133
+  hardened-sources-2.6.35-r1 based on 2.6.35.6 + genpatches +
+  grsec-2.2.0-2.6.35.6-201009281623
+
+*hardened-sources-2.6.35 (28 Sep 2010)
+
+  28 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.35.ebuild:
+  hardened-sources-2.6.35 based on grsec-2.2.0-2.6.35.6-201009262116 
+
+  21 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r14.ebuild, -hardened-sources-2.6.32-r15.ebuild,
+  hardened-sources-2.6.32-r18.ebuild, -hardened-sources-2.6.34-r2.ebuild,
+  -hardened-sources-2.6.34-r3.ebuild, hardened-sources-2.6.34-r6.ebuild:
+  Fast track stabilization. See bug #338273. Removed older versions.
+
+*hardened-sources-2.6.34-r6 (17 Sep 2010)
+*hardened-sources-2.6.32-r18 (17 Sep 2010)
+
+  17 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r18.ebuild, +hardened-sources-2.6.34-r6.ebuild:
+  hardened-sources-2.6.32-r18 based on 2.6.32.21 + genpatches +
+  grsec-2.2.0-2.6.32.21-201009162222
+  hardened-sources-2.6.34-r6 based on 2.6.34.7 + genpatches +
+  grsec-2.2.0-2.6.34.7-201009162222
+  Addresses IA32 syscall exploit.
+
+*hardened-sources-2.6.34-r5 (15 Sep 2010)
+*hardened-sources-2.6.32-r17 (15 Sep 2010)
+
+  15 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r17.ebuild, +hardened-sources-2.6.34-r5.ebuild:
+  hardened-sources-2.6.32-r17 based on 2.6.32.21 + genpatches +
+  grsec-2.2.0-2.6.32.21-201009130811
+  hardened-sources-2.6.34-r5 based on 2.6.34.6 + genpatches +
+  grsec-2.2.0-2.6.34.6-201009130754
+
+*hardened-sources-2.6.34-r4 (07 Sep 2010)
+*hardened-sources-2.6.32-r16 (07 Sep 2010)
+
+  07 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r16.ebuild, +hardened-sources-2.6.34-r4.ebuild:
+  hardened-sources-2.6.32-r16 based on 2.6.32.21 +
+  grsec-2.2.0-2.6.32.21-201009032133
+  hardened-sources-2.6.34-r4 based on 2.6.34.6 +
+  grsec-2.2.0-2.6.34.6-201009041352
+
+  02 Sep 2010; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  hardened-sources-2.6.32-r15 based on 2.6.32.21 +
+  grsec-2.2.0-2.6.32.21-201008292122
+  hardened-sources-2.6.34-r3 based on 2.6.34.6 +
+  grsec-2.2.0-2.6.34.6-201008292122
+
+*hardened-sources-2.6.34-r3 (02 Sep 2010)
+*hardened-sources-2.6.32-r15 (02 Sep 2010)
+
+  02 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r10.ebuild, -hardened-sources-2.6.32-r11.ebuild,
+  -hardened-sources-2.6.32-r12.ebuild, -hardened-sources-2.6.32-r13.ebuild,
+  +hardened-sources-2.6.32-r15.ebuild, -hardened-sources-2.6.34-r1.ebuild,
+  +hardened-sources-2.6.34-r3.ebuild:
+  Bumps and remove deprecated versions
+
+*hardened-sources-2.6.34-r2 (21 Aug 2010)
+
+  21 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.34-r2.ebuild:
+  Based on vanilla 2.6.34.4 + genpatches + grsec-2.2.0-2.6.34.4-201008131840
+
+*hardened-sources-2.6.32-r14 (21 Aug 2010)
+
+  21 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r14.ebuild:
+  Based on vanilla 2.6.32.19 + genpatches +
+  grsec-2.2.0-2.6.32.19-201008131840
+
+*hardened-sources-2.6.32-r13 (14 Aug 2010)
+
+  14 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r13.ebuild:
+  Based on vanilla 2.6.32.18 + genpatches +
+  grsecurity-2.2.0-2.6.32.18-201008112233
+
+  03 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> Manifest:
+  kernel-2 deblob support for 2.6.35; bug #324505: deblob-check usage.
+
+  01 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r9.ebuild:
+  Stable ppc64. Bug #326885
+
+*hardened-sources-2.6.32-r12 (24 Jul 2010)
+
+  24 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r12.ebuild:
+  Parallels fix incorporated into hardened-sources-2.6.34-r1
+
+*hardened-sources-2.6.34-r1 (24 Jul 2010)
+
+  24 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.34.ebuild, +hardened-sources-2.6.34-r1.ebuild:
+  Fixes bug #328275
+
+  21 Jul 2010; <chainsaw@gentoo.org> metadata.xml:
+  Address metadata concerns by Jeroen "rej" Roovers <rej@gentoo.org> raised
+  on gentoo-dev.
+
+  21 Jul 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml:
+  Correct mail address.
+
+  18 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.25-r13.ebuild, -hardened-sources-2.6.26-r9.ebuild,
+  -hardened-sources-2.6.28-r7.ebuild, -hardened-sources-2.6.29.ebuild,
+  -hardened-sources-2.6.32-r8.ebuild:
+  Removing outdated releases
+
+  17 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  hardened-sources-2.6.32-r9.ebuild:
+  stable x86, bug 326885
+
+  13 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r7.ebuild:
+  Removed for security. Bug #325573
+
+*hardened-sources-2.6.34 (13 Jul 2010)
+
+  13 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.34.ebuild:
+  Initial commit based on mainline 2.6.34.1 and grsec-2.2.0.
+
+*hardened-sources-2.6.32-r11 (13 Jul 2010)
+
+  13 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r11.ebuild:
+  New patchset based on mainline 2.6.32.16 and grsec-2.2.0. Bug #327263
+
+  06 Jul 2010; <chainsaw@gentoo.org> hardened-sources-2.6.32-r9.ebuild:
+  Marked stable on AMD64 as requested by Anthony G. Basile
+  <blueness@gentoo.org> in bug #326885. Operational testing done for 1 week
+  on roughly two dozen HP Proliant DL365 G1 and DL385 G2 systems.
+
+*hardened-sources-2.6.32-r10 (30 Jun 2010)
+
+  30 Jun 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r10.ebuild:
+  New patchset based on mainline 2.6.32.15 and grsec-2.2.0. Bug #325227.
+
+  29 Jun 2010; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Added myself to the metadata.xml
+
+*hardened-sources-2.6.32-r9 (11 Jun 2010)
+
+  11 Jun 2010; <chainsaw@gentoo.org> +hardened-sources-2.6.32-r9.ebuild:
+  New patchset by Anthony G Basile, based on mainline 2.6.32.15 sources.
+
+*hardened-sources-2.6.32-r8 (01 Jun 2010)
+
+  01 Jun 2010; <chainsaw@gentoo.org> +hardened-sources-2.6.32-r8.ebuild:
+  New patchset by Anthony G Basile, based on mainline 2.6.32.14 sources.
+
+  27 May 2010; <chainsaw@gentoo.org> hardened-sources-2.6.32-r7.ebuild:
+  Update SRC_URI to point to mirror network now that the distfile has
+  propagated.
+
+*hardened-sources-2.6.32-r7 (26 May 2010)
+
+  26 May 2010; <chainsaw@gentoo.org> +hardened-sources-2.6.32-r7.ebuild,
+  metadata.xml:
+  New 2.6.32-based release by Anthony G Basile, Robin H. Johnson & Matthew
+  Summers.
+
+  26 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  Update Manifest for deblob support in kernel-2 eclass.
+
+  31 May 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.28-r9.ebuild:
+  ppc stable
+
+  29 May 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r6.ebuild, hardened-sources-2.6.28-r9.ebuild:
+  Stable amd64/x86 and remove old.
+
+*hardened-sources-2.6.29 (25 May 2009)
+
+  25 May 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.29.ebuild:
+  Initial 2.6.29 release. Thanks to Kerin Millar for providing and testing
+  release candidates.
+
+*hardened-sources-2.6.28-r9 (25 May 2009)
+
+  25 May 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r8.ebuild, +hardened-sources-2.6.28-r9.ebuild:
+  Fix x86-32 boot failure (regression vs. 2.6.28-r7).
+
+*hardened-sources-2.6.28-r8 (18 May 2009)
+
+  18 May 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r8.ebuild:
+  Bump to Linux 2.6.28.10, latest genpatches, PaX updates. Fixes bug #256067
+  and #262862 among others.
+
+  01 May 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r13.ebuild, hardened-sources-2.6.26-r9.ebuild,
+  hardened-sources-2.6.28-r6.ebuild, hardened-sources-2.6.28-r7.ebuild:
+  Remove unnecessary mirror://gentoo from SRC_URI.
+
+  05 Apr 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.28-r7.ebuild:
+  ppc stable
+
+  30 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r4.ebuild, hardened-sources-2.6.28-r7.ebuild:
+  Stable amd64/x86 and remove old.
+
+*hardened-sources-2.6.28-r7 (27 Mar 2009)
+
+  27 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r7.ebuild:
+  Add Linux 2.6.28.9. Fix bugs 263424, 263870.
+
+  22 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.27-r7.ebuild, -hardened-sources-2.6.27-r8.ebuild,
+  -hardened-sources-2.6.28-r1.ebuild, -hardened-sources-2.6.28-r2.ebuild,
+  -hardened-sources-2.6.28-r3.ebuild, hardened-sources-2.6.28-r6.ebuild:
+  Stable amd64/x86 and remove old versions.
+
+  22 Mar 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.28-r6.ebuild:
+  ppc stable
+
+*hardened-sources-2.6.28-r6 (21 Mar 2009)
+
+  21 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r5.ebuild, +hardened-sources-2.6.28-r6.ebuild:
+  Minor fix to ensure RTC is properly selected when GRKERNSEC_IO is enabled.
+
+*hardened-sources-2.6.28-r5 (20 Mar 2009)
+
+  20 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r5.ebuild:
+  Bump genpatches. Grsecurity patch bump, fixes bug #262752.
+
+  20 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.28-r4.ebuild:
+  Stable amd64/x86.
+
+*hardened-sources-2.6.28-r4 (18 Mar 2009)
+
+  18 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r4.ebuild:
+  Bump to Linux 2.6.28.8. PaX update fixes oops in SANITIZE feature,
+  compilation with CPA_DEBUG and more.
+
+  17 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.28-r3.ebuild:
+  Quick stable amd64/x86.
+
+*hardened-sources-2.6.28-r3 (15 Mar 2009)
+
+  15 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r3.ebuild:
+  Adds latest PaX changes fixing some boot issues, ext4 fixes for bug #262507.
+
+  14 Mar 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.28-r2.ebuild:
+  ppc stable
+
+  13 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.28-r2.ebuild:
+  Stable amd64/x86.
+
+*hardened-sources-2.6.28-r2 (11 Mar 2009)
+
+  11 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28-r2.ebuild:
+  Version bump bringing in latest grsecurity patch.
+
+*hardened-sources-2.6.28-r1 (09 Mar 2009)
+
+  09 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28.ebuild, +hardened-sources-2.6.28-r1.ebuild:
+  Version bump and remove old.
+
+  07 Mar 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.27-r8.ebuild:
+  ppc stable
+
+  01 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.27-r8.ebuild:
+  Remove amd64 testing keyword, bug 256226.
+
+  01 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.27-r8.ebuild:
+  Revert amd64 stable, bug #256226.
+
+  01 Mar 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.27-r8.ebuild:
+  Stable on amd64/x86.
+
+  24 Feb 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.27-r6.ebuild:
+  Remove old 2.6.27 release.
+
+*hardened-sources-2.6.27-r8 (24 Feb 2009)
+
+  24 Feb 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r8.ebuild:
+  Bump to latest genpatches, Linux 2.6.27.19, PaX updates. Fixes bug #256067
+  and probably more.
+
+  04 Feb 2009; nixnut <nixnut@gentoo.org> hardened-sources-2.6.26-r9.ebuild:
+  ppc stable
+
+*hardened-sources-2.6.28 (25 Jan 2009)
+
+  25 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.28.ebuild:
+  Initial 2.6.28 release.
+
+*hardened-sources-2.6.27-r7 (25 Jan 2009)
+
+  25 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r7.ebuild:
+  Bump to Linux 2.6.27.13.
+
+  25 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.26-r9.ebuild:
+  Stable amd64/x86.
+
+  24 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.27-r3.ebuild, -hardened-sources-2.6.27-r4.ebuild,
+  -hardened-sources-2.6.27-r5.ebuild:
+  Remove problem versions.
+
+*hardened-sources-2.6.27-r6 (24 Jan 2009)
+
+  24 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r6.ebuild:
+  Revert PaX test29 to test30 changes. Fixes bug 256226.
+
+*hardened-sources-2.6.27-r5 (24 Jan 2009)
+
+  24 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r5.ebuild:
+  Bump to genpatches-10 (includes Linux 2.6.27.{11,12}) and fix bugs 253733,
+  254843.
+
+  23 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r11.ebuild, -hardened-sources-2.6.25-r12.ebuild,
+  -hardened-sources-2.6.26-r7.ebuild, -hardened-sources-2.6.26-r8.ebuild:
+  Remove problem versions.
+
+  23 Jan 2009; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.25-r13.ebuild:
+  ppc stable
+
+  21 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r13.ebuild:
+  Fasttrack stable amd64/x86.
+
+*hardened-sources-2.6.26-r9 (21 Jan 2009)
+
+  21 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.26-r9.ebuild:
+  Revert RLIMIT_STACK false-positives-avoidance patch. Bugs 253733, 254843
+
+*hardened-sources-2.6.25-r13 (20 Jan 2009)
+
+  20 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r13.ebuild:
+  Revert RLIMIT_STACK false-positives-avoidance patch. Bugs 253733, 254843
+
+  20 Jan 2009; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.25-r12.ebuild:
+  ppc stable
+
+  17 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r12.ebuild:
+  Stable amd64/x86.
+
+  14 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r10.ebuild, -hardened-sources-2.6.26-r6.ebuild,
+  -hardened-sources-2.6.27-r2.ebuild:
+  Clean out old versions.
+
+*hardened-sources-2.6.27-r4 (14 Jan 2009)
+*hardened-sources-2.6.26-r8 (14 Jan 2009)
+*hardened-sources-2.6.25-r12 (14 Jan 2009)
+
+  14 Jan 2009; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r12.ebuild, +hardened-sources-2.6.26-r8.ebuild,
+  +hardened-sources-2.6.27-r4.ebuild:
+  2.6.25-r12: Fixes bugs #249729, #250548, #252688, #254907
+  2.6.26-r8: Fixes bugs #249729, #250548, #252688, #254907
+  2.6.27-r4: Update to latest genpatches (includes Linux 2.6.27.10) and
+  grsecurity patch. Fixes bugs #249729, #250511, #250548, #252688, #254907
+
+  15 Dec 2008; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.25-r11.ebuild:
+  Stable on ppc
+
+  09 Dec 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r11.ebuild:
+  Stable amd64/x86.
+
+*hardened-sources-2.6.27-r3 (07 Dec 2008)
+
+  07 Dec 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r3.ebuild:
+  Bump to latest genpatches, including Linux 2.6.27.8. Bump grsec/pax patches.
+  Fixes bug #248754, #249729 and #246607.
+
+  03 Dec 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r9.ebuild, -hardened-sources-2.6.26-r5.ebuild:
+  Remove old versions.
+
+*hardened-sources-2.6.26-r7 (03 Dec 2008)
+*hardened-sources-2.6.25-r11 (03 Dec 2008)
+
+  03 Dec 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r11.ebuild, +hardened-sources-2.6.26-r7.ebuild:
+  2.6.25-r11: Fixes bugs 246607, 246710, 247453 and 248754.
+  2.6.26-r7: Fixes bugs 246607, 246710, 246763, 247453 and 248754.
+  Both include many backports from 2.6.27.{6,7} -stable releases.
+
+  24 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.27.ebuild, -hardened-sources-2.6.27-r1.ebuild:
+  Remove versions broken on ARCHes != x86/amd64.
+
+*hardened-sources-2.6.27-r2 (24 Nov 2008)
+
+  24 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r2.ebuild:
+  Bump to Linux 2.6.27.7 and latest grsecurity patch.
+
+  19 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r8.ebuild, -hardened-sources-2.6.26-r4.ebuild:
+  Remove old versions.
+
+  19 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.27.ebuild, hardened-sources-2.6.27-r1.ebuild:
+  Remove all but ~amd64 & ~x86 keywords (broken elsewhere).
+
+  16 Nov 2008; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.25-r10.ebuild:
+  Stable on ppc
+
+  15 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r10.ebuild:
+  Stable amd64/x86.
+
+*hardened-sources-2.6.26-r6 (12 Nov 2008)
+
+  12 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.26-r6.ebuild:
+  Bump to Linux 2.6.26.8 and fix security bug #245650.
+
+*hardened-sources-2.6.25-r10 (12 Nov 2008)
+
+  12 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r10.ebuild:
+  Update to Linux 2.6.25.20 and fix bugs #245427, #245650.
+
+*hardened-sources-2.6.27-r1 (09 Nov 2008)
+
+  09 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27-r1.ebuild:
+  Bump to stable kernel 2.6.27.5 and latest grsecurity patch.
+
+*hardened-sources-2.6.27 (04 Nov 2008)
+
+  04 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.27.ebuild:
+  Initial 2.6.27 release.
+
+*hardened-sources-2.6.26-r5 (03 Nov 2008)
+
+  03 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r7.ebuild, -hardened-sources-2.6.26-r2.ebuild,
+  +hardened-sources-2.6.26-r5.ebuild:
+  2.6.26-r5: Bump to Linux 2.6.26.7, PaX updates.
+  Clean out some old versions.
+
+  02 Nov 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.25-r9.ebuild:
+  Stable on ppc
+
+  30 Oct 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r9.ebuild:
+  Stable on amd64/x86.
+
+*hardened-sources-2.6.25-r9 (26 Oct 2008)
+
+  26 Oct 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r9.ebuild:
+  Update to Linux 2.6.25.19
+
+  15 Oct 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.25-r8.ebuild:
+  Stable on ppc
+
+*hardened-sources-2.6.26-r4 (14 Oct 2008)
+
+  14 Oct 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.26-r3.ebuild, +hardened-sources-2.6.26-r4.ebuild:
+  Update to latest grsecurity patch, fixing building of non-modular kernels.
+
+*hardened-sources-2.6.26-r3 (12 Oct 2008)
+
+  12 Oct 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r8.ebuild, -hardened-sources-2.6.26-r1.ebuild,
+  +hardened-sources-2.6.26-r3.ebuild:
+  2.6.26-r3: Update to Linux 2.6.26.6 and latest grsecurity patch.
+  2.6.26-r1: Removed.
+  2.6.25-r8: Stable amd64/x86.
+
+*hardened-sources-2.6.25-r8 (09 Oct 2008)
+
+  09 Oct 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r4.ebuild, -hardened-sources-2.6.25-r5.ebuild,
+  -hardened-sources-2.6.25-r6.ebuild, +hardened-sources-2.6.25-r8.ebuild:
+  Update to genpatches-11 and Linux 2.6.25.18. Remove old versions.
+
+  20 Sep 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.25-r7.ebuild:
+  Stable on ppc
+
+  17 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r7.ebuild:
+  Stable amd64/x86.
+
+*hardened-sources-2.6.26-r2 (13 Sep 2008)
+
+  13 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.26.ebuild, +hardened-sources-2.6.26-r2.ebuild:
+  2.6.26-r2: Update to Linux 2.6.26.5, new grsecurity patch adding
+  PAX_REFCOUNT feature, fix bug #237473 (CVE-2008-3525). 2.6.26: Removed.
+
+*hardened-sources-2.6.25-r7 (13 Sep 2008)
+
+  13 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  +hardened-sources-2.6.25-r7.ebuild:
+  Add 2.6.25-r7, fixing bug #237473 (CVE-2008-3525) and a PaX bug.
+
+  10 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r4.ebuild, hardened-sources-2.6.25-r5.ebuild,
+  hardened-sources-2.6.25-r6.ebuild, hardened-sources-2.6.26.ebuild,
+  hardened-sources-2.6.26-r1.ebuild:
+  Update DESCRIPTION and HGPV_URI.
+
+*hardened-sources-2.6.25-r6 (09 Sep 2008)
+
+  09 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.24-r3.ebuild, +hardened-sources-2.6.25-r6.ebuild:
+  2.6.25-r6: Update to Linux 2.6.25.17.
+  2.6.24-r3: Removed.
+
+  08 Sep 2008; Gordon Malm <gengor@gentoo.org>
+  hardened-sources-2.6.25-r5.ebuild:
+  Stable on amd64/x86
+
+  07 Sep 2008; Gordon Malm <gengor@gentoo.org> metadata.xml:
+  Update my email address.
+
+  31 Aug 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.25-r4.ebuild:
+  stable on ppc
+
+*hardened-sources-2.6.26-r1 (23 Aug 2008)
+*hardened-sources-2.6.25-r5 (23 Aug 2008)
+
+  23 Aug 2008; Bryan D. Stine <battousai@gentoo.org>
+  -hardened-sources-2.6.23-r13.ebuild, -hardened-sources-2.6.25-r3.ebuild,
+  hardened-sources-2.6.25-r4.ebuild, +hardened-sources-2.6.25-r5.ebuild,
+  +hardened-sources-2.6.26-r1.ebuild:
+  Bump to 2.6.25-r5 for updated patches and upstream .10 kernel, fixing
+  security bug #235221. Bump to 2.6.26-r1 for upstream .3 kernel, also
+  fixing security bug #235221. Marked 2.6.25-r4 stable on amd64 and x86.
+  Removed 2.6.23-r13 and 2.6.25-r3. Commit on behalf of Gordon Malm
+  (gengor).
+
+*hardened-sources-2.6.26 (18 Aug 2008)
+*hardened-sources-2.6.25-r4 (18 Aug 2008)
+
+  18 Aug 2008; <solar@gentoo.org> -hardened-sources-2.6.25-r2.ebuild,
+  +hardened-sources-2.6.25-r4.ebuild, +hardened-sources-2.6.26.ebuild:
+  - proxy commit for gengor 2.6.26: Initial 2.6.26 release. 2.6.25-r4: Update
+  to Linux 2.6.25.15. Fixes security bugs #234799, #234803 and #234812.
+  2.6.25-r2: Removed.
+
+  16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove phreak from metadata.xml (#96398)
+
+*hardened-sources-2.6.25-r3 (31 Jul 2008)
+
+  31 Jul 2008; <solar@gentoo.org> -hardened-sources-2.6.24-r2.ebuild,
+  -hardened-sources-2.6.25.ebuild, -hardened-sources-2.6.25-r1.ebuild,
+  +hardened-sources-2.6.25-r3.ebuild:
+  - 2.6.25-r3: Update to Linux 2.6.25.13 and new grsecurity patch. Multiple
+  fixes, including security bug #231750.
+
+  28 Jul 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.24-r3.ebuild:
+  Stable on ppc
+
+*hardened-sources-2.6.25-r2 (05 Jul 2008)
+
+  05 Jul 2008; <solar@gentoo.org> -hardened-sources-2.6.23-r11.ebuild,
+  -hardened-sources-2.6.23-r12.ebuild, hardened-sources-2.6.24-r3.ebuild,
+  +hardened-sources-2.6.25-r2.ebuild:
+  2.6.23-r4: Stable x86/amd64
+  2.6.25-r2: Update to Linux 2.6.25.10 and latest grsecurity release.
+  2.6.23-r{11,12}: Removed due to multiple vulns.
+  (gengor & kerframil)
+
+  04 Jul 2008; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.23-r13.ebuild:
+  Stable on ppc
+
+*hardened-sources-2.6.25-r1 (30 Jun 2008)
+
+  30 Jun 2008; <solar@gentoo.org> hardened-sources-2.6.23-r13.ebuild,
+  +hardened-sources-2.6.25-r1.ebuild:
+  2.6.25-r1: Brings in Linux -stable tree patches 2.6.25.{7,8,9} and newer
+  grsecurity release. 2.6.23-r13: x86/amd64 stable
+
+*hardened-sources-2.6.25 (17 Jun 2008)
+*hardened-sources-2.6.24-r3 (17 Jun 2008)
+*hardened-sources-2.6.23-r13 (17 Jun 2008)
+
+  17 Jun 2008; <solar@gentoo.org> +hardened-sources-2.6.23-r13.ebuild,
+  +hardened-sources-2.6.24-r3.ebuild, +hardened-sources-2.6.25.ebuild:
+  * 2.6.23-r13: Fixes security bugs #198997, #212136, #222331, #222635,
+  #224647, #225461, other fixes. * 2.6.24-r3: Fixes security bugs #212136,
+  #222331, #222635, #224647, #225461, grsec/PaX updates/fixes, other fixes. *
+  2.6.25: Initial 2.6.25 release.
+
+  15 May 2008; <solar@gentoo.org> hardened-sources-2.6.23-r12.ebuild:
+  - fasttrack to stable x86/amd64
+
+  11 May 2008; Sven Wegener <swegener@gentoo.org> Manifest:
+  Fix broken digest for linux-2.6.24.tar.bz2.
+
+*hardened-sources-2.6.24-r2 (11 May 2008)
+*hardened-sources-2.6.23-r12 (11 May 2008)
+
+  11 May 2008; <solar@gentoo.org> -hardened-sources-2.6.23-r7.ebuild,
+  -hardened-sources-2.6.23-r9.ebuild, -hardened-sources-2.6.23-r10.ebuild,
+  +hardened-sources-2.6.23-r12.ebuild, -hardened-sources-2.6.24.ebuild,
+  -hardened-sources-2.6.24-r1.ebuild, +hardened-sources-2.6.24-r2.ebuild:
+  proxy commit for gengor. 2.6.23-r11 shortlog: Fixes security bugs 220691,
+  220975, 220979, 221123. 2.6.24-r2 not-so-shortlog: Fixes bug 215442,
+  security bugs 219901, 220691, 220975, 220979, 221123. New
+  genpatches/grsecurity with numerous updates & fixes. 2.6.23-r7->2.6.23-r10
+  should be removed as far as I'm concerned, everything else remove due to
+  vulnerable to numerous security bugs or brokeness.
+
+  10 May 2008; nixnut <nixnut@gentoo.org>
+  hardened-sources-2.6.23-r11.ebuild:
+  Stable on ppc
+
+  05 May 2008; <solar@gentoo.org> hardened-sources-2.6.23-r11.ebuild:
+  - -r11 stable on x86/amd64
+
+*hardened-sources-2.6.23-r11 (01 May 2008)
+
+  01 May 2008; <solar@gentoo.org> +hardened-sources-2.6.23-r11.ebuild:
+  - version bump to fix ulgy linux bugs
+
+*hardened-sources-2.6.24-r1 (30 Apr 2008)
+
+  30 Apr 2008; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.24-r1.ebuild:
+  Revision bump (thanks to Kerin and Gordon, again), pulling
+  genpatches-2.6.24-7, solving #219089. Additionally contains further security
+  fixes plus some minor updates.
+
+*hardened-sources-2.6.23-r10 (30 Apr 2008)
+
+  30 Apr 2008; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r10.ebuild:
+  Revision bump (thanks to Kerin and Gordon, again), solving #213811, #219089.
+  Additional contains "various other fixes".
+
+  09 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Update the longdescription in metadata, thanks to Gordon Malm.
+
+  08 Apr 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.23-r9.ebuild:
+  Stable on ppc wrt bug #213255
+
+  07 Apr 2008; <solar@gentoo.org> -hardened-sources-2.4.35-r2.ebuild,
+  -hardened-sources-2.6.23-r8.ebuild, hardened-sources-2.6.23-r9.ebuild:
+  - stable on x86/amd64 per request. Removed obsolete ebuilds
+
+*hardened-sources-2.6.24 (07 Apr 2008)
+
+  07 Apr 2008; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.24.ebuild:
+  Adding ebuild for hardened-sources-2.6.24 (many thanks to Kerin Millar
+  <kerframil at gmail.com> and Gordon Malm <bugs-gentoo-org-02 at bumpin.org>
+  for the many contributions and their continued effort in #216612) based on
+  2.6.24 and genpatches-2.6.24-5.
+  
+  The current ebuild/patchset contains these things:
+  * Incoporates unmodified grsec-2.1.11-2.6.24.4-200803262003 patch
+  * Introduces bespoke server and workstation oriented security levels
+  * VDSO_COMPAT cannot be enabled during runtime if PaX is enabled
+
+  30 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Fix the metadata.xml (Kerin isn't a dev, though he and Gordon are
+  maintaining it).
+
+  24 Mar 2008; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.4.35-r2.ebuild:
+  Fixing SRC_URI for 2.4.35-r2.
+
+*hardened-sources-2.6.23-r9 (22 Mar 2008)
+
+  22 Mar 2008; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r9.ebuild:
+  * Revision bump, rebasing the patchset against genpatches-2.6.23-10.
+  * Change the default GIDs for some grsecurity options
+  * Revamp the Hardened [Gentoo] security level and make it the default level
+  * Fixing compilation on ia64 with CONFIG_MODULES=y (loadable module support)
+  * Fix a recursive lock -- call to capable() within ptrace_attach()
+  * Fix bug that allows audit and iscsi operations to be controlled via netlink
+
+*hardened-sources-2.6.23-r8 (27 Feb 2008)
+
+  27 Feb 2008; <solar@gentoo.org> +hardened-sources-2.6.23-r8.ebuild:
+  - version bump from Kerin Millar bug 210026
+
+  17 Feb 2008; <solar@gentoo.org> metadata.xml,
+  -hardened-sources-2.4.33.4.ebuild, -hardened-sources-2.6.20-r6.ebuild,
+  -hardened-sources-2.6.20-r10.ebuild, -hardened-sources-2.6.23-r4.ebuild,
+  -hardened-sources-2.6.23-r6.ebuild, hardened-sources-2.6.23-r7.ebuild:
+  - stable on x86 and remove old ebuilds
+
+  15 Feb 2008; <solar@gentoo.org> hardened-sources-2.6.23-r7.ebuild:
+  - stable on amd64 per request of amd64 lead
+
+*hardened-sources-2.6.23-r7 (11 Feb 2008)
+
+  11 Feb 2008; <solar@gentoo.org> +hardened-sources-2.6.23-r7.ebuild:
+  - version bump from kerin.millar
+  Changes:
+  
+  * Bump to genpatches-base-2.6.23-9
+  * Ported grsecurity-2.1.11-2.6.23.14-200801231800 to 2.6.23.15
+  * Disables COMPAT_VDSO in x86/defconfig
+  * Removes bogus symbols ACPI_SLEEP_PROC_(FS|SLEEP) from x86_64/defconfig
+
+  25 Jan 2008; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.22-r8.ebuild:
+  Cleaning up old versions.
+
+*hardened-sources-2.6.23-r6 (25 Jan 2008)
+
+  25 Jan 2008; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.23-r5.ebuild, +hardened-sources-2.6.23-r6.ebuild:
+  Revision bump, pulling in the latest genpatches.
+
+*hardened-sources-2.6.23-r5 (24 Dec 2007)
+
+  24 Dec 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.4.35-r2.ebuild, hardened-sources-2.6.20-r6.ebuild,
+  hardened-sources-2.6.20-r10.ebuild, hardened-sources-2.6.22-r8.ebuild,
+  hardened-sources-2.6.23-r4.ebuild, +hardened-sources-2.6.23-r5.ebuild:
+  Revision bump, for the promised updated grsec snapshot. Also changing SRC_URI.
+
+  24 Dec 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.22-r7.ebuild, -hardened-sources-2.6.23.ebuild,
+  -hardened-sources-2.6.23-r1.ebuild, -hardened-sources-2.6.23-r2.ebuild,
+  -hardened-sources-2.6.23-r3.ebuild:
+  Cleaning out some unused, old versions.
+
+  24 Dec 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.23-r4.ebuild:
+  Marking hardened-sources-2.6.23-r4 stable on amd64 and x86. I know it ain't
+  in the tree for long, but there isn't much of a difference between this and
+  -r3. Only this revision pulls in 2.6.23.11 and 2.6.23.12 from genpatches.
+
+*hardened-sources-2.6.23-r4 (23 Dec 2007)
+
+  23 Dec 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r4.ebuild:
+  Revision bump, grabbing the lastest genpatches release (2.6.23.12 that is).
+
+*hardened-sources-2.6.23-r3 (04 Dec 2007)
+
+  04 Dec 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r3.ebuild:
+  Revision bump, pulling in 2.6.23.9.
+
+*hardened-sources-2.6.23-r2 (25 Nov 2007)
+
+  25 Nov 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r2.ebuild:
+  Updated patchset, thanks to solar.
+
+*hardened-sources-2.6.23-r1 (31 Oct 2007)
+
+  31 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23-r1.ebuild:
+  Revision bump, pulling in the snapshot from 30. October 2007 (18:50).
+
+  29 Oct 2007; <solar@gentoo.org> metadata.xml:
+  - update metadata.xml
+
+  25 Oct 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.22-r8.ebuild:
+  Marking 2.6.22-r8 stable on amd64 and x86.
+
+  21 Oct 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.4.35.ebuild, -hardened-sources-2.4.35-r1.ebuild,
+  -hardened-sources-2.6.21-r4.ebuild:
+  Removing old ebuilds.
+
+*hardened-sources-2.4.35-r2 (21 Oct 2007)
+
+  21 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.4.35-r2.ebuild:
+  Revision bump for 2.4.35. Includes new snapshot and the lastest Linux stable
+  patches.
+
+*hardened-sources-2.6.22-r8 (21 Oct 2007)
+
+  21 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r8.ebuild:
+  Yet another new patch, hopefully fixing the remaining issues we had w/
+  2.6.22. Candidate for stabling.
+
+*hardened-sources-2.6.23 (13 Oct 2007)
+
+  13 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.23.ebuild:
+  Initial hardened-sources-2.6.23. If people still have problems w/ bug
+  194276, try setting CONFIG_PCI_GODIRECT=y instead of CONFIG_PCI_GOANY.
+
+  11 Oct 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r10.ebuild:
+  Pulling in yet another new genpatches version, fixing the PWC bug for real.
+
+  04 Oct 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.22-r5.ebuild, -hardened-sources-2.6.22-r6.ebuild:
+  Removing old versions.
+
+*hardened-sources-2.6.22-r7 (01 Oct 2007)
+
+  01 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r7.ebuild:
+  Revision bump, pulling in a newer patch. Should fix #194276.
+
+  30 Sep 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r10.ebuild:
+  Marking hardened-sources-2.6.20-r10 stable on x86 and amd64 (on courtesy of
+  Mike Doty).
+
+*hardened-sources-2.6.22-r6 (26 Sep 2007)
+
+  26 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r6.ebuild:
+  Revision bump, grabbing up till Linux 2.6.22.9.
+
+  24 Sep 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.22-r3.ebuild, -hardened-sources-2.6.22-r4.ebuild:
+  Cleaning up further.
+
+*hardened-sources-2.6.20-r10 (24 Sep 2007)
+
+  24 Sep 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.20-r8.ebuild, -hardened-sources-2.6.20-r9.ebuild,
+  +hardened-sources-2.6.20-r10.ebuild:
+  Revision bump, pulling in Linux 2.6.20.20. Removing some of the older
+  revisions.
+
+*hardened-sources-2.6.22-r5 (22 Sep 2007)
+
+  22 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r5.ebuild:
+  Revision bump, pulling in genpatches-2.6.22-8 for CVE-2007-4573.
+
+  17 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing johnm from metadata.xml (see #186467 for reference).
+
+*hardened-sources-2.6.22-r4 (17 Sep 2007)
+
+  17 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r4.ebuild:
+  Revision bump, hopefully fixing all those weird PAX failures.
+
+  01 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Updating the metadata.xml.
+
+  01 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing tocharian from metadata due to his retirement (see #71718 for
+  reference).
+
+*hardened-sources-2.6.20-r9 (30 Aug 2007)
+
+  30 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r9.ebuild:
+  Revision bump for 2.6.20.18 (thanks to kerframil in #gentoo-hardened).
+
+  29 Aug 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.4.34.ebuild, -hardened-sources-2.4.34.5.ebuild,
+  -hardened-sources-2.6.20-r2.ebuild, -hardened-sources-2.6.20-r5.ebuild,
+  -hardened-sources-2.6.20-r7.ebuild, -hardened-sources-2.6.21-r3.ebuild,
+  -hardened-sources-2.6.22.ebuild, -hardened-sources-2.6.22-r1.ebuild,
+  -hardened-sources-2.6.22-r2.ebuild:
+  Removing some redundant versions.
+
+*hardened-sources-2.4.35-r1 (29 Aug 2007)
+
+  29 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.4.35-r1.ebuild:
+  Revision bump, new grsecurity patch.
+
+*hardened-sources-2.6.20-r8 (26 Aug 2007)
+
+  26 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r8.ebuild:
+  Revision bump for Linux 2.6.20.17.
+
+*hardened-sources-2.6.22-r3 (22 Aug 2007)
+
+  22 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r3.ebuild:
+  Revision bump for Linux 2.6.22.4.
+
+  16 Aug 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.22-r2.ebuild:
+  Updated patchset, to fix the alignment against 2.6.22.3.
+
+*hardened-sources-2.6.22-r2 (16 Aug 2007)
+
+  16 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r2.ebuild:
+  Revision bump for Linux 2.6.22.3.
+
+*hardened-sources-2.4.35 (16 Aug 2007)
+
+  16 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.4.35.ebuild:
+  Version bump, initial version for Linux 2.4.35.
+
+*hardened-sources-2.6.21-r4 (16 Aug 2007)
+
+  16 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.21-r4.ebuild:
+  Revision bump for Linux 2.6.21.6.
+
+*hardened-sources-2.6.20-r7 (16 Aug 2007)
+
+  16 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r7.ebuild:
+  Revision bump for Linux 2.6.20.16.
+
+*hardened-sources-2.6.22-r1 (13 Aug 2007)
+
+  13 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22-r1.ebuild:
+  Yet another revision bump.
+
+*hardened-sources-2.6.22 (10 Aug 2007)
+
+  10 Aug 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.22.ebuild:
+  Initial release for 2.6.22. If you are using hardened-sources on a desktop
+  machine (P4 or newer), be aware you might need to disable
+  CONFIG_PAX_PAGEEXEC.
+
+  04 Aug 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r6.ebuild:
+  Stabling hardened-sources-2.6.20-r6 for amd64, ppc and x86 due to Linux
+  2.6.20.15.
+
+  10 Jul 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r5.ebuild:
+  Marking hardened-sources-2.6.20-r5 stable on ppc.
+
+  10 Jul 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.4.32-r6.ebuild, -hardened-sources-2.4.32-r7.ebuild:
+  Cleanup.
+
+*hardened-sources-2.6.20-r6 (08 Jul 2007)
+
+  08 Jul 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r6.ebuild:
+  Revision bump, grabbing yet another stable release.
+
+  17 Jun 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18-r6.ebuild, -hardened-sources-2.6.20-r4.ebuild,
+  -hardened-sources-2.6.21-r2.ebuild:
+  Removing older ebuilds, hardened-sources-2.6.18-r6 seems to have gotten the
+  alpha stable KEYWORD by mistake.
+
+  17 Jun 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r5.ebuild:
+  Stabling hardened-sources-2.6.20-r5 due to security bug #181647 (as
+  genpatches-2.6.20-12.base contains up to Linux 2.6.20.14) on amd64 and x86.
+
+*hardened-sources-2.6.21-r3 (12 Jun 2007)
+
+  12 Jun 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.21-r3.ebuild:
+  Revision bump for hardened-sources-2.6.21, incorporating various CVE (some
+  of them critical), two stable releases (2.6.21.4,2.6.21.5) and some other
+  love.
+
+*hardened-sources-2.6.20-r5 (11 Jun 2007)
+
+  11 Jun 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r5.ebuild:
+  Revision bump for hardened-sources-2.6.20, incorporating various CVE (some
+  of them critical), two stable releases (2.6.20.13,2.6.20.14) and some other
+  love.
+
+*hardened-sources-2.4.34.5 (11 Jun 2007)
+
+  11 Jun 2007; Alexander Gabert <pappy@gentoo.org>
+  +hardened-sources-2.4.34.5.ebuild:
+  added new hardened-sources 2.4 version, thx to phreak, solar, pipacs
+
+  30 May 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18.ebuild, hardened-sources-2.6.20-r2.ebuild:
+  Marking 2.6.20-r2 stable on ppc with permission of Gysbert. Removing more
+  stale ebuild(s).
+
+  30 May 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.14-r7.ebuild, -hardened-sources-2.6.16-r11.ebuild,
+  -hardened-sources-2.6.17-r1.ebuild, -hardened-sources-2.6.19-r6.ebuild,
+  -hardened-sources-2.6.20.ebuild, -hardened-sources-2.6.20-r1.ebuild:
+  Doing some cleanups, remove stale ebuilds.
+
+  26 May 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.21-r2.ebuild:
+  Fixing the grsecurity patch, had one '};' too much.
+
+*hardened-sources-2.6.21-r2 (26 May 2007)
+
+  26 May 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.21.ebuild, -hardened-sources-2.6.21-r1.ebuild,
+  +hardened-sources-2.6.21-r2.ebuild:
+  Revision bump, including Linux 2.6.21.3 (fixing CVE-2007-2451). Updating the
+  grsecurity patch to 2.1.10-2.6.21.1-200705221918.
+
+*hardened-sources-2.6.20-r4 (26 May 2007)
+
+  26 May 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.20-r3.ebuild, +hardened-sources-2.6.20-r4.ebuild:
+  Revision bump, including Linux 2.6.20.12 (which in fact fixed some security
+  bugs, at the very least CVE-2007-2451). Possible candidate for stable marking.
+
+  15 May 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r3.ebuild:
+  Looks like hardened-sources-2.6.20-r3 needs a new patch, as 2.6.20.11
+  introduced a change in arch/sparc64/kernel/pci_iommu.c, which made the
+  grsecurity patch fail in that exact same hunk.
+
+*hardened-sources-2.6.20-r3 (15 May 2007)
+
+  15 May 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r3.ebuild, +hardened-sources-2.6.21-r1.ebuild:
+  Revision bump, incorporating Linux 2.6.20.11.
+
+*hardened-sources-2.6.21-r1 (11 May 2007)
+
+  11 May 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.21-r1.ebuild:
+  Revision bump, hopefully fixing the GRSECURITY/GRKERNSEC mixup pipacs
+  mentioned in #177234.
+
+  07 May 2007; Kevin F. Quinn <kevquinn@gentoo.org>
+  files/digest-hardened-sources-2.6.21, Manifest:
+  Fix Manifest/digest for linux-2.6.21.tar.bz2
+
+  06 May 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.21.ebuild:
+  Bumping the hardened-patches version, needed for the fix for #177234.
+
+*hardened-sources-2.6.21 (02 May 2007)
+
+  02 May 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.21.ebuild:
+  Version bump, Linux 2.6.21-hardened.
+
+  29 Apr 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r2.ebuild:
+  Adding ~ia64 on Ned's request.
+
+  29 Apr 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r2.ebuild:
+  Fixing the included grsecurity patch, wasn't alligning due to the Index:
+  header line(s).
+
+  29 Apr 2007; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.20-r2.ebuild:
+  Stabilizing hardened-sources-2.6.20-r2 on amd64 and x86.
+
+*hardened-sources-2.6.20-r2 (10 Apr 2007)
+
+  10 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  +hardened-sources-2.6.20-r2.ebuild:
+  Version bump, on behalf of phreak
+
+*hardened-sources-2.6.20-r1 (04 Apr 2007)
+
+  04 Apr 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20-r1.ebuild:
+  Revision bump, grabbing a newer grsecurity snapshot.
+
+*hardened-sources-2.6.20 (25 Mar 2007)
+
+  25 Mar 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.20.ebuild:
+  Finally a hardened-sources version for 2.6.20; many people have been waiting
+  for this. Thanks to Steve for preliminary testing, thanks to Ned for the
+  testbox.
+
+  16 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
+  hardened-sources-2.6.18-r6.ebuild:
+  Marked stable on amd64 and x86. AMD64 keyword ack'ed by welp.
+
+*hardened-sources-2.6.18-r6 (16 Mar 2007)
+
+  16 Mar 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18-r5.ebuild, +hardened-sources-2.6.18-r6.ebuild:
+  Fixing CVE-2007-1000 locally (hardened/), thanks to Tony for pushing. And
+  yes I screwed up, this is tagged as 2.6.18-5 and not 2.6.18-6 as it's
+  supposed to be.
+
+  06 Mar 2007; Christian Heim <phreak@gentoo.org> ChangeLog:
+  Fixing the Manifest, the previous one was broken (as in still had the
+  deleted ebuild in it).
+
+  06 Mar 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.16-r10.ebuild, -hardened-sources-2.6.18-r4.ebuild,
+  +hardened-sources-2.6.18-r5.ebuild:
+  Bumping the ~arch'ed 2.6.18 version, pulling in genpatches-2.6.18-10 for
+  Linux 2.6.18.8. Also cleaning up the older version.
+
+*hardened-sources-2.6.18-r5 (06 Mar 2007)
+
+  06 Mar 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.16-r10.ebuild, -hardened-sources-2.6.18-r4.ebuild,
+  +hardened-sources-2.6.18-r5.ebuild:
+  Bumping the ~arch'ed 2.6.18 version, pulling in genpatches-2.6.18-10 for
+  Linux 2.6.18.8. Also cleaning up the older version.
+
+  24 Feb 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.19-r3.ebuild, -hardened-sources-2.6.19-r4.ebuild,
+  -hardened-sources-2.6.19-r5.ebuild:
+  Removing some of the old version, that didn't work.
+
+*hardened-sources-2.6.19-r6 (12 Feb 2007)
+
+  12 Feb 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.19-r6.ebuild:
+  Revision bump, including a new grsec version fixing #166235.
+
+*hardened-sources-2.4.34 (24 Jan 2007)
+
+  24 Jan 2007; Alexander Gabert <pappy@gentoo.org>
+  Manifest:
+  updating Manifest with checksums of new tarball and ebuild
+
+  24 Jan 2007; Alexander Gabert <pappy@gentoo.org>
+  +hardened-sources-2.4.34.ebuild:
+  I added new hardened sources 2.4 update, this is a critical path
+  security bugfix - all users of h-s are strongly advised
+  to update their existing hardened sources to this version.
+  It contains a fix for a kernel vulnerability that is pertaining
+  to the PaX changes to virtual memory management, possibly leading
+  to a local kernel exploit ... see grsecurity.net forums and homepage
+
+  23 Jan 2007; Christian Heim <phreak@gentoo.org>
+  files/digest-hardened-sources-2.6.19-r5, Manifest:
+  Fixing the patch-tarball digest.
+
+*hardened-sources-2.6.19-r5 (23 Jan 2007)
+
+  23 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.19-r5.ebuild:
+  Revision bump, closing the recently discovered PaX expand_stack()
+  vulnerability.
+
+*hardened-sources-2.6.19-r4 (14 Jan 2007)
+
+  14 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.19-r4.ebuild:
+  Revision bump, pulling in linux-2.6.19.2 and grsecurity 2.1.10 - thus
+  dropping the randomized PID feature.
+
+  11 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  hardened-sources-2.4.33.4.ebuild:
+  stable x86, bug #161171
+
+*hardened-sources-2.6.19-r3 (27 Dec 2006)
+
+  27 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.19-r2.ebuild, +hardened-sources-2.6.19-r3.ebuild:
+  Revision bump for bug #157186 and #158786.
+
+*hardened-sources-2.6.18-r4 (27 Dec 2006)
+
+  27 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18-r3.ebuild, +hardened-sources-2.6.18-r4.ebuild:
+  Revision bump for bug #157186.
+
+*hardened-sources-2.6.19-r2 (23 Dec 2006)
+
+  23 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.19-r1.ebuild, +hardened-sources-2.6.19-r2.ebuild:
+  Revision bump to pull in genpatches-2.6.19-3 for #157186.
+
+  17 Dec 2006; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.14-r7.ebuild, hardened-sources-2.6.16-r10.ebuild,
+  hardened-sources-2.6.16-r11.ebuild, hardened-sources-2.6.17-r1.ebuild,
+  hardened-sources-2.6.18.ebuild, hardened-sources-2.6.18-r3.ebuild,
+  hardened-sources-2.6.19-r1.ebuild:
+  Adding 4453_grsec-2.1.9-2.6.19-io-kmem-sysctl.patch to UNIPATCH_EXLUDE,
+  adding correct HOMEPAGE and adjusting DESCRIPTION (thanks to Alexander).
+
+*hardened-sources-2.4.33.4 (17 Dec 2006)
+
+  17 Dec 2006; Alexander Gabert <pappy@gentoo.org>
+  +hardened-sources-2.4.33.4.ebuild:
+  new 2.4.33.4 version including grsec and fixes, thanks to phreak for help
+  and quilting
+
+*hardened-sources-2.6.19-r1 (14 Dec 2006)
+
+  14 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.19.ebuild, +hardened-sources-2.6.19-r1.ebuild:
+  Revision bump, fixing #158107 (thanks to Petre Rodan <kaiowas at gentoo.org>
+  for reporting).
+
+*hardened-sources-2.6.19 (13 Dec 2006)
+
+  13 Dec 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.19.ebuild:
+  And finally 2.6.19, thanks to Ned (who prepared the inital patchset) and
+  Brad for providing that prompt update.
+
+*hardened-sources-2.6.18-r3 (13 Dec 2006)
+
+  13 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18-r1.ebuild, -hardened-sources-2.6.18-r2.ebuild,
+  +hardened-sources-2.6.18-r3.ebuild:
+  Revision bump, excluding the faulty patch. Thanks to Anakim Border and Peter
+  S. Mazinger. Closes #157409 for now. Also removing the previous revisions.
+
+  09 Dec 2006; Christian Heim <phreak@gentoo.org> Manifest:
+  Fixing the metadata.xml Manifest entry (thanks to xaid and ml8128 in #gentoo-hardened).
+
+  08 Dec 2006; nixnut <nixnut@gentoo.org> hardened-sources-2.6.18.ebuild:
+  Stable on ppc wrt bug 157356
+
+  07 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
+  hardened-sources-2.6.18.ebuild:
+  stable x86, bug #157356
+
+*hardened-sources-2.6.18-r2 (06 Dec 2006)
+
+  06 Dec 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.18-r2.ebuild:
+  Revision bump, including 2.6.18.5 (via genpatches) and
+  4454_grsec-2.1.9-2.6.18.2-io-kmem-sysctl.patch based on Peter Mazinger and
+  Ned Ludd's original patch. Thanks to Alexander Gabert (pappy) for the
+  redesign.
+
+  06 Dec 2006; Christian Heim <phreak@gentoo.org>
+  hardened-sources-2.6.18.ebuild:
+  Marking hardened-sources-2.6.18 stable on amd64 (see bug #157356, on behalf
+  of Mike Doty).
+
+*hardened-sources-2.6.18-r1 (23 Nov 2006)
+
+  23 Nov 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.18-r1.ebuild:
+  Revision bump to genpatches-2.6.18-4 (including 2.6.18.3).
+
+*hardened-sources-2.6.18 (11 Nov 2006)
+
+  11 Nov 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.18.ebuild:
+  Version bump, thanks to Alexander Gabert we're finally at 2.6.18.
+
+  18 Oct 2006; <solar@gentoo.org> hardened-sources-2.6.17-r1.ebuild:
+  - mark amd64 stable also. bug #151877
+
+  18 Oct 2006; <solar@gentoo.org> hardened-sources-2.6.17-r1.ebuild:
+  - mark 2.6.17-r1 stable
+
+  27 Aug 2006; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.17.ebuild, hardened-sources-2.6.17-r1.ebuild:
+  Removing old ebuild, removing unipatch from newer ebuild (need to fix it!).
+
+*hardened-sources-2.6.17-r1 (26 Aug 2006)
+
+  26 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.17-r1.ebuild:
+  Revision bump to genpatches-2.6.17-8 (including .9 and .10) and updating the
+  grsecurity patch.
+
+*hardened-sources-2.6.17 (17 Aug 2006)
+
+  17 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +hardened-sources-2.6.17.ebuild:
+  Bumping the hardened-sources-2.6 series to 2.6.17, using
+  genpatches-2.6.17-6.base.
+
+  07 Aug 2006; <solar@gentoo.org> hardened-sources-2.6.16-r11.ebuild:
+  - stable on x86 and amd64
+
+*hardened-sources-2.6.16-r11 (15 Jul 2006)
+
+  15 Jul 2006; <solar@gentoo.org> -hardened-sources-2.4.32-r3.ebuild,
+  -hardened-sources-2.4.32-r4.ebuild, -hardened-sources-2.4.32-r5.ebuild,
+  -hardened-sources-2.6.14-r8.ebuild, -hardened-sources-2.6.16-r7.ebuild,
+  -hardened-sources-2.6.16-r9.ebuild, +hardened-sources-2.6.16-r11.ebuild:
+  - 2.6.16 bumped for CVE-2006-3626 ; digest fix for 2.4.32-r6 ; removed old
+  crusty ebuilds
+
+  14 Jul 2006; John Mylchreest <johnm@gentoo.org>
+  hardened-sources-2.6.16-r10.ebuild:
+  marking stable on x86 and amd64
+
+  13 Jul 2006; <solar@gentoo.org> hardened-sources-2.4.32-r6.ebuild:
+  - 2.4.32-r6 stable on x86. RSBAC state unknown
+
+*hardened-sources-2.4.32-r7 (10 Jul 2006)
+
+  10 Jul 2006; Guillaume Destuynder <kang@gentoo.org>
+  +hardened-sources-2.4.32-r7.ebuild:
+  Bump PaX for RSBAC to test-17
+
+*hardened-sources-2.6.16-r9 (03 Jul 2006)
+
+  03 Jul 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.16-r6.ebuild, +hardened-sources-2.6.16-r9.ebuild:
+  hardened-sources-2.6.16 bump to latest -base.
+
+*hardened-sources-2.4.32-r6 (30 Jun 2006)
+
+  30 Jun 2006; <solar@gentoo.org> -hardened-sources-2.4.32-r2.ebuild,
+  hardened-sources-2.4.32-r4.ebuild, +hardened-sources-2.4.32-r6.ebuild:
+  - backport CVE-2006-0039, CVE-2006-1857 and CVE-2006-1858 and new grsecurity
+  sysctl controlable resource logging
+
+*hardened-sources-2.6.16-r7 (05 Jun 2006)
+
+  05 Jun 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.16-r5.ebuild, +hardened-sources-2.6.16-r7.ebuild:
+  push new 2.6.16 release in preparation for stable
+
+  22 May 2006; <solar@gentoo.org> :
+  - redigest bug 134002
+
+*hardened-sources-2.4.32-r5 (16 May 2006)
+
+  16 May 2006; Guillaume Destuynder <kang@gentoo.org>
+  +hardened-sources-2.4.32-r5.ebuild:
+  Fixes rsbac common patching (new patch in new -r5 patchset)
+
+*hardened-sources-2.4.32-r4 (13 May 2006)
+
+  13 May 2006; <solar@gentoo.org> hardened-sources-2.4.32-r3.ebuild,
+  +hardened-sources-2.4.32-r4.ebuild:
+  - security bumps
+
+*hardened-sources-2.6.16-r6 (03 May 2006)
+
+  03 May 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.16-r6.ebuild:
+  bump hardened-2.6.16 to 2.6.16.12 and latest grsec snapshot
+
+  28 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  hardened-sources-2.6.14-r8.ebuild:
+  fix x86_64 build problem, this will delay the digest issue again for a short
+  while but it will sort itself out
+
+  28 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  hardened-sources-2.6.14-r8.ebuild:
+  bump hardened patchset
+
+  27 Apr 2006; Alec Warner <antarus@gentoo.org>
+  files/digest-hardened-sources-2.4.32-r2,
+  files/digest-hardened-sources-2.4.32-r3,
+  files/digest-hardened-sources-2.6.14-r8, Manifest:
+  Fixing duff SHA256 digests: Bug # 131293
+
+*hardened-sources-2.6.16-r5 (27 Apr 2006)
+
+  27 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r6.ebuild, hardened-sources-2.6.14-r8.ebuild,
+  -hardened-sources-2.6.16-r4.ebuild, +hardened-sources-2.6.16-r5.ebuild:
+  stablise 2.6.14-r8 on x86 & amd64, bump 2.6.16 to fix CVE-2006-1863 &
+  cleanup of old uneccessary sources
+
+  20 Apr 2006; John Mylchreest <johnm@gentoo.org> ChangeLog:
+  fix digest
+
+*hardened-sources-2.6.14-r8 (20 Apr 2006)
+
+  20 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.14-r8.ebuild:
+  fix CVE-2006-1056, CVE-2006-1525, CVE-2006-1524
+
+  20 Apr 2006; John Mylchreest <johnm@gentoo.org> ChangeLog:
+  Turning on gpg-signing again, and recomitting
+
+*hardened-sources-2.6.16-r4 (20 Apr 2006)
+
+  20 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.16-r2.ebuild, -hardened-sources-2.6.16-r3.ebuild,
+  +hardened-sources-2.6.16-r4.ebuild:
+  Fix numerous security vulns
+
+*hardened-sources-2.4.32-r3 (16 Apr 2006)
+
+  16 Apr 2006; <solar@gentoo.org> -hardened-sources-2.4.30-r1.ebuild,
+  -hardened-sources-2.4.31.ebuild, -hardened-sources-2.4.32-r1.ebuild,
+  +hardened-sources-2.4.32-r3.ebuild, -hardened-sources-2.4.32.ebuild:
+  - security bump for bug #112791. Removed old ebuilds
+
+*hardened-sources-2.6.16-r3 (15 Apr 2006)
+
+  15 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.16-r3.ebuild:
+  Removing silly localversion which I missed
+
+*hardened-sources-2.6.14-r7 (14 Apr 2006)
+
+  14 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r5.ebuild, +hardened-sources-2.6.14-r7.ebuild:
+  Fixes CVE-2006-0744, CVE-2006-0744, CVE-2006-1522, CVE-2006-1242
+
+*hardened-sources-2.6.16-r2 (13 Apr 2006)
+
+  13 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.16.ebuild, -hardened-sources-2.6.16-r1.ebuild,
+  +hardened-sources-2.6.16-r2.ebuild:
+  Removing vulnerable 2.6.16 kernels. Bumping grsec, re-enabling reiserfs sec
+  labels, dropping USERGROUP define fixes, since these were merged mainstream.
+
+*hardened-sources-2.6.16-r1 (11 Apr 2006)
+
+  11 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.16-r1.ebuild:
+  Bumping to include ppc build fix and 2.6.16.3
+
+  06 Apr 2006; Joshua Jackson <tsunam@gentoo.org>
+  hardened-sources-2.6.14-r6.ebuild:
+  Stable on x86; bug #127718
+
+*hardened-sources-2.6.16 (31 Mar 2006)
+
+  31 Mar 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.16.ebuild:
+  Bumping to new version of grsec, and kernel base. New squashfs. Based on
+  2.6.16.1
+
+  30 Mar 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  hardened-sources-2.6.14-r6.ebuild:
+  Stable on amd64, bug 127718.
+
+  28 Mar 2006; <nixnut@gentoo.org> hardened-sources-2.6.14-r6.ebuild:
+  Stable on ppc. Bug #127718
+
+  15 Mar 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.11-r15.ebuild, -hardened-sources-2.6.14-r3.ebuild,
+  -hardened-sources-2.6.14-r4.ebuild:
+  Cleanup.
+
+*hardened-sources-2.6.14-r6 (15 Mar 2006)
+
+  15 Mar 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.14-r6.ebuild:
+  Fixes grsec policy recreation bug and adds a
+  >=sys-apps/gradm-2.1.8.200601212342-r1 depend.
+
+  02 Mar 2006; <solar@gentoo.org> hardened-sources-2.4.32-r2.ebuild:
+  - stable on x86
+
+  19 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
+  hardened-sources-2.6.14-r5.ebuild:
+  Stable on ppc.
+
+*hardened-sources-2.6.14-r5 (01 Feb 2006)
+
+  01 Feb 2006; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.14-r5.ebuild:
+  fixing every known exploit
+
+*hardened-sources-2.4.32-r2 (26 Jan 2006)
+
+  26 Jan 2006; <solar@gentoo.org> hardened-sources-2.4.32-r1.ebuild,
+  +hardened-sources-2.4.32-r2.ebuild:
+  - mark 2.4.32-r1 stable. added 2.4.32-r2 with 2.1.8-grsec patch
+
+*hardened-sources-2.6.14-r4 (12 Jan 2006)
+
+  12 Jan 2006; <solar@gentoo.org> +hardened-sources-2.6.14-r4.ebuild:
+  - version bump for new genpatches which fix up a few sec holes
+
+*hardened-sources-2.4.32-r1 (05 Jan 2006)
+
+  05 Jan 2006; <solar@gentoo.org> +hardened-sources-2.4.32-r1.ebuild:
+  - revision bump to add misc vital linux kernel security patches.
+
+*hardened-sources-2.6.14-r3 (30 Dec 2005)
+
+  30 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r2.ebuild, +hardened-sources-2.6.14-r3.ebuild:
+  Marking stable, and bumping for sec vuln. Fixes bugs #117171, #117040
+
+  28 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  hardened-sources-2.6.14-r2.ebuild:
+  making x86 & amd64 stable following testing.
+
+*hardened-sources-2.6.14-r2 (27 Dec 2005)
+
+  27 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r1.ebuild, +hardened-sources-2.6.14-r2.ebuild:
+  Fixing bugs 116832 115771 114635, updating grsec, removing selinux/pax
+  network hooks.
+
+  06 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  hardened-sources-2.6.14-r1.ebuild:
+  bumping to stable early for sec fix on x86 & amd64
+
+*hardened-sources-2.6.14-r1 (05 Dec 2005)
+
+  05 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14.ebuild, +hardened-sources-2.6.14-r1.ebuild:
+  bumping to genpatches 2.6.14-5, security fixup. Also bumping grsec patchset.
+
+  04 Dec 2005; <solar@gentoo.org> hardened-sources-2.4.32.ebuild:
+  - stable on x86 security bug #114227 CAN-2005-3257
+
+*hardened-sources-2.4.32 (19 Nov 2005)
+
+  19 Nov 2005; Guillaume Destuynder <kang@gentoo.org>
+  +hardened-sources-2.4.32.ebuild:
+  Bump to 2.4.32, includes RSBAC+PaX patchset with a local 'rsbac' keyword.
+  Add the 'rsbac' USE flag in /etc/portage/package.use for hardened-sources to
+  have RSBAC instead of GrSecurity patchset. (echo sys-kernel/hardened-sources
+  rsbac >> /etc/portage/package.use)
+
+*hardened-sources-2.6.14 (14 Nov 2005)
+
+  14 Nov 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.13-r2.ebuild, +hardened-sources-2.6.14.ebuild:
+  Bumping 2.6 series to 2.6.14.2
+
+*hardened-sources-2.6.13-r2 (20 Oct 2005)
+
+  20 Oct 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.13.ebuild, -hardened-sources-2.6.13-r1.ebuild,
+  +hardened-sources-2.6.13-r2.ebuild:
+  Fixes minor build error in ppc.
+
+*hardened-sources-2.6.13-r1 (17 Oct 2005)
+
+  17 Oct 2005; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.13-r1.ebuild:
+  Updating grsec to latest snapshot. Fixes some minor issues. Updating to
+  2.6.13.4, fixes some major amd64 stability problems.
+
+*hardened-sources-2.6.13 (16 Sep 2005)
+
+  16 Sep 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.11-r14.ebuild, +hardened-sources-2.6.13.ebuild:
+  2.6.13.1 with grsec testing patches. Lots of changes, to name a few big
+  ones: inotify now in kernel, RBAC has moved to chained-hash tables so RBAC
+  users should test this thoroughly.
+
+  01 Jul 2005; <solar@gentoo.org> hardened-sources-2.4.31.ebuild:
+  - stable on x86
+
+*hardened-sources-2.6.11-r15 (27 Jun 2005)
+
+  27 Jun 2005; John Mylchreest <johnm@gentoo.org>
+  +hardened-sources-2.6.11-r15.ebuild:
+  Fixes CAN-2005-1763, CAN-2005-1265 & CAN-2005-176. Also fixes problem with
+  grsec redefining curr_ip struct.
+
+*hardened-sources-2.4.31 (20 Jun 2005)
+
+  20 Jun 2005; <solar@gentoo.org> +hardened-sources-2.4.31.ebuild:
+  initial import of 2.4.31 tree
+
+*hardened-sources-2.6.11-r14 (14 Jun 2005)
+
+  14 Jun 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.11-r13.ebuild, +hardened-sources-2.6.11-r14.ebuild:
+  Updating inotify, grsec, updating to 11-14 genpatches.base, restructuring
+  naming scheme to abide by genpatches
+
+*hardened-sources-2.6.11-r13 (18 May 2005)
+
+  18 May 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.11-r12.ebuild, +hardened-sources-2.6.11-r13.ebuild:
+  Managed to mangle the Makefile patch from grsec, to miss out the grsec
+  target. sorry about that. Fixes bug #93022
+
+*hardened-sources-2.6.11-r12 (17 May 2005)
+
+  17 May 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.10-r3.ebuild, -hardened-sources-2.6.11-r1.ebuild,
+  +hardened-sources-2.6.11-r12.ebuild:
+  Cleanup older sources. Update to 2.6.11.10 - fixes several sec vulns. Also
+  merges in genpatches-base
+
+*hardened-sources-2.6.11-r12 (17 May 2005)
+
+  17 May 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.10-r3.ebuild, -hardened-sources-2.6.11-r1.ebuild,
+  +hardened-sources-2.6.11-r12.ebuild:
+  Cleanup older sources. Update to 2.6.11.10 - fixes several sec vulns. Also
+  merges in genpatches-base
+
+  29 Apr 2005; <solar@gentoo.org> -files/2.4.27-CAN-2004-0394.patch,
+  -files/2.4.27-cmdline-race.patch,
+  -files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch,
+  -files/2.4.28-grsec-binfmt_a.out.patch,
+  -files/2.4.28-grsec-cmdline-race.patch,
+  -files/2.4.28-selinux-binfmt_a.out.patch,
+  -files/2.4.28-selinux-cmdline-race.patch,
+  -hardened-sources-2.4.28-r5.ebuild, -hardened-sources-2.4.29.ebuild,
+  hardened-sources-2.4.30-r1.ebuild, -hardened-sources-2.4.30.ebuild:
+  - mark .30-r1 stable and remove older vuln ebuilds from the tree. filesdir
+  cleanup..
+
+*hardened-sources-2.4.30-r1 (21 Apr 2005)
+
+  21 Apr 2005; <solar@gentoo.org> +hardened-sources-2.4.30-r1.ebuild:
+  - disable aout by default
+
+*hardened-sources-2.4.30 (18 Apr 2005)
+
+  18 Apr 2005; <solar@gentoo.org> +hardened-sources-2.4.30.ebuild:
+  - 2.4.30 version bump. Adds 4008_CAN-2004-1056 back which was lost in 2.4.29
+  and an optional optimize for size -Os patch with a gcc-3.4 fix for embedded
+  use
+
+*hardened-sources-2.4.29 (30 Mar 2005)
+
+  30 Mar 2005; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.29.ebuild:
+  New hardened-patches-2.4-29.0 patchball.
+  Removed SELinux support, upgraded GRSecurity to 2.1.4.
+
+*hardened-sources-2.4.28-r5 (06 Mar 2005)
+
+  06 Mar 2005; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.28-r5.ebuild:
+  Added a fix for a PaX vulnerability.
+
+26 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  hardened-sources-2.4.28-r4.ebuild:
+  Stable on x86
+
+  23 Jan 2005; <solar@gentoo.org> hardened-sources-2.4.27-r3.ebuild,
+  hardened-sources-2.4.28-r1.ebuild, hardened-sources-2.4.28-r2.ebuild,
+  hardened-sources-2.4.28-r3.ebuild, hardened-sources-2.4.28-r4.ebuild,
+  hardened-sources-2.4.28.ebuild, hardened-sources-2.6.10-r3.ebuild:
+  - fixed/added RDEPEND= in all kernel-2 ebuilds
+
+*hardened-sources-2.4.28-r4 (21 Jan 2005)
+
+  21 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  +hardened-sources-2.4.28-r4.ebuild:
+  Fix vc_resize local DoS, ip_options_get memory leak, and ARP bug in 2.4
+  backport of neighbour hash updates.
+
+  21 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  hardened-sources-2.4.28-r3.ebuild:
+  Stable on x86
+
+*hardened-sources-2.6.10-r3 (20 Jan 2005)
+
+  20 Jan 2005; Brandon Hale <tseng@gentoo.org>
+  +hardened-sources-2.6.10-r3.ebuild:
+  Dual commit hardened-(dev-)sources-2.6.10 to here for the upcoming merge 
+  in 2005.0
+
+  17 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  -hardened-sources-2.4.27-r2.ebuild, hardened-sources-2.4.28-r1.ebuild,
+  hardened-sources-2.4.28-r2.ebuild:
+  Mark stable on x86
+
+*hardened-sources-2.4.28-r3 (17 Jan 2005)
+
+  17 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  +hardened-sources-2.4.28-r3.ebuild:
+  Fix SMP page fault handler vuln, and update device-mapper and evms patches.
+
+  14 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  hardened-sources-2.4.28.ebuild:
+  Mark stable on x86.
+
+*hardened-sources-2.4.28-r2 (13 Jan 2005)
+
+  13 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  +hardened-sources-2.4.28-r2.ebuild:
+  Updates security fixes and adds squashfs 2.1 support. Thanks to Peter S.
+  Mazinger for grsecurity patches as well.
+
+*hardened-sources-2.4.28-r1 (23 Dec 2004)
+
+  23 Dec 2004; <plasmaroo@gentoo.org> +hardened-sources-2.4.28-r1.ebuild:
+  Security bump. Thank tocharian for rolling a new patchset...
+
+  28 Nov 2004; <solar@gentoo.org> +files/2.4.28-grsec-binfmt_a.out.patch,
+  +files/2.4.28-grsec-cmdline-race.patch,
+  +files/2.4.28-selinux-binfmt_a.out.patch,
+  +files/2.4.28-selinux-cmdline-race.patch, hardened-sources-2.4.28.ebuild:
+  - Round up remaining security patches that appear to be missing in 2.4.28. -
+  PaX standalone updated to current. hgpv=28.1
+
+*hardened-sources-2.4.28 (28 Nov 2004)
+
+  28 Nov 2004; <solar@gentoo.org> +hardened-sources-2.4.28.ebuild:
+  security bump. Thank tocharian for rolling a new patchset
+
+*hardened-sources-2.4.27-r3 (08 Sep 2004)
+
+  08 Sep 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.27-r3.ebuild:
+  Applies the new 2.4-27.2 patchball which updates
+  GRSecurity to the 2.0.1 version.
+
+*hardened-sources-2.4.27-r2 (31 Aug 2004)
+
+  31 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.27-r2.ebuild:
+  Version bump. 
+  This version uses the new 2.4-27.1 patchball which updates 
+  both the SELinux PaX hooks patch and the SELinux headers.
+
+*hardened-sources-2.4.27-r1 (09 Aug 2004)
+
+  09 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.27-r1.ebuild,
+  -hardened-sources-2.4.27.ebuild,
+  +files/2.4.27-cmdline-race.patch:
+  Version bump, fix for cmdline race. See bug #59905.
+
+*hardened-sources-2.4.26-r6 (09 Aug 2004)
+
+  09 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r6.ebuild,
+  -hardened-sources-2.4.26-r5.ebuild,
+  -hardened-sources-2.4.26-r4.ebuild,
+  +files/2.4.26-cmdline-race.patch:
+  Version bump, fix for cmdline race. See bug #59905.
+
+*hardened-sources-2.4.27 (08 Aug 2004)
+
+  08 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.27.ebuild,
+  +files/2.4.27-CAN-2004-0394.patch:
+  Ported the patchball to the 2.4.27 kernel version.
+
+*hardened-sources-2.4.26-r5 (07 Aug 2004)
+
+  07 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r5.ebuild:
+  Updated to use the new hardened-patches-2.4-26.1 patchball.
+  It adds the following features:
+  - Squashfs
+  - Ebtables
+  - Netdev random (core+drivers)
+  - Watchdog Timer (WDT) fix.
+
+*hardened-sources-2.4.26-r4 (04 Aug 2004)
+
+  04 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r4.ebuild,
+  +files/2.4.26-CAN-2004-0415.patch,
+  -hardened-sources-2.4.26-3:
+  Version bump, fix for CAN 0415, see bug #59378.
+  
+*hardened-sources-2.4.26-r3 (22 Jul 2004)
+
+  22 Jul 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r3.ebuild,
+  +files/2.4.26-CAN-2004-0497.patch,
+  -hardened-sources-2.4.26-r2.ebuild:
+  Version bump, fixed CAN 0497, see bug #56171.
+  
+*hardened-sources-2.4.26-r2 (29 Jun 2004)
+
+  29 Jun 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r2.ebuild,
+  +files/2.4.26-CAN-2004-0495.patch,
+  +files/2.4.26-CAN-2004-0535.patch,
+  -hardened-sources-2.4.26-r1.ebuild:
+  Fixes for both CAN 0495 and 0535, see bug #54976
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  hardened-sources-2.4.26-r1.ebuild:
+  QA - fix use invocation
+
+*hardened-sources-2.4.26-r1 (22 June 2004)
+
+  22 June 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r1.ebuild,
+  +files/2.4.26-CAN-2004-0394.patch, 
+  +files/2.4.26-signal-race.patch,
+  -hardened-sources-2.4.26.ebuild,
+  -hardened-sources-2.4.24-r3.ebuild:
+  Version bump for the CAN-2004-0394 issue and bug #53804
+  Marked 2.4.26-r1 as stable, removed 2.4.26 and 2.4.24-r3
+  
+  
+  31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hardened-sources-2.4.24-r3.ebuild, hardened-sources-2.4.26.ebuild:
+  Masked hardened-sources-2.4.26.ebuild broken for ppc
+
+  31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hardened-sources-2.4.24-r3.ebuild:
+  Masked hardened-sources-2.4.24-r3.ebuild broken for ppc
+
+*hardened-sources-2.4.26 (29 May 2004)
+
+ 29 May 2004; Andrea Luzzardi <scox@gentoo.org>
+ +hardened-sources-2.4.26.ebuild:
+ Updated hardened-sources for the 2.4.26 kernel
+ Removed broken components, updated almost everything.
+ 
+*hardened-sources-2.4.24-r3 (17 Apr 2004)
+
+  17 Apr 2004; <plasmaroo@gentoo.org>
+  +files/hardened-sources-2.4.24.CAN-2004-0010.patch,
+  +files/hardened-sources-2.4.24.CAN-2004-0177.patch,
+  +files/hardened-sources-2.4.24.CAN-2004-0178.patch,
+  +hardened-sources-2.4.24-r3.ebuild:
+  Added patches for the CAN-2004-0010, CAN-2004-0177 and CAN-2004-0178
+  vulnerabilities. Old revisions removed.
+
+*hardened-sources-2.4.24-r2 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org>
+  +files/hardened-sources-2.4.24.CAN-2004-0109.patch,
+  -hardened-sources-2.4.24-r1.ebuild, +hardened-sources-2.4.24-r2.ebuild:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
+  hardened-sources-2.4.22-r2.ebuild, hardened-sources-2.4.24-r1.ebuild:
+  Add eutils to inherit.
+
+*hardened-sources-2.4.24-r1 (19 Feb 2004)
+
+  19 Feb 2004; <plasmaroo@gentoo.org> hardened-sources-2.4.24-r1.ebuild,
+  files/hardened-sources-2.4.24.munmap.patch:
+  Added the patch for the mremap/munmap vulnerability. Bug #42024.
+
+*hardened-sources-2.4.24 (06 Feb 2004)
+
+  06 Feb 2004; Andrea Luzzardi <scox@gentoo.org>
+  hardened-sources-2.4.24.ebuild:
+  Version bump, updated most of the components.
+  This release includes the following:
+
+  - Hardened security
+  - Netfilter patch-o-matic 20031219
+  - FreeSWAN 2.04 & x509 1.4.8
+  - EVMS 2.2.2
+  - XFS 1.3.1
+  - cryptoloop jari
+  - grsecurity 2.0-rc4
+  - SELinux
+  - PaX 200402060000
+  - PaX Obscurity 200308302223
+  - Others...
+
+  Neither -ck nor systrace are included anymore.
+
+*hardened-sources-2.4.22-r2 (05 Jan 2004)
+
+  05 Jan 2004; Andrea Luzzardi <scox@gentoo.org>
+  hardened-sources-2.4.22-r2.ebuild:
+  Version bump for the 'mremap' and the 'rtc' vulnerabilities.
+
+*hardened-sources-2.4.22-r1 (02 Dec 2003)
+
+  02 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  hardened-sources-2.4.22-r1.ebuild: Fix up a little booboo from earlier.
+
+  02 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  hardened-sources-2.4.22-r1.ebuild: 
+  Version bump for the 'do_brk' vulnerability.
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  hardened-sources-2.4.20-r2.ebuild, hardened-sources-2.4.20-r3.ebuild,
+  hardened-sources-2.4.20-r4.ebuild, hardened-sources-2.4.21.ebuild,
+  hardened-sources-2.4.22.ebuild, files/do_brk_fix.patch:
+  Fix the 'do_brk' vulnerability.
+
+  03 Nov 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.22.ebuild:
+  - Removed the src_install() portion for SELinux flask
+    components.  These are no longer handled in the kernel
+    so this code was not necessary.
+
+  29 Oct 2003; Matthew Rickard <frogger@gentoo.org> hardened-sources-2.4.22.ebuild:
+  New 2.4.22 based hardened-sources thanks to
+  Phil West <p.west@computer.org>.
+  
+  These sources include:
+  	- New SELinux API
+  	- Updated CK-base
+  	- Updated GRSec
+  	- Systrace
+  	- SuperFreeS/WAN 1.99.8
+  	- Propolice kernel build support
+  	- EVMS
+  	- Other various security related patches
+
+*hardened-sources-2.4.21 (14 Sep 2003)
+
+  14 Sep 2003; Matthew Rickard <frogger@gentoo.org> hardened-sources-2.4.21.ebuild:
+  Updated hardened-sources based on the 2.4.21 Linux kernel.
+  This includes updates to most major components such as:
+    - ck-base-0306300059
+    - selinux-2.4-2003071106
+    - grsecurity-2.0-rc1
+    - Updated IPTables patch-o-matic
+    - Updated SuperFreeS/WAN
+
+  Thanks to Phil West <pwest@computer.org> for his work in getting this
+  updated patch set ready for the 2.4.21 based kernel.
+  
+  16 Jun 2003; Matthew Rickard <frogger@gentoo.org> :
+  Initial import of hardened-sources-2.4.20-r4.  This revision
+  includes only a few changes, but one of these is an important
+  security fix.  It is recommended all users of hardened-sources
+  upgrade to this release.
+
+  	- ioperm bug fix
+  	- fixed compilation failure when building without GRSec
+
+  SAL (Secure Auditing for Linux) is NOT included in this revision
+  due to time constraints, but is planned for inclusion in the near
+  future.
+
+*hardened-sources-2.4.20-r2 (12 Jun 2003)
+
+  12 Jun 2003; <msterret@gentoo.org> hardened-sources-2.4.20-r2.ebuild,
+  hardened-sources-2.4.20-r3.ebuild:
+  Add Header...
+
+  08 Jun 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r3.ebuild:
+  Removed warnings from ebuild.  This kernel should be safe to
+  use at this point.
+
+*hardened-sources-2.4.20-r3 (08 Jun 2003)
+
+  08 Jun 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r3.ebuild:
+  New revision.  Includes the following changes over -r2:
+
+  - ck7-base (O(1), preempt, low latency)
+  - Super FreeS/WAN 1.99.7rc2
+  - PaX for the LSM/SELinux branch
+  - GRSecurity 2.0-pre4 (role based access control)
+  - Systrace 1.3
+  - EXT3 fixes
+  - EVMS 2.0.1
+  - GCC 3.1+ compile optimizations
+  - ProPolice kernel build support
+  - Hashing table security fixes
+
+*hardened-sources-2.4.20-r1 (09 Apr 2003)
+
+  23 Apr 2003; Matthew Rickard <frogger@gentoo.org> Manifest:
+  Initial import of hardened-sources-r2.  This new
+  ebuild includes many new performance and security
+  related patches.  As in -r1, it will patch in
+  LSM/SELinux if "selinux" is in USE, otherwise it
+  will patch in GRSecurity.  The following patches
+  are included in this revision:
+
+    - O(1) Scheduler, Low Latency, and Preempt
+  	(pulled from the base CK patch)
+    - ptrace exploit patch for the LSM kernel
+  	(the GRSec patch already fixes this)
+    - LSM 2.4-2003040709
+    - SELinux 2.4-2003040709
+    - Systrace v1.2
+    - IPTables patch-o-matic base patches - 20030107
+    - CryptoAPI 2.4.20.1 w/ loop-jari patch
+    - Super FreeS/WAN 1.99.6.1
+    - GRSecurity 1.9.9g
+    - MPPE
+    - EXT3 data journal fix
+    - CIPE 1.5.4
+
+  12 Apr 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r1.ebuild, manifest:
+  Updated to install flask components correctly for selinux.
+
+  12 Apr 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r1.ebuild:
+  LSM/SELinux is now patched in when "selinux" is in USE.  Otherwise, GRSecurity
+  is patched in instead.  Ptrace patches for selinux have also been added.  In
+  either case, systrace support will be patched in as well.
+
+  09 Apr 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r1.ebuild, hardened-sources-2.4.20.ebuild, manifest:
+  Revision bump for new sources.
+  
+  09 Apr 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r1.ebuild:
+  Now includes LSM1, GRSec-2.0-pre1, and systrace-v1.2.
+
+*hardened-sources-2.4.20 (30 Mar 2003)
+  
+  30 Mar 2003; Joshua Brindle <method@gentoo.org>
+  hardened-sources-2.4.20.ebuild:
+  Initial import, only has systrace support.
+
diff --git a/sys-kernel/hardened-sources/ChangeLog-2013 b/sys-kernel/hardened-sources/ChangeLog-2013
new file mode 100644
index 0000000..51e379b
--- /dev/null
+++ b/sys-kernel/hardened-sources/ChangeLog-2013
@@ -0,0 +1,2811 @@
+# ChangeLog for sys-kernel/hardened-sources
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog-2013,v 1.1 2014/01/01 18:41:12 dilfridge Exp $
+
+*hardened-sources-3.12.6-r3 (31 Dec 2013)
+
+  31 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.6-r3.ebuild:
+  vanilla-3.12.6 + genpatches-3.12-7 + grsecurity-3.0-3.12.6-201312301223
+
+*hardened-sources-3.12.6-r2 (27 Dec 2013)
+
+  27 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.6-r2.ebuild:
+  vanilla-3.12.6 + genpatches-3.12-7 + grsecurity-3.0-3.12.6-201312262020
+
+*hardened-sources-3.2.53-r6 (27 Dec 2013)
+
+  27 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r6.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312262018
+
+*hardened-sources-2.6.32-r189 (27 Dec 2013)
+
+  27 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r189.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201312262018
+
+  26 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r186.ebuild, -hardened-sources-2.6.32-r187.ebuild,
+  -hardened-sources-3.11.8-r1.ebuild, -hardened-sources-3.11.8.ebuild,
+  -hardened-sources-3.11.9.ebuild, -hardened-sources-3.12.5-r1.ebuild,
+  -hardened-sources-3.12.6.ebuild, -hardened-sources-3.2.52-r4.ebuild,
+  -hardened-sources-3.2.52-r5.ebuild, -hardened-sources-3.2.52-r6.ebuild,
+  -hardened-sources-3.2.53-r3.ebuild, -hardened-sources-3.2.53-r4.ebuild,
+  hardened-sources-2.6.32-r185.ebuild, hardened-sources-3.11.7-r1.ebuild,
+  hardened-sources-3.2.52-r3.ebuild:
+  Stable on amd64, x86.  Remove older unstables
+
+*hardened-sources-3.12.6-r1 (26 Dec 2013)
+
+  26 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.6-r1.ebuild:
+  vanilla-3.12.6 + genpatches-3.12-7 + grsecurity-3.0-3.12.6-201312251834
+
+*hardened-sources-3.2.53-r5 (26 Dec 2013)
+
+  26 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r5.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312251832
+
+*hardened-sources-2.6.32-r188 (26 Dec 2013)
+
+  26 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r188.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201312251831
+
+  25 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
+  hardened-sources-3.12.6.ebuild:
+  removed keywords from hardened-sources-3.12.6 because of bug 495208
+
+*hardened-sources-3.12.6 (21 Dec 2013)
+
+  21 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.6.ebuild:
+  vanilla-3.12.6 + genpatches-3.12-7 + grsecurity-3.0-3.12.6-201312210928
+
+*hardened-sources-3.2.53-r4 (21 Dec 2013)
+
+  21 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r4.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312210931
+
+  18 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.12.4.ebuild, -hardened-sources-3.12.5.ebuild,
+  -hardened-sources-3.2.53-r1.ebuild, -hardened-sources-3.2.53-r2.ebuild:
+  Remove older 3.0's
+
+*hardened-sources-3.12.5-r1 (18 Dec 2013)
+
+  18 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.5-r1.ebuild:
+  vanilla-3.12.5 + genpatches-3.12-6 + grsecurity-3.0-3.12.5-201312151212
+
+*hardened-sources-3.2.53-r3 (18 Dec 2013)
+
+  18 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r3.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312151209
+
+*hardened-sources-3.12.5 (16 Dec 2013)
+
+  16 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.5.ebuild:
+  vanilla-3.12.5 + genpatches-3.12-6 + grsecurity-3.0-3.12.5-201312132204
+
+*hardened-sources-3.2.53-r2 (16 Dec 2013)
+
+  16 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r2.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312132200
+
+*hardened-sources-3.12.4 (10 Dec 2013)
+
+  10 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.4.ebuild:
+  vanilla-3.12.4 + genpatches-3.12-4 + grsecurity-3.0-3.12.4-201312081754
+
+*hardened-sources-3.2.53-r1 (10 Dec 2013)
+
+  10 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.53-r1.ebuild:
+  vanilla-3.2.53 + genpatches-3.2-16 + grsecurity-3.0-3.2.53-201312081752
+
+*hardened-sources-2.6.32-r187 (10 Dec 2013)
+
+  10 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r187.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201312081751
+
+*hardened-sources-3.11.9 (24 Nov 2013)
+
+  24 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.9.ebuild:
+  vanilla-3.11.9 + genpatches-3.11-13 + grsecurity-2.9.1-3.11.9-201311222137
+
+*hardened-sources-3.2.52-r6 (24 Nov 2013)
+
+  24 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r6.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311222106
+
+*hardened-sources-3.11.8-r1 (22 Nov 2013)
+
+  22 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.8-r1.ebuild:
+  vanilla-3.11.8 + genpatches-3.11-12 + grsecurity-2.9.1-3.11.8-201311182333
+
+*hardened-sources-3.2.52-r5 (22 Nov 2013)
+
+  22 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r5.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311182331
+
+  17 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r183.ebuild, -hardened-sources-2.6.32-r184.ebuild,
+  -hardened-sources-3.11.6-r3.ebuild, -hardened-sources-3.11.7.ebuild,
+  -hardened-sources-3.2.52-r1.ebuild, -hardened-sources-3.2.52-r2.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.11.8 (17 Nov 2013)
+
+  17 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.8.ebuild:
+  vanilla-3.11.8 + genpatches-3.11-12 + grsecurity-2.9.1-3.11.8-201311142110
+
+*hardened-sources-3.2.52-r4 (17 Nov 2013)
+
+  17 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r4.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311142109
+
+*hardened-sources-2.6.32-r186 (17 Nov 2013)
+
+  17 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r186.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201311142108
+
+*hardened-sources-3.11.7-r1 (15 Nov 2013)
+
+  15 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.7-r1.ebuild:
+  vanilla-3.11.7 + genpatches-3.11-10 + grsecurity-2.9.1-3.11.7-201311102306
+
+*hardened-sources-3.2.52-r3 (15 Nov 2013)
+
+  15 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r3.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311102305
+
+*hardened-sources-2.6.32-r185 (15 Nov 2013)
+
+  15 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r185.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201311102303
+
+*hardened-sources-3.11.7 (11 Nov 2013)
+
+  11 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.7.ebuild:
+  vanilla-3.11.7 + genpatches-3.11-10 + grsecurity-2.9.1-3.11.7-201311071634
+
+*hardened-sources-3.2.52-r2 (11 Nov 2013)
+
+  11 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r2.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311071633
+
+*hardened-sources-2.6.32-r184 (11 Nov 2013)
+
+  11 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r184.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201311071632
+
+  05 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r182.ebuild, -hardened-sources-3.11.6-r1.ebuild,
+  -hardened-sources-3.11.6-r2.ebuild, -hardened-sources-3.11.6.ebuild,
+  -hardened-sources-3.2.51-r4.ebuild, -hardened-sources-3.2.51-r5.ebuild,
+  -hardened-sources-3.2.52.ebuild:
+  Remove older unstable
+
+*hardened-sources-3.11.6-r3 (05 Nov 2013)
+
+  05 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.6-r3.ebuild:
+  vanilla-3.11.6 + genpatches-3.11-9 + grsecurity-2.9.1-3.11.6-201311021635
+
+*hardened-sources-3.2.52-r1 (05 Nov 2013)
+
+  05 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52-r1.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201311021628
+
+*hardened-sources-3.11.6-r2 (02 Nov 2013)
+
+  02 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.6-r2.ebuild:
+  vanilla-3.11.6 + genpatches-3.11-9 + grsecurity-2.9.1-3.11.6-201310292050
+
+*hardened-sources-3.2.52 (02 Nov 2013)
+
+  02 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.52.ebuild:
+  vanilla-3.2.52 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.52-201310292049
+
+*hardened-sources-2.6.32-r183 (02 Nov 2013)
+
+  02 Nov 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r183.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201310292048
+
+*hardened-sources-3.11.6-r1 (27 Oct 2013)
+
+  27 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.6-r1.ebuild:
+  vanilla-3.11.6 + genpatches-3.11-9 + grsecurity-2.9.1-3.11.6-201310260850
+
+*hardened-sources-3.2.51-r5 (27 Oct 2013)
+
+  27 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51-r5.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201310260849
+
+  21 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.48-r1.ebuild, -hardened-sources-3.9.9.ebuild,
+  hardened-sources-3.11.2.ebuild, hardened-sources-3.2.51-r2.ebuild:
+  Stablize 3.2.51-r2/3.11.2 on amd64/x86, remove oldest stables
+
+  21 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.11.3.ebuild, -hardened-sources-3.11.5.ebuild,
+  -hardened-sources-3.2.51-r3.ebuild:
+  Remove older unstable
+
+*hardened-sources-3.11.6 (21 Oct 2013)
+
+  21 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.6.ebuild:
+  vanilla-3.11.6 + genpatches-3.11-6 + grsecurity-2.9.1-3.11.6-201310191259
+
+*hardened-sources-3.2.51-r4 (20 Oct 2013)
+
+  20 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51-r4.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201310191257
+
+*hardened-sources-3.11.5 (18 Oct 2013)
+
+  18 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.5.ebuild:
+  vanilla-3.11.5 + genpatches-3.11-7 + grsecurity-2.9.1-3.11.5-201310162041
+
+*hardened-sources-3.2.51-r3 (18 Oct 2013)
+
+  18 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51-r3.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201310162039
+
+*hardened-sources-3.11.3 (02 Oct 2013)
+
+  02 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.3.ebuild, -hardened-sources-3.11.1-r2.ebuild,
+  -hardened-sources-3.2.51-r1.ebuild, -hardened-sources-3.2.51.ebuild:
+  vanilla-3.11.3 + genpatches-3.11-6 + grsecurity-2.9.1-3.11.3-201310012249
+
+*hardened-sources-3.11.2 (30 Sep 2013)
+
+  30 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.2.ebuild:
+  vanilla-3.11.2 + genpatches-3.11-4 + grsecurity-2.9.1-3.11.2-201309281103
+
+*hardened-sources-3.2.51-r2 (30 Sep 2013)
+
+  30 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51-r2.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201309281102
+
+*hardened-sources-2.6.32-r182 (30 Sep 2013)
+
+  30 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r182.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201309281101
+
+  27 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.11.1-r1.ebuild, -hardened-sources-3.11.1.ebuild:
+  Remove buggy 3.11.1 versions
+
+*hardened-sources-3.11.1-r2 (27 Sep 2013)
+
+  27 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.1-r2.ebuild:
+  vanilla-3.11.1 + genpatches-3.11-4 + grsecurity-2.9.1-3.11.1-201309221838
+
+*hardened-sources-3.11.1-r1 (23 Sep 2013)
+
+  23 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.1-r1.ebuild:
+  vanilla-3.11.1 + genpatches-3.11-1 + grsecurity-2.9.1-3.11.1-201309181826
+
+*hardened-sources-3.2.51-r1 (23 Sep 2013)
+
+  23 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51-r1.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201309181906
+
+  17 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.50-r5.ebuild, -hardened-sources-3.2.50-r6.ebuild:
+  Remove some older versions
+
+  17 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.10.10.ebuild, -hardened-sources-3.10.11.ebuild:
+  Removed because of bug #485120
+
+*hardened-sources-3.11.1 (16 Sep 2013)
+
+  16 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.11.1.ebuild:
+  vanilla-3.11.1 + genpatches-3.11-1 + grsecurity-2.9.1-3.11.1-201309151124
+
+*hardened-sources-3.2.51 (16 Sep 2013)
+
+  16 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.51.ebuild:
+  vanilla-3.2.51 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.51-201309142348
+
+*hardened-sources-3.10.11 (11 Sep 2013)
+
+  11 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.11.ebuild:
+  vanilla-3.10.11 + genpatches-3.10-17 + grsecurity-2.9.1-3.10.11-201309081953
+
+*hardened-sources-3.2.50-r6 (11 Sep 2013)
+
+  11 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50-r6.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201309081951
+
+  10 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r175.ebuild, hardened-sources-2.6.32-r181.ebuild:
+  Stable on amd64 and x86, remove oldest stable
+
+  05 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r170.ebuild, -hardened-sources-3.2.46-r1.ebuild,
+  -hardened-sources-3.9.5.ebuild:
+  Remove oldest stables
+
+  05 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.10.7-r1.ebuild, -hardened-sources-3.10.9-r1.ebuild,
+  -hardened-sources-3.2.50-r2.ebuild, -hardened-sources-3.2.50-r4.ebuild,
+  hardened-sources-2.6.32-r178.ebuild, hardened-sources-3.10.1-r1.ebuild,
+  hardened-sources-3.2.48-r4.ebuild:
+  Stable amd64 and x86, remove older unstable
+
+*hardened-sources-3.10.10 (05 Sep 2013)
+
+  05 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.10.ebuild:
+  vanilla-3.10.10 + genpatches-3.10-17 + grsecurity-2.9.1-3.10.10-201309011630
+
+*hardened-sources-3.2.50-r5 (05 Sep 2013)
+
+  05 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50-r5.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201309011629
+
+*hardened-sources-3.10.9-r1 (30 Aug 2013)
+
+  30 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.9-r1.ebuild:
+  vanilla-3.10.9 + genpatches-3.10-16 + grsecurity-2.9.1-3.10.9-201308282054
+
+*hardened-sources-3.2.50-r4 (30 Aug 2013)
+
+  30 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50-r4.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201308282053
+
+  20 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r180.ebuild, -hardened-sources-3.10.5-r1.ebuild,
+  -hardened-sources-3.10.7.ebuild, -hardened-sources-3.2.50-r1.ebuild:
+  Remove older unstable
+
+*hardened-sources-3.10.7-r1 (20 Aug 2013)
+
+  20 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.7-r1.ebuild:
+  vanilla-3.10.7 + genpatches-3.10-13 + grsecurity-2.9.1-3.10.7-201308192211
+
+*hardened-sources-3.10.7 (19 Aug 2013)
+
+  19 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.7.ebuild:
+  vanilla-3.10.7 + genpatches-3.10-13 + grsecurity-2.9.1-3.10.7-201308182203
+
+*hardened-sources-3.2.50-r2 (19 Aug 2013)
+
+  19 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50-r2.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201308181813
+
+*hardened-sources-2.6.32-r181 (19 Aug 2013)
+
+  19 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r181.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201308171247
+
+*hardened-sources-3.10.5-r1 (12 Aug 2013)
+
+  12 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.5-r1.ebuild, -hardened-sources-3.10.5.ebuild:
+  vanilla-3.10.5 + genpatches-3.10-10 + grsecurity-2.9.1-3.10.5-201308091415
+
+  07 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r160.ebuild:
+  Remove older stable
+
+  07 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r179.ebuild, -hardened-sources-3.10.3.ebuild,
+  -hardened-sources-3.10.4-r1.ebuild, -hardened-sources-3.10.4-r2.ebuild,
+  -hardened-sources-3.2.48-r6.ebuild, -hardened-sources-3.2.49.ebuild,
+  -hardened-sources-3.2.50.ebuild, -hardened-sources-3.8.12.ebuild:
+  Remove older versions
+
+*hardened-sources-3.10.5 (07 Aug 2013)
+
+  07 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.5.ebuild:
+  vanilla-3.10.4 + genpatches-3.10-9 + grsecurity-2.9.1-3.10.5-201308052154
+
+*hardened-sources-3.2.50-r1 (07 Aug 2013)
+
+  07 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50-r1.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201308052151
+
+*hardened-sources-2.6.32-r180 (07 Aug 2013)
+
+  07 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r180.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201308052140
+
+*hardened-sources-3.10.4-r2 (04 Aug 2013)
+
+  04 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.4-r2.ebuild:
+  vanilla-3.10.4 + genpatches-3.10-8 + grsecurity-2.9.1-3.10.4-201308030031
+
+*hardened-sources-3.2.50 (04 Aug 2013)
+
+  04 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.50.ebuild:
+  vanilla-3.2.50 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.50-201308030030
+
+*hardened-sources-2.6.32-r179 (04 Aug 2013)
+
+  04 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r179.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201308030029
+
+*hardened-sources-3.10.4-r1 (01 Aug 2013)
+
+  01 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.4-r1.ebuild, -hardened-sources-3.10.4.ebuild:
+  vanilla-3.10.4 + genpatches-3.10-8 + grsecurity-2.9.1-3.10.4-201307311627
+
+*hardened-sources-3.10.4 (31 Jul 2013)
+
+  31 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.4.ebuild:
+  vanilla-3.10.4 + genpatches-3.10-8 + grsecurity-2.9.1-3.10.4-201307302312
+
+*hardened-sources-3.2.49 (31 Jul 2013)
+
+  31 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.49.ebuild:
+  vanilla-3.2.49 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.49-201307302311
+
+  28 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r175.ebuild, hardened-sources-3.2.48-r1.ebuild,
+  hardened-sources-3.9.9.ebuild:
+  Stable amd64, x86
+
+  27 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.10.2.ebuild, -hardened-sources-3.2.48-r5.ebuild:
+  Remove older 3.2.48 and 3.10.3
+
+*hardened-sources-3.2.48-r6 (27 Jul 2013)
+
+  27 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r6.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307261327
+
+*hardened-sources-3.10.2 (26 Jul 2013)
+
+  26 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.2.ebuild:
+  vanilla-3.10.2 + genpatches-3.10-5 + grsecurity-2.9.1-3.10.2-201307212247
+
+*hardened-sources-3.2.48-r5 (26 Jul 2013)
+
+  26 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r5.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307212241
+
+  21 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r174.ebuild, -hardened-sources-3.2.48.ebuild,
+  -hardened-sources-3.9.8-r1.ebuild:
+  Remove all unstable except candidates for stabilization
+
+  21 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r177.ebuild, -hardened-sources-3.10.1.ebuild,
+  -hardened-sources-3.2.48-r3.ebuild:
+  Remove previous unstable verions
+
+*hardened-sources-3.10.1-r1 (21 Jul 2013)
+
+  21 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.1-r1.ebuild:
+  vanilla-3.10.1  + genpatches-3.10-3 + grsecurity-2.9.1-3.10.1-201307181236
+
+*hardened-sources-3.2.48-r4 (21 Jul 2013)
+
+  21 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r4.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307181235
+
+*hardened-sources-2.6.32-r178 (21 Jul 2013)
+
+  21 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r178.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201307181234
+
+  17 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r176.ebuild, -hardened-sources-3.10.0.ebuild,
+  -hardened-sources-3.2.48-r2.ebuild:
+  Revove buggy version
+
+*hardened-sources-3.10.1 (17 Jul 2013)
+
+  17 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.1.ebuild:
+  vanilla-3.10.1  + genpatches-3.10-3 + grsecurity-2.9.1-3.10.1-201307141923
+
+*hardened-sources-3.2.48-r3 (17 Jul 2013)
+
+  17 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r3.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307122306
+
+*hardened-sources-2.6.32-r177 (17 Jul 2013)
+
+  17 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r177.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201307122305
+
+*hardened-sources-3.10.0 (12 Jul 2013)
+
+  12 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.0.ebuild:
+  vanilla-3.10.0 + genpatches-3.10-3 + grsecurity-2.9.1-3.10.0-201307092224
+
+*hardened-sources-3.2.48-r2 (12 Jul 2013)
+
+  12 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r2.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307092217
+
+*hardened-sources-2.6.32-r176 (12 Jul 2013)
+
+  12 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r176.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201307092216
+
+*hardened-sources-3.9.9 (06 Jul 2013)
+
+  06 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.9.ebuild:
+  vanilla-3.9.9 + genpatches-3.9-15 + grsecurity-2.9.1-3.9.9-201307050017  May
+  fix uefi bug #471626
+
+*hardened-sources-3.2.48-r1 (06 Jul 2013)
+
+  06 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48-r1.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201307050016
+
+*hardened-sources-2.6.32-r175 (06 Jul 2013)
+
+  06 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r175.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201307050015
+
+  04 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r171.ebuild, -hardened-sources-2.6.32-r172.ebuild,
+  -hardened-sources-2.6.32-r173.ebuild, -hardened-sources-3.2.47-r1.ebuild,
+  -hardened-sources-3.2.47-r2.ebuild, -hardened-sources-3.2.47-r3.ebuild,
+  -hardened-sources-3.9.7-r1.ebuild, -hardened-sources-3.9.7.ebuild,
+  -hardened-sources-3.9.8.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.2.48 (04 Jul 2013)
+
+  04 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.48.ebuild:
+  vanilla-3.2.48 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.48-201306302051
+
+*hardened-sources-3.9.8-r1 (04 Jul 2013)
+
+  04 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.8-r1.ebuild:
+  vanilla-3.9.8 + genpatches-3.9-13 + grsecurity-2.9.1-3.9.8-201306302052
+
+*hardened-sources-2.6.32-r174 (04 Jul 2013)
+
+  04 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r174.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201306302051
+
+*hardened-sources-3.9.8 (30 Jun 2013)
+
+  30 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.8.ebuild:
+  vanilla-3.9.8 + genpatches-3.9-13 + grsecurity-2.9.1-3.9.8-201306272057
+
+*hardened-sources-3.2.47-r3 (30 Jun 2013)
+
+  30 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.47-r3.ebuild:
+  vanilla-3.2.47 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.47-201306272056
+
+*hardened-sources-2.6.32-r173 (30 Jun 2013)
+
+  30 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r173.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201306272055
+
+  29 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.42-r1.ebuild:
+  Remove older insecure stable version
+
+  29 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r156.ebuild, -hardened-sources-3.2.40-r1.ebuild,
+  -hardened-sources-3.2.47.ebuild, -hardened-sources-3.8.3.ebuild,
+  -hardened-sources-3.8.6.ebuild, -hardened-sources-3.9.6.ebuild,
+  hardened-sources-3.8.12.ebuild:
+  Remove older versions, stabilize 3.8.12
+
+*hardened-sources-3.9.7-r1 (28 Jun 2013)
+
+  28 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.7-r1.ebuild:
+  vanilla-3.9.7 genpatches-3.9-12 + grsecurity-2.9.1-3.9.7-201306261901
+
+*hardened-sources-3.2.47-r2 (28 Jun 2013)
+
+  28 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.47-r2.ebuild:
+  vanilla-3.2.47 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.47-201306261900
+
+*hardened-sources-2.6.32-r172 (28 Jun 2013)
+
+  28 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r172.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201306261859
+
+*hardened-sources-3.9.7 (25 Jun 2013)
+
+  25 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.7.ebuild:
+  vanilla-3.9.7 genpatches-3.9-12 + grsecurity-2.9.1-3.9.7-201306231443
+
+*hardened-sources-3.2.47-r1 (25 Jun 2013)
+
+  25 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.47-r1.ebuild:
+  vanilla-3.2.47 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.47-201306231441
+
+*hardened-sources-3.8.12 (25 Jun 2013)
+
+  25 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.12.ebuild:
+  Reintroduce 3.8.12 because of reports that 3.9 doesn't boot
+
+  24 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r169.ebuild, -hardened-sources-3.2.46.ebuild,
+  -hardened-sources-3.9.4-r2.ebuild, hardened-sources-2.6.32-r170.ebuild,
+  hardened-sources-3.2.46-r1.ebuild, hardened-sources-3.9.5.ebuild:
+  Stable amd64 x86, and remove older unstable
+
+*hardened-sources-3.9.6 (21 Jun 2013)
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.6.ebuild:
+  vanilla-3.9.6 + genpatches-3.9-10 + grsecurity-2.9.1-3.9.6-201306182033
+
+*hardened-sources-3.2.47 (21 Jun 2013)
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.47.ebuild:
+  vanilla-3.2.47 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.47-201306191807
+
+*hardened-sources-2.6.32-r171 (21 Jun 2013)
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r171.ebuild:
+  vanilla-2.6.32.61 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201306171902
+
+  12 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r165.ebuild, -hardened-sources-2.6.32-r167.ebuild,
+  -hardened-sources-2.6.32-r168.ebuild, -hardened-sources-3.2.44-r2.ebuild,
+  -hardened-sources-3.2.45-r1.ebuild, -hardened-sources-3.2.45-r2.ebuild,
+  -hardened-sources-3.8.12.ebuild, -hardened-sources-3.9.4-r1.ebuild,
+  -hardened-sources-3.9.4.ebuild:
+  Remove older unstable.  Next in line for stabilization: 2.6.32-r169, 3.2.46,
+  3.9.4-r2
+
+  12 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r143.ebuild, -hardened-sources-2.6.32-r148.ebuild,
+  -hardened-sources-3.2.35.ebuild, -hardened-sources-3.2.37-r2.ebuild,
+  -hardened-sources-3.7.5-r1.ebuild:
+  Remove older stables
+
+*hardened-sources-3.9.5 (12 Jun 2013)
+
+  12 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.5.ebuild:
+  vanilla-3.9.5 + genpatches-3.9-9 + grsecurity-2.9.1-3.9.5-201306111850
+
+*hardened-sources-3.2.46-r1 (12 Jun 2013)
+
+  12 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.46-r1.ebuild:
+  vanilla-3.2.46 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.46-201306102217
+
+*hardened-sources-2.6.32-r170 (12 Jun 2013)
+
+  12 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r170.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.61-201306102216
+
+*hardened-sources-3.9.4-r2 (09 Jun 2013)
+
+  09 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.4-r2.ebuild:
+  vanilla-3.9.4 + genpatches-3.9-8 + grsecurity-2.9.1-3.9.4-201306041949
+
+*hardened-sources-3.2.46 (09 Jun 2013)
+
+  09 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.46.ebuild:
+  vanilla-3.2.46 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.46-201306041947
+
+*hardened-sources-2.6.32-r169 (09 Jun 2013)
+
+  09 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r169.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201306041946
+
+  31 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r161.ebuild, -hardened-sources-2.6.32-r162.ebuild,
+  -hardened-sources-2.6.32-r163.ebuild, -hardened-sources-2.6.32-r164.ebuild,
+  -hardened-sources-3.2.43-r1.ebuild, -hardened-sources-3.2.43.ebuild,
+  -hardened-sources-3.2.44-r1.ebuild, -hardened-sources-3.2.44.ebuild,
+  -hardened-sources-3.8.10.ebuild, -hardened-sources-3.8.11.ebuild,
+  -hardened-sources-3.8.7.ebuild, -hardened-sources-3.8.8.ebuild:
+  Remove older unstable, CVE-2013-2094
+
+*hardened-sources-3.9.4-r1 (31 May 2013)
+
+  31 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.4-r1.ebuild:
+  vanilla-3.9.4 + genpatches-3.9-8 + grsecurity-2.9.1-3.9.4-201305301927
+
+*hardened-sources-3.2.45-r2 (31 May 2013)
+
+  31 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.45-r2.ebuild:
+  vanilla-3.2.45 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.45-201305301925
+
+*hardened-sources-2.6.32-r168 (31 May 2013)
+
+  31 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r168.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201305301924
+
+  26 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r166.ebuild, -hardened-sources-3.2.45.ebuild,
+  -hardened-sources-3.9.2.ebuild:
+  Remove kernels with possible early boot freeze
+
+*hardened-sources-3.9.4 (26 May 2013)
+
+  26 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.4.ebuild:
+  vanilla-3.9.4 + genpatches-3.9-8 + grsecurity-2.9.1-3.9.4-201305251009
+
+*hardened-sources-3.2.45-r1 (26 May 2013)
+
+  26 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.45-r1.ebuild:
+  vanilla-3.2.45 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.45-201305251007
+
+*hardened-sources-2.6.32-r167 (26 May 2013)
+
+  26 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r167.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201305251007
+
+*hardened-sources-3.9.2 (21 May 2013)
+
+  21 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.9.2.ebuild:
+  vanilla-3.9.2 + genpatches-3.9-5 + grsecurity-2.9.1-3.9.2-201305172333 This
+  kernel has an early boot freeze on x86 with less than 512M.  It should not be
+  stabilized.
+
+*hardened-sources-3.2.45 (21 May 2013)
+
+  21 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.45.ebuild:
+  vanilla-3.2.45 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.45-201305162326
+
+*hardened-sources-2.6.32-r166 (21 May 2013)
+
+  21 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r166.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201305162326
+
+*hardened-sources-3.8.12 (10 May 2013)
+
+  10 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.12.ebuild:
+  vanilla-3.8.12 + genpatches-3.8-13 + grsecurity-2.9.1-3.8.12-201305082215
+
+*hardened-sources-3.2.44-r2 (10 May 2013)
+
+  10 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.44-r2.ebuild:
+  vanilla-3.2.44 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.44-201305082214
+
+*hardened-sources-2.6.32-r165 (10 May 2013)
+
+  10 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r165.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201305082213
+
+*hardened-sources-3.8.11 (05 May 2013)
+
+  05 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.11.ebuild:
+  vanilla-3.8.11 + genpatches-3.8-13 + grsecurity-2.9.1-3.8.11-201305011917
+
+*hardened-sources-3.2.44-r1 (05 May 2013)
+
+  05 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.44-r1.ebuild:
+  vanilla-3.2.44 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.44-201304292055
+
+*hardened-sources-2.6.32-r164 (05 May 2013)
+
+  05 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r164.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201304292054
+
+  29 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r160.ebuild, hardened-sources-3.2.42-r1.ebuild,
+  hardened-sources-3.8.6.ebuild:
+  Stable amd64 x86
+
+*hardened-sources-3.8.10 (28 Apr 2013)
+
+  28 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.10.ebuild:
+  vanilla-3.8.10 + genpatches-3.8-11 + grsecurity-2.9.1-3.8.10-201304262208
+
+*hardened-sources-3.2.44 (28 Apr 2013)
+
+  28 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.44.ebuild:
+  vanilla-3.2.44 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.44-201304271916
+
+*hardened-sources-2.6.32-r163 (28 Apr 2013)
+
+  28 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r163.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201304262205
+
+  21 Apr 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Fix gpg signing of Manifest
+
+*hardened-sources-3.8.8 (21 Apr 2013)
+
+  21 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.8.ebuild:
+  vanilla-3.8.8 + genpatches-3.8-9 + grsecurity-2.9.1-3.8.8-201304181923
+
+*hardened-sources-3.2.43-r1 (21 Apr 2013)
+
+  21 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.43-r1.ebuild:
+  vanilla-3.2.43 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.43-201304181907
+
+*hardened-sources-2.6.32-r162 (21 Apr 2013)
+
+  21 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r162.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201304181846
+
+  13 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r153.ebuild, -hardened-sources-2.6.32-r154.ebuild,
+  -hardened-sources-2.6.32-r155.ebuild, -hardened-sources-2.6.32-r157.ebuild,
+  -hardened-sources-2.6.32-r158.ebuild, -hardened-sources-2.6.32-r159.ebuild,
+  -hardened-sources-3.2.39-r1.ebuild, -hardened-sources-3.2.39-r2.ebuild,
+  -hardened-sources-3.2.40-r2.ebuild, -hardened-sources-3.2.40.ebuild,
+  -hardened-sources-3.2.41.ebuild, -hardened-sources-3.2.42.ebuild,
+  -hardened-sources-3.8.4-r1.ebuild, -hardened-sources-3.8.4.ebuild,
+  -hardened-sources-3.8.5.ebuild:
+  Remove older unstable
+
+  13 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r156.ebuild, hardened-sources-3.2.40-r1.ebuild,
+  hardened-sources-3.8.3.ebuild:
+  Stable amd64 x86
+
+*hardened-sources-3.8.7 (13 Apr 2013)
+
+  13 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.7.ebuild:
+  vanilla-3.8.7 + genpatches-3.8-9 + grsecurity-2.9.1-3.8.7-201304122027
+
+*hardened-sources-3.2.43 (13 Apr 2013)
+
+  13 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.43.ebuild:
+  vanilla-3.2.43 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.43-201304122026
+
+*hardened-sources-2.6.32-r161 (13 Apr 2013)
+
+  13 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r161.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201304122025
+
+*hardened-sources-3.8.6 (07 Apr 2013)
+
+  07 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.6.ebuild:
+  vanilla-3.8.6 + genpatches-3.8-7 + grsecurity-2.9.1-3.8.6-201304052305
+
+*hardened-sources-3.2.42-r1 (07 Apr 2013)
+
+  07 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.42-r1.ebuild, hardened-sources-3.2.37-r2.ebuild:
+  vanilla-3.2.42 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.42-201304052303
+
+*hardened-sources-2.6.32-r160 (07 Apr 2013)
+
+  07 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r160.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201304052259
+
+*hardened-sources-3.8.5 (02 Apr 2013)
+
+  02 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.5.ebuild:
+  vanilla-3.8.5 + genpatches-3.8-7 + grsecurity-2.9.1-3.8.5-201303292018
+
+*hardened-sources-3.2.42 (02 Apr 2013)
+
+  02 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.42.ebuild:
+  vanilla-3.2.42 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.42-201303292017
+
+*hardened-sources-2.6.32-r159 (02 Apr 2013)
+
+  02 Apr 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r159.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303292014
+
+*hardened-sources-3.8.4-r1 (27 Mar 2013)
+
+  27 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.4-r1.ebuild:
+  vanilla-3.8.4 + genpatches-3.8-5 + grsecurity-2.9.1-3.8.4-201303252035
+
+*hardened-sources-3.2.41 (27 Mar 2013)
+
+  27 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.41.ebuild:
+  vanilla-3.2.41 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.41-201303252031
+
+*hardened-sources-2.6.32-r158 (27 Mar 2013)
+
+  27 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r158.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303252031
+
+*hardened-sources-3.8.4 (23 Mar 2013)
+
+  23 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.4.ebuild:
+  vanilla-3.8.4 + genpatches-3.8-5 + grsecurity-2.9.1-3.8.4-201303221826
+
+*hardened-sources-3.2.40-r2 (23 Mar 2013)
+
+  23 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.40-r2.ebuild:
+  vanilla-3.2.40 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.40-201303221825
+
+*hardened-sources-2.6.32-r157 (23 Mar 2013)
+
+  23 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r157.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303221823
+
+  18 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.8.0-r1.ebuild, -hardened-sources-3.8.2-r1.ebuild,
+  -hardened-sources-3.8.2.ebuild:
+  Remove <3.8.3 for bug #462172
+
+*hardened-sources-3.8.3 (17 Mar 2013)
+
+  17 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.3.ebuild:
+  vanilla-3.8.2 + genpatches-3.8-3 + grsecurity-2.9.1-3.8.3-201303142235
+
+*hardened-sources-3.2.40-r1 (17 Mar 2013)
+
+  17 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.40-r1.ebuild:
+  vanilla-3.2.40 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.40-201303142234
+
+*hardened-sources-2.6.32-r156 (17 Mar 2013)
+
+  17 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r156.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303142231
+
+*hardened-sources-3.8.2-r1 (10 Mar 2013)
+
+  10 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.2-r1.ebuild:
+  vanilla-3.8.2 + genpatches-3.8-3 + grsecurity-2.9.1-3.8.2-201303082215
+
+*hardened-sources-3.2.40 (10 Mar 2013)
+
+  10 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.40.ebuild:
+  vanilla-3.2.40 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.40-201303082037
+
+*hardened-sources-2.6.32-r155 (10 Mar 2013)
+
+  10 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r155.ebuild, -hardened-sources-2.6.32-r151.ebuild,
+  -hardened-sources-2.6.32-r152.ebuild, -hardened-sources-3.2.38-r2.ebuild,
+  -hardened-sources-3.2.39.ebuild, -hardened-sources-3.7.9.ebuild,
+  -hardened-sources-3.8.0.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303082034
+
+  10 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r143.ebuild, hardened-sources-2.6.32-r148.ebuild,
+  hardened-sources-2.6.32-r151.ebuild, hardened-sources-2.6.32-r152.ebuild,
+  hardened-sources-2.6.32-r153.ebuild, hardened-sources-2.6.32-r154.ebuild,
+  hardened-sources-3.2.35.ebuild, hardened-sources-3.2.37-r2.ebuild,
+  hardened-sources-3.2.38-r2.ebuild, hardened-sources-3.2.39-r1.ebuild,
+  hardened-sources-3.2.39-r2.ebuild, hardened-sources-3.2.39.ebuild,
+  hardened-sources-3.7.5-r1.ebuild, hardened-sources-3.7.9.ebuild,
+  hardened-sources-3.8.0-r1.ebuild, hardened-sources-3.8.0.ebuild,
+  hardened-sources-3.8.2.ebuild:
+  Remove message about old predefined grsecurity level
+
+  09 Mar 2013; Tom Wijsman <TomWij@gentoo.org>
+  hardened-sources-2.6.32-r143.ebuild, hardened-sources-2.6.32-r148.ebuild,
+  hardened-sources-2.6.32-r151.ebuild, hardened-sources-2.6.32-r152.ebuild,
+  hardened-sources-2.6.32-r153.ebuild, hardened-sources-2.6.32-r154.ebuild,
+  hardened-sources-3.2.35.ebuild, hardened-sources-3.2.37-r2.ebuild,
+  hardened-sources-3.2.38-r2.ebuild, hardened-sources-3.2.39-r1.ebuild,
+  hardened-sources-3.2.39-r2.ebuild, hardened-sources-3.2.39.ebuild,
+  hardened-sources-3.7.5-r1.ebuild, hardened-sources-3.7.9.ebuild,
+  hardened-sources-3.8.0-r1.ebuild, hardened-sources-3.8.0.ebuild,
+  hardened-sources-3.8.2.ebuild:
+  EAPI 5. Kernel sources and (gen)patches now use xz instead of bz2. Bug
+  #421721.
+
+*hardened-sources-3.8.2 (06 Mar 2013)
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.2.ebuild:
+  vanilla-3.8.2 + genpatches-3.8-3 + grsecurity-2.9.1-3.8.2-201303041742
+
+*hardened-sources-3.2.39-r2 (06 Mar 2013)
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.39-r2.ebuild:
+  vanilla-3.2.39 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.39-201303012254
+
+*hardened-sources-2.6.32-r154 (06 Mar 2013)
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r154.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201303012253
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r149.ebuild, -hardened-sources-2.6.32-r150.ebuild,
+  -hardened-sources-3.2.38-r1.ebuild, -hardened-sources-3.2.38.ebuild,
+  -hardened-sources-3.7.6.ebuild, -hardened-sources-3.7.8.ebuild:
+  Remove older unstable kernels
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r116.ebuild, -hardened-sources-2.6.32-r130.ebuild,
+  -hardened-sources-3.2.23-r1.ebuild, -hardened-sources-3.2.30.ebuild:
+  Remove older stable kernels
+
+  06 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.4.5.ebuild, -hardened-sources-3.5.4-r1.ebuild,
+  -hardened-sources-3.7.5.ebuild:
+  Remove kernel susceptible to sock_diag out-of-bounds, bug #459124
+
+*hardened-sources-3.8.0-r1 (02 Mar 2013)
+
+  02 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.0-r1.ebuild:
+  vanilla-3.8.0 + genpatches-3.8-1 + grsecurity-2.9.1-3.8.0-201302271810
+
+*hardened-sources-3.2.39-r1 (02 Mar 2013)
+
+  02 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.39-r1.ebuild:
+  vanilla-3.2.39 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.39-201302271819
+
+*hardened-sources-2.6.32-r153 (02 Mar 2013)
+
+  02 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r153.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201302271816
+
+  26 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.7.5-r1.ebuild:
+  Rapid stabilization, bug #459124
+
+*hardened-sources-3.7.5-r1 (26 Feb 2013)
+
+  26 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.5-r1.ebuild:
+  Fix out-of-bounds access error in net/core/sock_diag.c:
+  http://lwn.net/Articles/539885
+
+*hardened-sources-3.8.0 (24 Feb 2013)
+
+  24 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.8.0.ebuild:
+  vanilla-3.8.0 + genpatches-3.8-1 + grsecurity-2.9.1-3.8.0-201302231124
+
+*hardened-sources-3.2.39 (24 Feb 2013)
+
+  24 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.39.ebuild:
+  vanilla-3.2.39 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.39-201302222046
+
+*hardened-sources-2.6.32-r152 (24 Feb 2013)
+
+  24 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r152.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201302222044
+
+*hardened-sources-3.7.9 (20 Feb 2013)
+
+  20 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.9.ebuild:
+  vanilla-3.7.9 + genpatches-3.7-11 + grsecurity-2.9.1-3.7.9-201302171808
+
+*hardened-sources-3.2.38-r2 (20 Feb 2013)
+
+  20 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.38-r2.ebuild:
+  vanilla-3.2.38 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.38-201302171808
+
+*hardened-sources-2.6.32-r151 (20 Feb 2013)
+
+  20 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r151.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201302181144
+
+  18 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r42.ebuild:
+  Sorry ppc64, no recent stables, dropping to ~ppc64 only
+
+  18 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.35-r1.ebuild:
+  Remove another older unstable 3.2.x
+
+  18 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r144.ebuild, -hardened-sources-2.6.32-r145.ebuild,
+  -hardened-sources-2.6.32-r146.ebuild, -hardened-sources-2.6.32-r147.ebuild,
+  -hardened-sources-3.2.36.ebuild, -hardened-sources-3.2.37-r1.ebuild,
+  -hardened-sources-3.2.37.ebuild:
+  Remove older unstable 3.2.x and 2.6.32-rX
+
+  18 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.7.0.ebuild, -hardened-sources-3.7.1-r1.ebuild,
+  -hardened-sources-3.7.1-r2.ebuild, -hardened-sources-3.7.1.ebuild,
+  -hardened-sources-3.7.3.ebuild, -hardened-sources-3.7.4-r1.ebuild,
+  -hardened-sources-3.7.4.ebuild:
+  Remove older 3.7.x, bug #454206
+
+*hardened-sources-3.7.8 (17 Feb 2013)
+
+  17 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.8.ebuild:
+  vanilla-3.7.8 + genpatches-3.7-10 + grsecurity-2.9.1-3.7.8-201302161158
+
+*hardened-sources-3.2.38-r1 (17 Feb 2013)
+
+  17 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.38-r1.ebuild:
+  vanilla-3.2.38 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.38-201302151927
+
+*hardened-sources-2.6.32-r150 (17 Feb 2013)
+
+  17 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r150.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201302161146
+
+  12 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r148.ebuild, hardened-sources-3.2.37-r2.ebuild,
+  hardened-sources-3.7.5.ebuild:
+  Stable amd64 x86
+
+*hardened-sources-3.7.6 (12 Feb 2013)
+
+  12 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.6.ebuild:
+  vanilla-3.7.6 + genpatches-3.7-8 + grsecurity-2.9.1-3.7.6-201302092141
+
+*hardened-sources-3.2.38 (12 Feb 2013)
+
+  12 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.38.ebuild:
+  vanilla-3.2.38 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.38-201302092140
+
+*hardened-sources-2.6.32-r149 (12 Feb 2013)
+
+  12 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r149.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201302092140
+
+*hardened-sources-3.7.5 (02 Feb 2013)
+
+  02 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.5.ebuild:
+  vanilla-3.7.5 + genpatches-3.7-7 + grsecurity-2.9.1-3.7.5-201301311811
+
+*hardened-sources-3.2.37-r2 (02 Feb 2013)
+
+  02 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.37-r2.ebuild:
+  vanilla-3.2.37 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.37-201301311810
+
+*hardened-sources-2.6.32-r148 (02 Feb 2013)
+
+  02 Feb 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r148.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201301311809
+
+*hardened-sources-3.7.4-r1 (28 Jan 2013)
+
+  28 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.4-r1.ebuild:
+  vanilla-3.7.3 + genpatches-3.7-6 + grsecurity-2.9.1-3.7.4-201301252226
+
+*hardened-sources-3.7.4 (25 Jan 2013)
+
+  25 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.4.ebuild:
+  vanilla-3.7.3 + genpatches-3.7-5 + grsecurity-2.9.1-3.7.4-201301230048
+
+*hardened-sources-3.2.37-r1 (25 Jan 2013)
+
+  25 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.37-r1.ebuild:
+  vanilla-3.2.37 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.37-201301230047
+
+*hardened-sources-2.6.32-r147 (25 Jan 2013)
+
+  25 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r147.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201301230046
+
+*hardened-sources-3.7.3 (20 Jan 2013)
+
+  20 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.3.ebuild:
+  vanilla-3.7.3 + genpatches-3.7-5 + grsecurity-2.9.1-3.7.3-201301181518
+
+*hardened-sources-3.2.37 (20 Jan 2013)
+
+  20 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.37.ebuild:
+  vanilla-3.2.37 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.37-201301181518
+
+*hardened-sources-2.6.32-r146 (20 Jan 2013)
+
+  20 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r146.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201301181517
+
+*hardened-sources-3.7.1-r2 (07 Jan 2013)
+
+  07 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.1-r2.ebuild:
+  vanilla-3.7.1 + genpatches-3.7-3 + grsecurity-2.9.1-3.7.1-201301041854
+
+*hardened-sources-3.2.36 (07 Jan 2013)
+
+  07 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.36.ebuild:
+  vanilla-3.2.36 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.36-201301032034
+
+*hardened-sources-2.6.32-r145 (07 Jan 2013)
+
+  07 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r145.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201301032033
+
+*hardened-sources-3.7.1-r1 (29 Dec 2012)
+
+  29 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.1-r1.ebuild:
+  vanilla-3.7.1 + genpatches-3.7-2 + grsecurity-2.9.1-3.7.1-201212271953
+
+*hardened-sources-3.2.35-r1 (29 Dec 2012)
+
+  29 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.35-r1.ebuild:
+  vanilla-3.2.35 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.35-201212271951
+
+*hardened-sources-2.6.32-r144 (29 Dec 2012)
+
+  29 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r144.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201212271948
+
+*hardened-sources-3.7.1 (28 Dec 2012)
+
+  28 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.1.ebuild:
+  vanilla-3.7.1 + genpatches-3.7-2 + grsecurity-2.9.1-3.7.1-201212171734
+
+  26 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r143.ebuild, hardened-sources-3.2.35.ebuild,
+  hardened-sources-3.7.0.ebuild:
+  Stable amd64 x86
+
+  17 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r138.ebuild, -hardened-sources-2.6.32-r139.ebuild,
+  -hardened-sources-2.6.32-r140.ebuild, -hardened-sources-2.6.32-r141.ebuild,
+  -hardened-sources-2.6.32-r142.ebuild, -hardened-sources-3.2.33-r1.ebuild,
+  -hardened-sources-3.2.33-r2.ebuild, -hardened-sources-3.2.34-r1.ebuild,
+  -hardened-sources-3.2.34-r2.ebuild, -hardened-sources-3.2.34.ebuild,
+  -hardened-sources-3.6.6-r1.ebuild, -hardened-sources-3.6.6.ebuild,
+  -hardened-sources-3.6.7-r1.ebuild, -hardened-sources-3.6.7.ebuild,
+  -hardened-sources-3.6.8.ebuild:
+  Remove older unstable and buggy versions
+
+*hardened-sources-3.7.0 (17 Dec 2012)
+
+  17 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.7.0.ebuild:
+  vanilla-3.7.0 + genpatches-3.7-1 + grsecurity-2.9.1-3.7.0-201212151422
+
+*hardened-sources-3.2.35 (17 Dec 2012)
+
+  17 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.35.ebuild:
+  vanilla-3.2.35 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.35-201212151420
+
+*hardened-sources-2.6.32-r143 (17 Dec 2012)
+
+  17 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r143.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201212151417
+
+*hardened-sources-3.6.8 (29 Nov 2012)
+
+  29 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.8.ebuild:
+  vanilla-3.6.8 + genpatches-3.6-9 + grsecurity-2.9.1-3.6.8-201211261714
+
+*hardened-sources-3.2.34-r2 (29 Nov 2012)
+
+  29 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.34-r2.ebuild:
+  vanilla-3.2.34 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.34-201211251859
+
+*hardened-sources-2.6.32-r142 (29 Nov 2012)
+
+  29 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r142.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201211261713
+
+*hardened-sources-3.6.7-r1 (27 Nov 2012)
+
+  27 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.7-r1.ebuild:
+  vanilla-3.6.7 + genpatches-3.6-8 + grsecurity-2.9.1-3.6.7-201211221000
+
+*hardened-sources-3.2.34-r1 (27 Nov 2012)
+
+  27 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.34-r1.ebuild:
+  vanilla-3.2.34 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.34-201211221000
+
+*hardened-sources-2.6.32-r141 (27 Nov 2012)
+
+  27 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r141.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201211221000
+
+*hardened-sources-3.6.7 (20 Nov 2012)
+
+  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.7.ebuild:
+  vanilla-3.6.7 + genpatches-3.6-8 + grsecurity-2.9.1-3.6.7-201211181105
+
+*hardened-sources-3.2.34 (20 Nov 2012)
+
+  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.34.ebuild:
+  vanilla-3.2.34 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.34-201211181104
+
+*hardened-sources-2.6.32-r140 (20 Nov 2012)
+
+  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r140.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201211181103
+
+  14 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r137.ebuild, -hardened-sources-3.6.5.ebuild:
+  Drop older unstables. Next stabilization candidates: 2.6.32-r138, 3.2.33-r1,
+  3.6.6
+
+*hardened-sources-3.6.6-r1 (14 Nov 2012)
+
+  14 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.6-r1.ebuild:
+  vanilla-3.6.6 + genpatches-3.6-8 + grsecurity-2.9.1-3.6.6-201211122213, adds
+  user namespace xttars on tmpfs, bug #432434
+
+*hardened-sources-3.2.33-r2 (14 Nov 2012)
+
+  14 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.33-r2.ebuild:
+  vanilla-3.2.33 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.33-201211122213,
+  adds user namespace xttars on tmpfs, bug #432434
+
+*hardened-sources-2.6.32-r139 (14 Nov 2012)
+
+  14 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r139.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201211122212
+
+  08 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r131.ebuild, -hardened-sources-2.6.32-r132.ebuild,
+  -hardened-sources-2.6.32-r133.ebuild, -hardened-sources-2.6.32-r134.ebuild,
+  -hardened-sources-2.6.32-r135.ebuild, -hardened-sources-2.6.32-r136.ebuild,
+  -hardened-sources-3.2.30-r1.ebuild, -hardened-sources-3.2.30-r2.ebuild,
+  -hardened-sources-3.2.30-r3.ebuild, -hardened-sources-3.2.31-r1.ebuild,
+  -hardened-sources-3.2.31.ebuild, -hardened-sources-3.2.32-r1.ebuild,
+  -hardened-sources-3.2.32.ebuild, -hardened-sources-3.2.33.ebuild,
+  -hardened-sources-3.5.4-r2.ebuild, -hardened-sources-3.5.5.ebuild,
+  -hardened-sources-3.5.6.ebuild, -hardened-sources-3.6.1.ebuild,
+  -hardened-sources-3.6.3.ebuild, -hardened-sources-3.6.4.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.6.6 (08 Nov 2012)
+
+  08 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.6.ebuild:
+  vanilla-3.6.6 + genpatches-3.6-8 + grsecurity-2.9.1-3.6.6-201211072001
+
+*hardened-sources-3.2.33-r1 (08 Nov 2012)
+
+  08 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.33-r1.ebuild:
+  vanilla-3.2.33 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.33-201211072000
+
+*hardened-sources-2.6.32-r138 (08 Nov 2012)
+
+  08 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r138.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201211071959
+
+*hardened-sources-3.6.5 (02 Nov 2012)
+
+  02 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.5.ebuild:
+  vanilla-3.6.5 + genpatches-3.6-4 + grsecurity-2.9.1-3.6.5-201210312121
+
+*hardened-sources-3.2.33 (02 Nov 2012)
+
+  02 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.33.ebuild:
+  vanilla-3.2.33 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.33-201210310843
+
+*hardened-sources-2.6.32-r137 (02 Nov 2012)
+
+  02 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r137.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201210310820
+
+*hardened-sources-3.2.32-r1 (31 Oct 2012)
+
+  31 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.32-r1.ebuild:
+  vanilla-3.2.32 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.32-201210291445
+
+*hardened-sources-2.6.32-r136 (31 Oct 2012)
+
+  31 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r136.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201210291444
+
+*hardened-sources-3.6.3 (26 Oct 2012)
+
+  26 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.3.ebuild:
+  vanilla-3.6.3 + genpatches-3.6-4 + grsecurity-2.9.1-3.6.3-201210231942
+
+*hardened-sources-3.2.32 (26 Oct 2012)
+
+  26 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.32.ebuild:
+  vanilla-3.2.32 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.32-201210231935
+
+  24 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.6.2.ebuild:
+  Removed because of bug #439502
+
+*hardened-sources-3.6.2 (17 Oct 2012)
+
+  17 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.2.ebuild:
+  vanilla-3.6.2 + genpatches-3.6-4 + grsecurity-2.9.1-3.6.2-201210151829
+
+*hardened-sources-3.2.31-r1 (17 Oct 2012)
+
+  17 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.31-r1.ebuild:
+  vanilla-3.2.31 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.31-201210121914
+
+*hardened-sources-2.6.32-r135 (17 Oct 2012)
+
+  17 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r135.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201210121913
+
+*hardened-sources-3.6.1 (13 Oct 2012)
+
+  13 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.6.1.ebuild:
+  vanilla-3.6.1 + genpatches-3.6-3 + grsecurity-2.9.1-3.6.1-201210111929
+
+*hardened-sources-3.2.31 (13 Oct 2012)
+
+  13 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.31.ebuild:
+  vanilla-3.2.31 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.31-201210111928
+
+*hardened-sources-2.6.32-r134 (13 Oct 2012)
+
+  13 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r134.ebuild:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201210111928
+
+*hardened-sources-3.5.6 (10 Oct 2012)
+
+  10 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.6.ebuild:
+  vanilla-3.5.6 + genpatches-3.5-6 + grsecurity-2.9.1-3.5.6-201210071716
+
+*hardened-sources-3.2.30-r3 (10 Oct 2012)
+
+  10 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.30-r3.ebuild:
+  vanilla-3.2.30 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.30-201210071704
+
+*hardened-sources-2.6.32-r133 (10 Oct 2012)
+
+  10 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r133.ebuild, metadata.xml:
+  vanilla-2.6.32.60 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.60-201210091739
+
+*hardened-sources-3.5.5 (06 Oct 2012)
+
+  06 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.5.ebuild:
+  vanilla-3.5.5 + genpatches-3.5-5 + grsecurity-2.9.1-3.5.5-201210022020
+
+*hardened-sources-3.2.30-r2 (06 Oct 2012)
+
+  06 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.30-r2.ebuild:
+  vanilla-3.2.30 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.30-201210022019
+
+*hardened-sources-2.6.32-r132 (06 Oct 2012)
+
+  06 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r132.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201210022016
+
+  30 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r110.ebuild, -hardened-sources-3.2.20.ebuild,
+  -hardened-sources-3.4.2-r1.ebuild, -hardened-sources-3.4.2.ebuild:
+  remove oldest stables
+
+  30 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r128.ebuild, -hardened-sources-2.6.32-r129.ebuild,
+  -hardened-sources-3.2.28-r5.ebuild, -hardened-sources-3.2.29.ebuild,
+  -hardened-sources-3.5.3-r3.ebuild, -hardened-sources-3.5.4.ebuild:
+  remove older unstable
+
+  30 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r130.ebuild, hardened-sources-3.2.30.ebuild,
+  hardened-sources-3.5.4-r1.ebuild:
+  stable amd64 x86
+
+*hardened-sources-3.5.4-r2 (25 Sep 2012)
+
+  25 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.4-r2.ebuild:
+  vanilla-3.5.4 + genpatches-3.5-5 + grsecurity-2.9.1-3.5.4-201209241829
+
+*hardened-sources-3.2.30-r1 (25 Sep 2012)
+
+  25 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.30-r1.ebuild:
+  vanilla-3.2.30 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.30-201209241828
+
+*hardened-sources-2.6.32-r131 (25 Sep 2012)
+
+  25 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r131.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201209241828
+
+*hardened-sources-3.5.4-r1 (21 Sep 2012)
+
+  21 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.4-r1.ebuild:
+  vanilla-3.5.4 + genpatches-3.5-5 + grsecurity-2.9.1-3.5.4-201209192118
+
+*hardened-sources-3.2.30 (21 Sep 2012)
+
+  21 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.30.ebuild:
+  vanilla-3.2.30 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.30-201209192117
+
+*hardened-sources-2.6.32-r130 (21 Sep 2012)
+
+  21 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r130.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201209192117
+
+  18 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r122.ebuild, -hardened-sources-2.6.32-r123.ebuild,
+  -hardened-sources-2.6.32-r124.ebuild, -hardened-sources-2.6.32-r125.ebuild,
+  -hardened-sources-2.6.32-r126.ebuild, -hardened-sources-2.6.32-r127.ebuild,
+  -hardened-sources-3.2.27-r2.ebuild, -hardened-sources-3.2.28.ebuild,
+  -hardened-sources-3.2.28-r1.ebuild, -hardened-sources-3.2.28-r2.ebuild,
+  -hardened-sources-3.2.28-r3.ebuild, -hardened-sources-3.2.28-r4.ebuild,
+  -hardened-sources-3.5.2.ebuild, -hardened-sources-3.5.2-r3.ebuild,
+  -hardened-sources-3.5.2-r4.ebuild, -hardened-sources-3.5.3.ebuild,
+  -hardened-sources-3.5.3-r1.ebuild, -hardened-sources-3.5.3-r2.ebuild:
+  Remove older unstable buggy versions, bug #430906, kvm slowdown
+
+*hardened-sources-3.5.4 (18 Sep 2012)
+
+  18 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.4.ebuild:
+  vanilla-3.5.4 + genpatches-3.5-5 + grsecurity-2.9.1-3.5.4-201209171824
+
+*hardened-sources-3.2.29 (18 Sep 2012)
+
+  18 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.29.ebuild:
+  vanilla-3.2.29 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.29-201209171824
+
+*hardened-sources-2.6.32-r129 (18 Sep 2012)
+
+  18 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r129.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201209171823
+
+*hardened-sources-3.5.3-r3 (15 Sep 2012)
+
+  15 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.3-r3.ebuild:
+  vanilla-3.5.3 + genpatches-3.5-4 + grsecurity-2.9.1-3.5.3-201209131726
+
+*hardened-sources-3.2.28-r5 (15 Sep 2012)
+
+  15 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28-r5.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.29-201209122157
+
+*hardened-sources-2.6.32-r128 (15 Sep 2012)
+
+  15 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r128.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201209131725
+
+*hardened-sources-3.5.3-r2 (12 Sep 2012)
+
+  12 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.3-r2.ebuild:
+  vanilla-3.5.3 + genpatches-3.5-4 + grsecurity-2.9.1-3.5.3-201209101830
+
+*hardened-sources-3.2.28-r4 (12 Sep 2012)
+
+  12 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28-r4.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.28-201209101830
+
+*hardened-sources-2.6.32-r127 (12 Sep 2012)
+
+  12 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r127.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201209101829
+
+*hardened-sources-3.5.3-r1 (01 Sep 2012)
+
+  01 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.3-r1.ebuild:
+  vanilla-3.5.3 + genpatches-3.5-4 + grsecurity-2.9.1-3.5.3-201208302015
+
+*hardened-sources-3.2.28-r3 (01 Sep 2012)
+
+  01 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28-r3.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.28-201208302014
+
+*hardened-sources-2.6.32-r126 (01 Sep 2012)
+
+  01 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r126.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208302014
+
+*hardened-sources-3.5.3 (29 Aug 2012)
+
+  29 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.3.ebuild:
+  vanilla-3.5.3 + genpatches-3.5-4 + grsecurity-2.9.1-3.5.3-201208271906
+
+*hardened-sources-3.2.28-r2 (29 Aug 2012)
+
+  29 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28-r2.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.28-201208271905
+
+*hardened-sources-2.6.32-r125 (29 Aug 2012)
+
+  29 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r125.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208271903
+
+  29 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r95.ebuild, -hardened-sources-3.2.11.ebuild:
+  Remove older stables, bug #433092
+
+  26 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r118.ebuild, -hardened-sources-2.6.32-r119.ebuild,
+  -hardened-sources-2.6.32-r120.ebuild, -hardened-sources-2.6.32-r121.ebuild,
+  -hardened-sources-3.2.23-r3.ebuild, -hardened-sources-3.2.24.ebuild,
+  -hardened-sources-3.2.26.ebuild, -hardened-sources-3.2.27.ebuild,
+  -hardened-sources-3.2.27-r1.ebuild, -hardened-sources-3.4.6-r1.ebuild,
+  -hardened-sources-3.4.7.ebuild, -hardened-sources-3.5.0-r1.ebuild,
+  -hardened-sources-3.5.1.ebuild, -hardened-sources-3.5.1-r1.ebuild,
+  -hardened-sources-3.5.1-r2.ebuild:
+  Remove older unstable and buggy versions
+
+*hardened-sources-3.5.2-r4 (26 Aug 2012)
+
+  26 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.2-r4.ebuild:
+  vanilla-3.5.2 + genpatches-3.5-3 + grsecurity-2.9.1-3.5.2-201208241943
+
+*hardened-sources-3.2.28-r1 (26 Aug 2012)
+
+  26 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28-r1.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.28-201208232048
+
+*hardened-sources-2.6.32-r124 (26 Aug 2012)
+
+  26 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r124.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208232048
+
+*hardened-sources-3.5.2-r3 (23 Aug 2012)
+
+  23 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.2-r3.ebuild:
+  vanilla-3.5.2 + genpatches-3.5-3 + grsecurity-2.9.1-3.5.2-201208222031
+
+*hardened-sources-3.2.28 (23 Aug 2012)
+
+  23 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.28.ebuild:
+  vanilla-3.2.28 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.28-201208222030
+
+  23 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r123.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208222030
+
+*hardened-sources-3.5.2 (19 Aug 2012)
+
+  19 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.2.ebuild:
+  vanilla-3.5.2 + genpatches-3.5-3 + grsecurity-2.9.1-3.5.2-201208151951
+
+*hardened-sources-3.2.27-r2 (19 Aug 2012)
+
+  19 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.27-r2.ebuild:
+  vanilla-3.2.27 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.27-201208151951
+
+*hardened-sources-2.6.32-r123 (19 Aug 2012)
+
+  19 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r123.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208151950
+
+*hardened-sources-3.5.1-r2 (16 Aug 2012)
+
+  16 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.1-r2.ebuild:
+  vanilla-3.5.1 + genpatches-3.5-2 + grsecurity-2.9.1-3.5.1-201208132030
+
+*hardened-sources-3.2.27-r1 (16 Aug 2012)
+
+  16 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.27-r1.ebuild:
+  vanilla-3.2.27 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.27-201208132029
+
+*hardened-sources-2.6.32-r122 (16 Aug 2012)
+
+  16 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r122.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208132029
+
+*hardened-sources-3.5.1-r1 (13 Aug 2012)
+
+  13 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.1-r1.ebuild:
+  vanilla-3.5.1 + genpatches-3.5-1 + grsecurity-2.9.1-3.5.1-201208112021
+
+*hardened-sources-3.2.27 (13 Aug 2012)
+
+  13 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.27.ebuild:
+  vanilla-3.2.27 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.27-201208120907
+
+*hardened-sources-2.6.32-r121 (13 Aug 2012)
+
+  13 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r121.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208120916
+
+*hardened-sources-3.5.1 (10 Aug 2012)
+
+  10 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.1.ebuild:
+  vanilla-3.5.1 + genpatches-3.5-1 + grsecurity-2.9.1-3.5.1-201208091728
+
+  09 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r115.ebuild, -hardened-sources-2.6.32-r117.ebuild,
+  -hardened-sources-3.2.23.ebuild, -hardened-sources-3.2.23-r2.ebuild,
+  -hardened-sources-3.4.4-r3.ebuild, -hardened-sources-3.4.6.ebuild:
+  Remove older unstable versions
+
+  09 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.5.0.ebuild:
+  Punt: panic during initrd load on amd64.
+
+*hardened-sources-3.5.0-r1 (09 Aug 2012)
+
+  09 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.0-r1.ebuild:
+  vanilla-3.5.0 + genpatches-3.5-1 + grsecurity-2.9.1-3.5.0-201208081934
+
+  09 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r116.ebuild, hardened-sources-3.2.23-r1.ebuild,
+  hardened-sources-3.4.5.ebuild:
+  Stable on amd64 x86
+
+*hardened-sources-3.5.0 (08 Aug 2012)
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.5.0.ebuild:
+  vanilla-3.5.0 + genpatches-3.5-1 + grsecurity-2.9.1-3.5.0-201208071916
+
+*hardened-sources-3.2.26 (08 Aug 2012)
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.26.ebuild:
+  vanilla-3.2.26 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.26-201208062017
+
+*hardened-sources-2.6.32-r120 (08 Aug 2012)
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r120.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208062015
+
+*hardened-sources-3.4.7 (02 Aug 2012)
+
+  02 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.7.ebuild:
+  vanilla-3.4.7 + genpatches-3.4-8 + grsecurity-2.9.1-3.4.7-201208011850
+
+*hardened-sources-3.2.24 (02 Aug 2012)
+
+  02 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.24.ebuild:
+  vanilla-3.2.24 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.24-201208011849
+
+*hardened-sources-2.6.32-r119 (02 Aug 2012)
+
+  02 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r119.ebuild:
+  vanilla-2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201208011848
+
+*hardened-sources-3.4.6-r1 (26 Jul 2012)
+
+  26 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.6-r1.ebuild:
+  Based on 3.4.6 + genpatches-3.4-6 + grsecurity-2.9.1-3.4.6-201207242237
+
+*hardened-sources-3.2.23-r3 (26 Jul 2012)
+
+  26 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.23-r3.ebuild:
+  Based on 3.2.23 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.23-201207242236
+
+*hardened-sources-2.6.32-r118 (26 Jul 2012)
+
+  26 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r118.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201207242236
+
+*hardened-sources-3.4.6 (22 Jul 2012)
+
+  22 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.6.ebuild:
+  Based on 3.4.6 + genpatches-3.4-6 + grsecurity-2.9.1-3.4.6-201207211444
+
+*hardened-sources-3.2.23-r2 (22 Jul 2012)
+
+  22 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.23-r2.ebuild:
+  Based on 3.2.23 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.23-201207211428
+
+*hardened-sources-2.6.32-r117 (22 Jul 2012)
+
+  22 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r117.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201207211427
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r111.ebuild, -hardened-sources-2.6.32-r112.ebuild,
+  -hardened-sources-2.6.32-r113.ebuild, -hardened-sources-2.6.32-r114.ebuild,
+  -hardened-sources-3.2.20-r1.ebuild, -hardened-sources-3.2.21.ebuild,
+  -hardened-sources-3.2.21-r1.ebuild, -hardened-sources-3.2.21-r2.ebuild,
+  -hardened-sources-3.2.22.ebuild, -hardened-sources-3.4.3.ebuild,
+  -hardened-sources-3.4.3-r1.ebuild, -hardened-sources-3.4.4.ebuild,
+  -hardened-sources-3.4.4-r1.ebuild, -hardened-sources-3.4.4-r2.ebuild:
+  Remove older unstable and buggy versions
+
+*hardened-sources-3.4.5 (19 Jul 2012)
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.5.ebuild:
+  Based on 3.4.5 + genpatches-3.4-6 + grsecurity-2.9.1-3.4.5-201207171624
+
+*hardened-sources-3.2.23-r1 (19 Jul 2012)
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.23-r1.ebuild:
+  Based on 3.2.23 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.23-201207171624
+
+*hardened-sources-2.6.32-r116 (19 Jul 2012)
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r116.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201207161806
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Fix failed signiture on manifest
+
+*hardened-sources-3.4.4-r3 (16 Jul 2012)
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.4-r3.ebuild:
+  Based on 3.4.4 + genpatches-3.4-5 + grsecurity-2.9.1-3.4.4
+
+*hardened-sources-3.2.23 (16 Jul 2012)
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.23.ebuild:
+  Based on 3.2.23 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.23-201207122159
+
+*hardened-sources-2.6.32-r115 (16 Jul 2012)
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r115.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201207150915
+
+*hardened-sources-3.4.4-r2 (11 Jul 2012)
+
+  11 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.4-r2.ebuild:
+  Based on 3.4.4 + genpatches-3.4-5 + grsecurity-2.9.1-3.4.4-201207080925
+
+*hardened-sources-3.2.22 (11 Jul 2012)
+
+  11 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.22.ebuild:
+  Based on 3.2.22 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.22-201207080924
+
+*hardened-sources-2.6.32-r114 (11 Jul 2012)
+
+  11 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r114.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201207080923
+
+  09 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r90.ebuild, -hardened-sources-3.2.2-r1.ebuild:
+  Clean out older stable versions
+
+  08 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r95.ebuild, hardened-sources-2.6.32-r110.ebuild,
+  hardened-sources-2.6.32-r111.ebuild, hardened-sources-2.6.32-r112.ebuild,
+  hardened-sources-2.6.32-r113.ebuild, hardened-sources-3.2.11.ebuild,
+  hardened-sources-3.2.20.ebuild, hardened-sources-3.2.20-r1.ebuild,
+  hardened-sources-3.2.21.ebuild, hardened-sources-3.2.21-r1.ebuild,
+  hardened-sources-3.2.21-r2.ebuild, hardened-sources-3.4.2.ebuild,
+  hardened-sources-3.4.2-r1.ebuild, hardened-sources-3.4.3.ebuild,
+  hardened-sources-3.4.3-r1.ebuild, hardened-sources-3.4.4.ebuild,
+  hardened-sources-3.4.4-r1.ebuild:
+  Consolidate pkg_postinst() message about gradm version
+
+  03 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.4.2-r1.ebuild:
+  Stable amd64
+
+*hardened-sources-3.4.2-r1 (03 Jul 2012)
+
+  03 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.2-r1.ebuild:
+  Based on hardened-sources-3.4.2 + fix for FW_MIPS_FILE_06 regression
+
+*hardened-sources-3.2.21-r2 (01 Jul 2012)
+
+  01 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.21-r2.ebuild:
+  Based on 3.2.21 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.21-201206251800
+
+*hardened-sources-3.4.4-r1 (01 Jul 2012)
+
+  01 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.4-r1.ebuild:
+  Based on 3.4.4 + genpatches-3.4-5 + grsecurity-2.9.1-3.4.4-201206251759
+  Adds new Kconfig structure for Grsec/PaX
+
+  29 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r108.ebuild, -hardened-sources-2.6.32-r109.ebuild,
+  -hardened-sources-3.2.19.ebuild, -hardened-sources-3.2.19-r1.ebuild,
+  -hardened-sources-3.3.8.ebuild, -hardened-sources-3.4.1.ebuild:
+  Remove older unstable versions
+
+  29 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r110.ebuild, hardened-sources-3.2.20.ebuild,
+  hardened-sources-3.4.2.ebuild:
+  Stable on x86 and amd64
+
+*hardened-sources-3.4.4 (25 Jun 2012)
+
+  25 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.4.ebuild:
+  Based on 3.4.4 + genpatches-3.4-5 + grsecurity-2.9.1-3.4.4-201206231147
+
+*hardened-sources-3.2.21-r1 (25 Jun 2012)
+
+  25 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.21-r1.ebuild:
+  Based on 3.2.21 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.21-201206221855
+
+*hardened-sources-2.6.32-r113 (25 Jun 2012)
+
+  25 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r113.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201206221854
+
+*hardened-sources-3.4.3-r1 (22 Jun 2012)
+
+  22 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.3-r1.ebuild:
+  Based on 3.4.3 + genpatches-3.4-4 + grsecurity-2.9.1-3.4.3-201206201813
+
+*hardened-sources-3.2.21 (22 Jun 2012)
+
+  22 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.21.ebuild:
+  Based on 3.2.21 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.21-201206201812
+
+*hardened-sources-2.6.32-r112 (22 Jun 2012)
+
+  22 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r112.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201206201812
+
+*hardened-sources-3.4.3 (18 Jun 2012)
+
+  18 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.3.ebuild:
+  Based on 3.4.2 + genpatches-3.4-2 + grsecurity-2.9.1-3.4.3-201206171836
+  Adds x32 support
+
+*hardened-sources-3.2.20-r1 (18 Jun 2012)
+
+  18 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.20-r1.ebuild:
+  Based on 3.2.20 + genpatches-3.2-15 + grsecurity-2.9.1-3.2.20-201206171957
+
+*hardened-sources-2.6.32-r111 (18 Jun 2012)
+
+  18 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r111.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201206171956
+
+  16 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r9.ebuild, hardened-sources-2.6.32-r42.ebuild,
+  -hardened-sources-2.6.32-r81.ebuild, -hardened-sources-3.0.4-r5.ebuild,
+  -hardened-sources-3.1.5.ebuild:
+  Drop all but last two stable releases in each branch
+
+  13 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.39-r6.ebuild, -hardened-sources-2.6.39-r8.ebuild,
+  -hardened-sources-3.0.4-r4.ebuild:
+  Remove older versions
+
+*hardened-sources-3.4.2 (12 Jun 2012)
+
+  12 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.2.ebuild:
+  Based on 3.4.2 + genpatches-3.4-2 + grsecurity-2.9.1-3.4.2-201206111838
+
+*hardened-sources-3.2.20 (12 Jun 2012)
+
+  12 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.20.ebuild:
+  Based on 3.2.20 + genpatches-3.2-15 + grsecurity-2.9.1-3.2.20-201206111836
+
+*hardened-sources-2.6.32-r110 (12 Jun 2012)
+
+  12 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r110.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201206111836
+
+  11 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r109.ebuild, hardened-sources-3.2.19-r1.ebuild,
+  hardened-sources-3.4.1.ebuild:
+  Fix pkg_postinst() message
+
+*hardened-sources-3.4.1 (11 Jun 2012)
+
+  11 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.1.ebuild:
+  Based on 3.4.1 + genpatches-3.4-1 + grsecurity-2.9.1-3.4.1-201206091540
+
+*hardened-sources-3.2.19-r1 (11 Jun 2012)
+
+  11 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.19-r1.ebuild:
+  Based on 3.2.19 + genpatches-3.2-15 + grsecurity-2.9.1-3.2.19-201206091539
+
+*hardened-sources-2.6.32-r109 (11 Jun 2012)
+
+  11 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r109.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9.1-2.6.32.59-201206091539
+
+  09 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r107.ebuild, -hardened-sources-3.2.18-r1.ebuild,
+  -hardened-sources-3.3.7-r1.ebuild:
+  Remove buggy versions, bug #420005
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r104.ebuild, -hardened-sources-2.6.32-r105.ebuild,
+  -hardened-sources-3.2.17.ebuild, -hardened-sources-3.2.17-r1.ebuild,
+  -hardened-sources-3.3.6.ebuild, -hardened-sources-3.3.6-r1.ebuild:
+  Remove older unstable, bug #417385
+
+*hardened-sources-3.3.8 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.8.ebuild:
+  Based on 3.3.8 + genpatches-3.3-9 + grsecurity-2.9-3.3.8-201206042136
+
+*hardened-sources-3.2.19 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.19.ebuild:
+  Based on 3.2.19 + genpatches-3.2-15 + grsecurity-2.9-3.2.19-201206042135
+
+*hardened-sources-2.6.32-r108 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r108.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201206042134
+
+  02 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r106.ebuild, -hardened-sources-3.2.18.ebuild,
+  -hardened-sources-3.3.7.ebuild:
+  Remove broken versions, bug #418979
+
+*hardened-sources-3.3.7-r1 (02 Jun 2012)
+
+  02 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.7-r1.ebuild:
+  Based on 3.3.7 + genpatches-3.3-8 + grsecurity-2.9-3.3.7-201206011935
+
+*hardened-sources-3.2.18-r1 (02 Jun 2012)
+
+  02 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.18-r1.ebuild:
+  Based on 3.2.18 + genpatches-3.2-14 + grsecurity-2.9-3.2.18-201206011935
+
+*hardened-sources-2.6.32-r107 (02 Jun 2012)
+
+  02 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r107.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201206011934
+
+*hardened-sources-3.3.7 (28 May 2012)
+
+  28 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.7.ebuild:
+  Based on 3.3.7 + genpatches-3.3-8 + grsecurity-2.9-3.3.7-201205271953
+
+*hardened-sources-3.2.18 (28 May 2012)
+
+  28 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.18.ebuild:
+  Based on 3.2.18 + genpatches-3.2-14 + grsecurity-2.9-3.2.18-201205271952
+
+*hardened-sources-2.6.32-r106 (28 May 2012)
+
+  28 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r106.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201205271952
+
+*hardened-sources-3.3.6-r1 (22 May 2012)
+
+  22 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.6-r1.ebuild:
+  Based on 3.3.6 + genpatches-3.3-6 + grsecurity-2.9-3.3.6-201205191125
+
+*hardened-sources-3.2.17-r1 (22 May 2012)
+
+  22 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.17-r1.ebuild:
+  Based on 3.2.17 + genpatches-3.2-14 + grsecurity-2.9-3.2.17-201205191125
+
+*hardened-sources-2.6.32-r105 (22 May 2012)
+
+  22 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r105.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201205191123
+
+  17 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r96.ebuild, -hardened-sources-2.6.32-r99.ebuild,
+  -hardened-sources-3.2.12.ebuild, -hardened-sources-3.2.14-r1.ebuild,
+  -hardened-sources-3.3.1-r1.ebuild:
+  Remove older unstable version
+
+  15 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r100.ebuild, -hardened-sources-2.6.32-r101.ebuild,
+  -hardened-sources-2.6.32-r102.ebuild, -hardened-sources-2.6.32-r103.ebuild,
+  -hardened-sources-3.2.15.ebuild, -hardened-sources-3.2.16.ebuild,
+  -hardened-sources-3.2.16-r1.ebuild, -hardened-sources-3.2.16-r2.ebuild,
+  -hardened-sources-3.3.2.ebuild, -hardened-sources-3.3.3.ebuild,
+  -hardened-sources-3.3.4.ebuild, -hardened-sources-3.3.5.ebuild:
+  Remove versions with buggy Kconfig KERNEXEC and UDEREF dependencies
+
+*hardened-sources-3.3.6 (14 May 2012)
+
+  14 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.6.ebuild:
+  Based on 3.3.6 + genpatches-3.3-6 + grsecurity-2.9-3.3.6-201205131658
+
+*hardened-sources-3.2.17 (14 May 2012)
+
+  14 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.17.ebuild:
+  Based on 3.2.17 + genpatches-3.2-14 + grsecurity-2.9-3.2.17-201205131657
+
+*hardened-sources-2.6.32-r104 (14 May 2012)
+
+  14 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r104.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201205131656
+
+*hardened-sources-3.3.5 (08 May 2012)
+
+  08 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.5.ebuild:
+  Based on 3.3.5 + genpatches-3.3-5 + grsecurity-2.9-3.3.5-201205071839
+
+*hardened-sources-3.2.16-r2 (08 May 2012)
+
+  08 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.16-r2.ebuild:
+  Based on 3.2.16 + genpatches-3.2-14 + grsecurity-2.9-3.2.16-201205071838
+
+*hardened-sources-2.6.32-r103 (08 May 2012)
+
+  08 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r103.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201205071838
+
+*hardened-sources-3.3.4 (02 May 2012)
+
+  02 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.4.ebuild:
+  Based on 3.3.4 + genpatches-3.3-5 + grsecurity-2.9-3.3.4-201204272006
+
+*hardened-sources-3.2.16-r1 (02 May 2012)
+
+  02 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.16-r1.ebuild:
+  Based on 3.2.16 + genpatches-3.2-14 + grsecurity-2.9-3.2.16-201204272005
+
+*hardened-sources-2.6.32-r102 (02 May 2012)
+
+  02 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r102.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201204272005
+
+*hardened-sources-3.3.3 (24 Apr 2012)
+
+  24 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.3.ebuild:
+  Based on 3.3.3 + genpatches-3.3-4 + grsecurity-2.9-3.3.3-201204231833
+
+*hardened-sources-3.2.16 (24 Apr 2012)
+
+  24 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.16.ebuild:
+  Based on 3.2.16 + genpatches-3.2-14 + grsecurity-2.9-3.2.16-201204231833
+
+*hardened-sources-2.6.32-r101 (24 Apr 2012)
+
+  24 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r101.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201204231832
+
+  20 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.5.ebuild:
+  Remove older unstable version
+
+  19 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r95.ebuild, hardened-sources-3.2.11.ebuild:
+  Stable on x86 and amd64
+
+*hardened-sources-3.3.2 (18 Apr 2012)
+
+  18 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.2.ebuild:
+  Based on 3.3.2 + genpatches-3.3-3 + grsecurity-2.9-3.3.2-201204131715
+
+*hardened-sources-3.2.15 (18 Apr 2012)
+
+  18 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.15.ebuild:
+  Based on 3.2.15 + genpatches-3.2-13 + grsecurity-2.9-3.2.15-201204131715
+
+*hardened-sources-2.6.32-r100 (18 Apr 2012)
+
+  18 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r100.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201204131714
+
+  18 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r91.ebuild, -hardened-sources-2.6.32-r92.ebuild,
+  -hardened-sources-2.6.32-r93.ebuild, -hardened-sources-2.6.32-r94.ebuild,
+  -hardened-sources-3.2.6.ebuild, -hardened-sources-3.2.7.ebuild,
+  -hardened-sources-3.2.9.ebuild, -hardened-sources-3.2.9-r1.ebuild:
+  Remove older buggy unstable versions
+
+  09 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r98.ebuild, -hardened-sources-3.2.14.ebuild,
+  -hardened-sources-3.3.1.ebuild:
+  Remove buggy older unstable versions
+
+*hardened-sources-3.3.1-r1 (09 Apr 2012)
+
+  09 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.1-r1.ebuild:
+  Based on 3.3.1 + genpatches-3.3-2 + grsecurity-2.9-3.3.1-201204062021
+
+*hardened-sources-3.2.14-r1 (09 Apr 2012)
+
+  09 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.14-r1.ebuild:
+  Based on 3.2.14 + genpatches-3.2-13 + grsecurity-2.9-3.2.14-201204062020
+
+*hardened-sources-2.6.32-r99 (09 Apr 2012)
+
+  09 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r99.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201204062020
+
+  05 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r97.ebuild, -hardened-sources-3.2.13.ebuild,
+  -hardened-sources-3.3.0.ebuild:
+  Remove older buggy unstable versions
+
+*hardened-sources-3.3.1 (05 Apr 2012)
+
+  05 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.1.ebuild:
+  Based on 3.3.1 + genpatches-3.3-2 + grsecurity-2.9-3.3.1-201204021758
+
+*hardened-sources-3.2.14 (05 Apr 2012)
+
+  05 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.14.ebuild:
+  Based on 3.2.14 + genpatches-3.2-13 + grsecurity-2.9-3.2.14-201204021757
+
+*hardened-sources-2.6.32-r98 (05 Apr 2012)
+
+  05 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r98.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201204010910
+
+*hardened-sources-3.3.0 (29 Mar 2012)
+
+  29 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.3.0.ebuild:
+  Based on 3.3.0 + genpatches-3.3-1 + grsecurity-2.9-3.3.0-201203251922
+
+*hardened-sources-3.2.13 (29 Mar 2012)
+
+  29 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.13.ebuild:
+  Based on 3.2.13 + genpatches-3.2-12 + grsecurity-2.9-3.2.13-201203251921
+
+*hardened-sources-2.6.32-r97 (29 Mar 2012)
+
+  29 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r97.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201203251921
+
+*hardened-sources-3.2.12 (24 Mar 2012)
+
+  24 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.12.ebuild:
+  Based on 3.2.12 + genpatches-3.2-12 + grsecurity-2.9-3.2.12-201203221944
+
+*hardened-sources-2.6.32-r96 (24 Mar 2012)
+
+  24 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r96.ebuild:
+  Based on 2.6.32.59 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.59-201203221943
+
+  21 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.1.10.ebuild:
+  Remove older unstable version
+
+*hardened-sources-3.2.11 (15 Mar 2012)
+
+  15 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.11.ebuild:
+  Based on 3.2.11 + genpatches-3.2-11 + grsecurity-2.9-3.2.11-201203141956
+
+*hardened-sources-2.6.32-r95 (15 Mar 2012)
+
+  15 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r95.ebuild:
+  Based on 2.6.32.58 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.58-201203131839
+
+  09 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r49.ebuild, -hardened-sources-2.6.32-r58.ebuild,
+  -hardened-sources-2.6.32-r68.ebuild, -hardened-sources-2.6.36-r9.ebuild,
+  -hardened-sources-2.6.37-r7.ebuild, -hardened-sources-2.6.38-r6.ebuild:
+  Remove old stable in favor of new stable
+
+*hardened-sources-3.2.9-r1 (09 Mar 2012)
+
+  09 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.9-r1.ebuild:
+  Based on 3.2.9 + genpatches-3.2-10 + grsecurity-2.9-3.2.9-201203062051
+
+*hardened-sources-2.6.32-r94 (09 Mar 2012)
+
+  09 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r94.ebuild:
+  Based on 2.6.32.58 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.58-201203062047
+
+*hardened-sources-3.2.9 (05 Mar 2012)
+
+  05 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.9.ebuild:
+  Based on 3.2.9 + genpatches-3.2-10 + grsecurity-2.9-3.2.9-201203022148
+
+*hardened-sources-2.6.32-r93 (05 Mar 2012)
+
+  05 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r93.ebuild:
+  Based on 2.6.32.57 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.57-201203022148
+
+  04 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r92.ebuild, hardened-sources-3.2.7.ebuild:
+  Added wildcard for emerge GRADM_COMPAT message
+
+*hardened-sources-3.2.7 (25 Feb 2012)
+
+  25 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r92.ebuild, +hardened-sources-3.2.7.ebuild:
+  Based on 3.2.7 + genpatches-3.2-9 + grsecurity-2.9-3.2.7-201202251203
+
+*hardened-sources-2.6.32-r92 (25 Feb 2012)
+
+  25 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r92.ebuild:
+  Based on 2.6.32.57 + genpatches-2.6.32-48 +
+  grsecurity-2.9-2.6.32.57-201202251202
+
+  18 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r89.ebuild, hardened-sources-2.6.32-r90.ebuild:
+  Stable amd64, x86. Removed -r89 because of boot issues, bug #404387
+
+  16 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.2.1.ebuild:
+  Remove another older ~arch 3.x kernel
+
+  16 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.1.4.ebuild, -hardened-sources-3.1.4-r1.ebuild,
+  -hardened-sources-3.1.6.ebuild, -hardened-sources-3.1.7.ebuild,
+  -hardened-sources-3.1.8.ebuild:
+  Remove older ~arch 3.x kernels
+
+  16 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r78.ebuild, -hardened-sources-2.6.32-r79.ebuild,
+  -hardened-sources-2.6.32-r80.ebuild, -hardened-sources-2.6.32-r83.ebuild,
+  -hardened-sources-2.6.32-r84.ebuild, -hardened-sources-2.6.32-r85.ebuild,
+  -hardened-sources-2.6.32-r86.ebuild, -hardened-sources-2.6.32-r87.ebuild:
+  Remove older ~arch 2.6.32 kernels
+
+*hardened-sources-3.2.6 (16 Feb 2012)
+
+  16 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.6.ebuild:
+  Based on 3.2.6 + genpatches-3.2-9 + grsecurity-2.2.2-3.2.6-201202131824
+
+*hardened-sources-2.6.32-r91 (16 Feb 2012)
+
+  16 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r91.ebuild:
+  Based on 2.6.32.57 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.57-201202131842
+
+*hardened-sources-3.2.5 (09 Feb 2012)
+
+  09 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.5.ebuild:
+  Based on 3.2.5 + genpatches-3.2-8 + grsecurity-2.2.2-3.2.5-201202081924
+
+*hardened-sources-2.6.32-r90 (09 Feb 2012)
+
+  09 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r90.ebuild:
+  Based on 2.6.32.56 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.56-201202071726
+
+  29 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r88.ebuild, -hardened-sources-3.2.2.ebuild:
+  Remove versions with sized 0 vmalloc issue
+
+  29 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r89.ebuild, hardened-sources-3.2.2-r1.ebuild:
+  Fast stabilization, address CVE-2012-0056
+
+*hardened-sources-3.2.2-r1 (28 Jan 2012)
+
+  28 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.2-r1.ebuild:
+  Based on 3.2.2 + genpatches-3.2-5 + grsecurity-2.2.2-3.2.2-201201272014
+
+*hardened-sources-2.6.32-r89 (28 Jan 2012)
+
+  28 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r89.ebuild:
+  Based on 2.6.32.55 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.55-201201272054
+
+*hardened-sources-3.2.2 (27 Jan 2012)
+
+  27 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.2.ebuild:
+  Based on 3.2.2 + genpatches-3.2-5 + grsecurity-2.2.2-3.2.2-201201252117
+
+*hardened-sources-2.6.32-r88 (27 Jan 2012)
+
+  27 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r88.ebuild:
+  Based on 2.6.32.55 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.55-201201252116
+
+*hardened-sources-3.2.1 (24 Jan 2012)
+
+  24 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.1.ebuild:
+  Based on 3.2.1 + genpatches-3.2-4 + grsecurity-2.2.2-3.2.1-201201221501
+
+*hardened-sources-2.6.32-r87 (24 Jan 2012)
+
+  24 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r87.ebuild:
+  Based on 2.6.32.54 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.54-201201221635
+
+*hardened-sources-3.1.10 (21 Jan 2012)
+
+  21 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.10.ebuild:
+  Based on 3.1.10 + genpatches-3.1-12 + grsecurity-2.2.2-3.1.10-201201201822
+
+*hardened-sources-2.6.32-r86 (21 Jan 2012)
+
+  21 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r86.ebuild:
+  Based on 2.6.32.54 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.54-201201201821
+
+*hardened-sources-3.1.8 (13 Jan 2012)
+
+  13 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.8.ebuild:
+  Based on 3.1.8 + genpatches-3.1-10 + grsecurity-2.2.2-3.1.8-201201111906
+
+*hardened-sources-2.6.32-r85 (13 Jan 2012)
+
+  13 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r85.ebuild:
+  Based on 2.6.32.53 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.53-201201101724
+
+*hardened-sources-3.1.7 (06 Jan 2012)
+
+  06 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.1.7.ebuild:
+  Based on 3.1.7 + genpatches-3.1-10 + grsecurity-2.2.2-3.1.7-201201032037
+
+*hardened-sources-2.6.32-r84 (06 Jan 2012)
+
+  06 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-2.6.32-r84.ebuild:
+  Based on 2.6.32.52 + genpatches-2.6.32-48 +
+  grsecurity-2.2.2-2.6.32.52-201201031758
+
+  06 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r74.ebuild, -hardened-sources-2.6.32-r75.ebuild,
+  -hardened-sources-2.6.32-r76.ebuild, -hardened-sources-2.6.32-r77.ebuild,
+  -hardened-sources-3.0.8-r1.ebuild, -hardened-sources-3.1.1.ebuild,
+  -hardened-sources-3.1.1-r1.ebuild, -hardened-sources-3.1.3.ebuild:
+  Removed deprecated version
+
+  06 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r81.ebuild, hardened-sources-3.1.5.ebuild:
+  Stable amd64, x86
+
+  01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2011:
+  Split ChangeLog.
+
+  For previous entries, please see ChangeLog-2011.
diff --git a/sys-kernel/hardened-sources/ChangeLog-2015 b/sys-kernel/hardened-sources/ChangeLog-2015
new file mode 100644
index 0000000..48a8451
--- /dev/null
+++ b/sys-kernel/hardened-sources/ChangeLog-2015
@@ -0,0 +1,2169 @@
+# ChangeLog for sys-kernel/hardened-sources
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.1334 2015/08/05 05:21:00 blueness Exp $
+
+*hardened-sources-4.1.4 (05 Aug 2015)
+
+  05 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.4.ebuild:
+  vanilla-4.1.4 + genpatches-4.1-7 + grsecurity-3.1-4.1.4-201508032312
+
+*hardened-sources-3.14.49 (05 Aug 2015)
+
+  05 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.49.ebuild:
+  vanilla-3.14.49 + genpatches-3.14-53 + grsecurity-3.1-3.14.49-201508032312
+
+  03 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.35.ebuild, -hardened-sources-3.2.68.ebuild:
+  Remove older stable versions.
+
+*hardened-sources-4.1.3-r3 (03 Aug 2015)
+
+  03 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.3-r3.ebuild:
+  vanilla-4.1.3 + genpatches-4.1-7 + grsecurity-3.1-4.1.3-201508011613
+
+*hardened-sources-3.14.48-r3 (03 Aug 2015)
+
+  03 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.48-r3.ebuild:
+  vanilla-3.14.48 + genpatches-3.14-53 + grsecurity-3.1-3.14.48-201508020901
+
+*hardened-sources-3.2.69-r13 (03 Aug 2015)
+
+  03 Aug 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r13.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201508020900
+
+  30 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.1.3-r1.ebuild:
+  Remove older unstable version.
+
+*hardened-sources-4.1.3-r2 (30 Jul 2015)
+
+  30 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.3-r2.ebuild:
+  vanilla-4.1.3 + genpatches-4.1-7 + grsecurity-3.1-4.1.3-201507281943
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.48-r1.ebuild, -hardened-sources-4.1.3.ebuild:
+  Remove buggy unstable versions.
+
+*hardened-sources-4.1.3-r1 (27 Jul 2015)
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.3-r1.ebuild:
+  vanilla-4.1.3 + genpatches-4.1-7 + grsecurity-3.1-4.1.3-201507261932
+
+*hardened-sources-3.14.48-r2 (27 Jul 2015)
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.48-r2.ebuild:
+  vanilla-3.14.48 + genpatches-3.14-53 + grsecurity-3.1-3.14.48-201507261203
+
+*hardened-sources-4.1.3 (27 Jul 2015)
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.1.3.ebuild:
+  vanilla-4.1.3 + genpatches-4.1-7 + grsecurity-3.1-4.1.3-201507251419
+
+*hardened-sources-3.14.48-r1 (27 Jul 2015)
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.48-r1.ebuild:
+  vanilla-3.14.48 + genpatches-3.14-53 + grsecurity-3.1-3.14.48-201507251417
+
+*hardened-sources-3.2.69-r12 (27 Jul 2015)
+
+  27 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r12.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201507251415
+
+  21 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.47.ebuild, -hardened-sources-3.2.69-r10.ebuild,
+  -hardened-sources-4.0.7-r1.ebuild:
+  Remove older unstable versions.
+
+  21 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.14.48.ebuild, hardened-sources-3.2.69-r11.ebuild,
+  hardened-sources-4.0.8.ebuild:
+  Stable on amd64 and x86.
+
+*hardened-sources-4.0.8 (12 Jul 2015)
+
+  12 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.8.ebuild:
+  vanilla-4.0.8 + genpatches-4.0-9 + grsecurity-3.1-4.0.8-201507111211
+
+*hardened-sources-3.14.48 (12 Jul 2015)
+
+  12 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.48.ebuild:
+  vanilla-3.14.48 + genpatches-3.14-52 + grsecurity-3.1-3.14.48-201507111210
+
+*hardened-sources-3.2.69-r11 (12 Jul 2015)
+
+  12 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r11.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201507111207
+
+  12 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.43-r4.ebuild, -hardened-sources-3.14.44.ebuild,
+  -hardened-sources-3.14.45-r1.ebuild, -hardened-sources-3.14.46.ebuild,
+  -hardened-sources-3.2.69-r5.ebuild, -hardened-sources-3.2.69-r6.ebuild,
+  -hardened-sources-3.2.69-r8.ebuild, -hardened-sources-3.2.69-r9.ebuild,
+  -hardened-sources-4.0.4-r3.ebuild, -hardened-sources-4.0.4-r4.ebuild,
+  -hardened-sources-4.0.5-r1.ebuild, -hardened-sources-4.0.5.ebuild,
+  -hardened-sources-4.0.6-r2.ebuild, -hardened-sources-4.0.7.ebuild:
+  Remove older unstable versions.
+
+*hardened-sources-4.0.7-r1 (05 Jul 2015)
+
+  05 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.7-r1.ebuild:
+  vanilla-4.0.7 + genpatches-4.0-9 + grsecurity-3.1-4.0.7-201507050833
+
+*hardened-sources-3.14.47 (05 Jul 2015)
+
+  05 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.47.ebuild:
+  vanilla-3.14.47 + genpatches-3.14-52 + grsecurity-3.1-3.14.47-201507050832
+
+*hardened-sources-3.2.69-r10 (05 Jul 2015)
+
+  05 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r10.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201507050830
+
+*hardened-sources-4.0.7 (02 Jul 2015)
+
+  02 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.7.ebuild:
+  vanilla-4.0.7 + genpatches-4.0-8 + grsecurity-3.1-4.0.7-201506300712
+
+*hardened-sources-3.14.46 (02 Jul 2015)
+
+  02 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.46.ebuild:
+  vanilla-3.14.46 + genpatches-3.14-51 + grsecurity-3.1-3.14.46-201506300711
+
+*hardened-sources-3.2.69-r9 (02 Jul 2015)
+
+  02 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r9.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201506300708
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-4.0.6-r1.ebuild:
+  Remove unstable buggy version.
+
+*hardened-sources-4.0.6-r2 (28 Jun 2015)
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.6-r2.ebuild:
+  vanilla-4.0.6 + genpatches-4.0-8 + grsecurity-3.1-4.0.6-201506272327
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.45.ebuild, -hardened-sources-3.2.69-r7.ebuild,
+  -hardened-sources-4.0.6.ebuild:
+  Remove previous unstables buggy versions.
+
+*hardened-sources-4.0.6-r1 (28 Jun 2015)
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.6-r1.ebuild:
+  vanilla-4.0.6 + genpatches-4.0-8 + grsecurity-3.1-4.0.6-201506262047
+
+*hardened-sources-3.14.45-r1 (28 Jun 2015)
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.45-r1.ebuild:
+  vanilla-3.14.45 + genpatches-3.14-51 + grsecurity-3.1-3.14.45-201506262046
+
+*hardened-sources-3.2.69-r8 (28 Jun 2015)
+
+  28 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r8.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201506262041
+
+*hardened-sources-4.0.6 (26 Jun 2015)
+
+  26 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.6.ebuild:
+  vanilla-4.0.6 + genpatches-4.0-8 + grsecurity-3.1-4.0.6-201506232104
+
+*hardened-sources-3.14.45 (26 Jun 2015)
+
+  26 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.45.ebuild:
+  vanilla-3.14.45 + genpatches-3.14-51 + grsecurity-3.1-3.14.45-201506232103
+
+*hardened-sources-3.2.69-r7 (26 Jun 2015)
+
+  26 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r7.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201506232100
+
+*hardened-sources-4.0.5-r1 (18 Jun 2015)
+
+  18 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.5-r1.ebuild:
+  vanilla-4.0.5 + genpatches-4.0-7 + grsecurity-3.1-4.0.5-201506171322
+
+*hardened-sources-4.0.5 (09 Jun 2015)
+
+  09 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.5.ebuild:
+  vanilla-4.0.5 + genpatches-4.0-7 + grsecurity-3.1-4.0.5-201506082251
+
+*hardened-sources-3.14.44 (09 Jun 2015)
+
+  09 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.44.ebuild:
+  vanilla-3.14.44 + genpatches-3.14-50 + grsecurity-3.1-3.14.44-201506082249
+
+*hardened-sources-3.2.69-r6 (09 Jun 2015)
+
+  09 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r6.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201506082246
+
+  09 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.27-r1.ebuild, -hardened-sources-3.14.43-r2.ebuild,
+  -hardened-sources-3.17.7-r1.ebuild, -hardened-sources-3.2.65-r2.ebuild,
+  -hardened-sources-3.2.69-r3.ebuild, -hardened-sources-4.0.4-r2.ebuild,
+  hardened-sources-3.14.43-r3.ebuild, hardened-sources-3.2.69-r4.ebuild:
+  Remove older stable grsec 3.0 series. Mark 3.2.69-r4 and 3.14.43-43 stable on
+  amd64 and x86.
+
+*hardened-sources-4.0.4-r4 (04 Jun 2015)
+
+  04 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.4-r4.ebuild:
+  vanilla-4.0.4 + genpatches-4.0-6 + grsecurity-3.1-4.0.4-201506021902
+
+*hardened-sources-3.14.43-r4 (04 Jun 2015)
+
+  04 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.43-r4.ebuild:
+  vanilla-3.14.43 + genpatches-3.14-49 + grsecurity-3.1-3.14.43-201506021902
+
+*hardened-sources-3.2.69-r5 (04 Jun 2015)
+
+  04 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r5.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201506021858
+
+*hardened-sources-4.0.4-r3 (30 May 2015)
+
+  30 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.4-r3.ebuild:
+  vanilla-4.0.4 + genpatches-4.0-6 + grsecurity-3.1-4.0.4-201505272113
+
+*hardened-sources-3.14.43-r3 (30 May 2015)
+
+  30 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.43-r3.ebuild:
+  vanilla-3.14.43 + genpatches-3.14-49 + grsecurity-3.1-3.14.43-201505272112
+
+*hardened-sources-3.2.69-r4 (30 May 2015)
+
+  30 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r4.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201505272108
+
+  24 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.43-r1.ebuild, -hardened-sources-4.0.4-r1.ebuild:
+  Remove older unstable.
+
+*hardened-sources-3.14.43-r2 (24 May 2015)
+
+  24 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.43-r2.ebuild:
+  vanilla-3.14.43 + genpatches-3.14-49 + grsecurity-3.1-3.14.43-201505222221
+
+*hardened-sources-4.0.4-r2 (24 May 2015)
+
+  24 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.4-r2.ebuild:
+  vanilla-4.0.4 + genpatches-4.0-6 + grsecurity-3.1-4.0.4-201505222222
+
+  20 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.43.ebuild, -hardened-sources-3.2.69-r2.ebuild,
+  -hardened-sources-4.0.4.ebuild:
+  Remove older buggy unstable versions.
+
+*hardened-sources-4.0.4-r1 (20 May 2015)
+
+  20 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.4-r1.ebuild:
+  vanilla-4.0.4 + genpatches-4.0-5 + grsecurity-3.1-4.0.4-201505182014
+
+*hardened-sources-3.14.43-r1 (20 May 2015)
+
+  20 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.43-r1.ebuild:
+  vanilla-3.14.43 + genpatches-3.14-47 + grsecurity-3.1-3.14.43-201505191737
+
+*hardened-sources-3.2.69-r3 (20 May 2015)
+
+  20 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r3.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201505181926
+
+*hardened-sources-4.0.4 (18 May 2015)
+
+  18 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.4.ebuild:
+  vanilla-4.0.4 + genpatches-4.0-5 + grsecurity-3.1-4.0.4-201505171737
+
+*hardened-sources-3.14.43 (18 May 2015)
+
+  18 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.43.ebuild:
+  vanilla-3.14.43 + genpatches-3.14-47 + grsecurity-3.1-3.14.43-201505171736
+
+*hardened-sources-3.2.69-r2 (18 May 2015)
+
+  18 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r2.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201505171733
+
+  18 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.40-r2.ebuild, -hardened-sources-3.14.40-r3.ebuild,
+  -hardened-sources-3.14.41-r1.ebuild, -hardened-sources-3.14.41.ebuild,
+  -hardened-sources-3.14.42-r1.ebuild, -hardened-sources-3.19.6-r2.ebuild,
+  -hardened-sources-3.2.68-r10.ebuild, -hardened-sources-3.2.68-r8.ebuild,
+  -hardened-sources-3.2.68-r9.ebuild, -hardened-sources-3.2.69-r1.ebuild,
+  -hardened-sources-3.2.69.ebuild, -hardened-sources-4.0.1.ebuild,
+  -hardened-sources-4.0.2-r1.ebuild, -hardened-sources-4.0.2.ebuild,
+  -hardened-sources-4.0.3-r1.ebuild:
+  Remove older buggy unstable versions.
+
+*hardened-sources-4.0.3-r1 (16 May 2015)
+
+  16 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.3-r1.ebuild:
+  vanilla-4.0.3 + genpatches-4.0-2 + grsecurity-3.1-4.0.3-201505141746
+
+*hardened-sources-3.14.42-r1 (16 May 2015)
+
+  16 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.42-r1.ebuild:
+  vanilla-3.14.42 + genpatches-3.14-46 + grsecurity-3.1-3.14.42-201505141745
+
+*hardened-sources-3.2.69-r1 (16 May 2015)
+
+  16 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69-r1.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201505141743
+
+*hardened-sources-4.0.2-r1 (11 May 2015)
+
+  11 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.2-r1.ebuild:
+  vanilla-4.0.2 + genpatches-4.0-2 + grsecurity-3.1-4.0.2-201505101122
+
+*hardened-sources-3.14.41-r1 (11 May 2015)
+
+  11 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.41-r1.ebuild:
+  vanilla-3.14.41 + genpatches-3.14-46 + grsecurity-3.1-3.14.41-201505101121
+
+*hardened-sources-3.2.69 (11 May 2015)
+
+  11 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.69.ebuild:
+  vanilla-3.2.69 + genpatches-3.2-16 + grsecurity-3.1-3.2.69-201505101117
+
+*hardened-sources-4.0.2 (10 May 2015)
+
+  10 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.2.ebuild:
+  vanilla-4.0.2 + genpatches-4.0-2 + grsecurity-3.1-4.0.2-201505091724
+
+*hardened-sources-3.14.41 (10 May 2015)
+
+  10 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.41.ebuild:
+  vanilla-3.14.41 + genpatches-3.14-46 + grsecurity-3.1-3.14.41-201505091723
+
+*hardened-sources-3.2.68-r10 (10 May 2015)
+
+  10 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r10.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201505091720
+
+*hardened-sources-4.0.1 (06 May 2015)
+
+  06 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-4.0.1.ebuild:
+  vanilla-4.0.1 + genpatches-4.0-2 + grsecurity-3.1-4.0.1-201505042053
+
+*hardened-sources-3.14.40-r3 (06 May 2015)
+
+  06 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.40-r3.ebuild:
+  vanilla-3.14.40 + genpatches-3.14-44 + grsecurity-3.1-3.14.40-201505042052
+
+*hardened-sources-3.2.68-r9 (06 May 2015)
+
+  06 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r9.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201505042051
+
+  06 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.38.ebuild, -hardened-sources-3.14.39-r1.ebuild,
+  -hardened-sources-3.14.39.ebuild, -hardened-sources-3.19.4.ebuild,
+  -hardened-sources-3.19.5-r1.ebuild, -hardened-sources-3.19.5.ebuild,
+  -hardened-sources-3.2.68-r5.ebuild:
+  Remove all unstable except for next release candidates.
+
+  04 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.40-r1.ebuild, -hardened-sources-3.19.6-r1.ebuild,
+  -hardened-sources-3.2.68-r7.ebuild:
+  Remove earlier buggy version.
+
+*hardened-sources-3.19.6-r2 (04 May 2015)
+
+  04 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.6-r2.ebuild:
+  vanilla-3.19.6 + genpatches-3.19-6 + grsecurity-3.1-3.19.6-201505021013
+
+*hardened-sources-3.14.40-r2 (04 May 2015)
+
+  04 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.40-r2.ebuild:
+  vanilla-3.14.40 + genpatches-3.14-44 + grsecurity-3.1-3.14.40-201505021012
+
+*hardened-sources-3.2.68-r8 (04 May 2015)
+
+  04 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r8.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201505021011
+
+  02 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.40.ebuild, -hardened-sources-3.19.6.ebuild,
+  -hardened-sources-3.2.68-r6.ebuild:
+  Remove older buggy versions.
+
+*hardened-sources-3.19.6-r1 (02 May 2015)
+
+  02 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.6-r1.ebuild:
+  vanilla-3.19.6 + genpatches-3.19-6 + grsecurity-3.1-3.19.6-201504302119
+
+*hardened-sources-3.14.40-r1 (02 May 2015)
+
+  02 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.40-r1.ebuild:
+  vanilla-3.14.40 + genpatches-3.14-44 + grsecurity-3.1-3.14.40-201504302118
+
+*hardened-sources-3.2.68-r7 (02 May 2015)
+
+  02 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r7.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201504302116
+
+*hardened-sources-3.19.6 (30 Apr 2015)
+
+  30 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.6.ebuild:
+  vanilla-3.19.6 + genpatches-3.19-6 + grsecurity-3.1-3.19.6-201504290821
+
+*hardened-sources-3.14.40 (30 Apr 2015)
+
+  30 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.40.ebuild:
+  vanilla-3.14.40 + genpatches-3.14-44 + grsecurity-3.1-3.14.40-201504290821
+
+*hardened-sources-3.19.5-r1 (29 Apr 2015)
+
+  29 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.5-r1.ebuild:
+  vanilla-3.19.5 + genpatches-3.19-6 + grsecurity-3.1-3.19.5-201504270827
+
+*hardened-sources-3.14.39-r1 (29 Apr 2015)
+
+  29 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.39-r1.ebuild:
+  vanilla-3.14.39 + genpatches-3.14-44 + grsecurity-3.1-3.14.39-201504270826
+
+*hardened-sources-3.2.68-r6 (29 Apr 2015)
+
+  29 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r6.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201504270825
+
+*hardened-sources-3.19.5 (21 Apr 2015)
+
+  21 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.5.ebuild:
+  vanilla-3.19.5 + genpatches-3.19-6 + grgrsecurity-3.1-3.19.5-201504190814
+
+*hardened-sources-3.14.39 (21 Apr 2015)
+
+  21 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.39.ebuild:
+  vanilla-3.14.39 + genpatches-3.14-44 + grsecurity-3.1-3.14.39-201504190814
+
+  15 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.35-r1.ebuild, -hardened-sources-3.14.36-r1.ebuild,
+  -hardened-sources-3.14.37-r1.ebuild, -hardened-sources-3.14.37.ebuild,
+  -hardened-sources-3.19.1.ebuild, -hardened-sources-3.19.2-r1.ebuild,
+  -hardened-sources-3.19.3-r1.ebuild, -hardened-sources-3.19.3.ebuild,
+  -hardened-sources-3.2.68-r1.ebuild, -hardened-sources-3.2.68-r3.ebuild,
+  -hardened-sources-3.2.68-r4.ebuild:
+  Remove older unstable versions.
+
+*hardened-sources-3.19.4 (15 Apr 2015)
+
+  15 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.4.ebuild:
+  vanilla-3.19.4 + genpatches-3.19-4 + grsecurity-3.1-3.19.4-201504142300
+
+*hardened-sources-3.14.38 (15 Apr 2015)
+
+  15 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.38.ebuild:
+  vanilla-3.14.38 + genpatches-3.14-42 + grsecurity-3.1-3.14.38-201504142259
+
+*hardened-sources-3.2.68-r5 (15 Apr 2015)
+
+  15 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r5.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201504142258
+
+*hardened-sources-3.19.3-r1 (07 Apr 2015)
+
+  07 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.3-r1.ebuild:
+  vanilla-3.19.3 + genpatches-3.19-3 + grsecurity-3.1-3.19.3-201504021826
+
+*hardened-sources-3.14.37-r1 (07 Apr 2015)
+
+  07 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.37-r1.ebuild:
+  vanilla-3.14.37 + genpatches-3.14-41 + grsecurity-3.1-3.14.37-201504051405
+
+*hardened-sources-3.2.68-r4 (07 Apr 2015)
+
+  07 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r4.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201504021823
+
+*hardened-sources-3.19.3 (28 Mar 2015)
+
+  28 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.3.ebuild:
+  vanilla-3.19.3 + genpatches-3.19-3 + grsecurity-3.1-3.19.3-201503270049
+
+*hardened-sources-3.14.37 (28 Mar 2015)
+
+  28 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.37.ebuild:
+  vanilla-3.14.37 + genpatches-3.14-41 + grsecurity-3.1-3.14.37-201503270048
+
+  26 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.17-r1.ebuild, -hardened-sources-3.15.10-r1.ebuild,
+  -hardened-sources-3.2.62-r1.ebuild, hardened-sources-3.14.35.ebuild,
+  hardened-sources-3.18.9.ebuild, hardened-sources-3.2.68.ebuild:
+  Stable on amd64 and x86.  Remove oldest stables.
+
+  26 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.36.ebuild, -hardened-sources-3.19.2.ebuild,
+  -hardened-sources-3.2.68-r2.ebuild:
+  Remove older buggy versions.
+
+*hardened-sources-3.19.2-r1 (26 Mar 2015)
+
+  26 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.2-r1.ebuild:
+  vanilla-3.19.2 + genpatches-3.19-3 + grsecurity-3.1-3.19.2-201503251807
+
+*hardened-sources-3.14.36-r1 (26 Mar 2015)
+
+  26 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.36-r1.ebuild:
+  vanilla-3.14.36 + genpatches-3.14-41 + grsecurity-3.1-3.14.36-201503251807
+
+*hardened-sources-3.2.68-r3 (26 Mar 2015)
+
+  26 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r3.ebuild, -hardened-sources-3.14.31-r1.ebuild,
+  -hardened-sources-3.14.33-r1.ebuild, -hardened-sources-3.14.33.ebuild,
+  -hardened-sources-3.14.34.ebuild, -hardened-sources-3.18.5-r1.ebuild,
+  -hardened-sources-3.18.7-r1.ebuild, -hardened-sources-3.18.7.ebuild,
+  -hardened-sources-3.18.8.ebuild, -hardened-sources-3.2.66-r5.ebuild,
+  -hardened-sources-3.2.67-r1.ebuild, -hardened-sources-3.2.67-r2.ebuild,
+  -hardened-sources-3.2.67.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201503251805
+
+*hardened-sources-3.19.2 (21 Mar 2015)
+
+  21 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.19.2.ebuild:
+  vanilla-3.19.2 + genpatches-3.19-3 + grsecurity-3.1-3.19.2-201503201903
+
+*hardened-sources-3.14.36 (21 Mar 2015)
+
+  21 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.36.ebuild:
+  vanilla-3.14.36 + genpatches-3.14-41 + grsecurity-3.1-3.14.36-201503182218
+
+*hardened-sources-3.2.68-r2 (21 Mar 2015)
+
+  21 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r2.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201503182213
+
+*hardened-sources-3.14.35-r1 (15 Mar 2015)
+
+  15 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.35-r1.ebuild:
+  vanilla-3.14.35 + genpatches-3.14-39 + grsecurity-3.1-3.14.35-201503092203
+
+*hardened-sources-3.2.68-r1 (15 Mar 2015)
+
+  15 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68-r1.ebuild:
+  vanilla-3.2.68 + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201503092202
+
+*hardened-sources-3.18.9 (11 Mar 2015)
+
+  11 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.9.ebuild:
+  vanilla-3.18.9 + genpatches-3.18-10 + grsecurity-3.1-3.18.9-201503071142
+
+*hardened-sources-3.14.35 (11 Mar 2015)
+
+  11 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.35.ebuild:
+  vanilla-3.14.35  + genpatches-3.14-39 + grsecurity-3.1-3.14.35-201503071140
+
+*hardened-sources-3.2.68 (11 Mar 2015)
+
+  11 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.68.ebuild:
+  vanilla-3.2.68  + genpatches-3.2-16 + grsecurity-3.1-3.2.68-201503071137
+
+*hardened-sources-3.18.8 (01 Mar 2015)
+
+  01 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.8.ebuild:
+  vanilla-3.18.8 + genpatches-3.18-10 + grsecurity-3.1-3.18.8-201502271843
+
+*hardened-sources-3.14.34 (01 Mar 2015)
+
+  01 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.34.ebuild:
+  vanilla-3.14.34 + genpatches-3.14-39 + grsecurity-3.1-3.14.34-201502271838
+
+*hardened-sources-3.2.67-r2 (01 Mar 2015)
+
+  01 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.67-r2.ebuild:
+  vanilla-3.2.67 + genpatches-3.2-16 + grsecurity-3.1-3.2.67-201502271837
+
+*hardened-sources-3.18.7-r1 (24 Feb 2015)
+
+  24 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.7-r1.ebuild:
+  vanilla-3.18.7 + genpatches-3.18-9 + grsecurity-3.1-3.18.7-201502222138
+
+*hardened-sources-3.14.33-r1 (24 Feb 2015)
+
+  24 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.33-r1.ebuild:
+  vanilla-3.14.33 + genpatches-3.14-38 + grsecurity-3.1-3.14.33-201502222137
+
+*hardened-sources-3.2.67-r1 (24 Feb 2015)
+
+  24 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.67-r1.ebuild:
+  vanilla-3.2.67 + genpatches-3.2-16 + grsecurity-3.1-3.2.67-201502222131
+
+*hardened-sources-3.18.7 (21 Feb 2015)
+
+  21 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.7.ebuild:
+  vanilla-3.18.7 + genpatches-3.18-9 + grsecurity-3.0-3.18.7-201502200813
+
+*hardened-sources-3.14.33 (21 Feb 2015)
+
+  21 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.33.ebuild:
+  vanilla-3.14.33 + genpatches-3.14-38 + grsecurity-3.0-3.14.33-201502200812
+
+*hardened-sources-3.2.67 (21 Feb 2015)
+
+  21 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.67.ebuild:
+  vanilla-3.2.67 + genpatches-3.2-16 + grsecurity-3.0-3.2.67-201502200807
+
+  07 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.28-r1.ebuild, -hardened-sources-3.14.29.ebuild,
+  -hardened-sources-3.14.30.ebuild, -hardened-sources-3.14.31.ebuild,
+  -hardened-sources-3.18.2-r1.ebuild, -hardened-sources-3.18.3.ebuild,
+  -hardened-sources-3.18.4.ebuild, -hardened-sources-3.18.5.ebuild,
+  -hardened-sources-3.2.66-r2.ebuild, -hardened-sources-3.2.66-r3.ebuild,
+  -hardened-sources-3.2.66-r4.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.18.5-r1 (07 Feb 2015)
+
+  07 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.5-r1.ebuild:
+  vanilla-3.18.4 + genpatches-3.18-6 + grsecurity-3.0-3.18.5-201502052352
+
+*hardened-sources-3.14.31-r1 (07 Feb 2015)
+
+  07 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.31-r1.ebuild:
+  vanilla-3.14.31 + genpatches-3.14-36 + grsecurity-3.0-3.14.31-201502052352
+
+*hardened-sources-3.2.66-r5 (07 Feb 2015)
+
+  07 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66-r5.ebuild:
+  vanilla-3.2.66 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201502052350
+
+*hardened-sources-3.18.5 (02 Feb 2015)
+
+  02 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.5.ebuild:
+  vanilla-3.18.5 + genpatches-3.18-7 + grsecurity-3.0-3.18.5-201501310706
+
+*hardened-sources-3.14.31 (02 Feb 2015)
+
+  02 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.31.ebuild:
+  vanilla-3.14.31 + genpatches-3.14-36 + grsecurity-3.0-3.14.31-201501310705
+
+*hardened-sources-3.18.4 (29 Jan 2015)
+
+  29 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.4.ebuild:
+  vanilla-3.18.4 + genpatches-3.18-6 + grsecurity-3.0-3.18.4-201501272307
+
+*hardened-sources-3.14.30 (29 Jan 2015)
+
+  29 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.30.ebuild:
+  vanilla-3.14.30 + genpatches-3.14-35 + grsecurity-3.0-3.14.30-201501272307
+
+*hardened-sources-3.2.66-r4 (29 Jan 2015)
+
+  29 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66-r4.ebuild:
+  vanilla-3.2.66 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201501272306
+
+*hardened-sources-3.18.3 (24 Jan 2015)
+
+  24 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.3.ebuild:
+  vanilla-3.18.3  + genpatches-3.18-5 + grsecurity-3.0-3.18.3-201501211944
+
+*hardened-sources-3.14.29 (24 Jan 2015)
+
+  24 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.29.ebuild:
+  vanilla-3.14.29 + genpatches-3.14-34 + grsecurity-3.0-3.14.29-201501211943
+
+*hardened-sources-3.2.66-r3 (23 Jan 2015)
+
+  23 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66-r3.ebuild:
+  vanilla-3.2.66 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201501211939
+
+  16 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.27-r3.ebuild, -hardened-sources-3.14.28.ebuild,
+  -hardened-sources-3.18.1-r1.ebuild, -hardened-sources-3.18.2.ebuild,
+  -hardened-sources-3.2.66-r1.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.18.2-r1 (16 Jan 2015)
+
+  16 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.2-r1.ebuild:
+  vanilla-3.18.2 + genpatches-3.18-4 + grsecurity-3.0-3.18.2-201501142325
+
+*hardened-sources-3.14.28-r1 (16 Jan 2015)
+
+  16 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.28-r1.ebuild:
+  vanilla-3.14.28 + genpatches-3.14-32 + grsecurity-3.0-3.14.28-201501142323
+
+*hardened-sources-3.2.66-r2 (16 Jan 2015)
+
+  16 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66-r2.ebuild:
+  vanilla-3.2.64 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201501142321
+
+*hardened-sources-3.18.2 (13 Jan 2015)
+
+  13 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.2.ebuild:
+  vanilla-3.18.2 + genpatches-3.18-4 + grsecurity-3.0-3.18.2-201501120821
+
+*hardened-sources-3.14.28 (13 Jan 2015)
+
+  13 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.28.ebuild:
+  vanilla-3.14.28 + genpatches-3.14-32 + grsecurity-3.0-3.14.28-201501120819
+
+*hardened-sources-3.2.66-r1 (13 Jan 2015)
+
+  13 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66-r1.ebuild, -hardened-sources-3.2.66.ebuild:
+  vanilla-3.2.66 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201501111416
+
+*hardened-sources-3.18.1-r1 (07 Jan 2015)
+
+  07 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.18.1-r1.ebuild:
+  vanilla-3.18.1 + genpatches-3.18-2 + grsecurity-3.0-3.18.1-201501042021
+
+*hardened-sources-3.14.27-r3 (07 Jan 2015)
+
+  07 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.27-r3.ebuild:
+  vanilla-3.14.27 + genpatches-3.14-32 + grsecurity-3.0-3.14.27-201501042018
+
+*hardened-sources-3.2.66 (07 Jan 2015)
+
+  07 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.66.ebuild:
+  vanilla-3.2.66 + genpatches-3.2-16 + grsecurity-3.0-3.2.66-201501051839
+
+  30 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.12-r2.ebuild, -hardened-sources-3.14.15.ebuild,
+  -hardened-sources-3.14.25-r1.ebuild, -hardened-sources-3.14.26.ebuild,
+  -hardened-sources-3.14.27.ebuild, -hardened-sources-3.15.5-r2.ebuild,
+  -hardened-sources-3.15.8.ebuild, -hardened-sources-3.17.4-r1.ebuild,
+  -hardened-sources-3.17.6.ebuild, -hardened-sources-3.17.7.ebuild,
+  -hardened-sources-3.2.61-r2.ebuild, -hardened-sources-3.2.61-r5.ebuild,
+  -hardened-sources-3.2.64-r3.ebuild, -hardened-sources-3.2.64-r4.ebuild,
+  -hardened-sources-3.2.65-r1.ebuild, hardened-sources-3.14.27-r1.ebuild,
+  hardened-sources-3.17.7-r1.ebuild, hardened-sources-3.2.65-r2.ebuild:
+  Stable on amd64 and x86.  Remove older stable versions.
+
+*hardened-sources-3.17.7-r1 (23 Dec 2014)
+
+  23 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.7-r1.ebuild:
+  vanilla-3.17.7 + genpatches-3.17-10 + grsecurity-3.0-3.17.7-201412211910
+
+*hardened-sources-3.14.27-r1 (23 Dec 2014)
+
+  23 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.27-r1.ebuild:
+  vanilla-3.14.27 + genpatches-3.14-32 + grsecurity-3.0-3.14.27-201412211908
+
+*hardened-sources-3.2.65-r2 (23 Dec 2014)
+
+  23 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.65-r2.ebuild:
+  vanilla-3.2.65 + genpatches-3.2-16 + grsecurity-3.0-3.2.65-201412211905
+
+*hardened-sources-3.17.7 (18 Dec 2014)
+
+  18 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.7.ebuild:
+  vanilla-3.17.7 + genpatches-3.17-10 + grsecurity-3.0-3.17.7-201412170700
+
+*hardened-sources-3.14.27 (18 Dec 2014)
+
+  18 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.27.ebuild:
+  vanilla-3.14.27 + genpatches-3.14-32 + grsecurity-3.0-3.14.27-201412170659
+
+*hardened-sources-3.2.65-r1 (18 Dec 2014)
+
+  18 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.65-r1.ebuild:
+  vanilla-3.2.64 + genpatches-3.2-16 + grsecurity-3.0-3.2.65-201412170654
+
+*hardened-sources-3.17.6 (09 Dec 2014)
+
+  09 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.6.ebuild:
+  vanilla-3.17.6 + genpatches-3.17-8 + grsecurity-3.0-3.17.6-201412071639
+
+*hardened-sources-3.14.26 (09 Dec 2014)
+
+  09 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.26.ebuild:
+  vanilla-3.14.26 + genpatches-3.14-29 + grsecurity-3.0-3.14.26-201412071005
+
+*hardened-sources-3.2.64-r4 (09 Dec 2014)
+
+  09 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.64-r4.ebuild:
+  vanilla-3.2.64 + genpatches-3.2-16 + grsecurity-3.0-3.2.64-201412040015
+
+  09 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.19.ebuild, -hardened-sources-3.14.22-r1.ebuild,
+  -hardened-sources-3.14.23-r1.ebuild, -hardened-sources-3.14.23.ebuild,
+  -hardened-sources-3.14.24.ebuild, -hardened-sources-3.14.25.ebuild,
+  -hardened-sources-3.16.3.ebuild, -hardened-sources-3.17.1-r1.ebuild,
+  -hardened-sources-3.17.2-r1.ebuild, -hardened-sources-3.17.2.ebuild,
+  -hardened-sources-3.17.3.ebuild, -hardened-sources-3.17.4.ebuild,
+  -hardened-sources-3.2.63-r1.ebuild, -hardened-sources-3.2.63-r7.ebuild,
+  -hardened-sources-3.2.63-r8.ebuild, -hardened-sources-3.2.63-r9.ebuild,
+  -hardened-sources-3.2.64-r1.ebuild, -hardened-sources-3.2.64-r2.ebuild,
+  -hardened-sources-3.2.64.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.17.4-r1 (27 Nov 2014)
+
+  27 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.4-r1.ebuild:
+  vanilla-3.17.4 + genpatches-3.17-7 + grsecurity-3.0-3.17.4-201411260107
+
+*hardened-sources-3.14.25-r1 (27 Nov 2014)
+
+  27 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.25-r1.ebuild:
+  vanilla-3.14.25 + genpatches-3.14-29 + grsecurity-3.0-3.14.25-201411260106
+
+*hardened-sources-3.2.64-r3 (27 Nov 2014)
+
+  27 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.64-r3.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.64-201411260105
+
+*hardened-sources-3.17.4 (23 Nov 2014)
+
+  23 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.4.ebuild:
+  vanilla-3.17.4 + genpatches-3.17-7 + grsecurity-3.0-3.17.4-201411220955
+
+*hardened-sources-3.14.25 (23 Nov 2014)
+
+  23 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.25.ebuild:
+  vanilla-3.14.25 + genpatches-3.14-29 + grsecurity-3.0-3.14.25-201411220954
+
+*hardened-sources-3.2.64-r2 (23 Nov 2014)
+
+  23 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.64-r2.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.64-201411220952
+
+*hardened-sources-3.17.3 (15 Nov 2014)
+
+  15 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.3.ebuild:
+  vanilla-3.17.3 + genpatches-3.17.4 + grsecurity-3.0-3.17.3-201411150027
+
+*hardened-sources-3.14.24 (15 Nov 2014)
+
+  15 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.24.ebuild:
+  vanilla-3.14.24 + genpatches-3.14-28 + grsecurity-3.0-3.14.24-201411150026
+
+*hardened-sources-3.2.64-r1 (15 Nov 2014)
+
+  15 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.64-r1.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.64-201411150025
+
+*hardened-sources-3.14.23-r1 (09 Nov 2014)
+
+  09 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.23-r1.ebuild:
+  vanilla-3.14.23 + genpatches-3.14-28 + grsecurity-3.0-3.14.23-201411062033
+
+*hardened-sources-3.2.64 (09 Nov 2014)
+
+  09 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.64.ebuild:
+  vanilla-3.2.64 + genpatches-3.2-16 + grsecurity-3.0-3.2.64-201411062032
+
+*hardened-sources-3.2.63-r9 (04 Nov 2014)
+
+  04 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r9.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201411020808
+
+*hardened-sources-3.17.2 (02 Nov 2014)
+
+  02 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.2.ebuild:
+  vanilla-3.17.2 + genpatches-3.17.4 + grsecurity-3.0-3.17.2-201410312213
+
+*hardened-sources-3.14.23 (02 Nov 2014)
+
+  02 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.23.ebuild:
+  vanilla-3.14.23 + genpatches-3.14-26 + grsecurity-3.0-3.14.23-201410312212
+
+*hardened-sources-3.2.63-r8 (02 Nov 2014)
+
+  02 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r8.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201410312211
+
+  01 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.19-r1.ebuild, -hardened-sources-3.14.20-r1.ebuild,
+  -hardened-sources-3.14.21.ebuild, -hardened-sources-3.14.22.ebuild,
+  -hardened-sources-3.16.3-r1.ebuild, -hardened-sources-3.16.4-r1.ebuild,
+  -hardened-sources-3.16.5.ebuild, -hardened-sources-3.17.1.ebuild,
+  -hardened-sources-3.2.63-r2.ebuild, -hardened-sources-3.2.63-r3.ebuild,
+  -hardened-sources-3.2.63-r4.ebuild, -hardened-sources-3.2.63-r6.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.17.1-r1 (27 Oct 2014)
+
+  27 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.1-r1.ebuild:
+  vanilla-3.17.1 + genpatches-3.17.3 + grsecurity-3.0-3.17.1-201410250027
+
+*hardened-sources-3.14.22-r1 (27 Oct 2014)
+
+  27 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.22-r1.ebuild:
+  vanilla-3.14.22 + genpatches-3.14-26 + grsecurity-3.0-3.14.22-201410250026
+
+*hardened-sources-3.2.63-r7 (27 Oct 2014)
+
+  27 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r7.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201410250023
+
+*hardened-sources-3.2.63-r6 (24 Oct 2014)
+
+  24 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r6.ebuild, -hardened-sources-3.2.63-r5.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201410201736
+
+*hardened-sources-3.17.1 (20 Oct 2014)
+
+  20 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.17.1.ebuild:
+  vanilla-3.17.1 + genpatches-3.17.3 + grsecurity-3.0-3.17.1-201410192051
+
+*hardened-sources-3.14.22 (20 Oct 2014)
+
+  20 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.22.ebuild:
+  vanilla-3.14.22 + genpatches-3.14-26 + grsecurity-3.0-3.14.22-201410192047
+
+*hardened-sources-3.2.63-r5 (20 Oct 2014)
+
+  20 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r5.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201410192044
+
+*hardened-sources-3.16.5 (16 Oct 2014)
+
+  16 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.5.ebuild:
+  vanilla-3.16.5 + genpatches-3.16.7 + grsecurity-3.0-3.16.5-201410132000
+
+*hardened-sources-3.14.21 (16 Oct 2014)
+
+  16 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.21.ebuild:
+  vanilla-3.14.21 + genpatches-3.14-25 + grsecurity-3.0-3.14.21-201410131959
+
+*hardened-sources-3.2.63-r4 (16 Oct 2014)
+
+  16 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r4.ebuild:
+  vanilla-3.2.63 + genpatches-3.2-16 + grsecurity-3.0-3.2.63-201410131955
+
+  09 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.20.ebuild, -hardened-sources-3.16.4.ebuild:
+  Remove older unstable
+
+*hardened-sources-3.16.4-r1 (09 Oct 2014)
+
+  09 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.4-r1.ebuild:
+  vanilla-3.16.4 + genpatches-3.16.6 + grsecurity-3.0-3.16.4-201410081932
+
+*hardened-sources-3.14.20-r1 (09 Oct 2014)
+
+  09 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.20-r1.ebuild:
+  vanilla-3.14.20 + genpatches-3.14-24 + grsecurity-3.0-3.14.20-201410081929
+
+*hardened-sources-3.16.4 (07 Oct 2014)
+
+  07 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.4.ebuild:
+  vanilla-3.16.4 + genpatches-3.16.6 + grsecurity-3.0-3.16.4-201410062041
+
+*hardened-sources-3.14.20 (07 Oct 2014)
+
+  07 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.20.ebuild:
+  vanilla-3.14.20 + genpatches-3.14-24 + grsecurity-3.0-3.14.20-201410062037
+
+*hardened-sources-3.2.63-r3 (07 Oct 2014)
+
+  07 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r3.ebuild:
+  vanilla-3.2.63 + genpatches-3.2.16 + grsecurity-3.0-3.2.63-201410062032
+
+*hardened-sources-3.16.3-r1 (29 Sep 2014)
+
+  29 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.3-r1.ebuild:
+  vanilla-3.16.3 + genpatches-3.16.3 + grsecurity-3.0-3.16.3-20149282025
+
+*hardened-sources-3.14.19-r1 (29 Sep 2014)
+
+  29 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.19-r1.ebuild:
+  vanilla-3.14.19 + genpatches-3.14-23 + grsecurity-3.0-3.14.19-201409282024
+
+*hardened-sources-3.2.63-r2 (29 Sep 2014)
+
+  29 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r2.ebuild:
+  vanilla-3.2.63 + genpatches-3.2.16 + grsecurity-3.0-3.2.63-201409282020
+
+  22 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.14.17-r1.ebuild, hardened-sources-3.15.10-r1.ebuild,
+  hardened-sources-3.2.62-r1.ebuild:
+  Stable on amd64 and x86
+
+  22 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.17-r3.ebuild, -hardened-sources-3.14.17-r4.ebuild,
+  -hardened-sources-3.14.18-r1.ebuild, -hardened-sources-3.14.18-r2.ebuild,
+  -hardened-sources-3.14.18.ebuild, -hardened-sources-3.15.10-r2.ebuild,
+  -hardened-sources-3.16.1.ebuild, -hardened-sources-3.16.2-r1.ebuild,
+  -hardened-sources-3.16.2-r2.ebuild, -hardened-sources-3.16.2.ebuild,
+  -hardened-sources-3.2.62-r3.ebuild, -hardened-sources-3.2.62-r4.ebuild,
+  -hardened-sources-3.2.62-r5.ebuild, -hardened-sources-3.2.62-r6.ebuild,
+  -hardened-sources-3.2.63.ebuild:
+  Remove many unstable versions, see bug #522524
+
+*hardened-sources-3.16.3 (21 Sep 2014)
+
+  21 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.3.ebuild:
+  vanilla-3.2.63 + genpatches-3.2.16 + grsecurity-3.0-3.2.63-201409180857
+
+*hardened-sources-3.14.19 (21 Sep 2014)
+
+  21 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.19.ebuild:
+  vanilla-3.14.19 + genpatches-3.14-23 + grsecurity-3.0-3.14.19-201409180900
+
+*hardened-sources-3.2.63-r1 (21 Sep 2014)
+
+  21 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63-r1.ebuild:
+  vanilla-3.2.63 + genpatches-3.2.16 + grsecurity-3.0-3.2.63-201409180857
+
+*hardened-sources-3.16.2-r2 (17 Sep 2014)
+
+  17 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.2-r2.ebuild:
+  vanilla-3.16.2 + genpatches-3.16-3 + grsecurity-3.0-3.16.2-201409141907
+
+*hardened-sources-3.14.18-r2 (17 Sep 2014)
+
+  17 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.18-r2.ebuild:
+  vanilla-3.14.18 + genpatches-3.14-22 + grsecurity-3.0-3.14.18-201409141906
+
+*hardened-sources-3.2.63 (17 Sep 2014)
+
+  17 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.63.ebuild:
+  vanilla-3.2.63 + genpatches-3.2.16 + grsecurity-3.0-3.2.63-201409150854
+
+*hardened-sources-3.16.2-r1 (14 Sep 2014)
+
+  14 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.2-r1.ebuild:
+  vanilla-3.16.2 + genpatches-3.16-3 + grsecurity-3.0-3.16.2-201409112237
+
+*hardened-sources-3.14.18-r1 (14 Sep 2014)
+
+  14 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.18-r1.ebuild:
+  vanilla-3.14.18 + genpatches-3.14-22 + grsecurity-3.0-3.14.18-201409112236
+
+*hardened-sources-3.2.62-r6 (13 Sep 2014)
+
+  13 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r6.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201409112233
+
+*hardened-sources-3.16.2 (10 Sep 2014)
+
+  10 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.2.ebuild:
+  vanilla-3.16.2 + genpatches-3.16-3 + grsecurity-3.0-3.16.2-201409082129
+
+*hardened-sources-3.14.18 (10 Sep 2014)
+
+  10 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.18.ebuild:
+  vanilla-3.14.18 + genpatches-3.14-22 + grsecurity-3.0-3.14.18-201409082127
+
+*hardened-sources-3.2.62-r5 (10 Sep 2014)
+
+  10 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r5.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201409082124
+
+*hardened-sources-3.16.1 (04 Sep 2014)
+
+  04 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.16.1.ebuild:
+  vanilla-3.16.1 + genpatches-3.16-2 + grsecurity-3.0-3.16.1-201409021826
+
+*hardened-sources-3.14.17-r4 (04 Sep 2014)
+
+  04 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.17-r4.ebuild:
+  vanilla-3.14.17 + genpatches-3.14-21 + grsecurity-3.0-3.14.17-201409021816
+
+*hardened-sources-3.2.62-r4 (04 Sep 2014)
+
+  04 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r4.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201408312002
+
+  30 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.17-r2.ebuild, -hardened-sources-3.2.62-r2.ebuild:
+  Remove older unstable
+
+*hardened-sources-3.14.17-r3 (30 Aug 2014)
+
+  30 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.17-r3.ebuild:
+  vanilla-3.14.17 + genpatches-3.14-21 + grsecurity-3.0-3.14.17-201408260041
+
+*hardened-sources-3.2.62-r3 (30 Aug 2014)
+
+  30 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r3.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201408260037
+
+*hardened-sources-3.15.10-r2 (24 Aug 2014)
+
+  24 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.10-r2.ebuild:
+  vanilla-3.15.10 + genpatches-3.15-12 + grsecurity-3.0-3.15.10-201408212335
+
+*hardened-sources-3.14.17-r2 (24 Aug 2014)
+
+  24 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.17-r2.ebuild:
+  vanilla-3.14.17 + genpatches-3.14-21 + grsecurity-3.0-3.14.17-201408212334
+
+*hardened-sources-3.2.62-r2 (24 Aug 2014)
+
+  24 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r2.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201408212331
+
+  22 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.10.ebuild, -hardened-sources-3.14.13.ebuild,
+  -hardened-sources-3.14.14.ebuild, -hardened-sources-3.14.16.ebuild,
+  -hardened-sources-3.14.5-r2.ebuild, -hardened-sources-3.15.6.ebuild,
+  -hardened-sources-3.15.7.ebuild, -hardened-sources-3.15.9.ebuild,
+  -hardened-sources-3.2.55-r7.ebuild, -hardened-sources-3.2.59-r5.ebuild,
+  -hardened-sources-3.2.61-r3.ebuild, -hardened-sources-3.2.61-r4.ebuild,
+  hardened-sources-3.14.15.ebuild, hardened-sources-3.15.8.ebuild,
+  hardened-sources-3.2.61-r5.ebuild:
+  Stable on amd64, x86.  Remove older versions.
+
+  21 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.17.ebuild, -hardened-sources-3.15.10.ebuild,
+  -hardened-sources-3.2.62.ebuild:
+  Remove version with md/raid10 memory leak
+
+*hardened-sources-3.15.10-r1 (21 Aug 2014)
+
+  21 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.10-r1.ebuild:
+  vanilla-3.15.10 + genpatches-3.15-12 + grsecurity-3.0-3.15.10-201408192020
+
+*hardened-sources-3.14.17-r1 (21 Aug 2014)
+
+  21 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.17-r1.ebuild:
+  vanilla-3.14.17 + genpatches-3.14-21 + grsecurity-3.0-3.14.17-201408192019
+
+*hardened-sources-3.2.62-r1 (21 Aug 2014)
+
+  21 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62-r1.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201408191950
+
+*hardened-sources-3.15.10 (15 Aug 2014)
+
+  15 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.10.ebuild:
+  vanilla-3.15.10 + genpatches-3.15-12 + grsecurity-3.0-3.15.10-201408140023
+
+*hardened-sources-3.14.17 (15 Aug 2014)
+
+  15 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.17.ebuild:
+  vanilla-3.14.17 + genpatches-3.14-21 + grsecurity-3.0-3.14.17-201408140021
+
+*hardened-sources-3.15.9 (12 Aug 2014)
+
+  12 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.9.ebuild:
+  vanilla-3.15.9 + genpatches-3.15-11 + grsecurity-3.0-3.15.9-201408110025
+
+*hardened-sources-3.14.16 (12 Aug 2014)
+
+  12 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.16.ebuild:
+  vanilla-3.14.16 + genpatches-3.14-20 + grsecurity-3.0-3.14.16-201408110024
+
+*hardened-sources-3.2.62 (12 Aug 2014)
+
+  12 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.62.ebuild:
+  vanilla-3.2.62 + genpatches-3.2.16 + grsecurity-3.0-3.2.62-201408110020
+
+  12 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.12-r1.ebuild, -hardened-sources-3.15.5-r1.ebuild,
+  -hardened-sources-3.2.61-r1.ebuild:
+  Remove older stable with bug in dma usb dvd code
+
+*hardened-sources-3.15.8 (05 Aug 2014)
+
+  05 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.8.ebuild:
+  vanilla-3.15.8 + genpatches-3.15-10 + grsecurity-3.0-3.15.8-201408040708
+
+*hardened-sources-3.14.15 (05 Aug 2014)
+
+  05 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.15.ebuild:
+  vanilla-3.14.15 + genpatches-3.14-19 + grsecurity-3.0-3.14.15-201408032014
+
+*hardened-sources-3.2.61-r5 (05 Aug 2014)
+
+  05 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61-r5.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201408032011
+
+*hardened-sources-3.15.7 (30 Jul 2014)
+
+  30 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.7.ebuild:
+  vanilla-3.15.7 + genpatches-3.15-9 + grsecurity-3.0-3.15.7-201407282112
+
+*hardened-sources-3.14.14 (30 Jul 2014)
+
+  30 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.14.ebuild:
+  vanilla-3.14.14 + genpatches-3.14-18 + grsecurity-3.0-3.14.14-201407282111
+
+*hardened-sources-3.2.61-r4 (30 Jul 2014)
+
+  30 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61-r4.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201407280723
+
+  30 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.14.12-r2.ebuild, hardened-sources-3.15.5-r2.ebuild,
+  hardened-sources-3.2.61-r2.ebuild:
+  Stable on amd64 and x64.  Adds a minor DMA fix over the previous verions.
+
+*hardened-sources-3.15.6 (25 Jul 2014)
+
+  25 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.6.ebuild:
+  vanilla-3.15.6 + genpatches-3.15-8 + grsecurity-3.0-3.15.6-201407232200
+
+*hardened-sources-3.14.13 (25 Jul 2014)
+
+  25 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.13.ebuild:
+  vanilla-3.14.13 + genpatches-3.14-17 + grsecurity-3.0-3.14.13-201407232159
+
+*hardened-sources-3.2.61-r3 (25 Jul 2014)
+
+  25 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61-r3.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201407232156
+
+*hardened-sources-3.15.5-r2 (21 Jul 2014)
+
+  21 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.5-r2.ebuild:
+  vanilla-3.15.5 + genpatches-3.15-7 + grsecurity-3.0-3.15.5-201407170639
+
+*hardened-sources-3.14.12-r2 (21 Jul 2014)
+
+  21 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.12-r2.ebuild:
+  vanilla-3.14.12 + genpatches-3.14-16 + grsecurity-3.0-3.14.12-201407170638
+
+*hardened-sources-3.2.61-r2 (21 Jul 2014)
+
+  21 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61-r2.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201407170636
+
+  18 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.11-r1.ebuild, -hardened-sources-3.14.12.ebuild,
+  -hardened-sources-3.15.4-r1.ebuild, -hardened-sources-3.15.5.ebuild,
+  -hardened-sources-3.2.60-r8.ebuild, -hardened-sources-3.2.60-r9.ebuild,
+  -hardened-sources-3.2.61.ebuild, hardened-sources-3.14.12-r1.ebuild,
+  hardened-sources-3.15.5-r1.ebuild, hardened-sources-3.2.61-r1.ebuild:
+  Stable on amd64 and x86, addresses CVE-2014-4699
+
+*hardened-sources-3.15.5-r1 (15 Jul 2014)
+
+  15 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.5-r1.ebuild:
+  vanilla-3.15.5 + genpatches-3.15-7 + grsecurity-3.0-3.15.5-201407142248
+
+*hardened-sources-3.2.61-r1 (15 Jul 2014)
+
+  15 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61-r1.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201407132023
+
+  13 Jul 2014; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Resign manifest
+
+*hardened-sources-3.2.61 (13 Jul 2014)
+
+  13 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.61.ebuild:
+  vanilla-3.2.61 + genpatches-3.2.16 + grsecurity-3.0-3.2.61-201407112156
+
+*hardened-sources-3.15.5 (11 Jul 2014)
+
+  11 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.5.ebuild:
+  vanilla-3.15.5 + genpatches-3.15-7 + grsecurity-3.0-3.15.5-201407100036
+
+*hardened-sources-3.14.12 (11 Jul 2014)
+
+  11 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.12.ebuild:
+  vanilla-3.14.12 + genpatches-3.14-16 + grsecurity-3.0-3.14.12-201407100035
+
+*hardened-sources-3.2.60-r9 (11 Jul 2014)
+
+  11 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r9.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201407100031
+
+  09 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.10-r1.ebuild, -hardened-sources-3.14.10.ebuild,
+  -hardened-sources-3.15.3-r2.ebuild, -hardened-sources-3.15.3.ebuild,
+  -hardened-sources-3.2.60-r5.ebuild, -hardened-sources-3.2.60-r6.ebuild:
+  Remove older buggy versions
+
+*hardened-sources-3.15.4-r1 (09 Jul 2014)
+
+  09 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.4-r1.ebuild:
+  vanilla-3.15.4 + genpatches-3.15-6 + grsecurity-3.0-3.15.4-201407081937
+
+*hardened-sources-3.14.11-r1 (09 Jul 2014)
+
+  09 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.11-r1.ebuild:
+  vanilla-3.14.11 + genpatches-3.14-15 + grsecurity-3.0-3.14.11-201407081919
+
+*hardened-sources-3.2.60-r8 (09 Jul 2014)
+
+  09 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r8.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201407081916
+
+*hardened-sources-3.15.3-r2 (06 Jul 2014)
+
+  06 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.3-r2.ebuild, -hardened-sources-3.15.3-r1.ebuild:
+  vanilla-3.15.3 + genpatches-3.15-4 + grsecurity-3.0-3.15.3-201407060933
+
+*hardened-sources-3.15.3-r1 (06 Jul 2014)
+
+  06 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.3-r1.ebuild:
+  vanilla-3.15.3 + genpatches-3.15-4 + grsecurity-3.0-3.15.3-201407052032
+
+*hardened-sources-3.14.10-r1 (06 Jul 2014)
+
+  06 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.10-r1.ebuild:
+  vanilla-3.14.10 + genpatches-3.14-14 + grsecurity-3.0-3.14.10-201407052031
+
+*hardened-sources-3.2.60-r6 (06 Jul 2014)
+
+  06 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r6.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201407052028
+
+  03 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.6-r3.ebuild, -hardened-sources-3.14.9.ebuild,
+  -hardened-sources-3.15.1.ebuild, -hardened-sources-3.15.2.ebuild,
+  -hardened-sources-3.2.54-r9.ebuild, -hardened-sources-3.2.60-r3.ebuild,
+  -hardened-sources-3.2.60-r4.ebuild:
+  Remove older versions
+
+*hardened-sources-3.15.3 (03 Jul 2014)
+
+  03 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.3.ebuild:
+  vanilla-3.15.3 + genpatches-3.15-4 + grsecurity-3.0-3.15.3-201407012153
+
+*hardened-sources-3.14.10 (03 Jul 2014)
+
+  03 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.10.ebuild:
+  vanilla-3.14.10 + genpatches-3.14-14 + grsecurity-3.0-3.14.10-201407012152
+
+*hardened-sources-3.2.60-r5 (03 Jul 2014)
+
+  03 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r5.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201407012149
+
+*hardened-sources-3.15.2 (27 Jun 2014)
+
+  27 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.2.ebuild:
+  vanilla-3.15.2 + genpatches-3.15-4 + grsecurity-3.0-3.15.2-201406262058
+
+*hardened-sources-3.14.9 (27 Jun 2014)
+
+  27 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.9.ebuild:
+  vanilla-3.14.9 + genpatches-3.14-13 + grsecurity-3.0-3.14.9-201406262057
+
+*hardened-sources-3.2.60-r4 (27 Jun 2014)
+
+  27 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r4.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201406262054
+
+  27 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.6.ebuild, -hardened-sources-3.14.8-r1.ebuild,
+  -hardened-sources-3.14.8-r2.ebuild, -hardened-sources-3.14.8.ebuild,
+  -hardened-sources-3.2.60-r1.ebuild, -hardened-sources-3.2.60-r2.ebuild,
+  -hardened-sources-3.2.60.ebuild:
+  Remove older testing versions
+
+*hardened-sources-3.15.1 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.15.1.ebuild:
+  vanilla-3.15.1 + genpatches-3.15-3 + grsecurity-3.0-3.15.1-201406222112
+
+*hardened-sources-3.14.8-r2 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.8-r2.ebuild:
+  vanilla-3.14.8 + genpatches-3.14-12 + grsecurity-3.0-3.14.8-201406222110
+
+*hardened-sources-3.2.60-r3 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r3.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201406222106
+
+*hardened-sources-3.14.8-r1 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.8-r1.ebuild:
+  vanilla-3.14.8 + genpatches-3.14-12 + grsecurity-3.0-3.14.8-201406220132
+
+*hardened-sources-3.2.60-r2 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r2.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201406220130
+
+*hardened-sources-3.14.8 (22 Jun 2014)
+
+  22 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.8.ebuild:
+  vanilla-3.14.8 + genpatches-3.14-12 + grsecurity-3.0-3.14.8-201406191347
+
+*hardened-sources-3.2.60-r1 (21 Jun 2014)
+
+  21 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60-r1.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201406191345
+
+*hardened-sources-3.14.6 (11 Jun 2014)
+
+  11 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.6.ebuild:
+  vanilla-3.14.6 + genpatches-3.14-10 + grsecurity-3.0-3.14.6-201406101411
+
+*hardened-sources-3.2.60 (11 Jun 2014)
+
+  11 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.60.ebuild:
+  vanilla-3.2.60 + genpatches-3.2.16 + grsecurity-3.0-3.2.60-201406101410
+
+  10 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.11.7-r1.ebuild, -hardened-sources-3.13.2-r3.ebuild,
+  -hardened-sources-3.2.53-r6.ebuild:
+  Remove old stables
+
+  10 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.14.5-r2.ebuild, hardened-sources-3.2.59-r5.ebuild:
+  Stable amd64, x86.  bug #512526, CVE-2014-3153
+
+*hardened-sources-3.2.59-r5 (06 Jun 2014)
+
+  06 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.59-r5.ebuild, -hardened-sources-3.14.4-r1.ebuild,
+  -hardened-sources-3.14.5.ebuild, -hardened-sources-3.2.59-r2.ebuild,
+  -hardened-sources-3.2.59-r4.ebuild, -hardened-sources-3.2.59.ebuild:
+  vanilla-3.2.59 + genpatches-3.2.16 + grsecurity-3.0-3.2.59-201406052202
+
+*hardened-sources-3.14.5-r2.ebuild
+
+  06 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.5-r2.ebuild:
+  vanilla-3.14.4 + genpatches-3.14-7 + grsecurity-3.0-3.14.5-201406051310
+  bug #512526, CVE-2014-3153
+
+*hardened-sources-3.2.59-r4 (06 Jun 2014)
+
+  06 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.59-r4.ebuild:
+  vanilla-3.2.59 + genpatches-3.2.16 + grsecurity-3.0-3.2.59-201406051309
+  bug #512526, CVE-2014-3153
+
+  05 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.11.7-r2.ebuild, -hardened-sources-3.13.10-r1.ebuild,
+  -hardened-sources-3.13.2-r4.ebuild, -hardened-sources-3.13.6-r4.ebuild,
+  -hardened-sources-3.14.4-r2.ebuild, -hardened-sources-3.14.5-r1.ebuild,
+  -hardened-sources-3.2.53-r7.ebuild, -hardened-sources-3.2.54-r10.ebuild,
+  -hardened-sources-3.2.55-r8.ebuild, -hardened-sources-3.2.59-r3.ebuild:
+  Revert previous additions which duplicate rev bumps
+
+*hardened-sources-3.14.4-r2 (05 Jun 2014)
+*hardened-sources-3.13.2-r4 (05 Jun 2014)
+*hardened-sources-3.13.10-r1 (05 Jun 2014)
+
+  05 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +hardened-sources-3.13.10-r1.ebuild, +hardened-sources-3.13.2-r4.ebuild,
+  +hardened-sources-3.14.4-r2.ebuild:
+  missed a couple of versions for CVE-2014-3153 bug 512526
+
+*hardened-sources-3.2.59-r3 (05 Jun 2014)
+*hardened-sources-3.11.7-r2 (05 Jun 2014)
+*hardened-sources-3.2.55-r8 (05 Jun 2014)
+*hardened-sources-3.2.53-r7 (05 Jun 2014)
+*hardened-sources-3.2.54-r10 (05 Jun 2014)
+*hardened-sources-3.13.6-r4 (05 Jun 2014)
+
+  05 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +hardened-sources-3.11.7-r2.ebuild, +hardened-sources-3.13.6-r4.ebuild,
+  +hardened-sources-3.2.53-r7.ebuild, +hardened-sources-3.2.54-r10.ebuild,
+  +hardened-sources-3.2.55-r8.ebuild, +hardened-sources-3.2.59-r3.ebuild:
+  more fixes for CVE-2014-3153 bug 512526
+
+*hardened-sources-3.14.5-r1 (05 Jun 2014)
+
+  05 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +hardened-sources-3.14.5-r1.ebuild:
+  fixes for CVE-2014-3153
+
+*hardened-sources-3.14.5 (03 Jun 2014)
+
+  03 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.5.ebuild:
+  vanilla-3.14.5 + genpatches-3.14-7 + grsecurity-3.0-3.14.5-201406021708
+
+*hardened-sources-3.2.59-r2 (03 Jun 2014)
+
+  03 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.59-r2.ebuild:
+  vanilla-3.2.59 + genpatches-3.2.16 + grsecurity-3.0-3.2.59-201406030716
+
+  26 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.3-r2.ebuild, -hardened-sources-3.14.4.ebuild,
+  -hardened-sources-3.2.58-r3.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.14.4-r1 (26 May 2014)
+
+  26 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.4-r1.ebuild:
+  vanilla-3.14.4 + genpatches-3.14-7 + grsecurity-3.0-3.14.4-201405252047
+
+*hardened-sources-3.2.59 (26 May 2014)
+
+  26 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.59.ebuild:
+  vanilla-3.2.59 + genpatches-3.2.16 + grsecurity-3.0-3.2.59-201405252042
+
+*hardened-sources-3.14.4 (17 May 2014)
+
+  17 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.4.ebuild, -hardened-sources-3.14.3-r3.ebuild:
+  vanilla-3.14.4 + genpatches-3.14-7 + grsecurity-3.0-3.14.4-201405141623
+
+  15 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.3-r1.ebuild, -hardened-sources-3.2.58-r2.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.14.3-r3 (15 May 2014)
+
+  15 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.3-r3.ebuild:
+  vanilla-3.14.3 + genpatches-3.14-6 + grsecurity-3.0-3.14.4-201405141623
+
+*hardened-sources-3.14.3-r2 (12 May 2014)
+
+  12 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.3-r2.ebuild:
+  vanilla-3.14.3 + genpatches-3.14-6 + grsecurity-3.0-3.14.3-201405112005
+
+*hardened-sources-3.2.58-r3 (12 May 2014)
+
+  12 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.58-r3.ebuild:
+  vanilla-3.2.58 + genpatches-3.2.16 + grsecurity-3.0-3.2.58-201405112002
+
+  11 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.13.10.ebuild:
+  Stable on amd64 and x86
+
+  10 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.14.2-r1.ebuild, -hardened-sources-3.14.3.ebuild,
+  -hardened-sources-3.2.58-r1.ebuild, -hardened-sources-3.2.58.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.14.3-r1 (10 May 2014)
+
+  10 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.3-r1.ebuild:
+  vanilla-3.14.3 + genpatches-3.14-6 + grsecurity-3.0-3.14.3-201405092337
+
+*hardened-sources-3.2.58-r2 (10 May 2014)
+
+  10 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.58-r2.ebuild:
+  vanilla-3.2.58 + genpatches-3.2-16 + grsecurity-3.0-3.2.58-201405092334
+
+*hardened-sources-3.14.3 (08 May 2014)
+
+  08 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.3.ebuild:
+  vanilla-3.14.3 + genpatches-3.14-6 + grsecurity-3.0-3.14.3-201405071928
+
+*hardened-sources-3.2.58-r1 (08 May 2014)
+
+  08 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.58-r1.ebuild:
+  vanilla-3.2.58 + genpatches-3.2-16 + grsecurity-3.0-3.2.58-201405061705
+
+*hardened-sources-3.13.10 (05 May 2014)
+
+  05 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.10.ebuild:
+  Restore 3.13.10 for Nikoli
+
+  03 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.10.ebuild, -hardened-sources-3.13.8-r1.ebuild,
+  -hardened-sources-3.13.8-r2.ebuild, -hardened-sources-3.13.9.ebuild,
+  -hardened-sources-3.14.1.ebuild, -hardened-sources-3.14.2.ebuild,
+  -hardened-sources-3.2.56-r1.ebuild, -hardened-sources-3.2.56-r2.ebuild,
+  -hardened-sources-3.2.57-r2.ebuild, -hardened-sources-3.2.57-r3.ebuild,
+  -hardened-sources-3.2.57.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.14.2-r1 (03 May 2014)
+
+  03 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.2-r1.ebuild:
+  vanilla-3.14.2 + genpatches-3.14-5 + grsecurity-3.0-3.14.2-201405011752
+
+*hardened-sources-3.2.58 (03 May 2014)
+
+  03 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.58.ebuild:
+  vanilla-3.2.59 + genpatches-3.2-16 + grsecurity-3.0-3.2.58-201405011748
+
+*hardened-sources-3.14.2 (28 Apr 2014)
+
+  28 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.2.ebuild:
+  vanilla-3.14.2 + genpatches-3.14-5 + grsecurity-3.0-3.14.2-201404270907
+
+*hardened-sources-3.2.57-r3 (28 Apr 2014)
+
+  28 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.57-r3.ebuild:
+  vanilla-3.2.57 + genpatches-3.2-16 + grsecurity-3.0-3.2.57-201404241714
+
+*hardened-sources-3.2.57-r2 (27 Apr 2014)
+
+  27 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.57-r2.ebuild, -hardened-sources-3.2.57-r1.ebuild:
+  Fix hardened patchset for 3.2.57-r1 -> 3.2.57-r2
+
+*hardened-sources-3.14.1 (21 Apr 2014)
+
+  21 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.14.1.ebuild:
+  vanilla-3.14.1 + genpatches-3.14-4 + grsecurity-3.14.1-201404201132
+
+*hardened-sources-3.13.10 (19 Apr 2014)
+
+  19 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.10.ebuild:
+  vanilla-3.13.10 + genpatches-3.13-13 + grsecurity-3.0-3.13.10-201404182111
+
+*hardened-sources-3.2.57-r1 (19 Apr 2014)
+
+  19 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.57-r1.ebuild:
+  vanilla-3.2.57 + genpatches-3.2-16 + grsecurity-3.0-3.2.57-201404182109
+
+*hardened-sources-3.13.9 (12 Apr 2014)
+
+  12 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.9.ebuild:
+  vanilla-3.13.9 + genpatches-3.13-12 + grsecurity-3.0-3.13.9-201404111815
+
+*hardened-sources-3.2.57 (12 Apr 2014)
+
+  12 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.57.ebuild:
+  vanilla-3.2.57 + genpatches-3.2-16 + grsecurity-3.0-3.2.57-201404111812
+
+  08 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.7.ebuild, -hardened-sources-3.2.55-r9.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.13.8-r2 (08 Apr 2014)
+
+  08 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.8-r2.ebuild:
+  vanilla-3.13.8 + genpatches-3.13-11 + grsecurity-3.0-3.13.9-201404062127
+
+*hardened-sources-3.2.56-r2 (08 Apr 2014)
+
+  08 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.56-r2.ebuild:
+  vanilla-3.2.56 + genpatches-3.2-16 + grsecurity-3.0-3.2.56-201404062126
+
+  08 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.6-r2.ebuild, -hardened-sources-3.2.55-r6.ebuild,
+  hardened-sources-3.13.6-r3.ebuild, hardened-sources-3.2.55-r7.ebuild:
+  Stable on amd64 and x86.  Remove older unstables
+
+  04 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.8.ebuild, -hardened-sources-3.2.56.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.13.8-r1 (04 Apr 2014)
+
+  04 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.8-r1.ebuild:
+  vanilla-3.13.8 + genpatches-3.13-11 + grsecurity-3.0-3.13.8-201404031157
+
+*hardened-sources-3.2.56-r1 (04 Apr 2014)
+
+  04 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.56-r1.ebuild:
+  vanilla-3.2.56 + genpatches-3.2-16 + grsecurity-3.0-3.2.56-201404031155
+
+*hardened-sources-3.13.8 (02 Apr 2014)
+
+  02 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.8.ebuild:
+  vanilla-3.13.8 + genpatches-3.13-11 + grsecurity-3.0-3.13.8-201404011912
+
+*hardened-sources-3.2.56 (02 Apr 2014)
+
+  02 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.56.ebuild:
+  vanilla-3.2.56 + genpatches-3.2-16 + grsecurity-3.0-3.2.56-201404012135
+
+*hardened-sources-3.13.7 (31 Mar 2014)
+
+  31 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.7.ebuild:
+  vanilla-3.13.7 + genpatches-3.13-10 + grsecurity-3.0-3.13.7-201403281902
+
+*hardened-sources-3.2.55-r9 (31 Mar 2014)
+
+  31 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r9.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403300851
+
+  27 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.10.1-r1.ebuild, -hardened-sources-3.11.2.ebuild,
+  -hardened-sources-3.2.52-r3.ebuild:
+  Remove older unstables
+
+  27 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r185.ebuild, -hardened-sources-2.6.32-r189.ebuild:
+  Remove 2.6.32 branch, no longer supported
+
+*hardened-sources-3.13.6-r3 (21 Mar 2014)
+
+  21 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.6-r3.ebuild:
+  vanilla-3.13.6 + genpatches-3.13-9 + grsecurity-3.0-3.13.6-201403202349
+
+*hardened-sources-3.2.55-r7 (21 Mar 2014)
+
+  21 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r7.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403202347
+
+  20 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.13.6-r1.ebuild, -hardened-sources-3.13.6.ebuild,
+  -hardened-sources-3.2.55-r4.ebuild, -hardened-sources-3.2.55-r5.ebuild:
+  Remove older unstable versions
+
+*hardened-sources-3.13.6-r2 (20 Mar 2014)
+
+  20 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.6-r2.ebuild:
+  vanilla-3.13.6 + genpatches-3.13-9 + grsecurity-3.0-3.13.6-201403192228
+
+*hardened-sources-3.2.55-r6 (20 Mar 2014)
+
+  20 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r6.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403192223
+
+*hardened-sources-3.13.6-r1 (19 Mar 2014)
+
+  19 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.6-r1.ebuild:
+  vanilla-3.13.6 + genpatches-3.13-9 + grsecurity-3.0-3.13.6-201403172032
+
+*hardened-sources-3.2.55-r5 (19 Mar 2014)
+
+  19 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r5.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403172027
+
+  19 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.12.8-r1.ebuild, -hardened-sources-3.13.2-r2.ebuild,
+  -hardened-sources-3.13.3-r1.ebuild, -hardened-sources-3.13.3.ebuild,
+  -hardened-sources-3.13.5-r1.ebuild, -hardened-sources-3.13.5.ebuild,
+  -hardened-sources-3.2.54-r8.ebuild, -hardened-sources-3.2.55-r1.ebuild,
+  -hardened-sources-3.2.55-r2.ebuild, -hardened-sources-3.2.55-r3.ebuild,
+  -hardened-sources-3.2.55.ebuild:
+  Remove some unstables versions
+
+  19 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-3.13.2-r3.ebuild, hardened-sources-3.2.54-r9.ebuild:
+  Stable on amd64 and x86
+
+*hardened-sources-3.13.6 (17 Mar 2014)
+
+  17 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.6.ebuild:
+  vanilla-3.13.6 + genpatches-3.13-9 + grsecurity-3.0-3.13.6-201403142112
+
+*hardened-sources-3.2.55-r4 (17 Mar 2014)
+
+  17 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r4.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403142107
+
+*hardened-sources-3.13.5-r1 (05 Mar 2014)
+
+  05 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.5-r1.ebuild:
+  vanilla-3.13.5 + genpatches-3.13-8 + grsecurity-3.0-3.13.5-201403041938
+
+*hardened-sources-3.2.55-r3 (05 Mar 2014)
+
+  05 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r3.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201403041936
+
+*hardened-sources-3.13.5 (25 Feb 2014)
+
+  25 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.5.ebuild:
+  vanilla-3.13.5 + genpatches-3.13-8 + grsecurity-3.0-3.13.5-201402241943
+
+*hardened-sources-3.2.55-r2 (25 Feb 2014)
+
+  25 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r2.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201402241936
+
+*hardened-sources-3.13.3-r1 (20 Feb 2014)
+
+  20 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.3-r1.ebuild:
+  vanilla-3.13.3 + genpatches-3.13-6 + grsecurity-3.0-3.13.3-201402192252
+
+*hardened-sources-3.2.55-r1 (20 Feb 2014)
+
+  20 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55-r1.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201402192249
+
+*hardened-sources-3.12.8-r1 (18 Feb 2014)
+
+  18 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.8-r1.ebuild:
+  Restore 3.12.8-r1 by popular demand
+
+*hardened-sources-3.13.3 (17 Feb 2014)
+
+  17 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.3.ebuild:
+  vanilla-3.13.2 + genpatches-3.13-6 + grsecurity-3.0-3.13.3-201402152204
+
+*hardened-sources-3.2.55 (17 Feb 2014)
+
+  17 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.55.ebuild:
+  vanilla-3.2.55 + genpatches-3.2-16 + grsecurity-3.0-3.2.55-201402152203
+
+*hardened-sources-3.13.2-r3 (12 Feb 2014)
+
+  12 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.2-r3.ebuild:
+  vanilla-3.13.2 + genpatches-3.13-5 + grsecurity-3.0-3.13.2-201402111747
+
+*hardened-sources-3.2.54-r9 (12 Feb 2014)
+
+  12 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r9.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201402111745
+
+  11 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-3.12.8-r1.ebuild, -hardened-sources-3.12.8.ebuild,
+  -hardened-sources-3.13.1-r1.ebuild, -hardened-sources-3.13.1.ebuild,
+  -hardened-sources-3.13.2-r1.ebuild, -hardened-sources-3.2.54-r7.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.13.2-r2 (11 Feb 2014)
+
+  11 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.2-r2.ebuild:
+  vanilla-3.13.2 + genpatches-3.13-5 + grsecurity-3.0-3.13.2-201402091134
+
+*hardened-sources-3.2.54-r8 (11 Feb 2014)
+
+  11 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r8.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201402091132
+
+  09 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r181.ebuild, -hardened-sources-3.2.51-r2.ebuild,
+  -hardened-sources-3.2.54-r2.ebuild, -hardened-sources-3.2.54-r3.ebuild,
+  -hardened-sources-3.2.54-r4.ebuild, -hardened-sources-3.2.54-r5.ebuild:
+  Remove older stable and unstable versions
+
+  09 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  hardened-sources-2.6.32-r189.ebuild, hardened-sources-3.2.53-r6.ebuild:
+  Stable on amd64 and x86
+
+*hardened-sources-3.13.2-r1 (09 Feb 2014)
+
+  09 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.2-r1.ebuild:
+  vanilla-3.13.2 + genpatches-3.13-5 + grsecurity-3.0-3.13.2-201402090002
+
+*hardened-sources-3.2.54-r7 (09 Feb 2014)
+
+  09 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r7.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201402090000
+
+*hardened-sources-3.13.1-r1 (06 Feb 2014)
+
+  06 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.1-r1.ebuild:
+  vanilla-3.13.1 + genpatches-3.13-3 + grsecurity-3.0-3.13.1-201402052349
+
+*hardened-sources-3.2.54-r5 (06 Feb 2014)
+
+  06 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r5.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201402052347
+
+*hardened-sources-3.13.1 (01 Feb 2014)
+
+  01 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.13.1.ebuild:
+  vanilla-3.13.1 + genpatches-3.13-3 + grsecurity-3.0-3.13.1-201401301657
+
+*hardened-sources-3.2.54-r4 (01 Feb 2014)
+
+  01 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r4.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201401281850
+
+*hardened-sources-3.12.8-r1 (22 Jan 2014)
+
+  22 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.8-r1.ebuild:
+  vanilla-3.12.8 + genpatches-3.12-9 + grsecurity-3.0-3.12.8-201401191015
+
+*hardened-sources-3.2.54-r3 (22 Jan 2014)
+
+  22 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r3.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201401191012
+
+*hardened-sources-3.10.1-r1 (20 Jan 2014)
+
+  20 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.10.1-r1.ebuild:
+  Restored by request
+
+  19 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r178.ebuild, -hardened-sources-3.10.1-r1.ebuild,
+  -hardened-sources-3.2.48-r4.ebuild:
+  Remove older stables
+
+  19 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r188.ebuild, -hardened-sources-3.12.6-r4.ebuild,
+  -hardened-sources-3.2.53-r5.ebuild, -hardened-sources-3.2.54.ebuild:
+  Remove older unstables
+
+*hardened-sources-3.12.8 (19 Jan 2014)
+
+  19 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.8.ebuild:
+  vanilla-3.12.8 + genpatches-3.12-9 + grsecurity-3.0-3.12.8-201401160931
+
+*hardened-sources-3.2.54-r2 (19 Jan 2014)
+
+  19 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54-r2.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201401160931
+
+*hardened-sources-3.2.54 (06 Jan 2014)
+
+  06 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.2.54.ebuild:
+  vanilla-3.2.54 + genpatches-3.2-16 + grsecurity-3.0-3.2.54-201401051649
+
+*hardened-sources-3.12.6-r4 (04 Jan 2014)
+
+  04 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.12.6-r4.ebuild, -hardened-sources-3.12.6-r1.ebuild,
+  -hardened-sources-3.12.6-r2.ebuild, -hardened-sources-3.12.6-r3.ebuild:
+  vanilla-3.12.6 + genpatches-3.12-7 + grsecurity-3.0-3.12.6-201401021726
+
+  01 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2013:
+  Rotate ChangeLog
+
+  For previous entries, please see ChangeLog-2013.
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
new file mode 100644
index 0000000..33dad07
--- /dev/null
+++ b/sys-kernel/hardened-sources/Manifest
@@ -0,0 +1,11 @@
+DIST deblob-4.4 137370 SHA256 7cf11c8594db0d2a10a1b02390c9ff8916f1d2a1fe9d59058ca45485500c5274 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a WHIRLPOOL bedd494be2032ce4b8911f25df906055d019af31ea6548b885482f870cd5313e09e7fb544fc8db268b3498cc18c199ae5701023839c972b48dbd8128239eeb75
+DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b
+DIST genpatches-4.4-9.base.tar.xz 304360 SHA256 e9ba25000126256be414a273b154accc51ef523d236c35e2214ee75e243aa71f SHA512 ef239c362defeafc92eae84ede7a07820ddf0c01002f52a58d39d7b0dcdfd83af2d5fa4d2ee3d2c57e4c89a30d4fbf05dc5519886b8f55bf148ce4197b85d465 WHIRLPOOL 88963d0eac645d453ccf1cfe0e30777090240f18f20ccf735b7551a57365c2505849b13c8cd4092542f6baf6d251eb0e9c44fbba118d9677f9cd334e0ef10861
+DIST hardened-patches-4.4.8-2.extras.tar.bz2 1743408 SHA256 5cde9a96f6a47ebe3c8abeb5d5add60480490fd365d4c31da2d7ac1973a4c258 SHA512 cfb52ee6aee76b125a5a833cd9facc92ea1dff17129a488b66e976e94699cea8109e6f5df90835e818af1ea6e59e12cecc95159601d544f5b008560a1190b530 WHIRLPOOL 56facf79d5556aaac3bf08fa3b4be21b7fef561c8d3fd41943ce51c4d15b71e114be2e33914f5bf7e3d981abcebeffb95fb99aedde8d72231edcef72123ea9fa
+DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
+EBUILD hardened-sources-4.4.8-r1.ebuild 1357 SHA256 e5e658a5f2411cd77e1d248bb15363320466eacbb8a8aaae916961d5d6fde2b1 SHA512 2cf3e1e073ac496827b5dcaaafafc84dbc2c2ccfeb1bda28b4cfbfb3b0646c8055e23fe9623dc50efe72533c0104999a1a459a3c9b27af3b0474136753be9d13 WHIRLPOOL c028149f7887ad8c0b7d717714670e1c8e4d76137ec07e3ab82d223aca94458214e2f0d483670c8c670df40d646d705fbd0a0ba5f4f92c28bcaa9003562314bd
+MISC ChangeLog 19350 SHA256 700a2c8140e15923c3cf525dcb2bc039ebe054d4a27dc840c0b8c3b7ac507ee5 SHA512 0f4b649ff1a63f5c05b4dca0c3b19fffa8ad382f0c5a62323f80a268397805000b0185152f67b55151ef07f9602c48bf9ea4be6ee9ffe3975fd3f2c672508cba WHIRLPOOL 0a644f4edec0292c13bc193d5babc205f7af42987189109b40a5f0639e8d488cfa0560180804bcb3abab5e2e684f9132ae9653316a74f20a4928d89ce18289e5
+MISC ChangeLog-2011 112069 SHA256 39bac69a08709be5b79c6e711fd94aac7e53191b76fef64f9b3d09f7b5ac0f82 SHA512 3d66e844a3f619a530e7ff236cbbb095bf9150e1542048268646468afe09d1fb20da3ea8dfa4b80812f35f9eeed1e399a115ceb573cce43f34f1c30c0ff67ee5 WHIRLPOOL c55f94fc4655b77b9db447c8f315af698e5c180496f9a333e22aa16c57c172e26bf9dbb0a70d7319c1a54943bce4756d11679f3c3435cb90bf427a64e49ded34
+MISC ChangeLog-2013 103203 SHA256 cfb8a9a5ca8cbc986810b1f82bdc05240105e74c249216e766e8a130df09bb6a SHA512 15b230e910293e7d142906c22327bb24eb4d7214f94bd7058de1d21e91eb24bde9727a968749858558e214a1af48a590e56621f09a26b31f1cc7cea91498dc48 WHIRLPOOL 187f4b375446d2a30ed504cd71ddc7698c99e693e656b4db79a67736a2339a9fe890b601f479f351a31ce3803937009cf8d5eaeaa19a3d1d8b52edbf2c40287a
+MISC ChangeLog-2015 81136 SHA256 fa80e9f2e1ff804f74665b888a4fb289d6f3cf36aafc4db656adfd4ce0e2177a SHA512 2f91d91b2e895ad3990aa453809f741f3e5c145a512cd33683f626d49ae6c7d3f6a3ae35db8bd43dab4c84c0df2a5a230cd85cefe9bb3f4f4e33e6c9b9acc300 WHIRLPOOL 7c949a90737ba58da62b8b6ea304466289449d481b39a126abda9ab0840fb76fa2b6cdb226c69ba8615d8c3ea4a0f1c06480ceb1a57675aa39a9dc7334497fa9
+MISC metadata.xml 576 SHA256 53e0d3bfb958bcbf62457a89abe76a7a6f5a2b1df5decb04bf8b840184cc5828 SHA512 aabb8324fc608a74fecda5e4fff0f29d47d34ff20bdea2af8a69726772268d7b3b9d2639cd9c2308b3c79b89d9e923d2a96b212e7cfe59a0bf0008e3fb1c7e6a WHIRLPOOL 11fc891bd478667fe4ca5d203b366fdcf1680dac31bf997ea7c707c6f00a1c03b6ca7a00045b75dc1604e9eb57c2cab03a12f46318320ed6abdb5d6feb06b71f
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
new file mode 100644
index 0000000..0357218
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+        1500_XATTR_USER_PREFIX.patch
+        2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+        kernel-2_pkg_postinst
+
+        local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+        ewarn
+        ewarn "Users of grsecurity's RBAC system must ensure they are using"
+        ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+        ewarn "It is strongly recommended that the following command is issued"
+        ewarn "prior to booting a ${PF} kernel for the first time:"
+        ewarn
+        ewarn "emerge -na =${GRADM_COMPAT}"
+        ewarn
+}
diff --git a/sys-kernel/hardened-sources/metadata.xml b/sys-kernel/hardened-sources/metadata.xml
new file mode 100644
index 0000000..6ed4877
--- /dev/null
+++ b/sys-kernel/hardened-sources/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kernel</herd>
+	<herd>hardened</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
+		hardened-sources is based upon genpatches, and adds the grsecurity
+		patch from http://www.grsecurity.net, which also includes PaX.
+	</longdescription>
+	<use>
+		<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+	</use>
+</pkgmetadata>

From 3beea8e8710beef6d5d05f3fbe07dd1c78d9dce1 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 3 Nov 2016 19:09:04 -0700
Subject: [PATCH 223/261] updates

---
 net-misc/kamailio/Manifest             |  4 +--
 net-misc/kamailio/files/kamailio.confd | 19 ++++++++++++++
 net-misc/kamailio/files/kamailio.initd | 34 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/kamailio/files/kamailio.confd
 create mode 100644 net-misc/kamailio/files/kamailio.initd

diff --git a/net-misc/kamailio/Manifest b/net-misc/kamailio/Manifest
index 80fc674..1ce7293 100644
--- a/net-misc/kamailio/Manifest
+++ b/net-misc/kamailio/Manifest
@@ -1,6 +1,6 @@
-AUX kamailio.confd 534 SHA256 7cddcc909ad9692ec4c82c69b69a62041bf80292a9b6c4dac297b19883159b50 SHA512 717ec01e3d052596c0587a3830152510244bedd2eb8aeee2eac2b3e560676c4f62b52f18ec2097781e09cab4885b62b979cd63cd650bdfbbe12300986b3818e5 WHIRLPOOL 101cced125343ac4b56ada9eb7f9eb43f9e3af2112a4e7c59cade53b47092f56338c51de4913d7326c64bc29448032dad3e9013255b21cc7fd362496da5f9145
+AUX kamailio.confd 562 SHA256 651fccffbfdcc19685a55816bb3726ee64cb2a88081e0bd48fc238a985cb241c SHA512 304b8a8eb191cfa6e401accce1aaccdb2c40fcbf2cdd9bebbb88500fab92cd1bbcce934b76876290e95747633d1554b1f8f523e97ae3315514ad6463592a7b0b WHIRLPOOL 08b646226174ce519d9a283503ae915ba597c45b4db177cb168a0045c6d630ad2d14ed40bbc2c31155d123d6df07552145572d9c1de8badeed9fcaeb39f66a8d
 AUX kamailio.default 786 SHA256 41ac4d6de5e7b2a7cef34b717e1d89721df4041354c001f90359b266619313e2 SHA512 a305815955c8c8713de0a398471979f2c21a769d2f939573ce7a08a9a8a5432eebfb940213b3e5611ec54f8f8b46ee87e5e485ea8c2509ade9fe6ca013fe62be WHIRLPOOL 1c265ee3328777fd20cb95e1d1c2ce19a0cb883b6af830e08255c8d43ad0b85d08c454d64fa05175c5bce062a7b363edde11da828ad88aef963ba789e74ed706
-AUX kamailio.initd 858 SHA256 f3276ac521ab5f0bbbc4d908651e0019540247db9d00f043c414cb486bde5c23 SHA512 d1bcbf1f0af1ddde410f724a7fd6b80142e15870db4b5961be2e017ab702da0fff1bec2508cd304b217af3bfb5dea0bf6368f087d207e90373fd0f99a4144687 WHIRLPOOL 257b0b4b7f0a8196d62e85886586223df211ee19ee9a46318bd4b5bf0a22aab91f3b941469512782f7d4d56fa2071ae9ad79e92e09c9e5033c1fa6c58fac81b7
+AUX kamailio.initd 810 SHA256 5555ac12a0f003841db734bb46db6372891bccbee2af8a5b6e21bdaff0d9617e SHA512 2ed29e599989c9e1b7e7ba7766b8a4b997baf72ba026af9c98af56fd6cb3ff44ab7a675dfd2c4b53bd00a2227e1cb70315069122a3b827449d243117d01309ef WHIRLPOOL 624b33f45b6cb4de9a710a7ebd75778c9909f2b482a6f6bd6b502f7470fdbd91abac6dd93694afcf041c8c5da12055edbd1e3e6211acc0b1a75aa3ec078b16fc
 AUX kamailio.service 655 SHA256 096b7abbfaad568cc214e2b02f5b42ea75dadd7d524f9d14e33e8c1ba23ce782 SHA512 2c85b9ff19d50da54c180ca0735804b61c739104608c8168820c8a23f495b1eac4e60a6ce576e3079c701399ac776ba62b76523e08781274c912e7cc78eaebf6 WHIRLPOOL 9e3254031fbd37b96f3e0b92e5550951453d18bab2a0e4e052a1abbc6539790cfc20d39f164017b055e1a14f41132ee1f47d9320584de600425f568da4a1e86e
 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
diff --git a/net-misc/kamailio/files/kamailio.confd b/net-misc/kamailio/files/kamailio.confd
new file mode 100644
index 0000000..89d1998
--- /dev/null
+++ b/net-misc/kamailio/files/kamailio.confd
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Additional options to start Kamailio with.
+#
+# see "sip-router -h" for a list of options
+#
+# default: run Kamailio as user:group = kamailio:kamailio
+#
+
+SHM_MEMORY=64
+PKG_MEMORY=8
+MAIN_NAME="kamailio"
+USER="kamailio"
+GROUP="kamailio"
+CONFIGFILE="${CONFIGFILE:-/etc/${MAIN_NAME}/kamailio.cfg}"
+CONFIGDEFS="" # eg: "-A WITH_DEBUG -A WITH_NAT -A WITH_TLS"
+OPTS="-u $USER -g $GROUP -f ${CONFIGFILE} -m $SHM_MEMORY -M $PKG_MEMORY ${CONFIGDEFS}"
diff --git a/net-misc/kamailio/files/kamailio.initd b/net-misc/kamailio/files/kamailio.initd
new file mode 100644
index 0000000..ce6a3b3
--- /dev/null
+++ b/net-misc/kamailio/files/kamailio.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+}
+
+check_config() {
+	out=`(/usr/sbin/kamailio -f ${CONFIGFILE} -c > /dev/null || true) 2>&1`
+	echo "$out" | grep -q 'config file ok, exiting...'
+	if [ "$?" == 1 ]; then
+		echo -e "There are errors in the configuration. Please fix them first"
+		echo -e "\n$out\n"
+		return 1
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting kamailio"
+	start-stop-daemon --start --quiet --pidfile /var/run/kamailio/kamailio.pid \
+		--exec /usr/sbin/kamailio -- -P /var/run/kamailio/kamailio.pid \
+                ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kamailio"
+	start-stop-daemon --stop --quiet --pidfile /var/run/kamailio/kamailio.pid
+	eend $?
+}
+

From 5117099c6470f7090373d430fb609c6e60ae7189 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 3 Nov 2016 19:33:38 -0700
Subject: [PATCH 224/261] added more pckages

---
 dev-libs/thrift/Manifest                      |   8 +
 .../files/thrift-0.9.0-arpa_inet_h.patch      |  12 +
 .../thrift/files/thrift-0.9.0-exception.patch | 291 ++++++++++++++++++
 .../files/thrift-0.9.0-sysparam-header.patch  |  24 ++
 dev-libs/thrift/metadata.xml                  |  17 +
 dev-libs/thrift/thrift-0.9.0-r3.ebuild        |  82 +++++
 dev-libs/thrift/thrift-0.9.3.ebuild           |  71 +++++
 net-proxy/mediaproxy/Manifest                 |   2 +
 net-proxy/mediaproxy/mediaproxy-2.6.1.ebuild  |  49 +++
 9 files changed, 556 insertions(+)
 create mode 100644 dev-libs/thrift/Manifest
 create mode 100644 dev-libs/thrift/files/thrift-0.9.0-arpa_inet_h.patch
 create mode 100644 dev-libs/thrift/files/thrift-0.9.0-exception.patch
 create mode 100644 dev-libs/thrift/files/thrift-0.9.0-sysparam-header.patch
 create mode 100644 dev-libs/thrift/metadata.xml
 create mode 100644 dev-libs/thrift/thrift-0.9.0-r3.ebuild
 create mode 100644 dev-libs/thrift/thrift-0.9.3.ebuild
 create mode 100644 net-proxy/mediaproxy/Manifest
 create mode 100644 net-proxy/mediaproxy/mediaproxy-2.6.1.ebuild

diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
new file mode 100644
index 0000000..cd75d7d
--- /dev/null
+++ b/dev-libs/thrift/Manifest
@@ -0,0 +1,8 @@
+AUX thrift-0.9.0-arpa_inet_h.patch 406 SHA256 cc4b2f08076de88deb9014149d8374cd9a782bd3b6bb30c05c06ae75d70a645f SHA512 279d5384f8a7c8f4e437c14fae9a8e5dcd37eff14fe7400ddebd3ef48e1f74db36254fd3536cbeff5d1576d71aadccb1f7911b57b0c6dae6c22a50f97bd552e8 WHIRLPOOL faca5d3ce2bf0d4ddea3126455eb665c07e52bfa43a5109c14988bd2a6e4ab6e13ffd3b8900c769c71e28c68370de35a36ad97a89eaccc2e7ef7f51cb8de220a
+AUX thrift-0.9.0-exception.patch 9460 SHA256 a48547718d423f8e6b8ecaf599df43554dd046f957bfa5b48393dc3947c6c63b SHA512 cd0925e61c740fc1e03ca60d4d180c3eabda260701bd7955c0947514f5f1fc6e87eb2987364052cbb2ffa899b306e29d425569645b36b5da8e7ddd73cf95c845 WHIRLPOOL 08e8741b88deb1da50128fdbb3bba7ede95ff63f75d7900c3137f3013261a6e89f15f7899a733a3c771be104f79f5875a0e5700e37c8e9d6ad0d09d141c72a0d
+AUX thrift-0.9.0-sysparam-header.patch 694 SHA256 f6164c000858d802e8cebf2dc7b095a40578f4426790c27f1f5661ed7bca7393 SHA512 367c9ed1b746ad217987ca56d7719950fd7511cd3c5a07e472c8cae3e275123283feb8b896f28ab8be012dddb44ab73b4c2f2aef92d6875c49d72ba0dedf1ffc WHIRLPOOL 35dff0a38b3093b11b93511f6112f755edc2a538c0a4f3f89257740d990b061970e4a63c1d6e5de3501bf752dfcdfdcafcdbc56e3a06fac290f38cc5f4395e74
+DIST thrift-0.9.0.tar.gz 8317 SHA256 bcb4a1ef398da7b3f7033e703dd6d4929d8b04c5569fe723a22d1660bba38677 SHA512 ed65989a9017d66c93b9b974cca36d9b78910a7369981d386ad9faf52a85296a07aa03299aade59b46a0b4460bfeafaa0e43dfef9d928ae087117f9b61b06f5d WHIRLPOOL 0579c2209a86d691293d77718030b4b67b6f2d453b66c6d9b88827d6cb0acc4cfc31de4038ac712540c1ddcd516a5bd59fd223d6f2f49aadc9a2b2bcfbe8dfff
+DIST thrift-0.9.3.tar.gz 8897936 SHA256 b0740a070ac09adde04d43e852ce4c320564a292f26521c46b78e0641564969e SHA512 5156915fca6a9b9e620524d0228dcc417ea49249242f8087f746f243b54ed4548d36bccc2eda880517766fe6e944cf5c8feda6fb847301ac1009d8d5eaa1656d WHIRLPOOL 32c9988739f46f9f99dd0378c7b908a32d221dd777d0155c386e4c6fba690716548c8000d882925537ce347fc81947e0c26e818046c01819956ed52af90685ca
+EBUILD thrift-0.9.0-r3.ebuild 1819 SHA256 a0ba473f32b0fae87b60183f53a05be69bb61c84ed2020a12c89eeab3857b532 SHA512 f1e0051f03c394b7e48610fbe7479e0b404f7b7408a59723c3131722f4928bd00bfd52a5e499959669ca71f5821a703c066d79e2f464d7e8c8fe395a3f6d0095 WHIRLPOOL de22869e45816c7dfe3b31f6d4c2858fd4068d107538d4de558c539155697cc383b15b7967563fc2f375d29bd4a45109cf0be330703c1325c252cc6205c190bd
+EBUILD thrift-0.9.3.ebuild 1484 SHA256 331ba6bf0a63c6fc007b4b35f859d0109fcd01f45ce8dae7544c6f707f556d20 SHA512 9e4101202017467c6bd36e061f5233e1d78a5997793c24abb1b44e5924c0c2c7962160e4d1b635d8ed1d8402eca7694278b6d125ed011755a4888b5cea83f788 WHIRLPOOL aec2af491d709425eaa6c5e3f5a607061627cc92f71e231ffe50cf0b41128c784334c097118357d4c47c8d096dc04f4febb00f637572a3b0b1532cb55f49306b
+MISC metadata.xml 625 SHA256 20ace7f64f5bb405a5829b1686b007514b242bc5e669a2bdb76fb9d2c9a5aed5 SHA512 717afeca9870c560b25a1124c18df15ca1000ed64f6e1843e921ded1208d425346b3a36fee1b3522269ecbdc143975b5eef03fa8ee12a2cfa3dd25f69d7e2fb0 WHIRLPOOL 6d57b716870cceb2749abd988cb7c9c0ad8948889ee6d3f0f5789383910770c1fc586a1c165a5e03f04e15b8d68ef58b727c1c48ba74c0ab8b429f03ddc1efb0
diff --git a/dev-libs/thrift/files/thrift-0.9.0-arpa_inet_h.patch b/dev-libs/thrift/files/thrift-0.9.0-arpa_inet_h.patch
new file mode 100644
index 0000000..3ea20f7
--- /dev/null
+++ b/dev-libs/thrift/files/thrift-0.9.0-arpa_inet_h.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
+index 294c831..5534dcc 100644
+--- a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
++++ b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
+@@ -23,6 +23,7 @@
+ #include "TBinaryProtocol.h"
+ 
+ #include <limits>
++#include <arpa/inet.h>
+ 
+ 
+ namespace apache { namespace thrift { namespace protocol {
diff --git a/dev-libs/thrift/files/thrift-0.9.0-exception.patch b/dev-libs/thrift/files/thrift-0.9.0-exception.patch
new file mode 100644
index 0000000..5c6d007
--- /dev/null
+++ b/dev-libs/thrift/files/thrift-0.9.0-exception.patch
@@ -0,0 +1,291 @@
+From 544eebb56239849f27e594e691639ab099913ae3 Mon Sep 17 00:00:00 2001
+From: Vasiliy Yeremeyev <vayerx@gmail.com>
+Date: Wed, 28 May 2014 17:58:13 +0400
+Subject: [PATCH] exception
+
+---
+ compiler/cpp/src/generate/t_cpp_generator.cc | 31 ++++++++++++++++++++++++++++
+ test/DebugProtoTest.thrift                   |  1 +
+ test/DocTest.thrift                          |  3 ++-
+ test/ThriftTest.thrift                       |  3 ++-
+ tutorial/cpp/CppServer.cpp                   |  4 ++--
+ tutorial/d/server.d                          |  4 ++--
+ tutorial/erl/server.erl                      |  4 ++--
+ tutorial/java/src/CalculatorHandler.java     |  4 ++--
+ tutorial/perl/PerlServer.pl                  |  4 ++--
+ tutorial/php/PhpServer.php                   |  4 ++--
+ tutorial/py/PythonServer.py                  |  4 ++--
+ tutorial/rb/RubyServer.rb                    |  4 ++--
+ tutorial/tutorial.thrift                     |  5 +++--
+ 13 files changed, 55 insertions(+), 20 deletions(-)
+
+diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
+index 9b960bf..cacdd44 100644
+--- a/compiler/cpp/src/generate/t_cpp_generator.cc
++++ b/compiler/cpp/src/generate/t_cpp_generator.cc
+@@ -905,6 +905,37 @@ void t_cpp_generator::generate_struct_definition(ofstream& out,
+     scope_down(out);
+   }
+ 
++  // (IW) костыль для отображения сообщения в what() исключений.
++  if (is_exception) {
++    out << endl << indent() << tstruct->get_name() << "(const std::string& a_message) : message(a_message) {"
++      << "// Если здесь вылезает ошибка, то вы забыли объявить в исключении поле 'string message'."
++      << endl << indent() << "}" << endl << endl;
++
++    indent(out) << "virtual const char* what() const throw() {" << endl;
++
++    {
++      indent_up();
++      indent(out) << "if (message.empty()) {" << endl;
++
++      {
++        indent_up();
++        indent(out) << "return \"(Empty thrift exception: " << tstruct->get_name() << ")\";" << endl;
++        indent_down();
++      }
++
++      indent(out) << "} else {" << endl;
++
++      {
++        indent_up();
++        indent(out) << "return message.c_str();" << endl;
++        scope_down(out);
++      }
++
++      scope_down(out);
++    }
++  }
++  // (IW) конец костыля.
++
+   if (tstruct->annotations_.find("final") == tstruct->annotations_.end()) {
+     out <<
+       endl <<
+diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift
+index e2bba40..70f65e3 100644
+--- a/test/DebugProtoTest.thrift
++++ b/test/DebugProtoTest.thrift
+@@ -225,6 +225,7 @@ const i32 MYCONST = 2
+ exception ExceptionWithAMap {
+   1: string blah;
+   2: map<string, string> map_field;
++  3: string message;
+ }
+ 
+ service ServiceForExceptionWithAMap {
+diff --git a/test/DocTest.thrift b/test/DocTest.thrift
+index cb355ae..524ef7e 100644
+--- a/test/DocTest.thrift
++++ b/test/DocTest.thrift
+@@ -97,7 +97,8 @@ exception Xception {
+ 
+ exception Xception2 {
+   1: i32 errorCode,
+-  2: Xtruct struct_thing
++  2: Xtruct struct_thing,
++  3: string message
+ }
+ 
+ /* C1 */
+diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift
+index 2be53fa..3442e6d 100644
+--- a/test/ThriftTest.thrift
++++ b/test/ThriftTest.thrift
+@@ -111,7 +111,8 @@ exception Xception {
+ 
+ exception Xception2 {
+   1: i32 errorCode,
+-  2: Xtruct struct_thing
++  2: Xtruct struct_thing,
++  3: string message
+ }
+ 
+ struct EmptyStruct {}
+diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
+index d0dbad9..d424449 100644
+--- a/tutorial/cpp/CppServer.cpp
++++ b/tutorial/cpp/CppServer.cpp
+@@ -73,7 +73,7 @@ class CalculatorHandler : public CalculatorIf {
+     case Operation::DIVIDE:
+       if (work.num2 == 0) {
+         InvalidOperation io;
+-        io.what = work.op;
++        io.what_happened = work.op;
+         io.why = "Cannot divide by 0";
+         throw io;
+       }
+@@ -81,7 +81,7 @@ class CalculatorHandler : public CalculatorIf {
+       break;
+     default:
+       InvalidOperation io;
+-      io.what = work.op;
++      io.what_happened = work.op;
+       io.why = "Invalid Operation";
+       throw io;
+     }
+diff --git a/tutorial/d/server.d b/tutorial/d/server.d
+index d32b937..2778409 100644
+--- a/tutorial/d/server.d
++++ b/tutorial/d/server.d
+@@ -62,7 +62,7 @@ class CalculatorHandler : Calculator {
+     case Operation.DIVIDE:
+       if (work.num2 == 0) {
+         auto io = new InvalidOperation();
+-        io.what = work.op;
++        io.what_happened = work.op;
+         io.why = "Cannot divide by 0";
+         throw io;
+       }
+@@ -70,7 +70,7 @@ class CalculatorHandler : Calculator {
+       break;
+     default:
+       auto io = new InvalidOperation();
+-      io.what = work.op;
++      io.what_happened = work.op;
+       io.why = "Invalid Operation";
+       throw io;
+     }
+diff --git a/tutorial/erl/server.erl b/tutorial/erl/server.erl
+index 4915606..b5814b2 100644
+--- a/tutorial/erl/server.erl
++++ b/tutorial/erl/server.erl
+@@ -44,12 +44,12 @@ calculate(Logid, Work) ->
+         ?tutorial_Operation_MULTIPLY -> Num1 * Num2;
+ 
+         ?tutorial_Operation_DIVIDE when Num2 == 0 ->
+-          throw(#invalidOperation{what=Op, why="Cannot divide by 0"});
++          throw(#invalidOperation{what_happened=Op, why="Cannot divide by 0"});
+         ?tutorial_Operation_DIVIDE ->
+           Num1 div Num2;
+ 
+         _Else ->
+-          throw(#invalidOperation{what=Op, why="Invalid operation"})
++          throw(#invalidOperation{what_happened=Op, why="Invalid operation"})
+     end.
+ 
+ getStruct(Key) ->
+diff --git a/tutorial/java/src/CalculatorHandler.java b/tutorial/java/src/CalculatorHandler.java
+index 4216be5..7765100 100644
+--- a/tutorial/java/src/CalculatorHandler.java
++++ b/tutorial/java/src/CalculatorHandler.java
+@@ -58,7 +58,7 @@ public class CalculatorHandler implements Calculator.Iface {
+     case DIVIDE:
+       if (work.num2 == 0) {
+         InvalidOperation io = new InvalidOperation();
+-        io.what = work.op.getValue();
++        io.what_happened = work.op.getValue();
+         io.why = "Cannot divide by 0";
+         throw io;
+       }
+@@ -66,7 +66,7 @@ public class CalculatorHandler implements Calculator.Iface {
+       break;
+     default:
+       InvalidOperation io = new InvalidOperation();
+-      io.what = work.op.getValue();
++      io.what_happened = work.op.getValue();
+       io.why = "Unknown operation";
+       throw io;
+     }
+diff --git a/tutorial/perl/PerlServer.pl b/tutorial/perl/PerlServer.pl
+index a40ec69..78ab929 100644
+--- a/tutorial/perl/PerlServer.pl
++++ b/tutorial/perl/PerlServer.pl
+@@ -68,14 +68,14 @@ sub calculate
+     if ($num2 == 0)
+     {
+       my $x = new tutorial::InvalidOperation;
+-      $x->what($op);
++      $x->what_happened($op);
+       $x->why('Cannot divide by 0');
+       die $x;
+     }
+     $val = $num1 / $num2;
+   } else {
+     my $x = new tutorial::InvalidOperation;
+-    $x->what($op);
++    $x->what_happened($op);
+     $x->why('Invalid operation');
+     die $x;
+   }
+diff --git a/tutorial/php/PhpServer.php b/tutorial/php/PhpServer.php
+index 4af70a4..f97b7ea 100755
+--- a/tutorial/php/PhpServer.php
++++ b/tutorial/php/PhpServer.php
+@@ -79,7 +79,7 @@ class CalculatorHandler implements \tutorial\CalculatorIf {
+       case \tutorial\Operation::DIVIDE:
+         if ($w->num2 == 0) {
+           $io = new \tutorial\InvalidOperation();
+-          $io->what = $w->op;
++          $io->what_happened = $w->op;
+           $io->why = "Cannot divide by 0";
+           throw $io;
+         }
+@@ -87,7 +87,7 @@ class CalculatorHandler implements \tutorial\CalculatorIf {
+         break;
+       default:
+         $io = new \tutorial\InvalidOperation();
+-        $io->what = $w->op;
++        $io->what_happened = $w->op;
+         $io->why = "Invalid Operation";
+         throw $io;
+     }
+diff --git a/tutorial/py/PythonServer.py b/tutorial/py/PythonServer.py
+index cf2aab2..b77ed19 100755
+--- a/tutorial/py/PythonServer.py
++++ b/tutorial/py/PythonServer.py
+@@ -55,13 +55,13 @@ class CalculatorHandler:
+     elif work.op == Operation.DIVIDE:
+       if work.num2 == 0:
+         x = InvalidOperation()
+-        x.what = work.op
++        x.what_happened = work.op
+         x.why = 'Cannot divide by 0'
+         raise x
+       val = work.num1 / work.num2
+     else:
+       x = InvalidOperation()
+-      x.what = work.op
++      x.what_happened = work.op
+       x.why = 'Invalid operation'
+       raise x
+ 
+diff --git a/tutorial/rb/RubyServer.rb b/tutorial/rb/RubyServer.rb
+index 30aa7f2..f283791 100755
+--- a/tutorial/rb/RubyServer.rb
++++ b/tutorial/rb/RubyServer.rb
+@@ -52,14 +52,14 @@ class CalculatorHandler
+     elsif work.op == Operation::DIVIDE
+       if work.num2 == 0
+         x = InvalidOperation.new()
+-        x.what = work.op
++        x.what_happened = work.op
+         x.why = "Cannot divide by 0"
+         raise x
+       end
+       val = work.num1 / work.num2
+     else
+       x = InvalidOperation.new()
+-      x.what = work.op
++      x.what_happened = work.op
+       x.why = "Invalid operation"
+       raise x
+     end
+diff --git a/tutorial/tutorial.thrift b/tutorial/tutorial.thrift
+index 3150151..9854138 100644
+--- a/tutorial/tutorial.thrift
++++ b/tutorial/tutorial.thrift
+@@ -112,8 +112,9 @@ struct Work {
+  * Structs can also be exceptions, if they are nasty.
+  */
+ exception InvalidOperation {
+-  1: i32 what,
+-  2: string why
++  1: i32 what_happened,
++  2: string why,
++  3: string message
+ }
+ 
+ /**
+-- 
+1.9.3
+
diff --git a/dev-libs/thrift/files/thrift-0.9.0-sysparam-header.patch b/dev-libs/thrift/files/thrift-0.9.0-sysparam-header.patch
new file mode 100644
index 0000000..1677368
--- /dev/null
+++ b/dev-libs/thrift/files/thrift-0.9.0-sysparam-header.patch
@@ -0,0 +1,24 @@
+--- a/lib/cpp/src/thrift/protocol/TProtocol.h	2013-09-27 13:27:12.732148823 +0200
++++ b/lib/cpp/src/thrift/protocol/TProtocol.h	2013-09-27 13:27:56.738669377 +0200
+@@ -75,10 +75,6 @@
+ }
+ 
+ 
+-namespace apache { namespace thrift { namespace protocol {
+-
+-using apache::thrift::transport::TTransport;
+-
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+@@ -140,6 +136,10 @@
+ # error "Can't define htonll or ntohll!"
+ #endif
+ 
++namespace apache { namespace thrift { namespace protocol {
++
++using apache::thrift::transport::TTransport;
++
+ /**
+  * Enumerated definition of the types that the Thrift protocol supports.
+  * Take special note of the T_END type which is used specifically to mark
diff --git a/dev-libs/thrift/metadata.xml b/dev-libs/thrift/metadata.xml
new file mode 100644
index 0000000..d2ca5a6
--- /dev/null
+++ b/dev-libs/thrift/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<use>
+	<flag name='c_glib'>c_glib</flag>
+	<flag name='cpp'>cpp</flag>
+	<flag name='std-cxx11'>Enable std::thread support.</flag>
+	<flag name='csharp'>csharp</flag>
+	<flag name='csharp'>csharp</flag>
+	<flag name='erlang'>erlang</flag>
+	<flag name='go'>go</flag>
+	<flag name='haskell'>haskell</flag>
+	<flag name='php_extension'>php_extension</flag>
+	<flag name='pic'>Position-Independent Code</flag>
+	<flag name='xmsg_patch'>apply 'exception' patch -- add message to what()</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-libs/thrift/thrift-0.9.0-r3.ebuild b/dev-libs/thrift/thrift-0.9.0-r3.ebuild
new file mode 100644
index 0000000..0ed5c2d
--- /dev/null
+++ b/dev-libs/thrift/thrift-0.9.0-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2012 W-Mark Kubacki; modified by Vasiliy Yeremeyev, 2012-2014
+# Distributed under the terms of the OSI Reciprocal Public License
+# $Id$
+
+EAPI="5"
+inherit flag-o-matic
+
+DESCRIPTION="Data serialization and communication toolwork"
+HOMEPAGE="http://thrift.apache.org/about/"
+SRC_URI="mirror://apache/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="xmsg_patch +pic cpp c_glib csharp erlang python perl php php_extension ruby haskell go"
+
+RDEPEND=">=dev-libs/boost-1.34.0
+	virtual/yacc
+	sys-devel/flex
+	dev-libs/openssl
+	cpp? (
+		>=sys-libs/zlib-1.2.3
+		dev-libs/libevent
+	)
+	csharp? ( >=dev-lang/mono-1.2.4 )
+	erlang? ( >=dev-lang/erlang-12.0.0 )
+	python? (
+		>=dev-lang/python-2.4.0
+		!dev-python/thrift
+	)
+	perl? (
+		dev-lang/perl
+		dev-perl/Bit-Vector
+		dev-perl/Class-Accessor
+	)
+	php? ( >=dev-lang/php-5.0.0 )
+	php_extension? ( >=dev-lang/php-5.0.0 )
+	ruby? ( virtual/rubygems )
+	haskell? ( dev-haskell/haskell-platform )
+	go? ( sys-devel/gcc[go] )
+	"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	c_glib? ( dev-libs/glib )
+	"
+
+S="${WORKDIR}/${P/_beta[0-9]/}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-arpa_inet_h.patch" \
+		"${FILESDIR}/${P}-sysparam-header.patch"
+	use xmsg_patch && epatch "${FILESDIR}/${P}-exception.patch"
+}
+
+src_configure() {
+	local myconf="--without-java"
+	for USEFLAG in ${IUSE}; do
+		myconf+=" $(use_with ${USEFLAG/+/})"
+	done
+
+	# This flags either result in compilation errors
+	# or byzantine runtime behaviour.
+	filter-flags -fwhole-program -fwhopr
+
+	econf \
+		${myconf}
+}
+
+src_compile() {
+	if use cpp; then
+		# -jx fails for x > 1 with use cpp
+		emake -j1 || die "emake install failed"
+	else
+		emake || die "emake install failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/dev-libs/thrift/thrift-0.9.3.ebuild b/dev-libs/thrift/thrift-0.9.3.ebuild
new file mode 100644
index 0000000..b8bb85e
--- /dev/null
+++ b/dev-libs/thrift/thrift-0.9.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-r1
+
+DESCRIPTION="Software framework for scalable cross-language services development"
+HOMEPAGE="http://thrift.apache.org"
+SRC_URI="mirror://apache/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Thrift 0.9.3 cmake build doesn't support other generator libraries
+# TODO: as3 c_glib cocoa cpp csharp d delphi erl go haxe hs java javame js lua nodejs ocaml perl php py rb st ts
+IUSE="cpp c_glib python qt4 qt5 std-cxx11"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/openssl:=
+	qt4? ( dev-qt/qtcore:4 )
+	qt5? ( dev-qt/qtcore:5 )
+
+	cpp? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-devel/gcc-4.8
+	sys-devel/flex
+	virtual/yacc
+	c_glib? ( dev-libs/glib )
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with std-cxx11 STDTHREADS)
+	)
+	for flag in ${IUSE}; do
+		mycmakeargs+=($(cmake-utils_use_with ${flag/+/}))
+	done
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Thrift 0.9.3 doesn't install python libs
+	install_python() {
+		cd "${S}/lib/py/" || die
+		${EPYTHON} "${S}/lib/py/setup.py" install --root "${D}"
+
+		python_optimize
+	}
+	if use python; then
+		python_foreach_impl install_python
+	fi
+
+}
diff --git a/net-proxy/mediaproxy/Manifest b/net-proxy/mediaproxy/Manifest
new file mode 100644
index 0000000..01fe06a
--- /dev/null
+++ b/net-proxy/mediaproxy/Manifest
@@ -0,0 +1,2 @@
+DIST mediaproxy-2.6.1.tar.gz 201536 SHA256 a424893f951f233d3f31e286034aabde07b9625f8d79a808ff28d2cf3eda0854 SHA512 f4da0dcf2347911feacfa9b6757738d94d8f1fdd7eae885ba13e49aa590bb9f195c76c8928b11564d7e51d7f0e2e89ee277e0b58e7450b6a68f91d56b8428c8a WHIRLPOOL 289ef64c01abd2389804b1f9247f66d21dcc55197f4f0739a4ffe1b767f8529b9f2bbefe24c60b3609ad268053abcf597e566c72825ca314b92b89754cbfa8b9
+EBUILD mediaproxy-2.6.1.ebuild 1131 SHA256 6e8778c96033be491514c094c033ace28870dc5955597170bf29dcfe036e4cc7 SHA512 fe8dab1fff760cfe1b68e7619de1b310fd4b12a7fad537fcf1754423015bf6c6fdeccca86105724060fadd0196cb1d51b447e5c4fbd8ba7604195a51cb875fd8 WHIRLPOOL 848f451a9307a845762d6d762bea033390d226ded403bc68f5d8d7842a1ef12e76cfb6bf257fac4e3f64aa3972e3674d3c8593b79883045597749b73438f59f8
diff --git a/net-proxy/mediaproxy/mediaproxy-2.6.1.ebuild b/net-proxy/mediaproxy/mediaproxy-2.6.1.ebuild
new file mode 100644
index 0000000..5da1256
--- /dev/null
+++ b/net-proxy/mediaproxy/mediaproxy-2.6.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils distutils
+
+DESCRIPTION="MediaProxy is a media relay for RTP/RTCP and UDP streams"
+HOMEPAGE="http://mediaproxy.ag-projects.com/"
+SRC_URI="http://download.ag-projects.com/MediaProxy/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="accounting radius"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+dev-python/twisted
+net-zope/zope-interface
+dev-python/python-gnutls
+net-libs/libnetfilter_conntrack
+dev-python/python-application
+dev-python/python-cjson
+accounting? ( dev-python/sqlobject )
+radius? ( dev-python/pyrad )
+"
+
+pkg_setup() {
+	enewgroup mediaproxy
+	enewuser mediaproxy -1 -1 -1 "mediaproxy"
+}
+
+src_install() {
+	distutils_src_install
+
+	keepdir /var/run/mediaproxy
+	fowners mediaproxy:mediaproxy /var/run/mediaproxy
+	keepdir /var/log/mediaproxy
+	fowners mediaproxy:mediaproxy /var/log/mediaproxy
+
+	keepdir /etc/mediaproxy
+	insinto /etc/mediaproxy
+	#newins "${FILESDIR}/${PN}.tac" "${PN}.tac"
+
+	#newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	#newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}

From eee2c2dad16b27b9eda2e78c2a4c614af4aaaa2d Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 10 Nov 2016 23:12:55 -0800
Subject: [PATCH 225/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 766382c..9bba2fb 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3959680 SHA256 c88abc0326c72926ce88d947a64330fcd07ac6b2b2376308d1ee33947636207f SHA512 5d57fb5530b501d7442f8007c9bae1779540eea487fe9eb7a3742982e83fec9220606ac472301ee7f74cb31daae7bc7f342bd4245e8bc808b5916ddc82b251fb WHIRLPOOL f260a1bde47af80bda3f83a204e50cbe49c62d298b0c745f15b12e035382c53703476aba8e5d16a6357e48ae3a438e1d662fcce6d3787eafdf9338aa50eefc60
+DIST freeswitch-cyneric-1.6.10.tar.gz 3960294 SHA256 83dff5ff7f7162f94761412c4aeb44f5b97eede5a2b953c1306c75f387b966ff SHA512 a9b757013b349061225a3fb9513a19361fba021f5f236a0fba0405a3fb720828689bf3fec93f628293b86f257c7e47ad02b0b720c37d943a7cbc5e52ee5a70ac WHIRLPOOL 5e13dbe0734be00990d1816e8fe851c9c8bed97ca6733d0630e5d4c89bf8ad184e3fb13ccbfd26ccacbafb50f818fba7103bb3bade2f373f9d605cf50bf6f38d
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From a5240f35a9abeb264f3a24332258b1ed83942a2b Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 15 Nov 2016 12:27:43 -0800
Subject: [PATCH 226/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 9bba2fb..6d3e8dc 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3960294 SHA256 83dff5ff7f7162f94761412c4aeb44f5b97eede5a2b953c1306c75f387b966ff SHA512 a9b757013b349061225a3fb9513a19361fba021f5f236a0fba0405a3fb720828689bf3fec93f628293b86f257c7e47ad02b0b720c37d943a7cbc5e52ee5a70ac WHIRLPOOL 5e13dbe0734be00990d1816e8fe851c9c8bed97ca6733d0630e5d4c89bf8ad184e3fb13ccbfd26ccacbafb50f818fba7103bb3bade2f373f9d605cf50bf6f38d
+DIST freeswitch-cyneric-1.6.10.tar.gz 3960291 SHA256 913f2f3afbb33ba8d97ac7f6c6e180ed8bb52f9630eb1d8b5c7e4ce002fb6ebe SHA512 cec7a2e457ae1f194acd99ce9c5d568528df6906ed89801ef60fa55c134643ec8c449dd206aef29f50cc93f723e731ed7d80371d7e150810c6cfde3cb1090201 WHIRLPOOL 3d8843993e2ff23c3c3e164e9c7f6f2d00dc55bb49891720c7115187547e16a9f5564fd9b118f7f82f3ef4518519b18e306b33b8d40c2ccc671eccd47b63bfc4
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 9bc38475cfef57fafbbddefafa040fe5a948c5cc Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 15 Nov 2016 12:44:25 -0800
Subject: [PATCH 227/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 6d3e8dc..408770f 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3960291 SHA256 913f2f3afbb33ba8d97ac7f6c6e180ed8bb52f9630eb1d8b5c7e4ce002fb6ebe SHA512 cec7a2e457ae1f194acd99ce9c5d568528df6906ed89801ef60fa55c134643ec8c449dd206aef29f50cc93f723e731ed7d80371d7e150810c6cfde3cb1090201 WHIRLPOOL 3d8843993e2ff23c3c3e164e9c7f6f2d00dc55bb49891720c7115187547e16a9f5564fd9b118f7f82f3ef4518519b18e306b33b8d40c2ccc671eccd47b63bfc4
+DIST freeswitch-cyneric-1.6.10.tar.gz 3960300 SHA256 b0ae945df51ed4d1d5a3aa0e7562f7b29a454c8fb4510811a456556e2682f20f SHA512 19486e70cd2f8d646daa265b382f17c84115826ffc2c0af06199c21444a74054916257f42398b8929dc5c8b1aa9d8eb02977c83dcd36625b3e4ffdb322637a22 WHIRLPOOL ffa86dccef333f869adad24fa67caac7c9ea398edf14d616de787bbe3d0593b46ab3e69f38e5282844870154439e8fe3c036ff71dae9cdc7040d255d863e0aa7
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 34a98c59854437c127c1c67213b77e29e00d3150 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Tue, 15 Nov 2016 12:48:20 -0800
Subject: [PATCH 228/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 408770f..1c14a8e 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3960300 SHA256 b0ae945df51ed4d1d5a3aa0e7562f7b29a454c8fb4510811a456556e2682f20f SHA512 19486e70cd2f8d646daa265b382f17c84115826ffc2c0af06199c21444a74054916257f42398b8929dc5c8b1aa9d8eb02977c83dcd36625b3e4ffdb322637a22 WHIRLPOOL ffa86dccef333f869adad24fa67caac7c9ea398edf14d616de787bbe3d0593b46ab3e69f38e5282844870154439e8fe3c036ff71dae9cdc7040d255d863e0aa7
+DIST freeswitch-cyneric-1.6.10.tar.gz 3966734 SHA256 224b8841f869c62af0c41a8de1cad3f8e781cd96848321dfb665af11c8685aa6 SHA512 b174865e9b7ed300c091c3aef980a5640327088ba180766388f50609799859579aecfdfae1e8bc834ec54373dee845147a3c7425c9fc647831ff1031342079b6 WHIRLPOOL 75f66ab8e21a99e559a82807cefcfdfab70a1b3a54a717df8a0bc6ea316456d12b98a6907055f54ad3ef17fb6e347aa7db6db5b5c3fbe3e337c2ad4248132307
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 9bcf0c43f79008a9a432ce2508a05fa98dd1ae86 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Thu, 17 Nov 2016 15:51:33 -0800
Subject: [PATCH 229/261] fixed initd

---
 net-misc/freeswitch-cyneric/Manifest                      | 2 +-
 net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 1c14a8e..d458f25 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,6 +1,6 @@
 AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
 AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
-AUX freeswitch.1.6.10.initd 1674 SHA256 acce25077fab0622a4723e55dab8eba2e87a1322e772792d93d7508a2288a7ab SHA512 4a3acddd7cea1bd8f60561f73dfd48326b7692a18a19a9afb7b73b91ee45d0fb0e0aa4a8ebee8c2cb40195b173e8d82766ac87a5f44c63d2e9b33e23c0139a4f WHIRLPOOL 8dcdd1c045b6fe2679474ffd9712b83db77ddc2fbb92c8ecf32448693d844bbc66d370e243a0252f6468c258b052dad68b9138ce9ae21b15f9123502348dbf85
+AUX freeswitch.1.6.10.initd 1675 SHA256 cdab5efdd21d1c8d9d907bf6367891bb172c9e8eb2d41aa05cd61708a012ea89 SHA512 ec944c11b9c4541924dcbf592c00c47908978db2f9efcb08565c981ccf50c8fc35abb54c462e86e8e227b2f5398e251b08a9c9d9c1be30cf5da45a7d366fa9a5 WHIRLPOOL dbef5c5ac2bdbf24adbb99f6d187940deb30426e02e093f55e39f94ce3b04bb47b47fded3bec691d2af7cfe6f5da6db7f493c5eb1483c162620277b6eef3f459
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
index 98a96b0..30c4e7d 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -71,7 +71,7 @@ stop() {
 
 	ebegin "Stopping Freeswitch instance ${INSTANCE}"
 	start-stop-daemon --stop \
-		--signal SIGILL \
+		--signal SIGKILL \
 		--retry 5 --quiet \
 		--pidfile /opt/freeswitch/log/${INSTANCE}/freeswitch.pid
         eend $?

From 3f88ad2513b54cad5f9aa615581ea3e933b5c921 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 28 Nov 2016 13:53:52 -0800
Subject: [PATCH 230/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index d458f25..72b5ebf 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1675 SHA256 cdab5efdd21d1c8d9d907bf6367891bb172c9e8e
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3966734 SHA256 224b8841f869c62af0c41a8de1cad3f8e781cd96848321dfb665af11c8685aa6 SHA512 b174865e9b7ed300c091c3aef980a5640327088ba180766388f50609799859579aecfdfae1e8bc834ec54373dee845147a3c7425c9fc647831ff1031342079b6 WHIRLPOOL 75f66ab8e21a99e559a82807cefcfdfab70a1b3a54a717df8a0bc6ea316456d12b98a6907055f54ad3ef17fb6e347aa7db6db5b5c3fbe3e337c2ad4248132307
+DIST freeswitch-cyneric-1.6.10.tar.gz 3967232 SHA256 345ce67dc60d5b3dc2cc76245382f32c23b3f65a63f6ec8d5f7e6c701fbf5fb5 SHA512 20fcc4dbcd4674328dfec95ed6f56979708bd3755697841468eb4233d334a65d1ce9aef468ebc6c2365a25c93cbbcce29dad115368e6643327227d8301cccabe WHIRLPOOL 9e59ddd907f7e8791c496adc43951e753f11a35c644b646aabee0935859b52275643d7605a614ec67dcd00f9fda790c3e687053b5d7bea690a1ef2cf85b6fba8
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 4ac544a2f01fb953a8201b6bb28076ab2483bf98 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 7 Dec 2016 12:30:56 -0800
Subject: [PATCH 231/261] new version of asterisk

---
 net-misc/asterisk/Manifest                |   2 +
 net-misc/asterisk/asterisk-11.25.0.ebuild | 324 ++++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 net-misc/asterisk/asterisk-11.25.0.ebuild

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4620057..a56d791 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -96,6 +96,7 @@ DIST asterisk-11.21.0.tar.gz 34875184 SHA256 14e525c104633bf49a4122bda93d9fcbc16
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
 DIST asterisk-11.22.0.tar.gz 35101090 SHA256 590c361f8926e08eeaf320a35985cd39a2ea651ec3e94fb62484a7179c32f527 SHA512 98085053fc8d2aaf1c3305ef1900287bc1ee9d1e421a073cb0e1b56d379fd7803fdbfaab16143be24bdd41a7b28305dce7b91763564e750697ac2b2d9e8ad719 WHIRLPOOL f531ae8be5db9071c1809149523883cf0b7e65d2e8cecbc70d585d1881cd36a206de8cbc0edd2c4805d326427bb67a87cf2e079bed464fcc0cce376cb1098d59
+DIST asterisk-11.25.0.tar.gz 35125167 SHA256 12bc6d6b254e232417c656e86bec99e08828335e135d923f87498c133641f1c1 SHA512 a545352180612b9008ab92c7c24e416835cbf12ba3fd93c8a6ceee9b7a930b197b5ee3eb0de949605a800f0f57257393bee7deab2a1d933beed3d81ce28ec0c2 WHIRLPOOL 047654c4defe3446f3930192e3228e5df2d882ba2e7c307c15d575e1a226f401c59ca2e6d2e6a63d7fd8a2b8273961d5f900482c5a6b02fc6e45662665c9a79c
 DIST asterisk-certified-11.6-current.tar.gz 28887227 SHA256 592e3084e86c64b4c22848290124481e3f14d7cc1bfe01a8223c064a1ba0916c SHA512 32ea8fbaf159a364577d229c1cd1fda19c5f757c317268284c24cd9917c969b58a830604311ae9afcd20c7881233767bcde3f2ba2e42be5e2863d184a7e69907 WHIRLPOOL 9102f8c1c810f2e41bdec62e691f7d54449ff91afc7b90e94586cf9cee472dcd7f1b76e11d394f0d3fac8ba1b05a0003926088a3bebe5a8c7f3f846d6ac95603
 DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
 DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
@@ -108,4 +109,5 @@ EBUILD asterisk-11.21.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259
 EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.22.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.22.0_rc1.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
+EBUILD asterisk-11.25.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.6.ebuild 9656 SHA256 5eaf9d59d2a902db8b49f98ccef973943453497a5e6044cf5512e7df1aebbcaf SHA512 2c39db59c6a1bd2f6092e24a403d352d8560ad464cd9bbad854bf1a1ebadfbd1664f3b12b79e825f85791f5bab3073123721499d8dace84228663f39fdf2996c WHIRLPOOL 228a4e2bda2188b0f424e3007eef5909e6fe2b44add37eed714b59df9a82a100e2d4a49083ec9c61ddbc41d2f14fb2dc4110eddd259d5de5c7f17b3789cd4a35
diff --git a/net-misc/asterisk/asterisk-11.25.0.ebuild b/net-misc/asterisk/asterisk-11.25.0.ebuild
new file mode 100644
index 0000000..5cdcf40
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.25.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+         http://mirrors.safesoft.us/gentoo/portage/net-misc/asterisk/asterisk-patchset-3.0/asterisk-patchset-3.0.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl:*
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}

From 1254f0b720e94c1b9ecd22673b8cde1dfc048c47 Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 28 Dec 2016 11:23:46 -0800
Subject: [PATCH 232/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 72b5ebf..9dc636e 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1675 SHA256 cdab5efdd21d1c8d9d907bf6367891bb172c9e8e
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3967232 SHA256 345ce67dc60d5b3dc2cc76245382f32c23b3f65a63f6ec8d5f7e6c701fbf5fb5 SHA512 20fcc4dbcd4674328dfec95ed6f56979708bd3755697841468eb4233d334a65d1ce9aef468ebc6c2365a25c93cbbcce29dad115368e6643327227d8301cccabe WHIRLPOOL 9e59ddd907f7e8791c496adc43951e753f11a35c644b646aabee0935859b52275643d7605a614ec67dcd00f9fda790c3e687053b5d7bea690a1ef2cf85b6fba8
+DIST freeswitch-cyneric-1.6.10.tar.gz 3967088 SHA256 9eb14216e496d71d841b835888df0a31023cc47f215cbdc89e4100c237e14881 SHA512 d81ba35790b9338b3a39a2370f5b372043b219d2731e9af0bd95e9977faea91229bb2d44f265aae22b2770cd90cb49e0f4c1acccfa07e17d2cefba9058c59292 WHIRLPOOL 444d30daf3d1b56fb331618b37457402314e9b0898696ad7547a5beaecfb2a2ca665ec04f857d3cc59c78079b0b23a6e96a7aff4d58bb509440b29c448e0f2e1
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 2f26d063f9d45e3ae38be22b064d1ab2b20f9aed Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 28 Dec 2016 11:26:10 -0800
Subject: [PATCH 233/261] update

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 9dc636e..d78619a 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1675 SHA256 cdab5efdd21d1c8d9d907bf6367891bb172c9e8e
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3967088 SHA256 9eb14216e496d71d841b835888df0a31023cc47f215cbdc89e4100c237e14881 SHA512 d81ba35790b9338b3a39a2370f5b372043b219d2731e9af0bd95e9977faea91229bb2d44f265aae22b2770cd90cb49e0f4c1acccfa07e17d2cefba9058c59292 WHIRLPOOL 444d30daf3d1b56fb331618b37457402314e9b0898696ad7547a5beaecfb2a2ca665ec04f857d3cc59c78079b0b23a6e96a7aff4d58bb509440b29c448e0f2e1
+DIST freeswitch-cyneric-1.6.10.tar.gz 3967252 SHA256 92cf3d245e97f54a572c77c6f2af320504d46812af42b5b830848a29b651f51b SHA512 9763e97c36f17558bc41a7ae32da91ea42dd975f764c69500a58c0ce6f47cac5bf8a9b38eb2fc253710f7f61fe7b027aa5d54ecedab3c641cf9f4832d6ecff07 WHIRLPOOL f2bb9fd21aa3b0da8a8f9ffef605c303579913252ed63d8a762570213939db9f656a41daa392f397fdd43e489307ed7125520edc371317873da5df3dcf27bb35
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From deb60b756576dc7e61b406509f8967f9dd52b123 Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 28 Dec 2016 11:47:05 -0800
Subject: [PATCH 234/261] update

---
 net-misc/freeswitch-cyneric/Manifest                      | 2 +-
 net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index d78619a..cfa58e4 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,6 +1,6 @@
 AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
 AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
-AUX freeswitch.1.6.10.initd 1675 SHA256 cdab5efdd21d1c8d9d907bf6367891bb172c9e8eb2d41aa05cd61708a012ea89 SHA512 ec944c11b9c4541924dcbf592c00c47908978db2f9efcb08565c981ccf50c8fc35abb54c462e86e8e227b2f5398e251b08a9c9d9c1be30cf5da45a7d366fa9a5 WHIRLPOOL dbef5c5ac2bdbf24adbb99f6d187940deb30426e02e093f55e39f94ce3b04bb47b47fded3bec691d2af7cfe6f5da6db7f493c5eb1483c162620277b6eef3f459
+AUX freeswitch.1.6.10.initd 1702 SHA256 048a3174e3e56da291edaf667aa95f1a08286493c6807e3a0427a7dae2cee445 SHA512 9ab4429e9836f0d8caae17fb94146289cc1b96bb6643ad681a06e19690f3ca2e9ad6bf13c669694fe6cefae309fdc750c1f5576d7d1d74d5f0aa088cd5a6cee6 WHIRLPOOL da44d880337464c1b38d0b3efffa0f832ddf4a6f45bf79dba902a5fd8a47953906e10117463be7342c63e58b4395028f725f7afe6e5094e5d93d19640e11809f
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
index 30c4e7d..e86b5b1 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -58,12 +58,13 @@ start() {
 		-nc ${OPTS}
 	eend $?
 
-        ebegin "Starting cynerwebmon.sh"
+	ebegin "Starting cynerwebmon.sh"
+
 	sleep 3
 
 	# start freeswitch mon
-	kill -9 $(pidof -x cynerwebmon.sh)
-	/opt/freeswitch/scripts/cynerwebmon.sh
+	killall -9 cynerwebmon.sh
+	flock -n /var/run/cynerwebmon.lockfile -c /opt/freeswitch/scripts/cynerwebmon.sh
 
 }
 

From 387f10383f6a4f5382b8b1583bdddd9fd3d7ce6d Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 28 Dec 2016 13:21:50 -0800
Subject: [PATCH 235/261] fml

---
 net-misc/freeswitch-cyneric/Manifest                      | 2 +-
 net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index cfa58e4..8cb2a20 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -1,6 +1,6 @@
 AUX cyneric.cron 3175 SHA256 74b87d2023acd5fdc709a419c2c83a81e74be75f3e0f8f1bdeee959b12d1d3de SHA512 a946631ae31c297c55242680350f1508f377052b05eae73e12083f63e90c7cf6c20eb9fe244f698050d1dd655329eff85244a9fb1ff0faef0d4403f375cbd47c WHIRLPOOL db2e318e8f45f495629b2492232c3ebdc224b423b4036e69e8aec0e16617c453bd10e5a1b8c6b42df5ed024fe01f8949ea6197133f20234245534ac75ce8b684
 AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec82ea78e425090a8 SHA512 ce5bfe9873df9229a13c0c72d9594a9142ee7aaa05f08137dc52673f66bf488c5051b3ca026aed214621cac2a79eefd5d23640b5f3ed88f5bc31bbd0d06a62e7 WHIRLPOOL c47bd3a87a957477986a90a9d200b038538c1bf22bf8c696b33e121b9b102df11687bab1de25483f76d6e1b56f2907f2a02205c9adc76de44b3d64780c879100
-AUX freeswitch.1.6.10.initd 1702 SHA256 048a3174e3e56da291edaf667aa95f1a08286493c6807e3a0427a7dae2cee445 SHA512 9ab4429e9836f0d8caae17fb94146289cc1b96bb6643ad681a06e19690f3ca2e9ad6bf13c669694fe6cefae309fdc750c1f5576d7d1d74d5f0aa088cd5a6cee6 WHIRLPOOL da44d880337464c1b38d0b3efffa0f832ddf4a6f45bf79dba902a5fd8a47953906e10117463be7342c63e58b4395028f725f7afe6e5094e5d93d19640e11809f
+AUX freeswitch.1.6.10.initd 1736 SHA256 aae77965c75774af88629e4c6f152a570783b577c27f706db9faa348bcfa1b90 SHA512 dde1373077eba80ff7d89116858114c73ff02879322b9e2e6d69e758aa045399daee855ac1d07953d177cb132a92e92b30d8f6ef2ca5ce7c4294639f381112c4 WHIRLPOOL 9264b45ed5828917eb69af0ba66a93ac986ed1044bd4ceea5b52ef6e4c4110dde3d38667957df67fc76d8efc29e5558c95ceb31c7af14c13d95ae6d9b5389a5b
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
diff --git a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
index e86b5b1..43b1779 100755
--- a/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
+++ b/net-misc/freeswitch-cyneric/files/freeswitch.1.6.10.initd
@@ -63,8 +63,8 @@ start() {
 	sleep 3
 
 	# start freeswitch mon
-	killall -9 cynerwebmon.sh
-	flock -n /var/run/cynerwebmon.lockfile -c /opt/freeswitch/scripts/cynerwebmon.sh
+	killall -9 cynerwebmon.sh > /dev/null 2>&1
+	flock -n /var/run/cynerwebmon.lockfile -c /opt/freeswitch/scripts/cynerwebmon.sh > /dev/null 2>&1
 
 }
 

From 1faaed03354fad3064c77d944aba99d414e437c9 Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 4 Jan 2017 12:43:56 -0800
Subject: [PATCH 236/261] janus update

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 6e05025..67d6042 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,5 +2,5 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 20811816 SHA256 113850c8df640b34022e6cf2b567dbc419af3b5b18395380bc5d5722ab4c1855 SHA512 999456fac00e8beb4a9dcb2f90e3dbc9e7ae4dca8b0376a67db720d81c3c921f040708acb7dc14bd9ee5d1faacad6bf6887e6a1a33c78faea361a4572ebbf671 WHIRLPOOL 17510ba780d846738adc5ac5a61dfc402ccf42e5b0af656d357fea7bd2453bc94066905083d59006610f0e7607395f2d128cd6311937dd59f1eeef8c1ffb862c
+DIST janus-0.0.5.tar.gz 26263671 SHA256 36c7035b9aae9aedcd64aa7d7cab74f035e0c262a155e18b7eb9104d04641086 SHA512 356ced3ee7ea5c2e8752d42599057da992573a3c0f7d59ae6e796e7e91b99aab015116bb0414633e6196f5410424e232b75e01a6e7fb1385fa2a898f14f4257c WHIRLPOOL 194e28cd56f72bf84af3a189add8ec6da9c0eb7d022c40cc69ebefa0e08a589cbe14a422773e27f5d83cea26d15918f91a1d34c2fd326ab99128285c2cb9c54b
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 5663da3c253cff98bc83192d7906d19509879738 Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Wed, 4 Jan 2017 12:47:14 -0800
Subject: [PATCH 237/261] new janus version

---
 net-misc/janus/Manifest           |  2 +
 net-misc/janus/janus-0.2.2.ebuild | 80 +++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 net-misc/janus/janus-0.2.2.ebuild

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 67d6042..4612b65 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -3,4 +3,6 @@ AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293c
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 26263671 SHA256 36c7035b9aae9aedcd64aa7d7cab74f035e0c262a155e18b7eb9104d04641086 SHA512 356ced3ee7ea5c2e8752d42599057da992573a3c0f7d59ae6e796e7e91b99aab015116bb0414633e6196f5410424e232b75e01a6e7fb1385fa2a898f14f4257c WHIRLPOOL 194e28cd56f72bf84af3a189add8ec6da9c0eb7d022c40cc69ebefa0e08a589cbe14a422773e27f5d83cea26d15918f91a1d34c2fd326ab99128285c2cb9c54b
+DIST janus-0.2.2.tar.gz 26263671 SHA256 771faac52a63ec40c24c9b573b9349405b47342864d7a9e6f3b9684d8f0996b2 SHA512 e459e453719146ee1f15146bfe0c643f9de06836379340829120a6738499cdaaabbe22a9a7ce93faf14d8485cc8bef56a05fb70d73867c0122d380422ab50b17 WHIRLPOOL 8fb8e055b1e9c8973996789c9ef576219674e0d5f7bb81b8b405626fb760786522f21ac845fc539ad4d61385dfd7464dc5b5ef38f383c2b247fcd8a723f9d078
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
+EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
new file mode 100644
index 0000000..ea45abb
--- /dev/null
+++ b/net-misc/janus/janus-0.2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
+HOMEPAGE="http://janus.conf.meetecho.com/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
+#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="websockets rabbitmq docs opus ogg data-channels"
+FEATURES="nostrip"
+
+#EPATCH_SUFFIX="patch"
+#PATCHES=( "${WORKDIR}/janus-patchset" )
+
+DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
+	opus? ( media-libs/opus )
+	ogg? ( media-libs/libogg )
+	websockets? ( net-libs/libwebsockets dev-util/cmake )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	data-channels? ( net-libs/usrsctp )
+	net-libs/libmicrohttpd
+	dev-libs/jansson
+	net-libs/libnice[-upnp]
+	dev-libs/openssl
+	>=net-libs/libsrtp-1.5.2-r1
+	net-libs/sofia-sip
+	dev-libs/glib
+	app-misc/screen
+	dev-util/gengetopt
+	dev-libs/ding-libs"
+
+S="${WORKDIR}/janus-gateway"
+
+src_prepare() {
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+
+	econf \
+		--prefix=/usr \
+		$(use_enable data-channels) \
+		$(use_enable websockets) \
+		$(use_enable rabbitmq) \
+		$(use_enable docs)
+}
+
+src_compile() {
+	export PREFIX="/usr"
+	MAKEOPTS="-j1" emake
+}
+
+src_install() {
+
+        mkdir -p "${D}"/etc/janus
+
+        dodir /usr/sbin
+
+        newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
+        newconfd "${FILESDIR}"/janus-confd janus || die "newconfd failed"
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+
+}
+
+

From 2bb4738d462016c26962f55f9aad7ef46503c218 Mon Sep 17 00:00:00 2001
From: root <root@webnode01-services01.safesoftsolutions.com>
Date: Fri, 13 Jan 2017 08:14:17 -0800
Subject: [PATCH 238/261] update

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 4612b65..47c1f45 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,7 +2,7 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 26263671 SHA256 36c7035b9aae9aedcd64aa7d7cab74f035e0c262a155e18b7eb9104d04641086 SHA512 356ced3ee7ea5c2e8752d42599057da992573a3c0f7d59ae6e796e7e91b99aab015116bb0414633e6196f5410424e232b75e01a6e7fb1385fa2a898f14f4257c WHIRLPOOL 194e28cd56f72bf84af3a189add8ec6da9c0eb7d022c40cc69ebefa0e08a589cbe14a422773e27f5d83cea26d15918f91a1d34c2fd326ab99128285c2cb9c54b
+DIST janus-0.0.5.tar.gz 20811816 SHA256 113850c8df640b34022e6cf2b567dbc419af3b5b18395380bc5d5722ab4c1855 SHA512 999456fac00e8beb4a9dcb2f90e3dbc9e7ae4dca8b0376a67db720d81c3c921f040708acb7dc14bd9ee5d1faacad6bf6887e6a1a33c78faea361a4572ebbf671 WHIRLPOOL 17510ba780d846738adc5ac5a61dfc402ccf42e5b0af656d357fea7bd2453bc94066905083d59006610f0e7607395f2d128cd6311937dd59f1eeef8c1ffb862c
 DIST janus-0.2.2.tar.gz 26263671 SHA256 771faac52a63ec40c24c9b573b9349405b47342864d7a9e6f3b9684d8f0996b2 SHA512 e459e453719146ee1f15146bfe0c643f9de06836379340829120a6738499cdaaabbe22a9a7ce93faf14d8485cc8bef56a05fb70d73867c0122d380422ab50b17 WHIRLPOOL 8fb8e055b1e9c8973996789c9ef576219674e0d5f7bb81b8b405626fb760786522f21ac845fc539ad4d61385dfd7464dc5b5ef38f383c2b247fcd8a723f9d078
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
 EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 1ffb33660eb6f53f461043071683c8969dae3a3c Mon Sep 17 00:00:00 2001
From: root <vcall07-01@safesoft.io>
Date: Wed, 18 Jan 2017 14:43:24 -0800
Subject: [PATCH 239/261] add clickhouse

---
 dev-db/clickhouse/Manifest                    |   3 +
 dev-db/clickhouse/clickhouse-1.1.54127.ebuild | 123 ++++++++++++++++++
 .../clickhouse/files/clickhouse-server.initd  |  17 +++
 3 files changed, 143 insertions(+)
 create mode 100644 dev-db/clickhouse/Manifest
 create mode 100644 dev-db/clickhouse/clickhouse-1.1.54127.ebuild
 create mode 100644 dev-db/clickhouse/files/clickhouse-server.initd

diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
new file mode 100644
index 0000000..8b8124d
--- /dev/null
+++ b/dev-db/clickhouse/Manifest
@@ -0,0 +1,3 @@
+AUX clickhouse-server.initd 453 SHA256 45e7820663529849fa7fe51b3a5976a7c29964761cf207ff77795f799672b51d SHA512 25b7074f8ca423ee1afc4bf3e04aa481b33e2f972bfd5f7627999cc4bc269f43eaf5aef7b8041acd69028f625075fce95f854e002f6cdadaf3ab3bc2681671d5 WHIRLPOOL b713c56491c577d3fee98ae38232d52f735b03cf9fd074f95be7dfa469808ef44a09dd67771bf472658ecf6b1be78dc00b51126672702bb59c17e2b9f3c2ea48
+DIST clickhouse-1.1.54127.tar.gz 13109874 SHA256 1ae68b6456239547f7591e83ff3d7c93e2669253d83361fd997f5fc7e06743a1 SHA512 1f7e354632bec8ef1e10aca1ac09dd367721ee9399d3a2d032d39e66c345be14c9dd7c8fe2335db417fe8c6eb0e24e8554c12258deca5a04f697b199da20a456 WHIRLPOOL 1fcc4e09ebb0129db0101acf41c55a31340b41ed4bc0fbfe04a8e8fbbbfe7c4f6d463ecbaea0696418d4c304bf3bb6995c12b4b291510a81f6644cf1e6e11e9d
+EBUILD clickhouse-1.1.54127.ebuild 3235 SHA256 754c4fb6925236394cafe9aa70ba80398a0ed34f75067b63e77070ef99cf0678 SHA512 c415b03e8e4dd176d254c97d40c9d055847c8332f87d4e145ccdb17ac0fb38ad930beddaaa2c763e557d2c5cf61af336b14a9d90c0dec1492df2c5b07173ecf2 WHIRLPOOL 41ccc1658b8229b0e45986f5b6bc8ef0ef36bc20e24e1a0c00cd2c42916f3202f4db9c9be4b151dce1e6559fb7617887969eed1d24db3923c55df2e743928282
diff --git a/dev-db/clickhouse/clickhouse-1.1.54127.ebuild b/dev-db/clickhouse/clickhouse-1.1.54127.ebuild
new file mode 100644
index 0000000..6dc9bb7
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-1.1.54127.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+EAPI=6
+
+inherit cmake-utils user check-reqs versionator
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+MY_PN="ClickHouse"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/yandex/${MY_PN}.git"
+	EGIT_SUBMODULES=( -private )
+	SRC_URI=""
+	TYPE="unstable"
+else
+	TYPE="stable"
+	SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+fi
+
+SLOT="0/${TYPE}"
+IUSE="+server +client mongodb cpu_flags_x86_sse4_2"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+"
+
+RDEPEND="dev-libs/libltdl[static-libs]
+sys-libs/zlib[static-libs]
+dev-libs/libpcre
+client? (
+	sys-libs/ncurses:0
+	sys-libs/readline:0
+)
+|| (
+	dev-db/unixODBC[static-libs]
+	dev-libs/poco[odbc]
+)"
+
+DEPEND="${RDEPEND}
+sys-libs/libtermcap-compat[static-libs]
+dev-libs/icu[static-libs]
+dev-libs/glib[static-libs]
+dev-libs/boost[static-libs]
+dev-libs/openssl[static-libs]
+dev-libs/zookeeper-c[static-libs]
+dev-util/patchelf
+virtual/libmysqlclient[static-libs]
+|| ( >=sys-devel/gcc-5.0 >=sys-devel/clang-3.8 )"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="18G"
+	check-reqs_pkg_pretend
+	if [[ $(tc-getCC) == clang ]]; then
+		:
+	elif [[ $(gcc-major-version) -lt 5 ]]; then
+		eerror "Compilation with gcc older than 6.0 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
+src_prepare() {
+	default_src_prepare
+	sed -i -r -e "s: -Wno-(for-loop-analysis|unused-local-typedef|unused-private-field): -Wno-unused-variable:g" \
+		contrib/libpoco/CMakeLists.txt || die "Cann-t patch poco"
+}
+
+src_configure() {
+	DISABLE_MONGODB=1
+	use mongodb && DISABLE_MONGODB=0
+	export DISABLE_MONGODB
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile $(use server && echo clickhouse-server) $(use client && echo clickhouse-client)
+}
+
+src_install() {
+	cd "${BUILD_DIR}"
+	einfo $(pwd)
+	if use server; then
+		exeinto /usr/sbin
+		patchelf --remove-rpath dbms/src/Server/clickhouse-server
+		doexe dbms/src/Server/clickhouse-server
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse
+
+		insinto /etc/clickhouse-server
+		doins "${S}"/dbms/src/Server/config.xml
+		doins "${S}"/dbms/src/Server/users.xml
+
+		sed -e 's:/opt/clickhouse:/var/lib/clickhouse:g' -i "${ED}/etc/clickhouse-server/config.xml"
+		sed -e '/listen_host/s%::%::1%' -i "${ED}/etc/clickhouse-server/config.xml"
+
+		dodir /var/lib/clickhouse/data/default /var/lib/clickhouse/metadata/default /var/lib/clickhouse/tmp
+		dodir /var/log/clickhouse-server
+		fowners -R clickhouse:clickhouse /var/lib/clickhouse
+		fperms -R 0750 /var/lib/clickhouse
+		fowners -R clickhouse:adm /var/log/clickhouse-server
+		fperms -R 0750 /var/log/clickhouse-server
+	fi
+
+	if use client; then
+		exeinto /usr/bin
+		patchelf --remove-rpath dbms/src/Client/clickhouse-client
+		doexe dbms/src/Client/clickhouse-client
+
+		insinto /etc/clickhouse-client
+		doins "${S}"/dbms/src/Client/config.xml
+	fi
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd b/dev-db/clickhouse/files/clickhouse-server.initd
new file mode 100644
index 0000000..dd9a653
--- /dev/null
+++ b/dev-db/clickhouse/files/clickhouse-server.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/run/clickhouse-server.pid"
+command_background=1
+command="/usr/sbin/clickhouse-server"
+start_stop_daemon_args="--user clickhouse --group clickhouse \
+	--chdir /etc/clickhouse-server \
+	-1 /var/log/clickhouse-server/stdout.log \
+	-2 /var/log/clickhouse-server/stderr.log"
+
+depend() {
+	need net
+	after mongodb
+}

From 2f501d719ccab219905dfd570cf679f698adb5f9 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Wed, 18 Jan 2017 14:48:57 -0800
Subject: [PATCH 240/261] added libtermcap-compat

---
 sys-libs/libtermcap-compat/Manifest           |  4 ++
 .../libtermcap-compat-2.0.8-r4.ebuild         | 57 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 sys-libs/libtermcap-compat/Manifest
 create mode 100644 sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild

diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
new file mode 100644
index 0000000..a45e048
--- /dev/null
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -0,0 +1,4 @@
+DIST termcap-2.0.8-patches-2.tar.bz2 11589 SHA256 9e6e623445070f351c3c5fcc0a13da9f8df93687b3429160f7a8c2e7928f795a SHA512 24d871007191a051dca604635f6d4e2dec67b675c2c9a0c728a0458a6a501ac268f5d4c4203356a6f64e718edba5c8ec970276c244435a25bef11c6fba0e837d WHIRLPOOL 97562be3b39aaf023e8e177cf6e02e3b38aecd105dffe02fbfb56a80e1223b06e4acb5cbd5ca0ca2a34ed654054dc9dd53d6346a355d2526acea453e3bda7929
+DIST termcap-2.0.8.tar.bz2 211523 SHA256 293fb17823ae10b01902465d9f83625598b784e7bf72dde5425914c1c718f917 SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad WHIRLPOOL 1893929d35ca9fa8a68a9ea7ed8a424709d3393c4671f01e75995f4ed9bef8c70f3c5026dae2edcc4f88a1bb29542398477dae33915dadf4011f80bd4f6ca04e
+DIST termtypes.tc.gz 228329 SHA256 c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678 WHIRLPOOL ee07db90257172a651e067e5313b2c9240b6a4cb60f376fd699f70ae95d20c1c7ed36cdb954259b21ecd48b7f997fe67f1be6ab5555ce8bdc3f65f7f3d6fa18f
+EBUILD libtermcap-compat-2.0.8-r4.ebuild 1419 SHA256 763fe32088d7d37c3272863ba93ec0c630e7e8c7855386a3cddc6b2bcdac1c4b SHA512 db366970318b1a8677c6f8173f321dda4c37f44f2d82ded08d0a42680457fbab450bb93b926ae5dab3b769f3738d0784872752ead7461ba9f2ddd45560abc11f WHIRLPOOL 11d8853a64aebb623b473c53ee063a0432da0f775fe642cae0ff0f728902011d403bd956a83a62a04db1183d6440a44c8668d68eab91fa8a63597c1937c2241a
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
new file mode 100644
index 0000000..8661e09
--- /dev/null
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# we only want this for binary-only packages, so we will only be installing
+# the lib used at runtime; no headers and no files to link against
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+PATCHVER="2"
+
+MY_P="termcap-${PV}"
+DESCRIPTION="Compatibility package for old termcap-based programs"
+HOMEPAGE="http://www.catb.org/~esr/terminfo/"
+SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
+        mirror://gentoo/${MY_P}.tar.bz2
+        mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2 BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc sparc x86"
+IUSE="static-libs"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+        EPATCH_SOURCE="${WORKDIR}/patch"
+        EPATCH_SUFFIX="patch"
+        epatch "${EPATCH_SOURCE}"
+
+        cd "${WORKDIR}"
+        mv termtypes.tc termcap || die
+        epatch "${EPATCH_SOURCE}"/tc.file
+}
+
+src_configure() {
+        tc-export CC
+}
+
+src_compile() {
+        TARGETS=libtermcap.so.${PV}
+        use static-libs && TARGETS="${TARGETS} libtermcap.a"
+    emake ${TARGETS} || die
+}
+
+src_install() {
+        use static-libs && dolib libtermcap.a
+        dolib.so libtermcap.so.${PV}
+        dosym libtermcap.so.${PV} /usr/$(get_libdir)/libtermcap.so.2
+
+        insinto /etc
+        doins "${WORKDIR}"/termcap
+
+        dodoc ChangeLog README
+}

From 0731217c52c7b50d6b95ccb342b429db3e5c6ff2 Mon Sep 17 00:00:00 2001
From: root <root@hyp01-dt>
Date: Wed, 18 Jan 2017 15:45:19 -0800
Subject: [PATCH 241/261] update

---
 net-misc/janus/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 4612b65..681dbf7 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -2,7 +2,7 @@ AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d3
 AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 26263671 SHA256 36c7035b9aae9aedcd64aa7d7cab74f035e0c262a155e18b7eb9104d04641086 SHA512 356ced3ee7ea5c2e8752d42599057da992573a3c0f7d59ae6e796e7e91b99aab015116bb0414633e6196f5410424e232b75e01a6e7fb1385fa2a898f14f4257c WHIRLPOOL 194e28cd56f72bf84af3a189add8ec6da9c0eb7d022c40cc69ebefa0e08a589cbe14a422773e27f5d83cea26d15918f91a1d34c2fd326ab99128285c2cb9c54b
+DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
 DIST janus-0.2.2.tar.gz 26263671 SHA256 771faac52a63ec40c24c9b573b9349405b47342864d7a9e6f3b9684d8f0996b2 SHA512 e459e453719146ee1f15146bfe0c643f9de06836379340829120a6738499cdaaabbe22a9a7ce93faf14d8485cc8bef56a05fb70d73867c0122d380422ab50b17 WHIRLPOOL 8fb8e055b1e9c8973996789c9ef576219674e0d5f7bb81b8b405626fb760786522f21ac845fc539ad4d61385dfd7464dc5b5ef38f383c2b247fcd8a723f9d078
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
 EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From 0af8bf583545de043e913bdd555832cb37ed2df0 Mon Sep 17 00:00:00 2001
From: root <root@hyp08.safesoftsolutions.com>
Date: Wed, 18 Jan 2017 15:47:42 -0800
Subject: [PATCH 242/261] update

---
 net-misc/janus/Manifest           |  2 -
 net-misc/janus/janus-0.2.2.ebuild | 80 -------------------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 net-misc/janus/janus-0.2.2.ebuild

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 681dbf7..8a77fb9 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -3,6 +3,4 @@ AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293c
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
-DIST janus-0.2.2.tar.gz 26263671 SHA256 771faac52a63ec40c24c9b573b9349405b47342864d7a9e6f3b9684d8f0996b2 SHA512 e459e453719146ee1f15146bfe0c643f9de06836379340829120a6738499cdaaabbe22a9a7ce93faf14d8485cc8bef56a05fb70d73867c0122d380422ab50b17 WHIRLPOOL 8fb8e055b1e9c8973996789c9ef576219674e0d5f7bb81b8b405626fb760786522f21ac845fc539ad4d61385dfd7464dc5b5ef38f383c2b247fcd8a723f9d078
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
-EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
deleted file mode 100644
index ea45abb..0000000
--- a/net-misc/janus/janus-0.2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#inherit autotools base eutils linux-info multilib user systemd
-inherit autotools base eutils multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
-HOMEPAGE="http://janus.conf.meetecho.com/"
-SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
-#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="websockets rabbitmq docs opus ogg data-channels"
-FEATURES="nostrip"
-
-#EPATCH_SUFFIX="patch"
-#PATCHES=( "${WORKDIR}/janus-patchset" )
-
-DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
-	opus? ( media-libs/opus )
-	ogg? ( media-libs/libogg )
-	websockets? ( net-libs/libwebsockets dev-util/cmake )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	data-channels? ( net-libs/usrsctp )
-	net-libs/libmicrohttpd
-	dev-libs/jansson
-	net-libs/libnice[-upnp]
-	dev-libs/openssl
-	>=net-libs/libsrtp-1.5.2-r1
-	net-libs/sofia-sip
-	dev-libs/glib
-	app-misc/screen
-	dev-util/gengetopt
-	dev-libs/ding-libs"
-
-S="${WORKDIR}/janus-gateway"
-
-src_prepare() {
-        ./autogen.sh || die "Autogen script failed"
-}
-
-src_configure() {
-	local vmst
-
-	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
-
-	econf \
-		--prefix=/usr \
-		$(use_enable data-channels) \
-		$(use_enable websockets) \
-		$(use_enable rabbitmq) \
-		$(use_enable docs)
-}
-
-src_compile() {
-	export PREFIX="/usr"
-	MAKEOPTS="-j1" emake
-}
-
-src_install() {
-
-        mkdir -p "${D}"/etc/janus
-
-        dodir /usr/sbin
-
-        newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
-        newconfd "${FILESDIR}"/janus-confd janus || die "newconfd failed"
-
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-
-}
-
-

From acb7567081d4a05d025812e614d14c9cae63c4dd Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 8 Feb 2017 14:56:58 -0800
Subject: [PATCH 243/261] added janus version 0.2.2

---
 net-misc/janus/Manifest           |  2 +
 net-misc/janus/janus-0.2.2.ebuild | 80 +++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 net-misc/janus/janus-0.2.2.ebuild

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 8a77fb9..90cef10 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -3,4 +3,6 @@ AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293c
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
+DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
+EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
new file mode 100644
index 0000000..ea45abb
--- /dev/null
+++ b/net-misc/janus/janus-0.2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#inherit autotools base eutils linux-info multilib user systemd
+inherit autotools base eutils multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Janus WebRTC Gateway: Janus is an open source, general purpose, WebRTC gateway designed and developed by Meetecho."
+HOMEPAGE="http://janus.conf.meetecho.com/"
+SRC_URI="http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/${MY_P}.tar.gz"
+#http://mirrors.safesoft.us/gentoo/portage/net-misc/janus/janus-patchset.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="websockets rabbitmq docs opus ogg data-channels"
+FEATURES="nostrip"
+
+#EPATCH_SUFFIX="patch"
+#PATCHES=( "${WORKDIR}/janus-patchset" )
+
+DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
+	opus? ( media-libs/opus )
+	ogg? ( media-libs/libogg )
+	websockets? ( net-libs/libwebsockets dev-util/cmake )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	data-channels? ( net-libs/usrsctp )
+	net-libs/libmicrohttpd
+	dev-libs/jansson
+	net-libs/libnice[-upnp]
+	dev-libs/openssl
+	>=net-libs/libsrtp-1.5.2-r1
+	net-libs/sofia-sip
+	dev-libs/glib
+	app-misc/screen
+	dev-util/gengetopt
+	dev-libs/ding-libs"
+
+S="${WORKDIR}/janus-gateway"
+
+src_prepare() {
+        ./autogen.sh || die "Autogen script failed"
+}
+
+src_configure() {
+	local vmst
+
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig"
+
+	econf \
+		--prefix=/usr \
+		$(use_enable data-channels) \
+		$(use_enable websockets) \
+		$(use_enable rabbitmq) \
+		$(use_enable docs)
+}
+
+src_compile() {
+	export PREFIX="/usr"
+	MAKEOPTS="-j1" emake
+}
+
+src_install() {
+
+        mkdir -p "${D}"/etc/janus
+
+        dodir /usr/sbin
+
+        newinitd "${FILESDIR}"/janus-initd janus || die "newinitd failed"
+        newconfd "${FILESDIR}"/janus-confd janus || die "newconfd failed"
+
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+
+}
+
+

From a5e79c0ab0a645270cc5965726f24337a41edac5 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Wed, 8 Feb 2017 15:10:08 -0800
Subject: [PATCH 244/261] ne winit.d

---
 net-misc/janus/Manifest          |  2 +-
 net-misc/janus/files/janus-initd | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 90cef10..1826b6f 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
-AUX janus-initd 6035 SHA256 186d939a5cf9d3ad63c327ac7761ac6457563330766931e7293cb31756db3af9 SHA512 2f0d44437b00dcd27556f77bff8e6d8662bc80b813202d0f362d9236f6e3d3dfcdf48d3cda46f621cdedd4d4c811afc7fac9d57c6c11110af9a85a2e7cea9a7b WHIRLPOOL f595271b235bb189468e9d18204886b82c39a9f9daa1cbcd7d814ab1b5a4490b7fbfa68ec278f138fc9bfdf0aed3932ba68232fce068e615cb9d054df25ca522
+AUX janus-initd 6112 SHA256 d052ee527b771578ca20021334e907474a35afb5a32bc3efcf68d5bc4c91cfd0 SHA512 ecf095b5581bec96e2cd598a1f89a7d8bd4e22415f2944a6b4a5321a4e60cb972f871d65f944aafae8d63c16e9e4bf62e674b59c714290725b93d21e68061071 WHIRLPOOL 94271484afb94833fbccdb5ec7c729ab2c38888fe813f1c37b2558c4a825d3819004364d9125fca19ad0683c9d0aa9eb5d78298fd2d496c17475d03ab4dcb896
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 7ecd11d..26d0239 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -40,10 +40,10 @@ janus_run_loop() {
 
         echo "Initializing $(janus_svcname) wrapper"
         
-        trap "rm -f '/var/run/janus_wrapper_loop.running'" EXIT
-        touch "/var/run/janus_wrapper_loop.running"
+        trap "rm -f '/var/run/janus_wrapper_loop.running.${SVCNAME}'" EXIT
+        touch "/var/run/janus_wrapper_loop.running.${SVCNAME}"
 
-        while [ -r "/var/run/janus_wrapper_loop.running" ]; do
+        while [ -r "/var/run/janus_wrapper_loop.running.${SVCNAME}" ]; do
 
 	        export G_MESSAGES_DEBUG=false
 	        export NICE_DEBUG=false
@@ -143,17 +143,17 @@ start() {
 
 wrapperstop() {
         # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-        if [ -r "/var/run/janus_wrapper_loop.pid" ]; then
+        if [ -r "/var/run/janus_wrapper_loop.${SVCNAME}.pid" ]; then
                 ebegin "Killing janus wrapper script"
-                kill "$(cat /var/run/janus_wrapper_loop.pid)"
+                kill "$(cat /var/run/janus_wrapper_loop.${SVCNAME}.pid)"
                 eend $?
         fi
 
         # The new one (due to "hardened" requirements) uses a simpler
         # flag to indicate running or shutting down.
-        if [ -r "/var/run/janus_wrapper_loop.running" ]; then
+        if [ -r "/var/run/janus_wrapper_loop.running.${SVCNAME}" ]; then
                 ebegin "Signalling wrapper script to terminate"
-                rm "/var/run/janus_wrapper_loop.running"
+                rm "/var/run/janus_wrapper_loop.running.${SVCNAME}"
                 eend $?
         fi
 

From 4f17034dce1944d46588154bed7736fdf8aad924 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Wed, 8 Feb 2017 15:20:12 -0800
Subject: [PATCH 245/261] init.d update

---
 net-misc/janus/Manifest          | 2 +-
 net-misc/janus/files/janus-initd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 1826b6f..8014199 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
-AUX janus-initd 6112 SHA256 d052ee527b771578ca20021334e907474a35afb5a32bc3efcf68d5bc4c91cfd0 SHA512 ecf095b5581bec96e2cd598a1f89a7d8bd4e22415f2944a6b4a5321a4e60cb972f871d65f944aafae8d63c16e9e4bf62e674b59c714290725b93d21e68061071 WHIRLPOOL 94271484afb94833fbccdb5ec7c729ab2c38888fe813f1c37b2558c4a825d3819004364d9125fca19ad0683c9d0aa9eb5d78298fd2d496c17475d03ab4dcb896
+AUX janus-initd 6113 SHA256 5ca2eb5e466ddae27cd4d445ad14c17a871196e62e2a959d82bdd5a580ef142d SHA512 9e238e9e58ff148d422ad0b6166a4880191d72a53688f61ee385f4e3dcf318b9786234619c7f27aaaf7e86da693fbe01f754689d1faa6408d8ba599c58216464 WHIRLPOOL 8fabf11093ef3c32bc677c0f151d58cd7ff43cab47d071b37f1f31c236e5164accba9dba705e12243689e4d0e3bd283d4c115de9b4ae2a0990f3ebde219f2fcd
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 26d0239..7bf5719 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

From 3b739e0c41a1ca39d4ee9e83abb690231b724865 Mon Sep 17 00:00:00 2001
From: root <root@hyp01-dt>
Date: Wed, 8 Feb 2017 16:32:13 -0800
Subject: [PATCH 246/261] update

---
 net-misc/janus/Manifest          | 2 +-
 net-misc/janus/files/janus-initd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 8014199..e43a618 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
-AUX janus-initd 6113 SHA256 5ca2eb5e466ddae27cd4d445ad14c17a871196e62e2a959d82bdd5a580ef142d SHA512 9e238e9e58ff148d422ad0b6166a4880191d72a53688f61ee385f4e3dcf318b9786234619c7f27aaaf7e86da693fbe01f754689d1faa6408d8ba599c58216464 WHIRLPOOL 8fabf11093ef3c32bc677c0f151d58cd7ff43cab47d071b37f1f31c236e5164accba9dba705e12243689e4d0e3bd283d4c115de9b4ae2a0990f3ebde219f2fcd
+AUX janus-initd 6119 SHA256 dc27d03ba6baa9be869720abca42faa76781f43ea078de7d552f39b34b71fcad SHA512 6dfed00696be58d0ffea7cda705276d8da41316c4334d09c32b5429d7b5f16b8db9babe635daadcd51adfdfec3cf2f98edaa46332a0f471db21a2d50010fb341 WHIRLPOOL 39d8d83edcce93784f6b9f2ca8e54c8e1760d9c7d25991d2c76c0dface1b706535b1ad1f79a82d5db4e812bd30a1d0e3ad2e011a7a96847be6e27134201cc1c4
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 7bf5719..6a41d37 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -50,7 +50,7 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
-		cd /etc/janus
+		cd /etc/${SVCNAME}}
 
 		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
 		result=$?

From 3cd80a6b6883275dab5fcf15f20d96a556995324 Mon Sep 17 00:00:00 2001
From: root <root@hyp01-dt>
Date: Wed, 8 Feb 2017 16:35:34 -0800
Subject: [PATCH 247/261] typo

---
 net-misc/janus/Manifest          | 2 +-
 net-misc/janus/files/janus-initd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index e43a618..4521c69 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -1,5 +1,5 @@
 AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
-AUX janus-initd 6119 SHA256 dc27d03ba6baa9be869720abca42faa76781f43ea078de7d552f39b34b71fcad SHA512 6dfed00696be58d0ffea7cda705276d8da41316c4334d09c32b5429d7b5f16b8db9babe635daadcd51adfdfec3cf2f98edaa46332a0f471db21a2d50010fb341 WHIRLPOOL 39d8d83edcce93784f6b9f2ca8e54c8e1760d9c7d25991d2c76c0dface1b706535b1ad1f79a82d5db4e812bd30a1d0e3ad2e011a7a96847be6e27134201cc1c4
+AUX janus-initd 6118 SHA256 6a5cd5948610b21e2037f728aee1c3fc72683a5c627229502036045c0febe754 SHA512 54f06bdedc81fd370a3c979ec9704a5d21104ec25036bc9e0e7e3193446e9bb31d523f2448d986945470ad80e4fdb3c5a534d1f9c3fab3ae2657882696d6e77c WHIRLPOOL 30429482ef0069c3a4bd36c87804d8d0f10401af582270f288257d5e7ee58777b09d251947c17977f54a341bbc8e2bff20bc29af498eab9d33a0bdc2c7dceacf
 AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
 AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 6a41d37..40e4e4b 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -50,7 +50,7 @@ janus_run_loop() {
 
 	        JANUS_CNF_PATH="${JANUS_CNF_PATH:-/etc/${SVCNAME}}"
 
-		cd /etc/${SVCNAME}}
+		cd /etc/${SVCNAME}
 
 		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
 		result=$?

From 343d10b0c9fbd09d611f7d3c020e5788a6b55525 Mon Sep 17 00:00:00 2001
From: root <root@hyp01-dt>
Date: Wed, 8 Feb 2017 16:39:19 -0800
Subject: [PATCH 248/261] typo

---
 net-misc/janus/Manifest          | 8 --------
 net-misc/janus/files/janus-initd | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 net-misc/janus/Manifest

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
deleted file mode 100644
index 4521c69..0000000
--- a/net-misc/janus/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
-AUX janus-initd 6118 SHA256 6a5cd5948610b21e2037f728aee1c3fc72683a5c627229502036045c0febe754 SHA512 54f06bdedc81fd370a3c979ec9704a5d21104ec25036bc9e0e7e3193446e9bb31d523f2448d986945470ad80e4fdb3c5a534d1f9c3fab3ae2657882696d6e77c WHIRLPOOL 30429482ef0069c3a4bd36c87804d8d0f10401af582270f288257d5e7ee58777b09d251947c17977f54a341bbc8e2bff20bc29af498eab9d33a0bdc2c7dceacf
-AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
-AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
-DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
-DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
-EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
-EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
diff --git a/net-misc/janus/files/janus-initd b/net-misc/janus/files/janus-initd
index 40e4e4b..6198f2e 100755
--- a/net-misc/janus/files/janus-initd
+++ b/net-misc/janus/files/janus-initd
@@ -52,7 +52,7 @@ janus_run_loop() {
 
 		cd /etc/${SVCNAME}
 
-		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/janus.log -p ${pid_file}
+		/usr/bin/janus -F${JANUS_CNF_PATH} ${JANUS_OPTS} -N -L /var/log/${SVCNAME}.log -p ${pid_file}
 		result=$?
 
                 if [ "$result" -eq 0 ]; then

From 39e218bc90559c0f9e31bb5d1dd9b1666de57ed8 Mon Sep 17 00:00:00 2001
From: root <root@hyp01-dt>
Date: Wed, 8 Feb 2017 16:40:01 -0800
Subject: [PATCH 249/261] new mani

---
 net-misc/janus/Manifest | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 net-misc/janus/Manifest

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
new file mode 100644
index 0000000..ddbe6b6
--- /dev/null
+++ b/net-misc/janus/Manifest
@@ -0,0 +1,8 @@
+AUX janus-confd 568 SHA256 2e6e74e0ffcaa3c11ed08ea4c5e667b7c41ab44b4cbc0bb0e14d32c2e4449dd8 SHA512 9293a9679c9b94728c94c0323dab47946f612b082fd9f64b22c7251f0fb17daf953aedef955104f8bdf44478928052fcb7062db4e87bebec38087535e8a8580f WHIRLPOOL 4a32382d59f6104678fb356d88bc4e11960812c8888cb0de169dc2b87d6b649f0eb33f3d804f4fb9d0b8c66c502785461c5d0845428e8dfae160e797d1647552
+AUX janus-initd 6123 SHA256 1ce5c006c93153676bc6d810182151505651e59d017cc22f37a68751a49b2e33 SHA512 41d4a6cfb862f5a464535a4ad7c4c98701d43b4e635d2db71ddba0d89e0a812bece5bed3fda343339d012f29e6035adf7460c2fcfac02fe1e71e3eb8efc69eea WHIRLPOOL be0fcedda0319278c6b1933a10d2848341c835d9ab0cf67e7f5c9da61ecdd4d4dc9808bdd3c112793b969e1db24df6d58671a2a9374492095de3746b4b089467
+AUX janus-initd.nosafe 6048 SHA256 a3ddd9c2b62f72e152db589bff5efa829bf6a0c7e508913dbaa86de56575e546 SHA512 5dca4e570c7507d0a9371ce6efe79dd307cce0e0573cc183ef1eba4edb102a55dec8679a3dc4dbaddc5d64fae48c9704dfccc92368dd2cab52804057ba39a665 WHIRLPOOL ef5a05ce8393b9fb6a4a38215d31a7750b4143d86b227a38f5d31fdb048288b17085c9960736452b9a5d4e4816d9907c30be25e987a477b2da362b52a7511e05
+AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbcbfe6a299292178ce4 SHA512 dcaaa6222dbe5ffaccf1106365b2c48068296a0b4852b9cea3f7fe1ebab9a479c1c4e8f7ea3bd1e2353b66bb378372413d478f756f233ab6d2dbb715e4828c61 WHIRLPOOL 354e89b090d0a04b7392fc7f284afdeb59b00a0c84a9ca16900063e4846ebe2c79b8448456cc1f7a5e280b339f1a16f68815e84492f42efae0529b1807d91ce0
+DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
+DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
+EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
+EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71

From daf6792db8ded0ec37544ebc96ef3b4905bbe05a Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Fri, 10 Feb 2017 16:23:56 -0800
Subject: [PATCH 250/261] use libsrtp 2.0

---
 net-misc/janus/Manifest           | 2 +-
 net-misc/janus/janus-0.2.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index ddbe6b6..d0f3f62 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -5,4 +5,4 @@ AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbc
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
 DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
-EBUILD janus-0.2.2.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
+EBUILD janus-0.2.2.ebuild 1925 SHA256 001e3cae6b4d9652e5cfc1f58ede1719c50a9fd3f581046f4efe0ca0ead6d130 SHA512 f5d6d16609660648192b95c9b36f6b4c2fc4170f036545dc0572aebdc095541ac1f890311ace8fac3fb0e328a179b3f9a33e1cee6e64f18377497fff94367282 WHIRLPOOL a23e798c82d2058685763ed5a3fe6f325f6bc7e8fae8b9d676efc830254bce9e8ea046feb7bc2660318b8a3278704ef972ccf6521eaf5813f5054824acd956a7
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
index ea45abb..11b918f 100644
--- a/net-misc/janus/janus-0.2.2.ebuild
+++ b/net-misc/janus/janus-0.2.2.ebuild
@@ -31,7 +31,7 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	dev-libs/jansson
 	net-libs/libnice[-upnp]
 	dev-libs/openssl
-	>=net-libs/libsrtp-1.5.2-r1
+	>=net-libs/libsrtp-2.0.0
 	net-libs/sofia-sip
 	dev-libs/glib
 	app-misc/screen

From 5225fc2d1cc30c21ac2f1813cd762f8600858af7 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Wed, 15 Feb 2017 18:59:56 -0800
Subject: [PATCH 251/261] add maxscale

---
 dev-db/mariadb-connector-c/ChangeLog          | 30 +++++++
 dev-db/mariadb-connector-c/Manifest           | 15 ++++
 .../files/fix-libdir.patch                    | 58 +++++++++++++
 .../files/fix-mariadb_config-2.1.0.patch      | 12 +++
 .../files/fix-mariadb_config.patch            | 25 ++++++
 .../files/gentoo-layout-2.2.2.patch           | 24 +++++
 .../files/gentoo-layout.patch                 | 60 +++++++++++++
 .../files/multilib-install.patch              | 16 ++++
 .../mariadb-connector-c-2.0.0-r1.ebuild       | 82 +++++++++++++++++
 .../mariadb-connector-c-2.1.0.ebuild          | 81 +++++++++++++++++
 .../mariadb-connector-c-2.2.2.ebuild          | 72 +++++++++++++++
 .../mariadb-connector-c-9999.ebuild           | 81 +++++++++++++++++
 dev-db/mariadb-connector-c/metadata.xml       | 11 +++
 dev-db/mariadb-maxscale/Manifest              |  9 ++
 dev-db/mariadb-maxscale/files/cmakelist.patch | 69 +++++++++++++++
 .../files/cmakelist.patch-2.0.0               | 44 ++++++++++
 dev-db/mariadb-maxscale/files/confd-server    |  4 +
 dev-db/mariadb-maxscale/files/init-server     | 30 +++++++
 dev-db/mariadb-maxscale/files/slavelagc.patch | 11 +++
 .../mariadb-maxscale-1.4.4.ebuild             | 87 +++++++++++++++++++
 .../mariadb-maxscale-2.0.2.ebuild             | 83 ++++++++++++++++++
 dev-libs/libpcre2/Manifest                    |  4 +
 dev-libs/libpcre2/libpcre2-10.20.ebuild       | 76 ++++++++++++++++
 dev-libs/libpcre2/libpcre2-10.21.ebuild       | 76 ++++++++++++++++
 24 files changed, 1060 insertions(+)
 create mode 100644 dev-db/mariadb-connector-c/ChangeLog
 create mode 100644 dev-db/mariadb-connector-c/Manifest
 create mode 100644 dev-db/mariadb-connector-c/files/fix-libdir.patch
 create mode 100644 dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
 create mode 100644 dev-db/mariadb-connector-c/files/fix-mariadb_config.patch
 create mode 100644 dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch
 create mode 100644 dev-db/mariadb-connector-c/files/gentoo-layout.patch
 create mode 100644 dev-db/mariadb-connector-c/files/multilib-install.patch
 create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
 create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
 create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
 create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
 create mode 100644 dev-db/mariadb-connector-c/metadata.xml
 create mode 100644 dev-db/mariadb-maxscale/Manifest
 create mode 100644 dev-db/mariadb-maxscale/files/cmakelist.patch
 create mode 100644 dev-db/mariadb-maxscale/files/cmakelist.patch-2.0.0
 create mode 100644 dev-db/mariadb-maxscale/files/confd-server
 create mode 100755 dev-db/mariadb-maxscale/files/init-server
 create mode 100644 dev-db/mariadb-maxscale/files/slavelagc.patch
 create mode 100644 dev-db/mariadb-maxscale/mariadb-maxscale-1.4.4.ebuild
 create mode 100644 dev-db/mariadb-maxscale/mariadb-maxscale-2.0.2.ebuild
 create mode 100644 dev-libs/libpcre2/Manifest
 create mode 100644 dev-libs/libpcre2/libpcre2-10.20.ebuild
 create mode 100644 dev-libs/libpcre2/libpcre2-10.21.ebuild

diff --git a/dev-db/mariadb-connector-c/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog
new file mode 100644
index 0000000..2457265
--- /dev/null
+++ b/dev-db/mariadb-connector-c/ChangeLog
@@ -0,0 +1,30 @@
+*mariadb-connector-c-2.2.2 (13 Feb 2016)
+
+  13 Feb 2016; Brian Evans <grknight@gentoo.org>
+  +files/gentoo-layout-2.2.2.patch, +mariadb-connector-c-2.2.2.ebuild:
+  dev-db/mariadb-connector-c: Version bump
+
+  15 Aug 2015; Brian Evans <grknight@gentoo.org>
+  mariadb-connector-c-2.0.0-r1.ebuild, mariadb-connector-c-2.1.0.ebuild,
+  mariadb-connector-c-9999.ebuild:
+  dev-db/mariadb-connector-c: fix QA inherit wrt bug 557730
+
+*mariadb-native-client-2.0.0 (29 Apr 2014)
+
+  29 Apr 2014; Brian Evans <grknight@tuffmail.com> +files/fix-libdir.patch,
+  +files/fix-mariadb_config.patch, +mariadb-native-client-2.0.0.ebuild:
+  Version bump for 2.0.0
+
+*mariadb-native-client-9999 (26 Jun 2013)
+
+  26 Jun 2013; Brian Evans <grknight@lavabit.com>
+  +mariadb-native-client-9999.ebuild, mariadb-native-client-1.0.ebuild,
+  metadata.xml:
+  Add live ebuild with mysqlcompat feature, optional ssl support and external
+  zlib
+
+*mariadb-native-client-1.0 (22 May 2013)
+
+  22 May 2013;  <grknight@lavabit.com> +files/multilib-install.patch,
+  +mariadb-native-client-1.0.ebuild, +metadata.xml:
+  Add new C library for MySQL
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
new file mode 100644
index 0000000..0149388
--- /dev/null
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -0,0 +1,15 @@
+AUX fix-libdir.patch 2722 SHA256 446b5322b29074624d41964953525837b5073215e4e8457cacab00ba37be24b7 SHA512 e851091f20c9df9cacb17ce0f3eeba18661bd613522431f0d449bad4ed8cf9cbe8ba705da275c5d5f4213aac7f3dbc66f96ca50076f6d08d4f82c0018f63c924 WHIRLPOOL ea02166f557a0c8219f6f8dbfd711605e4facec53523274b37c5f58d88939cc07997f56e458442de5726ed420cf70c0b6b769f64ecb415b82d4f5222affe2b97
+AUX fix-mariadb_config-2.1.0.patch 760 SHA256 224471b61d82a7855b969f945903e3ecd09ff4f7c8bedb04a47c08e624b88e29 SHA512 29339d0d1b536a26cc4b72dbad8215b50e0a0f08caab5413c58633ab8a391f716a0bb0fb494bf1b32b2db5780a85f78879aab33a5ab712bc698920b22d202045 WHIRLPOOL 1d369cb613ba3062ff9e69cafb6c9525cd0401cea127c7ab3fe4bf750ec36ce63a88d1c5838a0224fd4b8fca1021c30f90b6e6fd2076f156790dc8705b9fe0dd
+AUX fix-mariadb_config.patch 1253 SHA256 7d854a5f895088b1ccc1359b6010b946e7885dc37993b3db05f85f3441d3af31 SHA512 69b1f5d4025b8fa71c2f55b197f8dadf2ce7784c04e80b5e5988f3c96938e80e0ec5a3c2f110fdc41b295ca3a1e56189bacf7ee0eeefda4a42717bf0b50741fd WHIRLPOOL d9d0405ddc7e0f1cf388b5d6e42a84caff336a54c739dd03f136a000d66e3a7114db7664b1452d403cd498ebcc7f76f5320fa2c71805d76937d2752e950c1613
+AUX gentoo-layout-2.2.2.patch 906 SHA256 5aef6da183f2a670b444311fd70c06bdb4493e659883ce132981e2d175a1bb6d SHA512 2196b52d47fd62bcadd942140237e4ce8fcefd5efa4f04c10c62ecb85e5345d2211fe2ba987e48175ab7c8eaf9ab65e4a3b7beacb9fadbb306bc632e03bb3dbf WHIRLPOOL 606fd03ed564980707411d52daf3289d262a062001873cde892890353489e44c9f042fb32b0a9d2d38ebc51570f7d8dfa24609a5cce5996d2d9f66fd65a9e814
+AUX gentoo-layout.patch 2245 SHA256 66773387340885c83ce9222dce7e156fc4c9e03fca61dfb57d6fab3be4847d30 SHA512 8dfc78a03cc78fd1cd8e45f31b0489ba6773efb5cd1915a07ea1787c0e3946b00f6202f9ad468c692822feaa5faea4fa5458199c867b3a36da0b1ff6ee53ed2c WHIRLPOOL 6b25963f0e7eb5608381d90c5ee7184bbc7debea8a729a2b18348677ee2c791399d42b8ac93fa895ff8881caae53dfeca6904f7cf3afafaee0461016697e5642
+AUX multilib-install.patch 621 SHA256 162b4f3e6ef0dd9105e07fa59acfa8049e1099adde013e1a471e0acd31b45bb0 SHA512 5c3c619cec9f16505a6d32f5fbd41615357c7069689c20b911031fc447e91261391d5efab28dac82ffcca7e66516aa547017fe43ba07cfc8d86f24efa913677e WHIRLPOOL e8f61f4d420d9840002475bead10647901b0758f2a2968a9a432211f29a21f3ff214e2f815a8215532b443ced572860e225cfee20c5b75a8ae982b24eb68ce85
+DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624
+DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1
+DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55
+EBUILD mariadb-connector-c-2.0.0-r1.ebuild 2122 SHA256 14d7ea30d5344f2a195f2bab2be42d89438cd97d966aa978de02a6aa40343853 SHA512 0eead9b0e6aa91a41b886903e957c11bec56669ea949e240c85dbc18e76c73753df7ab102b42a0ea7c871e2d3f9207bd98f0d00c29640da94d0f827b1b442372 WHIRLPOOL 480b47fd9570064f2ec1d7b54f7c254738ce94816b511e3ae77f8455da77994626248f737b19a993f6412a019d40f215dcc03042a2dd553c4d23335e2ce59e39
+EBUILD mariadb-connector-c-2.1.0.ebuild 2067 SHA256 ee7e1d45af51c036fe7cd570ac66d7e6fa849fe1aa84fea6670680ee149c93a5 SHA512 e4ea3ee6195cc550d94f4af6a4112df14041ac99bf722692215aa9e3742b482f59b381d79f059effc042f18723e2282a39c72ff31604d8fac3ddd4e75599c746 WHIRLPOOL 5fc03608aa2796d731be67607b5954fe9e502767383db9901eb2a93677a0a580358c79f056066b30c1dc4dac39fb9e9e9373325c53378b13bab20d45bda2b84e
+EBUILD mariadb-connector-c-2.2.2.ebuild 1773 SHA256 a41f76438b924ff45ac603d5ff519a7fc0c1e421140f5d8fbd6844b12c504a45 SHA512 a3bf9a8693f6ba9ba94ae6437e20aa61c3abed0762856be73950e4a6c493d5e9c802721ee917aae34048ce91ba0477159259341d8ea6a1e026581f81a17947e3 WHIRLPOOL 6bfa994daba217103def04f12595c7b3df495c090b3be3caaad6692900d600e2a829a20bbe7ff65d399bb97a5749ff68e29ba4c8eea603f1c52ecfd4fe39afb4
+EBUILD mariadb-connector-c-9999.ebuild 2075 SHA256 effd69251c468e69c92c19edf1f87ccedde59a9bb5c4968fb92ce95ba25e13c4 SHA512 677dd155a9100be9246c81d0a93c8fa7b2dfb080a2007a86d2267b2554b750fb5c803aee5ac15c10d0b499579471be5db022491fc2a115c08f75ce25216b253b WHIRLPOOL e15f96f16edca149268b71288e8633d1bbc6f7cb5671decd0c29b687469326e6c01d6ad669eeedd65c1f4dc2204ae58809a1ffe452b85cde95ea3eeca8d4da73
+MISC ChangeLog 1103 SHA256 c1b556dc6fe0cd98f566511306a00f9cd28dfe1e5ae025105223dc381143804e SHA512 c81589cc72e7b964f6f660a8ca3171d5472d059472d2e84c34bcf1dfcef64269b107b11b461a9094f942a94cec714f37b9191c1684b940049213eb563608fc43 WHIRLPOOL 629a4c4b73289376b7cfb1fb57815c80b6fd19888fb261a5b4e1989ea8ab7326d0e9d537391a750232628ec63683f28e2ec2bb5a1bc45e4164a0ea2c9873f032
+MISC metadata.xml 324 SHA256 a203ec34bc7ecdff3283bb6b6012d24c940c075ae797dc4fc6ff8215d135e274 SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6 WHIRLPOOL e84dc2171d4b1f1fa97bb99488d2fd4a8c2c00a7842da6f1bbe5234db8548bcf459ffec38f2b16ca43841d2c65bdef3635afe4d659eebfc823bdf4247be41d46
diff --git a/dev-db/mariadb-connector-c/files/fix-libdir.patch b/dev-db/mariadb-connector-c/files/fix-libdir.patch
new file mode 100644
index 0000000..c7ade92
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/fix-libdir.patch
@@ -0,0 +1,58 @@
+diff -aurN mariadb_client-2.0.0-src/CMakeLists.txt mariadb_client-2.0.0-src.new/CMakeLists.txt
+--- mariadb_client-2.0.0-src/CMakeLists.txt	2014-04-01 11:14:40.000000000 -0400
++++ mariadb_client-2.0.0-src.new/CMakeLists.txt	2014-04-03 16:12:55.163032445 -0400
+@@ -27,8 +27,19 @@
+ 
+ OPTION(WITH_SQLITE "Enables Sqlite support" OFF)
+ OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
++OPTION(INSTALL_LIBDIR "Library install location" OFF)
+ ###############
+ 
++IF(NOT INSTALL_LIBDIR)
++  # Some distros can set this in a global cmake config
++  IF(CMAKE_INSTALL_LIBDIR)
++    SET(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
++  ELSE() 
++    # Provide a sane default
++    SET(INSTALL_LIBDIR "lib/mariadb")
++  ENDIF()
++ENDIF()
++
+ IF(WITH_RTC)
+   SET(RTC_OPTIONS "/RTC1 /RTCc")
+ ENDIF()
+diff -aurN mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt
+--- mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt	2014-03-18 11:01:05.000000000 -0400
++++ mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt	2014-04-03 16:15:49.417626907 -0400
+@@ -210,15 +210,15 @@
+ 
+ INSTALL(TARGETS
+           libmariadb mariadbclient
+-          RUNTIME DESTINATION "lib/mariadb"
+-          LIBRARY DESTINATION "lib/mariadb"
+-          ARCHIVE DESTINATION "lib/mariadb")
++          RUNTIME DESTINATION "${INSTALL_LIBDIR}"
++          LIBRARY DESTINATION "${INSTALL_LIBDIR}"
++          ARCHIVE DESTINATION "${INSTALL_LIBDIR}")
+ IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
+   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
+-                DESTINATION lib/mariadb)
++                DESTINATION ${INSTALL_LIBDIR})
+ ENDIF()
+ 
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
+diff -aurN mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in
+--- mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in	2014-03-18 11:01:05.000000000 -0400
++++ mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in	2014-04-03 16:16:52.455669572 -0400
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ 
+ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
++#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \
+                 "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
+ #define VERSION "@MYSQL_CLIENT_VERSION@"
diff --git a/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
new file mode 100644
index 0000000..e5bbce3
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
@@ -0,0 +1,12 @@
+diff -aruN a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
+--- a/mariadb_config/mariadb_config.c.in	2015-01-29 13:21:48.000000000 -0500
++++ b/mariadb_config/mariadb_config.c.in	2015-01-30 13:03:01.312548413 -0500
+@@ -6,7 +6,7 @@
+ #define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql"
+ #define LIBS    "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \
+                 "@extra_dynamic_LDFLAGS@"
+-#define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
++#define CFLAGS  INCLUDE
+ #define VERSION "@MYSQL_CLIENT_VERSION@"
+ #define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
+ #define SOCKET  "@MYSQL_UNIX_ADDR@"
diff --git a/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch
new file mode 100644
index 0000000..444c877
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch
@@ -0,0 +1,25 @@
+diff -aurN a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt
+--- a/mariadb_config/CMakeLists.txt	2014-04-29 12:44:35.309693578 -0400
++++ b/mariadb_config/CMakeLists.txt	2014-04-29 12:43:25.511924411 -0400
+@@ -19,7 +19,8 @@
+   SEARCH_LIBRARY(LIBDL dlopen "dl")
+   SEARCH_LIBRARY(LIBM floor m)
+   FOREACH(lib ${EXTRA_LIBS})
+-    SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${lib}")
++    STRING(REPLACE "-l" "" clean_lib ${lib})
++    SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${clean_lib}")
+   ENDFOREACH()
+   IF(WITH_SQLITE)
+     SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -lsqlite")
+diff -aurN a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
+--- a/mariadb_config/mariadb_config.c.in	2014-04-29 12:44:22.320108741 -0400
++++ b/mariadb_config/mariadb_config.c.in	2014-04-29 12:41:54.934819014 -0400
+@@ -6,7 +6,7 @@
+ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
+ #define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \
+                 "@extra_dynamic_LDFLAGS@"
+-#define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
++#define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
+ #define VERSION "@MYSQL_CLIENT_VERSION@"
+ #define SOCKET  "@MYSQL_UNIX_ADDR@"
+ #define PORT "@MYSQL_PORT@"
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch
new file mode 100644
index 0000000..dd43133
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch
@@ -0,0 +1,24 @@
+diff -aurN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake	2015-12-08 02:50:35.000000000 -0500
++++ b/cmake/install.cmake	2016-02-12 21:40:46.599011426 -0500
+@@ -120,12 +120,6 @@
+   SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${PREFIX_INSTALL_DIR})
+ ENDIF()
+ 
+-IF(NOT SUFFIX_INSTALL_DIR)
+-  SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
+-ELSE()
+-  SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${SUFFIX_INSTALL_DIR})
+-ENDIF()
+-
+ FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
+   SET(${dir}_INSTALL_DIR ${${dir}_INSTALL_DIR_${INSTALL_LAYOUT}})
+   MARK_AS_ADVANCED(${dir}_INSTALL_DIR)
+--- a/mariadb_config/CMakeLists.txt	2016-02-12 21:21:06.981021227 -0500
++++ b/mariadb_config/CMakeLists.txt	2016-02-12 22:06:02.397130410 -0500
+@@ -33,4 +33,4 @@
+ # Installation
+ #
+ INSTALL(TARGETS mariadb_config
+-        DESTINATION "bin")
++        DESTINATION ${BIN_INSTALL_DIR})
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout.patch b/dev-db/mariadb-connector-c/files/gentoo-layout.patch
new file mode 100644
index 0000000..5663a37
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/gentoo-layout.patch
@@ -0,0 +1,60 @@
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake	2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake	2015-03-18 14:43:14.682768210 -0400
+@@ -39,12 +39,14 @@
+ ENDIF()
+ 
+ SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
+-  STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip) and RPM")
++  STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip), GENTOO, and RPM")
+ 
+ # On Windows we only provide zip and .msi. Latter one uses a different packager. 
+ IF(UNIX)
+   IF(INSTALL_LAYOUT MATCHES "RPM")
+     SET(libmariadb_prefix "/usr")
++  ELSEIF(INSTALL_LAYOUT MATCHES "GENTOO")
++    SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
+   ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT")
+     SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
+   ENDIF()
+@@ -55,7 +57,7 @@
+ ENDIF()
+ 
+ # check if the specified installation layout is valid
+-SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM")
++SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "GENTOO")
+ LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
+ IF(layout_no EQUAL -1)
+   MESSAGE(FATAL_ERROR "Invalid installation layout. Please specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake	2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake	2015-03-18 14:39:35.240617655 -0400
+@@ -79,6 +79,16 @@
+ SET(PLUGIN_INSTALL_DIR_DEFAULT "lib/plugin")
+ 
+ #
++# Gentoo layout
++#
++SET(SUFFIX_INSTALL_DIR_GENTOO "")
++SET(BIN_INSTALL_DIR_GENTOO "bin")
++SET(LIB_INSTALL_DIR_GENTOO "lib")
++SET(INCLUDE_INSTALL_DIR_GENTOO "include/mariadb")
++SET(DOCS_INSTALL_DIR_GENTOO "share/docs")
++SET(PLUGIN_INSTALL_DIR_GENTOO "lib/mariadb/plugin")
++
++#
+ # RPM layout
+ #
+ SET(SUFFIX_INSTALL_DIR_RPM "mariadb")
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake	2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake	2015-03-18 14:31:56.156920869 -0400
+@@ -118,8 +118,5 @@
+   SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${libmariadb_prefix})
+ ENDIF()
+ 
+-IF(NOT SUFFIX_INSTALL_DIR)
+-  SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
+-ENDIF()
+ 
+ FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
diff --git a/dev-db/mariadb-connector-c/files/multilib-install.patch b/dev-db/mariadb-connector-c/files/multilib-install.patch
new file mode 100644
index 0000000..6dfa270
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/multilib-install.patch
@@ -0,0 +1,16 @@
+diff -aruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/libmysql/CMakeLists.txt	2013-05-17 14:16:47.621519747 -0400
++++ b/libmysql/CMakeLists.txt	2013-05-17 14:18:04.570428917 -0400
+@@ -166,9 +166,9 @@
+ 
+ INSTALL(TARGETS
+           libmariadb mariadbclient
+-          RUNTIME DESTINATION "lib"
+-          LIBRARY DESTINATION "lib"
+-          ARCHIVE DESTINATION "lib")
++          RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ 
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include
+         DESTINATION mariadbclient)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
new file mode 100644
index 0000000..641ab44
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
+	KEYWORDS=""
+else
+	MY_PN="mariadb_client"
+	SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
+	"
+	S="${WORKDIR}/${MY_PN}-${PV}-src"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-multilib eutils ${VCS_INHERIT}
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+IUSE="doc +mysqlcompat +ssl static-libs"
+
+CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	"
+# Block server packages due to /usr/bin/mariadb_config symlink there
+# TODO: make server package block only when mysqlcompat is enabled
+RDEPEND="${CDEPEND}
+	!dev-db/mysql
+	!dev-db/mysql-cluster
+	!dev-db/mysql-connector-c
+	!dev-db/mariadb
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch 	"${FILESDIR}/fix-libdir.patch" \
+		"${FILESDIR}/fix-mariadb_config.patch"
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_EXTERNAL_ZLIB=ON
+		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+		$(cmake-utils_use_build doc DOCS)
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if ! use static-libs ; then
+		rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die
+		use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use mysqlcompat ; then
+		dosym mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
new file mode 100644
index 0000000..3604069
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
+	KEYWORDS=""
+else
+	MY_PN=${PN#mariadb-}
+	SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	"
+	S="${WORKDIR}/${P}-src"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-multilib eutils ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+IUSE="mysqlcompat +ssl static-libs"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	"
+# Block server packages due to /usr/bin/mariadb_config symlink there
+# TODO: make server package block only when mysqlcompat is enabled
+RDEPEND="${DEPEND}
+	!dev-db/mysql
+	!dev-db/mysql-cluster
+	!dev-db/mariadb
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	mysqlcompat? ( !dev-db/mysql-connector-c )
+	"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
+		"${FILESDIR}/gentoo-layout.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_EXTERNAL_ZLIB=ON
+		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_LAYOUT=GENTOO
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	if use mysqlcompat ; then
+		dosym mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
new file mode 100644
index 0000000..4c91c54
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
+	KEYWORDS=""
+else
+	MY_PN=${PN#mariadb-}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV}/${P}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-utils multilib-minimal ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/sbin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+IUSE="mysqlcompat +ssl static-libs"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	"
+RDEPEND="${DEPEND}
+	mysqlcompat? (
+	!dev-db/mysql
+	!dev-db/mysql-cluster
+	!dev-db/mariadb
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	!dev-db/mysql-connector-c )
+	"
+PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
+	"${FILESDIR}/gentoo-layout-2.2.2.patch" )
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_OPENSSL=$(usex ssl ON OFF)
+		-DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF)
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+		-DDOCS_INSTALL_DIR=share/docs
+		-DBIN_INSTALL_DIR=sbin
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	if use mysqlcompat ; then
+		dosym /usr/sbin/mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
new file mode 100644
index 0000000..497147f
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+	KEYWORDS=""
+else
+	MY_PN=${PN#mariadb-}
+	SRC_URI="
+	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+	"
+	S="${WORKDIR}/${P}-src"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-multilib eutils ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+IUSE="mysqlcompat +ssl static-libs"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	"
+# Block server packages due to /usr/bin/mariadb_config symlink there
+# TODO: make server package block only when mysqlcompat is enabled
+RDEPEND="${DEPEND}
+	!dev-db/mysql
+	!dev-db/mysql-cluster
+	!dev-db/mariadb
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	mysqlcompat? ( !dev-db/mysql-connector-c )
+	"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
+		"${FILESDIR}/gentoo-layout.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_EXTERNAL_ZLIB=ON
+		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_LAYOUT=GENTOO
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	if use mysqlcompat ; then
+		dosym mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/metadata.xml b/dev-db/mariadb-connector-c/metadata.xml
new file mode 100644
index 0000000..9c4d844
--- /dev/null
+++ b/dev-db/mariadb-connector-c/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>mysql-bugs@gentoo.org</email>
+<name>MySQL</name>
+</maintainer>
+<use>
+<flag name="mysqlcompat">Enable mysqlclient library symbolic links</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/mariadb-maxscale/Manifest b/dev-db/mariadb-maxscale/Manifest
new file mode 100644
index 0000000..e8611c9
--- /dev/null
+++ b/dev-db/mariadb-maxscale/Manifest
@@ -0,0 +1,9 @@
+AUX cmakelist.patch 4264 SHA256 71246cafc92b545c88b9c0ae44c2b26d9beeb10c90206ab7219ea8b4fc4aff6e SHA512 65b5e3214bb727a6c5bba23a3162d5fce695ae47554e14c7c0b38a3dd509558370fb72cbdf02ef27a3cabf6465bc7653f373e7f9a3f652009c6ac2ce9c14fa5f WHIRLPOOL a0f63ed009db59e60dcb5c8b169ce4824feaec7ea8135a8fcfc1e2a8ee85b783d806b500ef83cb3c0652023c07e41acc4b39abf003f6d38ef5989c00376baca3
+AUX cmakelist.patch-2.0.0 2277 SHA256 239f6c8c49a23b86ab5227eacde8b0cc1593b67072366fb4c99ddb1a05391d1d SHA512 b7daf747a94f427a40f425e7ed2a23b137ba22ea11cd69b8e665fada231e26975238b0002518474aa63b46fb0316df3215d290c5ed2a9a57070219e5bfa87d41 WHIRLPOOL 07114887ebeec1b9ca8953399605a22d6d1d1300660277f441e81d8e24fea27bae14b7851ffc7258da1029c30ee5cd0aa589fbfc88ea3cb21f960def2b7b82e8
+AUX confd-server 212 SHA256 27b1780a07db8685564edb49ca269b659f4cfbac2f880f6c26466e5d311da00c SHA512 aa4c59e9f13170266d9b7c732d4a321ea842040ee0adcb7a4694138a64a069eccc350e69789151804304934e22212ec3aa2d9205c4ce4aa420446455cb70938e WHIRLPOOL 91c363b2003e697e45115fcbec16943c77ccec2a737be2ef535222471235c430add52de10f353ce93f920faf59c268e56a2859ef41db560a40b9efc9daf55eab
+AUX init-server 622 SHA256 8864766e5e2c7a694b4feca91d69a18fd45441a3c68de2f1604cbaf91da8401b SHA512 68ba732f2c2f68dffba51e273b7d07cf8ae0c3c14d990aae3deaf7eb6b0820f97ecc54662b24583b486ca48adc5ee339bf5f328b19e820e88d4046889835fdfb WHIRLPOOL d3f7316bfd0f510871503e2b27f8cba3086d7db5fed28728615fcc8877fd1de10764f0e32d395526736c5e6a2adf0630c073c96cf528ae8f81e4b97025b4ede8
+AUX slavelagc.patch 543 SHA256 d19b8ac2700d814cd7b4851fa0a7176e140c1f6300ee198e1c1f1afa62191ec5 SHA512 4443c8b0b56fd3e1d02c18170af87ef5f6662cfbb29300f51df95cb9d9b77c6b5e618eea11c68c498306e35d6529810cc8ecfb9a363d4fda5c25e0c85ab00269 WHIRLPOOL d22b829f662d5b236c1627aa563c1942b0d1a187174378b1d0724f425653de26e83cfb556a0c2b39871091afa124ae4d1873696ed2f34163eaf3cb10be62c4e7
+DIST 1.4.4.tar.gz 10596077 SHA256 b57f57b02235bba0cb12cb5983b7346dd5ec6bd4880f9e0f86a89c3c728a2e40 SHA512 b9727d904497525dfd1e86ed66aeefee1a835e90b076affc39568eaccfb303ba67bcff1790d271a00a7fa21cc56c7fa022fcb120be200f0830b81aa11b85e367 WHIRLPOOL abe28dbde82d1a1b8ded462841e08e7fa4739f5cb387e9e5fc1235b56fad29d9285bfa7d3602fcaaebb6f5b129956ca5e731dcfb14e13079d8eaf47820dd455f
+DIST maxscale-2.0.2.tar.gz 14508920 SHA256 cc6b90c91e5799cf919542eef029a1557731d486848cca39a0b094e689514edc SHA512 f1f0ded052a9cb8cb4676748d38f5ea02f0f0148d3c9e9bff5f3f9190be1a181da8dbed600d75724823fa16edfcbdd19788541ae4b7b36e353115590e10ac0d1 WHIRLPOOL 3c4104306b297f60b5b4658f244f8257f4c26c77ae86df3a3141d0daa0a8aea803eff85795e6dbc7afd18521edb77b270f9ba0accb9453302d0277c11754216e
+EBUILD mariadb-maxscale-1.4.4.ebuild 1987 SHA256 9af2f361b8ceb8248b2f4b371c606e31b61b18173d8f6450b2f55677a0d574e1 SHA512 3b9e8f967dd0bf4cd5fafdf1bacd2c307be04ea37b085c681e5600baa95a42e75cda2c23a9384f1e95e89be4472eb1c39082aaa3622f88f498b5ae303e4ddb5c WHIRLPOOL c4935aad89eb844167a21f562e718c4ef5c73465e6d6fdcf4b9b6ef76c2ce186a1542200186eff4f053fe300a9b45229856105b0353cf0e1d723412c23cab5ff
+EBUILD mariadb-maxscale-2.0.2.ebuild 1943 SHA256 fd007df2aec436fea756365963ea13ff03c90ba1336401dc31835af51da17272 SHA512 33ab237e5a18f79bb57622b2d4581c937b420a1521ff9a79bd24ea631943c5ae7f864c6312f2c64e0b8515a68dd1f2951d23500ed256be80156f2018b9f0e02f WHIRLPOOL f853540866ef47593dd6d1c1c5c20c6679d2ce53a276263c6a9ff91aa191cde34da385bdf5626bf3bd2ca6c787d8615c3f0a57377b3ffaea69485359ae9e5be5
diff --git a/dev-db/mariadb-maxscale/files/cmakelist.patch b/dev-db/mariadb-maxscale/files/cmakelist.patch
new file mode 100644
index 0000000..3b13020
--- /dev/null
+++ b/dev-db/mariadb-maxscale/files/cmakelist.patch
@@ -0,0 +1,69 @@
+diff -ur MaxScale-1.4.0.orig/CMakeLists.txt MaxScale-1.4.0/CMakeLists.txt
+--- MaxScale-1.4.0.orig/CMakeLists.txt	2016-03-17 12:38:50.743597543 +0100
++++ MaxScale-1.4.0/CMakeLists.txt	2016-03-18 11:00:07.133516027 +0100
+@@ -10,9 +10,7 @@
+ enable_testing()
+ 
+ # Packaging builds install to /usr and other builds to /usr/local
+-if(PACKAGE)
+-  set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories.")
+-endif()
++set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories.")
+ 
+ # Set default values for cache entries and set the MaxScale version
+ set_variables() 
+@@ -95,7 +93,7 @@
+   set(MAXSCALE_COMMIT "source-build")
+ endif()
+ 
+-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
++set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
+ 
+ # Make sure the release notes for this release are present if it is a stable one
+ if(${MAXSCALE_VERSION} MATCHES "-stable")
+@@ -114,7 +112,7 @@
+ configure_file(${CMAKE_SOURCE_DIR}/etc/postrm.in ${CMAKE_BINARY_DIR}/postrm @ONLY)
+ configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.cnf ${CMAKE_BINARY_DIR}/maxscale.cnf @ONLY)
+ 
+-set(FLAGS "-Wall -Wno-unused-variable -Wno-unused-function -Werror -fPIC" CACHE STRING "Compilation flags")
++set(FLAGS "-Wall -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function -Werror -fPIC" CACHE STRING "Compilation flags")
+ set(DEBUG_FLAGS "-ggdb -pthread -pipe -Wformat -fstack-protector --param=ssp-buffer-size=4" CACHE STRING "Debug compilation flags")
+ 
+ if(CMAKE_VERSION VERSION_GREATER 2.6)
+diff -ur MaxScale-1.4.0.orig/server/core/CMakeLists.txt MaxScale-1.4.0/server/core/CMakeLists.txt
+--- MaxScale-1.4.0.orig/server/core/CMakeLists.txt	2016-03-17 12:38:50.798598472 +0100
++++ MaxScale-1.4.0/server/core/CMakeLists.txt	2016-03-18 09:29:50.229336518 +0100
+@@ -8,6 +8,8 @@
+   target_link_libraries(maxscale-common ${TCMALLOC_LIBRARIES})
+ endif()
+ 
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ add_dependencies(maxscale-common pcre2)
+ install(TARGETS maxscale-common DESTINATION ${MAXSCALE_LIBDIR})
+ set_target_properties(maxscale-common PROPERTIES VERSION "1.0.0")
+diff -ur MaxScale-1.4.0.orig/server/modules/filter/hint/CMakeLists.txt MaxScale-1.4.0/server/modules/filter/hint/CMakeLists.txt
+--- MaxScale-1.4.0.orig/server/modules/filter/hint/CMakeLists.txt	2016-03-17 12:38:50.804598574 +0100
++++ MaxScale-1.4.0/server/modules/filter/hint/CMakeLists.txt	2016-03-18 09:31:47.001325777 +0100
+@@ -1,4 +1,3 @@
+ add_library(hintfilter SHARED hintfilter.c hintparser.c)
+-set_target_properties(hintfilter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "1.0.0")
+ target_link_libraries(hintfilter maxscale-common)
+ install(TARGETS hintfilter DESTINATION ${MAXSCALE_LIBDIR})
+diff -ur MaxScale-1.4.0.orig/server/modules/routing/binlog/CMakeLists.txt MaxScale-1.4.0/server/modules/routing/binlog/CMakeLists.txt
+--- MaxScale-1.4.0.orig/server/modules/routing/binlog/CMakeLists.txt	2016-03-17 12:38:50.808598640 +0100
++++ MaxScale-1.4.0/server/modules/routing/binlog/CMakeLists.txt	2016-03-18 09:31:28.609012471 +0100
+@@ -1,5 +1,4 @@
+ add_library(binlogrouter SHARED blr.c blr_master.c blr_cache.c blr_slave.c blr_file.c)
+-set_target_properties(binlogrouter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "2.0.0")
+ set_target_properties(binlogrouter PROPERTIES LINK_FLAGS -Wl,-z,defs)
+ # libbinlogrouter refers to my_uuid_init and my_uuid. They are non-public functions and
+ # should not be used. They are found only from the embedded lib.
+diff -ur MaxScale-1.4.0.orig/server/modules/routing/maxinfo/CMakeLists.txt MaxScale-1.4.0/server/modules/routing/maxinfo/CMakeLists.txt
+--- MaxScale-1.4.0.orig/server/modules/routing/maxinfo/CMakeLists.txt	2016-03-17 12:38:50.809598657 +0100
++++ MaxScale-1.4.0/server/modules/routing/maxinfo/CMakeLists.txt	2016-03-18 09:30:54.517431722 +0100
+@@ -1,4 +1,3 @@
+ add_library(maxinfo SHARED maxinfo.c maxinfo_parse.c maxinfo_error.c maxinfo_exec.c)
+-set_target_properties(maxinfo PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "1.0.0")
+ target_link_libraries(maxinfo maxscale-common)
+ install(TARGETS maxinfo DESTINATION ${MAXSCALE_LIBDIR})
diff --git a/dev-db/mariadb-maxscale/files/cmakelist.patch-2.0.0 b/dev-db/mariadb-maxscale/files/cmakelist.patch-2.0.0
new file mode 100644
index 0000000..3998dd1
--- /dev/null
+++ b/dev-db/mariadb-maxscale/files/cmakelist.patch-2.0.0
@@ -0,0 +1,44 @@
+diff -ur MaxScale-maxscale-2.0.0.orig/CMakeLists.txt MaxScale-maxscale-2.0.0/CMakeLists.txt
+--- MaxScale-maxscale-2.0.0.orig/CMakeLists.txt	2016-08-11 11:44:07.000000000 +0200
++++ MaxScale-maxscale-2.0.0/CMakeLists.txt	2016-08-19 13:54:09.271449911 +0200
+@@ -10,9 +10,7 @@
+ enable_testing()
+ 
+ # Packaging builds install to /usr and other builds to /usr/local
+-if(PACKAGE)
+-  set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories.")
+-endif()
++set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories.")
+ 
+ # Set default values for cache entries and set the MaxScale version
+ include(cmake/defaults.cmake)
+@@ -96,7 +94,7 @@
+   set(MAXSCALE_COMMIT "source-build")
+ endif()
+ 
+-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
++set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
+ 
+ # Make sure the release notes for this release are present if it is a stable one
+ if(${MAXSCALE_VERSION} MATCHES "-stable")
+@@ -116,7 +114,7 @@
+ configure_file(${CMAKE_SOURCE_DIR}/etc/postrm.in ${CMAKE_BINARY_DIR}/postrm @ONLY)
+ configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.cnf ${CMAKE_BINARY_DIR}/maxscale.cnf @ONLY)
+ 
+-set(FLAGS "-Wall -Wno-unused-variable -Wno-unused-function -Werror -fPIC" CACHE STRING "Compilation flags")
++set(FLAGS "-Wall -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function -Werror -fPIC" CACHE STRING "Compilation flags")
+ set(DEBUG_FLAGS "-ggdb -pthread -pipe -Wformat -fstack-protector --param=ssp-buffer-size=4" CACHE STRING "Debug compilation flags")
+ 
+ if(CMAKE_VERSION VERSION_GREATER 2.6)
+diff -ur MaxScale-maxscale-2.0.0.orig/server/core/CMakeLists.txt MaxScale-maxscale-2.0.0/server/core/CMakeLists.txt
+--- MaxScale-maxscale-2.0.0.orig/server/core/CMakeLists.txt	2016-08-11 11:44:07.000000000 +0200
++++ MaxScale-maxscale-2.0.0/server/core/CMakeLists.txt	2016-08-19 13:23:25.691415482 +0200
+@@ -8,6 +8,8 @@
+   target_link_libraries(maxscale-common ${TCMALLOC_LIBRARIES})
+ endif()
+ 
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ add_dependencies(maxscale-common pcre2 connector-c)
+ install(TARGETS maxscale-common DESTINATION ${MAXSCALE_LIBDIR})
+ set_target_properties(maxscale-common PROPERTIES VERSION "1.0.0")
diff --git a/dev-db/mariadb-maxscale/files/confd-server b/dev-db/mariadb-maxscale/files/confd-server
new file mode 100644
index 0000000..3c8dd9b
--- /dev/null
+++ b/dev-db/mariadb-maxscale/files/confd-server
@@ -0,0 +1,4 @@
+export MAXSCALE_USER="maxscale"
+export MAXSCALE_DAEMON="/usr/bin/maxscale"
+export MAXSCALE_PIDFILE="/var/run/maxscale/maxscale.pid"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/maxscale/:/usr/lib64/mysql"
diff --git a/dev-db/mariadb-maxscale/files/init-server b/dev-db/mariadb-maxscale/files/init-server
new file mode 100755
index 0000000..c17efaa
--- /dev/null
+++ b/dev-db/mariadb-maxscale/files/init-server
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+
+	need net
+
+}
+
+start() {
+
+       checkpath --directory --owner maxscale /run/maxscale
+       checkpath --directory --owner maxscale /var/log/maxscale	
+
+       ebegin "Starting Maxscale"
+       start-stop-daemon --start --pidfile ${MAXSCALE_PIDFILE} --user ${MAXSCALE_USER} \
+       --name maxscale ${MAXSCALE_DAEMON}
+       eend $?
+
+}
+
+stop() {
+
+      ebegin "Stoping Maxscale"
+      start-stop-daemon --stop --pidfile ${MAXSCALE_PIDFILE} --name maxscale
+      eend $?
+
+}
diff --git a/dev-db/mariadb-maxscale/files/slavelagc.patch b/dev-db/mariadb-maxscale/files/slavelagc.patch
new file mode 100644
index 0000000..432631b
--- /dev/null
+++ b/dev-db/mariadb-maxscale/files/slavelagc.patch
@@ -0,0 +1,11 @@
+--- MaxScale-1.4.0.orig/server/modules/filter/slavelag.c	2016-03-17 12:38:50.804598574 +0100
++++ MaxScale-1.4.0/server/modules/filter/slavelag.c	2016-03-17 14:53:36.805836853 +0100
+@@ -332,7 +332,7 @@
+             queue = gwbuf_make_contiguous(queue);
+         }
+ 
+-        if (query_classifier_get_operation(queue) & (QUERY_OP_DELETE | QUERY_OP_INSERT | QUERY_OP_UPDATE))
++	if (qc_get_operation(queue) & (QUERY_OP_DELETE | QUERY_OP_INSERT | QUERY_OP_UPDATE))
+         {
+             if ((sql = modutil_get_SQL(queue)) != NULL)
+             {
diff --git a/dev-db/mariadb-maxscale/mariadb-maxscale-1.4.4.ebuild b/dev-db/mariadb-maxscale/mariadb-maxscale-1.4.4.ebuild
new file mode 100644
index 0000000..978b8f7
--- /dev/null
+++ b/dev-db/mariadb-maxscale/mariadb-maxscale-1.4.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils unpacker user eutils
+
+SRC_URI="https://github.com/mariadb-corporation/MaxScale/archive/${PV}.tar.gz"
+KEYWORDS=""
+
+DESCRIPTION="MaxScale is an intelligent proxy"
+HOMEPAGE="https://github.com/mariadb-corporation/MaxScale"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="jemalloc rabbitmq tcmalloc slavelag binlog"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+>=sys-devel/gcc-4.6.3
+>=sys-libs/glibc-2.16.0
+>=dev-util/cmake-2.8.12
+>=dev-db/mariadb-connector-c-2.1.0
+dev-libs/libpcre2
+virtual/mysql[embedded]
+jemalloc? ( dev-libs/jemalloc )
+rabbitmq? ( net-libs/rabbitmq-c )
+tcmalloc? ( dev-util/google-perftools:= )"
+
+pkg_setup() {
+enewgroup maxscale
+enewuser maxscale -1 -1 /usr/lib64/maxscale maxscale
+}
+
+S="${WORKDIR}/MaxScale-1.4.4"
+
+src_prepare() {
+		epatch "${FILESDIR}"/cmakelist.patch
+
+        if use slavelag ; then
+			epatch "${FILESDIR}"/slavelagc.patch
+    	fi
+
+}
+
+src_configure() {
+    local mycmakeargs=(
+        -DSTATIC_EMBEDDED=ON
+        -DWITH_SCRIPTS=OFF
+        $(cmake-utils_use_with jemalloc JEMALLOC)
+        $(cmake-utils_use_build rabbitmq RABBITMQ)
+        $(cmake-utils_use_with tcmalloc TCMALLOC)
+        $(cmake-utils_use_build slavelag SLAVELAG)
+        $(cmake-utils_use_build binlog BINLOG)
+        )
+    cmake-utils_src_configure
+}
+
+src_compile() {
+    cmake-utils_src_compile
+}
+
+src_install() {
+    cmake-utils_src_install
+    keepdir /var/log/maxscale /var/lib/maxscale/data \
+        /var/cache/maxscale
+    fowners maxscale:maxscale /var/log/maxscale \
+        /var/lib/maxscale/data \
+        /var/lib/maxscale \
+        /var/cache/maxscale
+
+#	chown -R maxscale:maxscale "${D}"
+    newinitd "${FILESDIR}/init-server" ${PN}
+    newconfd "${FILESDIR}/confd-server" ${PN}
+
+}
+
+pkg_postinst() {
+	
+		ewarn ""
+		ewarn "Before you start Maxscale,"
+		ewarn "please take a look at /etc/maxscale.cnf."
+		ewarn ""
+}
diff --git a/dev-db/mariadb-maxscale/mariadb-maxscale-2.0.2.ebuild b/dev-db/mariadb-maxscale/mariadb-maxscale-2.0.2.ebuild
new file mode 100644
index 0000000..99b559a
--- /dev/null
+++ b/dev-db/mariadb-maxscale/mariadb-maxscale-2.0.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils unpacker user eutils
+
+SRC_URI="https://github.com/mariadb-corporation/MaxScale/archive/maxscale-${PV}.tar.gz"
+KEYWORDS=""
+
+DESCRIPTION="MaxScale is an intelligent proxy"
+HOMEPAGE="https://github.com/mariadb-corporation/MaxScale"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="jemalloc rabbitmq tcmalloc slavelag binlog"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+>=sys-devel/gcc-4.6.3
+>=sys-libs/glibc-2.16.0
+>=dev-util/cmake-2.8.12
+>=dev-db/mariadb-connector-c-2.1.0
+dev-libs/libpcre2
+dev-lang/tcl
+virtual/mysql[embedded]
+jemalloc? ( dev-libs/jemalloc )
+rabbitmq? ( net-libs/rabbitmq-c )
+tcmalloc? ( dev-util/google-perftools:= )"
+
+pkg_setup() {
+enewgroup maxscale
+enewuser maxscale -1 -1 /usr/lib64/maxscale maxscale
+}
+
+S="${WORKDIR}/MaxScale-maxscale-2.0.2"
+
+src_prepare() {
+		epatch "${FILESDIR}"/cmakelist.patch-2.0.0
+}
+
+src_configure() {
+    local mycmakeargs=(
+        -DSTATIC_EMBEDDED=ON
+        -DWITH_SCRIPTS=OFF
+        $(cmake-utils_use_with jemalloc JEMALLOC)
+        $(cmake-utils_use_build rabbitmq RABBITMQ)
+        $(cmake-utils_use_with tcmalloc TCMALLOC)
+        $(cmake-utils_use_build slavelag SLAVELAG)
+        $(cmake-utils_use_build binlog BINLOG)
+        )
+    cmake-utils_src_configure
+}
+
+src_compile() {
+    cmake-utils_src_compile
+}
+
+src_install() {
+    cmake-utils_src_install
+    keepdir /var/log/maxscale /var/lib/maxscale/data \
+        /var/cache/maxscale
+    fowners maxscale:maxscale /var/log/maxscale \
+        /var/lib/maxscale/data \
+        /var/lib/maxscale \
+        /var/cache/maxscale
+
+#	chown -R maxscale:maxscale "${D}"
+    newinitd "${FILESDIR}/init-server" ${PN}
+    newconfd "${FILESDIR}/confd-server" ${PN}
+
+}
+
+pkg_postinst() {
+	
+		ewarn ""
+		ewarn "Before you start Maxscale,"
+		ewarn "please take a look at /etc/maxscale.cnf."
+		ewarn ""
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
new file mode 100644
index 0000000..f4b75a3
--- /dev/null
+++ b/dev-libs/libpcre2/Manifest
@@ -0,0 +1,4 @@
+DIST pcre2-10.20.tar.bz2 1358380 SHA256 332e287101c9e9567d1ed55391b338b32f1f72c5b5ee7cc81ef2274a53ad487a SHA512 3fcad35581a9d8e3b84b3509ada618165c0b53edb9622aa6ad92e83103eddabd6cfa8ce3aa9339bf5e0cf560b6f4ed07f37fcd3faa3b977964e610f23c99f639 WHIRLPOOL 1a2fe62fc333293678ee4899316159d61addc41fad581fd0dfc06d95c51e93daa7bdfd7d9f26466ee476b2bcda98bd1f6e6f266ff60e5691b811baea9f530410
+DIST pcre2-10.21.tar.bz2 1455359 SHA256 c66a17509328a7251782691093e75ede7484a203ebc6bed3c08122b092ccd4e0 SHA512 82f16e5476919de66bbd15a96a0f769bc03f55e679280d470f13e932b660efb7f57637c42a5d0907d1a84f836636bf57756ea961ae1d5763463c6964a8c37bb6 WHIRLPOOL 755f4d0531e8f68c469018833e5d7ba02b683bf1f19639ca634bf690ca42fb9403ead4c159667807c264392301f6999664f60d0ec03c87a230234b6ad327142e
+EBUILD libpcre2-10.20.ebuild 2486 SHA256 ba847ff38c9df0db505221db13e6ec1e8d267f391a031043a4f7a9ecf3c857a2 SHA512 f84410cf3f8bfa40e58f2dc7eccdebb32326c7bd556b2eba6ec9b7700b510129f6f21690deb9cbe028274605cb271170d996dca6eeff0a7ac87107b7c9636bd4 WHIRLPOOL b3224f8e58caa4cd1b9c18d9ec0e9293f097956ad1cd2956458d1c34c487d73e915fc51e4874bfff6e938d1eae12a2e7b2324c0bb9ea734f953504e85822d03f
+EBUILD libpcre2-10.21.ebuild 2486 SHA256 ba847ff38c9df0db505221db13e6ec1e8d267f391a031043a4f7a9ecf3c857a2 SHA512 f84410cf3f8bfa40e58f2dc7eccdebb32326c7bd556b2eba6ec9b7700b510129f6f21690deb9cbe028274605cb271170d996dca6eeff0a7ac87107b7c9636bd4 WHIRLPOOL b3224f8e58caa4cd1b9c18d9ec0e9293f097956ad1cd2956458d1c34c487d73e915fc51e4874bfff6e938d1eae12a2e7b2324c0bb9ea734f953504e85822d03f
diff --git a/dev-libs/libpcre2/libpcre2-10.20.ebuild b/dev-libs/libpcre2/libpcre2-10.20.ebuild
new file mode 100644
index 0000000..ba28bed
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.20.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.37.ebuild,v 1.1 2015/04/30 11:00:06 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre2-${PV}"
+SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	local pc
+	for pc in *.pc.in ; do
+		echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
+	done
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
+		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
+		$(use_enable pcre16 pcre2-16) \
+		$(use_enable pcre32 pcre2-32) \
+		$(multilib_native_use_enable libedit pcre2test-libedit) \
+		$(multilib_native_use_enable readline pcre2test-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(multilib_native_use_enable zlib pcre2grep-libz) \
+		--enable-pcre2-8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
diff --git a/dev-libs/libpcre2/libpcre2-10.21.ebuild b/dev-libs/libpcre2/libpcre2-10.21.ebuild
new file mode 100644
index 0000000..ba28bed
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.21.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.37.ebuild,v 1.1 2015/04/30 11:00:06 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre2-${PV}"
+SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	local pc
+	for pc in *.pc.in ; do
+		echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
+	done
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
+		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
+		$(use_enable pcre16 pcre2-16) \
+		$(use_enable pcre32 pcre2-32) \
+		$(multilib_native_use_enable libedit pcre2test-libedit) \
+		$(multilib_native_use_enable readline pcre2test-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(multilib_native_use_enable zlib pcre2grep-libz) \
+		--enable-pcre2-8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}

From 1b26096ed6985b78392c7bc6eceeeb6c7027a884 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Wed, 22 Feb 2017 16:15:49 -0800
Subject: [PATCH 252/261] update mani

---
 net-misc/freeswitch-cyneric/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 8cb2a20..83b7815 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -3,7 +3,7 @@ AUX cyneric.fstab 2293 SHA256 e2d39810e27770c2aa294ce0d052a44dac9b5cd788582c8ec8
 AUX freeswitch.1.6.10.initd 1736 SHA256 aae77965c75774af88629e4c6f152a570783b577c27f706db9faa348bcfa1b90 SHA512 dde1373077eba80ff7d89116858114c73ff02879322b9e2e6d69e758aa045399daee855ac1d07953d177cb132a92e92b30d8f6ef2ca5ce7c4294639f381112c4 WHIRLPOOL 9264b45ed5828917eb69af0ba66a93ac986ed1044bd4ceea5b52ef6e4c4110dde3d38667957df67fc76d8efc29e5558c95ceb31c7af14c13d95ae6d9b5389a5b
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
-DIST freeswitch-cyneric-0.1.0.tar.gz 2183257 SHA256 4566c35212754ea8351b3ab01a64fe104c013c598ffbc1650ff2933490c70723 SHA512 f0d03bc7090d3aa4fd53f663a38f20367c795fe282302a6e59f81db2323c6040d760c6b6cb7b654f455b15c680d4d07a4636bdc367b9da2fbe5c50eecfef0441 WHIRLPOOL 528ecd0440ab2d81e277b040865b4cec6fda135680571e77bd865369b43fc35440bb6fe92c425ec043a38463966125061027426b2fe32dbe5faa9de342e7a45c
-DIST freeswitch-cyneric-1.6.10.tar.gz 3967252 SHA256 92cf3d245e97f54a572c77c6f2af320504d46812af42b5b830848a29b651f51b SHA512 9763e97c36f17558bc41a7ae32da91ea42dd975f764c69500a58c0ce6f47cac5bf8a9b38eb2fc253710f7f61fe7b027aa5d54ecedab3c641cf9f4832d6ecff07 WHIRLPOOL f2bb9fd21aa3b0da8a8f9ffef605c303579913252ed63d8a762570213939db9f656a41daa392f397fdd43e489307ed7125520edc371317873da5df3dcf27bb35
+DIST freeswitch-cyneric-0.1.0.tar.gz 2183268 SHA256 f9587728b579fca09e85ada7ca8362e25ef6f8e037b2a74623a795ca229e5ff1 SHA512 320294c9b07ecfd80f8e01db2d63c3d2e3ce2958caa64b2f0cceff7b36a7499138d6bd07d8db49b9c1e5af6bddff27d89ce1723dd6d0b6fcc445da9ad732db8b WHIRLPOOL 7de360a8ff2cc3c4c7d2efe6c874118640f6d6ea6d4aa7b91405f42818fbcf4274a39502047ffd3ec0dc6a0ae728ab37b01057032f4d07d56ac04efc40b8bf70
+DIST freeswitch-cyneric-1.6.10.tar.gz 7906172 SHA256 14b557a88f83e8e62ba2d150f2cb90d6b52d454ac8d4328b66bbf17eb4b5b4b4 SHA512 01be5afa8e46ca7491437083c50145cb118558e9c4c24c021ea4ac0a9a17ac2609ac6d0820adf61f3f82f95a5c33342269d5ed4aa7f25c164720a8dc1c013bc3 WHIRLPOOL 762f3701fd598636bb89aeaf77023f3845f451a720b4972e71d87689e17f05fa9942a4a975e0ea8d8c0404ca8d0811d90ba65a096f61b62e1476efc6524cd340
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From 1700978b4c06b51d580881661f60bb08d4067518 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Fri, 24 Feb 2017 18:01:05 -0800
Subject: [PATCH 253/261] update mani

---
 net-misc/freeswitch-cyneric/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/freeswitch-cyneric/Manifest b/net-misc/freeswitch-cyneric/Manifest
index 83b7815..52bacde 100644
--- a/net-misc/freeswitch-cyneric/Manifest
+++ b/net-misc/freeswitch-cyneric/Manifest
@@ -4,6 +4,6 @@ AUX freeswitch.1.6.10.initd 1736 SHA256 aae77965c75774af88629e4c6f152a570783b577
 AUX freeswitch.confd 539 SHA256 542ee9a6915bbf07d031aa6b6c673074c78c689dda4060263b8f5a6ec4428e60 SHA512 33e23526044c9bc66636619c56e28b8db19e72cde4297d121035f6d69a2b853e6e1d7ed5214d84be03d7a24b780caa46297bf35be725d173106ddc1a6b0db1b0 WHIRLPOOL ce95f55cabd0740b4ef4b37d105359788f3673daf391427815d3c2345ebb7bd04a0d6050788aeb432c175100e7795a1c69061bcece04e0825bb14d588c0f86c3
 AUX freeswitch.rc6 1638 SHA256 f4f3518f486df21c89ef48f182e50a31d68d4907bcc36abdbe2a780cc693ddd7 SHA512 20a5dd552c5cfbce47499c6dc724b206b15ec1db129e563c2792bb1866c74d78f72c50754566120e73b160c355df1566818371d63936426ccdc62a406614e071 WHIRLPOOL dc15139cd6bce900e7c3390607ec684c18b91e583d919c3a523763c7a27a9a4d1771613c9d0abc594854b2aec8f7d7e1e04f6ec806d69364b07d5ca359012c4a
 DIST freeswitch-cyneric-0.1.0.tar.gz 2183268 SHA256 f9587728b579fca09e85ada7ca8362e25ef6f8e037b2a74623a795ca229e5ff1 SHA512 320294c9b07ecfd80f8e01db2d63c3d2e3ce2958caa64b2f0cceff7b36a7499138d6bd07d8db49b9c1e5af6bddff27d89ce1723dd6d0b6fcc445da9ad732db8b WHIRLPOOL 7de360a8ff2cc3c4c7d2efe6c874118640f6d6ea6d4aa7b91405f42818fbcf4274a39502047ffd3ec0dc6a0ae728ab37b01057032f4d07d56ac04efc40b8bf70
-DIST freeswitch-cyneric-1.6.10.tar.gz 7906172 SHA256 14b557a88f83e8e62ba2d150f2cb90d6b52d454ac8d4328b66bbf17eb4b5b4b4 SHA512 01be5afa8e46ca7491437083c50145cb118558e9c4c24c021ea4ac0a9a17ac2609ac6d0820adf61f3f82f95a5c33342269d5ed4aa7f25c164720a8dc1c013bc3 WHIRLPOOL 762f3701fd598636bb89aeaf77023f3845f451a720b4972e71d87689e17f05fa9942a4a975e0ea8d8c0404ca8d0811d90ba65a096f61b62e1476efc6524cd340
+DIST freeswitch-cyneric-1.6.10.tar.gz 3959810 SHA256 65d124507a34e72b88261aaa302b3f7491306803a9db1a88b2f959c876c78930 SHA512 ae35f200afbe5c86f0b2b22532ed07a9880f0261fc423f9fa68926267f9ea6e65089d867f350249e5a263237188bd3620aecbd78eb88f16bd7250a1afe53fae1 WHIRLPOOL 5c5f9ce70b29cff862eb4637d781a9abda10deb8dacb774a680387fd54d9c7da0ea3829617d7404552c346524b97d7f653fb3284376c8e2ad452b425a2d0b3cb
 EBUILD freeswitch-cyneric-0.1.0.ebuild 1508 SHA256 0bcdcaea5f95e681ab51a6e2983ae3552d4bcdd0d0c252fb3a3b62af2be5b747 SHA512 fcfda3a4dce98f5c2a82d5edef65024a14cf89414bd5de3a9f18c3793e826f13b2e5ef695d98bc3efa72a754a56d513bd9b437f90cf25b14900ab30c4e0ff47a WHIRLPOOL a95080da47955320ad975cb19b1d63320b51a8c7920b064448fc6f5074b81d8838bd60585a18a3c5c4d085a824e521879f2e65a99a686ce15099609b790beca8
 EBUILD freeswitch-cyneric-1.6.10.ebuild 1817 SHA256 06dfb6fac3bc2589dca41310e172a5f2cd0219fa986947f7e97bcf3c45445ff2 SHA512 b25ca9827090f55c9974ae147da8699e31f1cd92103ffdebdcdc1a6b6029aa0c0f3868dc20560b12817627d8d4fc0f192165aa5cdf5ef4f41be6cb91926f9cf7 WHIRLPOOL 7e2b492d37ad5e3249301cdd556f6f7df1aaef3e64db88f7ccb4a0f083578fc6e752ba0751ab7544bd0248d645164f0fd8da60753b3452d317115fb7550e26b6

From c8af5a1edc9e348bd5e7927b7695e584a1c0422e Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 27 Feb 2017 13:58:06 -0800
Subject: [PATCH 254/261] added old version of glusterfs

---
 sys-cluster/glusterfs/Manifest                |  15 +
 .../files/50glusterfs-mode-gentoo.el          |   5 +
 .../files/glusterd-3.2.0-workdir.patch        |  49 ++
 sys-cluster/glusterfs/files/glusterd-r2.initd |  33 +
 .../glusterfs-3.1.0-parallel-build.patch      |  22 +
 .../files/glusterfs-3.4.0-silent_rules.patch  |  23 +
 ...ries-using-LIBADD-instead-of-LDFLAGS.patch |  54 ++
 .../glusterfs-3.5.1-build-shared-only.patch   | 576 ++++++++++++++++++
 .../glusterfs-3.6.5-build-shared-only.patch   | 547 +++++++++++++++++
 .../glusterfs/files/glusterfs-docdir.patch    |  51 ++
 .../glusterfs/files/glusterfs-r1.initd        | 122 ++++
 sys-cluster/glusterfs/files/glusterfs.confd   |   6 +
 .../glusterfs/files/glusterfs.logrotate       |  34 ++
 sys-cluster/glusterfs/files/glusterfs.vim     |   8 +
 sys-cluster/glusterfs/glusterfs-3.2.7.ebuild  | 122 ++++
 15 files changed, 1667 insertions(+)
 create mode 100644 sys-cluster/glusterfs/Manifest
 create mode 100644 sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
 create mode 100644 sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterd-r2.initd
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-docdir.patch
 create mode 100644 sys-cluster/glusterfs/files/glusterfs-r1.initd
 create mode 100644 sys-cluster/glusterfs/files/glusterfs.confd
 create mode 100644 sys-cluster/glusterfs/files/glusterfs.logrotate
 create mode 100644 sys-cluster/glusterfs/files/glusterfs.vim
 create mode 100644 sys-cluster/glusterfs/glusterfs-3.2.7.ebuild

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
new file mode 100644
index 0000000..67cc444
--- /dev/null
+++ b/sys-cluster/glusterfs/Manifest
@@ -0,0 +1,15 @@
+AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
+AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
+AUX glusterd-r2.initd 756 SHA256 5fee2ab663249573f1f37d8b32ba8d609028446d12bdcfd925d763803cd88d47 SHA512 ad0f69cde665515b8cd2ce0ceeb2d6abdbf84dd2a2cde4f883a76b44fe61c18261ef4120f6e11eb6ef4a61b9361fd2eb6e5a3a62e98c78c086b4d177e3115b57 WHIRLPOOL 731dbd0bcf7f30b16c83ed08751b5768e5185c2231f55bc051ff0c2396856a7ed1a0db271f6bc18c9533c427aaa103503113806bf9a857c76e703cbc64f965ec
+AUX glusterfs-3.1.0-parallel-build.patch 659 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c SHA512 9bfa0572beda5d132a47d9a52c2f6c3149abec36054a5d20203acf01e624721a7e9f9dd603b43a724f0eb5e01ecf45696de8b5a3b6204ff9871cefaae85c5bf8 WHIRLPOOL 8d7037a6ec21d4e099d696628428747182a1c416bc6a158dd7c55633a009cbaa81aed919a3108ba35f30d1593b4027bfcd2662ee457b43c28122ade91a1688cc
+AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
+AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 SHA256 10b0ad92f61996f7ca0e0bf12b383813c4cd2013d95d8b6e1ab53a18853a9e05 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00 WHIRLPOOL e8e5572a5861478c718cd0b89c74159e3b13f6ef204eb3e3b2d8af8ddd296bc71469648ae957f0dd4e18de187e6fcd3e1910ea9ec5a707b78f61af8c88c9bb9b
+AUX glusterfs-3.5.1-build-shared-only.patch 25227 SHA256 203d834d63845e0324585d99dbe0a34deda7a2b06949223787359946440e8ad2 SHA512 6ea22772c9dec330c63d5665a861537536fec6a66cecccad36f0123cc35818d31096bce5561d6ea3d2318327c0f28831bc81d83b489e71432dfcf8879ee56fd9 WHIRLPOOL d983d70170ca78be7a7533f96334baf6127864e63d17e1597f164db60ac5d52d4fb1a78a9d2d7cae998946fc9a4dd8eb2d3fef68de749fcb2f8e5e7079967d16
+AUX glusterfs-3.6.5-build-shared-only.patch 27261 SHA256 b2d73ffb27f07bf762e8f67bdbbbdd3a7eef62049ec346a2ab84a9171e55c053 SHA512 cbaa02845022cb32aab1e419d13f8291b59aa6de78ccdd944af52d05defcd4ae9bb891c0f303f7d4870056e0777d70507b137aa9e38a4a13a267925a3cbc0277 WHIRLPOOL ab0b75e36a0f3011618e87dc9490471c9a759cd65985074a3046be5bb3609830018ca50d82de4db8b783424c46768d4b2fe0c906271cb5e2a01fec264b0f26e1
+AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
+AUX glusterfs-r1.initd 3072 SHA256 ee75831e6c81f5944adf15e7bf3b929972581031ae4d782e50bb69c4edf2845b SHA512 79594885b78ba9f2aa3bceea2df4abff0d0249fbdab1b4054051060463e4c630daeccb75b69ba96138614b93fa585ce5967534d3cb72e986fd160f951c2e19da WHIRLPOOL 4d4bc5f987879b2ef63bda994be846871eed96cf6e7a506e3b37389dead717a44a01459c36280de59f3ba8742f97c3ddcfc995c3e1df18f75fd950beaa48f7ec
+AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d
+AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a736ccb76fd05f9a9f60a2 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 WHIRLPOOL 10ced84d8035e3e7e5aaa013cd7c0c9761999e8ddca41ff2df3ed2be7a78add579d5c2b17a27b86d9a6fafdb607b9d175725208af72585d9fdc66b3bdb5fed3d
+AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
+DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
+EBUILD glusterfs-3.2.7.ebuild 3590 SHA256 f310dab1fb4e3ddc775384962e7316abbe4ba04ff00cdca89ecdfded1922750d SHA512 1856135c0c027a06d3b8eab46efeebcd166a842e81e487d2e5a5575193211ec9fe29ab206bf9b35044547156ed86b8471880b98f1dfedc44b92170edb72764c7 WHIRLPOOL 854b8a8c4f7d5be1f177d212271cb7aae14726175f3f0d7172423d430fc31b75f3ffc467c75bd7548bde3bc8e19e4634b3ac736b04fa577948cee99e15143e7e
diff --git a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
new file mode 100644
index 0000000..c14b0d8
--- /dev/null
+++ b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'glusterfs-mode "glusterfs-mode" "Major mode for editing glusterfs manifests")
diff --git a/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch b/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch
new file mode 100644
index 0000000..a312bdb
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch
@@ -0,0 +1,49 @@
+Change the default workdir of the glusterd daemon to /var/lib/glusterd instead of /etc/glusterd.
+This directory is dynamically populated by glusterd via the gluster CLI so it does better
+belong into /var/lib/.
+
+Patch by Ultrabug.
+
+--- a/xlators/mgmt/glusterd/src/glusterd.h   2010-10-13 06:20:37.000000000 +0200
++++ b/xlators/mgmt/glusterd/src/glusterd.h   2010-10-26 10:47:52.747265444 +0200
+@@ -204,7 +204,7 @@
+         GLUSTERD_VOL_COMP_RJT,
+ };
+
+-#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd"
++#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd"
+ #define GLUSTERD_DEFAULT_PORT    GF_DEFAULT_BASE_PORT
+ #define GLUSTERD_INFO_FILE      "glusterd.info"
+ #define GLUSTERD_VOLUME_DIR_PREFIX "vols"
+--- a/doc/glusterd.vol  2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.vol  2010-10-26 10:48:16.487931870 +0200
+@@ -1,6 +1,6 @@
+ volume management
+     type mgmt/glusterd
+-    option working-directory /etc/glusterd
++    option working-directory /var/lib/glusterd
+     option transport-type socket,rdma
+     option transport.socket.keepalive-time 10
+     option transport.socket.keepalive-interval 2
+--- a/doc/glusterd.8 2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.8 2010-10-26 10:48:44.898729373 +0200
+@@ -70,7 +70,7 @@
+
+ .PP
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+
+ .SH SEE ALSO
+ .nf
+--- a/doc/gluster.8     2011-04-22 19:37:28.000000000 +0200
++++ b/doc/gluster.8     2011-05-16 11:56:14.318682346 +0200
+@@ -121,7 +121,7 @@
+ Exit the gluster command line interface.
+
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+ .SH SEE ALSO
+ .nf
+ \fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBglusterfs\fR(8), \fBglusterd\fR(8)
\ No newline at end of file
diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd
new file mode 100644
index 0000000..bd33651
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r2.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner root:root --mode 0700 /var/run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
new file mode 100644
index 0000000..9320c12
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
@@ -0,0 +1,22 @@
+--- glusterfsd/src/Makefile.am
++++ glusterfsd/src/Makefile.am
+@@ -20,5 +20,6 @@ uninstall-local:
+ install-data-local:
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
++	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
+ 	rm -f $(DESTDIR)$(sbindir)/glusterfs
+ 	ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
+--- libglusterfs/src/Makefile.am
++++ libglusterfs/src/Makefile.am
+@@ -15,7 +15,9 @@
+ graph.lex.c: graph.l y.tab.h
+ 	$(LEX) -t $(srcdir)/graph.l > $@
+ 
+-y.tab.c y.tab.h: graph.y
++y.tab.c: y.tab.h
++
++y.tab.h: graph.y
+ 	$(YACC) -d $(srcdir)/graph.y
+ 
+ CLEANFILES = graph.lex.c y.tab.c y.tab.h
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
new file mode 100644
index 0000000..1b79e0d
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
@@ -0,0 +1,23 @@
+--- configure.ac	2013-07-12 19:43:26.000000000 +0200
++++ configure.ac2	2013-07-25 13:58:48.294091861 +0200
+@@ -10,20 +10,6 @@
+ 
+ AM_INIT_AUTOMAKE
+ 
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+-
+-if make --help 2>&1 | grep -q no-print-directory; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
+-fi
+-
+-if make --help 2>&1 | grep -q quiet; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
+-fi
+-
+-if libtool --help 2>&1 | grep -q quiet; then
+-   AM_LIBTOOLFLAGS="--quiet";
+-fi
+-
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_CONFIG_FILES([Makefile
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
new file mode 100644
index 0000000..5c4df0c
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
@@ -0,0 +1,54 @@
+From 8bfe3752c3a0a4db49a879048cdd089da6c45ed0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Thu, 26 Jun 2014 19:04:54 +0200
+Subject: [PATCH] Add libraries using LIBADD instead of LDFLAGS
+
+---
+ xlators/encryption/crypt/src/Makefile.am  | 6 +++---
+ xlators/features/compress/src/Makefile.am | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
+index b13f650..d7ebac6 100644
+--- a/xlators/encryption/crypt/src/Makefile.am
++++ b/xlators/encryption/crypt/src/Makefile.am
+@@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR
+ xlator_LTLIBRARIES = crypt.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto
++crypt_la_LDFLAGS = -module -avoid-version
+ 
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
+-crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
++crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
+ 
+ noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
+ 
+@@ -21,4 +21,4 @@ else
+ noinst_DIST = keys.c data.c metadata.c atom.c crypt.c
+ noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
+ 
+-endif
+\ No newline at end of file
++endif
+diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
+index 0bf757c..d3abe03 100644
+--- a/xlators/features/compress/src/Makefile.am
++++ b/xlators/features/compress/src/Makefile.am
+@@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+ noinst_HEADERS = cdc.h cdc-mem-types.h
+ 
+-cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
++cdc_la_LDFLAGS = -module -avoid-version
+ 
+ cdc_la_SOURCES = cdc.c cdc-helper.c
+-cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
++cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
+ 
+ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
+ -shared -nostartfiles  $(LIBZ_CFLAGS)
+-- 
+1.9.2
+
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
new file mode 100644
index 0000000..9acf0d7
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
@@ -0,0 +1,576 @@
+diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
+index 2bf7cf2..8e52d70 100644
+--- a/rpc/rpc-transport/rdma/src/Makefile.am
++++ b/rpc/rpc-transport/rdma/src/Makefile.am
+@@ -3,7 +3,7 @@
+ transport_LTLIBRARIES = rdma.la
+ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+ 
+-rdma_la_LDFLAGS = -module -avoid-version
++rdma_la_LDFLAGS = -module -avoid-version -shared
+ 
+ rdma_la_SOURCES = rdma.c name.c
+ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
+diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
+index 71e6ed6..b481fe9 100644
+--- a/rpc/rpc-transport/socket/src/Makefile.am
++++ b/rpc/rpc-transport/socket/src/Makefile.am
+@@ -3,7 +3,7 @@ noinst_HEADERS = socket.h name.h
+ rpctransport_LTLIBRARIES = socket.la
+ rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+ 
+-socket_la_LDFLAGS = -module -avoid-version
++socket_la_LDFLAGS = -module -avoid-version -shared
+ 
+ socket_la_SOURCES = socket.c name.c
+ socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
+diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
+index 35d18a6..959fea8 100644
+--- a/xlators/cluster/afr/src/Makefile.am
++++ b/xlators/cluster/afr/src/Makefile.am
+@@ -7,11 +7,11 @@ afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \
+ 	afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \
+ 	$(top_builddir)/xlators/lib/src/libxlator.c
+ 
+-afr_la_LDFLAGS = -module -avoid-version
++afr_la_LDFLAGS = -module -avoid-version -shared
+ afr_la_SOURCES = $(afr_common_source) afr.c
+ afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-pump_la_LDFLAGS = -module -avoid-version
++pump_la_LDFLAGS = -module -avoid-version -shared
+ pump_la_SOURCES =  $(afr_common_source) pump.c
+ pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
+index 174bea8..cab9993 100644
+--- a/xlators/cluster/dht/src/Makefile.am
++++ b/xlators/cluster/dht/src/Makefile.am
+@@ -12,13 +12,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c
+ nufa_la_SOURCES = $(dht_common_source) nufa.c
+ switch_la_SOURCES = $(dht_common_source) switch.c
+ 
+-dht_la_LDFLAGS = -module -avoid-version
++dht_la_LDFLAGS = -module -avoid-version -shared
+ dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-nufa_la_LDFLAGS = -module -avoid-version
++nufa_la_LDFLAGS = -module -avoid-version -shared
+ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-switch_la_LDFLAGS = -module -avoid-version
++switch_la_LDFLAGS = -module -avoid-version -shared
+ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+ noinst_HEADERS = dht-common.h dht-mem-types.h \
+diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
+index 2d15142..6989de9 100644
+--- a/xlators/cluster/stripe/src/Makefile.am
++++ b/xlators/cluster/stripe/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = stripe.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+ 
+-stripe_la_LDFLAGS = -module -avoid-version
++stripe_la_LDFLAGS = -module -avoid-version -shared
+ 
+ stripe_la_SOURCES = stripe.c stripe-helpers.c \
+ 	$(top_builddir)/xlators/lib/src/libxlator.c
+diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
+index 5075c59..a7681c4 100644
+--- a/xlators/debug/error-gen/src/Makefile.am
++++ b/xlators/debug/error-gen/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = error-gen.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-error_gen_la_LDFLAGS = -module -avoid-version
++error_gen_la_LDFLAGS = -module -avoid-version -shared
+ 
+ error_gen_la_SOURCES = error-gen.c
+ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
+index 332d790..bf62017 100644
+--- a/xlators/debug/io-stats/src/Makefile.am
++++ b/xlators/debug/io-stats/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = io-stats.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-io_stats_la_LDFLAGS = -module -avoid-version
++io_stats_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_stats_la_SOURCES = io-stats.c
+ io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
+index 7b2597b..2030ed4 100644
+--- a/xlators/debug/trace/src/Makefile.am
++++ b/xlators/debug/trace/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = trace.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-trace_la_LDFLAGS = -module -avoid-version
++trace_la_LDFLAGS = -module -avoid-version -shared
+ 
+ trace_la_SOURCES = trace.c
+ trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
+index d7ebac6..66ae6f5 100644
+--- a/xlators/encryption/crypt/src/Makefile.am
++++ b/xlators/encryption/crypt/src/Makefile.am
+@@ -3,7 +3,7 @@ if ENABLE_CRYPT_XLATOR
+ xlator_LTLIBRARIES = crypt.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-crypt_la_LDFLAGS = -module -avoid-version
++crypt_la_LDFLAGS = -module -avoid-version -shared
+ 
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
+ crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
+diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
+index 94e8d18..d13894e 100644
+--- a/xlators/encryption/rot-13/src/Makefile.am
++++ b/xlators/encryption/rot-13/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = rot-13.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-rot_13_la_LDFLAGS = -module -avoid-version
++rot_13_la_LDFLAGS = -module -avoid-version -shared
+ 
+ rot_13_la_SOURCES = rot-13.c
+ rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+diff --git a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
+index 54c21ac..d98f43f 100644
+--- a/xlators/features/changelog/src/Makefile.am
++++ b/xlators/features/changelog/src/Makefile.am
+@@ -5,7 +5,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
+ 	changelog-misc.h changelog-encoders.h changelog-notifier.h
+ 
+-changelog_la_LDFLAGS = -module -avoid-version
++changelog_la_LDFLAGS = -module -avoid-version -shared
+ 
+ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
+ 	changelog-encoders.c changelog-notifier.c
+diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
+index d3abe03..659cd49 100644
+--- a/xlators/features/compress/src/Makefile.am
++++ b/xlators/features/compress/src/Makefile.am
+@@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+ noinst_HEADERS = cdc.h cdc-mem-types.h
+ 
+-cdc_la_LDFLAGS = -module -avoid-version
++cdc_la_LDFLAGS = -module -avoid-version -shared
+ 
+ cdc_la_SOURCES = cdc.c cdc-helper.c
+ cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
+diff --git a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
+index db53aff..4eeaa4f 100644
+--- a/xlators/features/gfid-access/src/Makefile.am
++++ b/xlators/features/gfid-access/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = gfid-access.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-gfid_access_la_LDFLAGS = -module -avoid-version
++gfid_access_la_LDFLAGS = -module -avoid-version -shared
+ 
+ gfid_access_la_SOURCES = gfid-access.c
+ gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
+index 73bb897..5519798 100644
+--- a/xlators/features/index/src/Makefile.am
++++ b/xlators/features/index/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = index.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-index_la_LDFLAGS = -module -avoid-version
++index_la_LDFLAGS = -module -avoid-version -shared
+ 
+ index_la_SOURCES = index.c
+ index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
+index 0f79731..eda6a05 100644
+--- a/xlators/features/locks/src/Makefile.am
++++ b/xlators/features/locks/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = locks.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-locks_la_LDFLAGS = -module -avoid-version
++locks_la_LDFLAGS = -module -avoid-version -shared
+ 
+ locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \
+ 		   clear.c
+diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
+index f8567ed..a283eb0 100644
+--- a/xlators/features/mac-compat/src/Makefile.am
++++ b/xlators/features/mac-compat/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = mac-compat.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-mac_compat_la_LDFLAGS = -module -avoid-version
++mac_compat_la_LDFLAGS = -module -avoid-version -shared
+ 
+ mac_compat_la_SOURCES = mac-compat.c
+ mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
+index a7c6764..477fe0f 100644
+--- a/xlators/features/marker/src/Makefile.am
++++ b/xlators/features/marker/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = marker.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-marker_la_LDFLAGS = -module -avoid-version
++marker_la_LDFLAGS = -module -avoid-version -shared
+ 
+ marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c
+ marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
+index 968e88c..84ceec2 100644
+--- a/xlators/features/protect/src/Makefile.am
++++ b/xlators/features/protect/src/Makefile.am
+@@ -2,15 +2,15 @@ xlator_LTLIBRARIES = prot_dht.la prot_client.la prot_server.la
+ 
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-prot_dht_la_LDFLAGS = -module -avoid-version
++prot_dht_la_LDFLAGS = -module -avoid-version -shared
+ prot_dht_la_SOURCES = prot_dht.c
+ prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_client_la_LDFLAGS = -module -avoid-version
++prot_client_la_LDFLAGS = -module -avoid-version -shared
+ prot_client_la_SOURCES = prot_client.c
+ prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_server_la_LDFLAGS = -module -avoid-version
++prot_server_la_LDFLAGS = -module -avoid-version -shared
+ prot_server_la_SOURCES = prot_server.c
+ prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+diff --git a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
+index 08a7b62..30639e0 100644
+--- a/xlators/features/qemu-block/src/Makefile.am
++++ b/xlators/features/qemu-block/src/Makefile.am
+@@ -2,7 +2,7 @@ if ENABLE_QEMU_BLOCK
+ xlator_LTLIBRARIES = qemu-block.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-qemu_block_la_LDFLAGS = -module -avoid-version
++qemu_block_la_LDFLAGS = -module -avoid-version -shared
+ qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) -lz -lrt
+ 
+ qemu_block_la_SOURCES_qemu = \
+diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
+index 15e4662..b3cd9d1 100644
+--- a/xlators/features/quiesce/src/Makefile.am
++++ b/xlators/features/quiesce/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quiesce.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-quiesce_la_LDFLAGS = -module -avoid-version
++quiesce_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quiesce_la_SOURCES = quiesce.c
+ quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
+index 7165adc..06905f3 100644
+--- a/xlators/features/quota/src/Makefile.am
++++ b/xlators/features/quota/src/Makefile.am
+@@ -1,8 +1,8 @@
+ xlator_LTLIBRARIES = quota.la quotad.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-quota_la_LDFLAGS = -module -avoid-version
+-quotad_la_LDFLAGS = -module -avoid-version
++quota_la_LDFLAGS = -module -avoid-version -shared
++quotad_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quota_la_SOURCES = quota.c quota-enforcer-client.c
+ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
+index 4c14621..a3f79fa 100644
+--- a/xlators/features/read-only/src/Makefile.am
++++ b/xlators/features/read-only/src/Makefile.am
+@@ -4,12 +4,12 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+ noinst_HEADERS = read-only-common.h
+ 
+-read_only_la_LDFLAGS = -module -avoid-version
++read_only_la_LDFLAGS = -module -avoid-version -shared
+ 
+ read_only_la_SOURCES = read-only.c read-only-common.c
+ read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+ 
+-worm_la_LDFLAGS = -module -avoid-version
++worm_la_LDFLAGS = -module -avoid-version -shared
+ 
+ worm_la_SOURCES = read-only-common.c worm.c
+ worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+index a6f49ae..b071280 100644
+--- a/xlators/mgmt/glusterd/src/Makefile.am
++++ b/xlators/mgmt/glusterd/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = glusterd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
+ glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
+-glusterd_la_LDFLAGS = -module -avoid-version
++glusterd_la_LDFLAGS = -module -avoid-version -shared
+ if ENABLE_BD_XLATOR
+ glusterd_la_LDFLAGS += -llvm2app
+ endif
+diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
+index 653121d..3f221d8 100644
+--- a/xlators/mount/fuse/src/Makefile.am
++++ b/xlators/mount/fuse/src/Makefile.am
+@@ -24,7 +24,7 @@ endif
+ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
+ 	$(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
+ 
+-fuse_la_LDFLAGS = -module -avoid-version
++fuse_la_LDFLAGS = -module -avoid-version -shared
+ fuse_la_LIBADD = @GF_FUSE_LDADD@
+ 
+ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
+index 62fbf65..1995f67 100644
+--- a/xlators/nfs/server/src/Makefile.am
++++ b/xlators/nfs/server/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
+ nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+ server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \
+ 	nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \
+ 	nlmcbk_svc.c mount3udp_svc.c acl3.c
+diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
+index 155be99..ba0738c 100644
+--- a/xlators/performance/io-cache/src/Makefile.am
++++ b/xlators/performance/io-cache/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-io_cache_la_LDFLAGS = -module -avoid-version 
++io_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
+ io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
+index d63042e..aba1fdb 100644
+--- a/xlators/performance/io-threads/src/Makefile.am
++++ b/xlators/performance/io-threads/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-threads.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-io_threads_la_LDFLAGS = -module -avoid-version 
++io_threads_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_threads_la_SOURCES = io-threads.c
+ io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
+index 8c9f5a8..4d714fa 100644
+--- a/xlators/performance/md-cache/src/Makefile.am
++++ b/xlators/performance/md-cache/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = md-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-md_cache_la_LDFLAGS = -module -avoid-version
++md_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ md_cache_la_SOURCES = md-cache.c
+ md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
+index 1252857..568434a 100644
+--- a/xlators/performance/open-behind/src/Makefile.am
++++ b/xlators/performance/open-behind/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = open-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-open_behind_la_LDFLAGS = -module -avoid-version
++open_behind_la_LDFLAGS = -module -avoid-version -shared
+ 
+ open_behind_la_SOURCES = open-behind.c
+ open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
+index 4906f40..8d42116 100644
+--- a/xlators/performance/quick-read/src/Makefile.am
++++ b/xlators/performance/quick-read/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quick-read.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-quick_read_la_LDFLAGS = -module -avoid-version 
++quick_read_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quick_read_la_SOURCES = quick-read.c
+ quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
+index be80ae7..eae0540 100644
+--- a/xlators/performance/read-ahead/src/Makefile.am
++++ b/xlators/performance/read-ahead/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = read-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-read_ahead_la_LDFLAGS = -module -avoid-version
++read_ahead_la_LDFLAGS = -module -avoid-version -shared
+ 
+ read_ahead_la_SOURCES = read-ahead.c page.c
+ read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
+index 539d6ed..020b670 100644
+--- a/xlators/performance/readdir-ahead/src/Makefile.am
++++ b/xlators/performance/readdir-ahead/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = readdir-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-readdir_ahead_la_LDFLAGS = -module -avoid-version
++readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
+ 
+ readdir_ahead_la_SOURCES = readdir-ahead.c
+ readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
+index 4091c32..0d600d6 100644
+--- a/xlators/performance/symlink-cache/src/Makefile.am
++++ b/xlators/performance/symlink-cache/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = symlink-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance
+ 
+-symlink_cache_la_LDFLAGS = -module -avoid-version 
++symlink_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ symlink_cache_la_SOURCES = symlink-cache.c
+ symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
+index 6c829d8..746e5c1 100644
+--- a/xlators/performance/write-behind/src/Makefile.am
++++ b/xlators/performance/write-behind/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = write-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-write_behind_la_LDFLAGS = -module -avoid-version 
++write_behind_la_LDFLAGS = -module -avoid-version -shared
+ 
+ write_behind_la_SOURCES = write-behind.c
+ write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
+index 21f1c5f..3161bc8 100644
+--- a/xlators/playground/template/src/Makefile.am
++++ b/xlators/playground/template/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = template.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
+ 
+-template_la_LDFLAGS = -module -avoid-version
++template_la_LDFLAGS = -module -avoid-version -shared
+ 
+ template_la_SOURCES = template.c
+ template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
+index 426e7c2..fa7234d 100644
+--- a/xlators/protocol/auth/addr/src/Makefile.am
++++ b/xlators/protocol/auth/addr/src/Makefile.am
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = addr.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+ 
+-addr_la_LDFLAGS = -module -avoid-version
++addr_la_LDFLAGS = -module -avoid-version -shared
+ 
+ addr_la_SOURCES = addr.c
+ addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
+index d84db91..022739d 100644
+--- a/xlators/protocol/auth/login/src/Makefile.am
++++ b/xlators/protocol/auth/login/src/Makefile.am
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = login.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+ 
+-login_la_LDFLAGS = -module -avoid-version
++login_la_LDFLAGS = -module -avoid-version -shared
+ 
+ login_la_SOURCES = login.c
+ login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
+index cf89d42..8f2612c 100644
+--- a/xlators/protocol/client/src/Makefile.am
++++ b/xlators/protocol/client/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = client.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+ 
+-client_la_LDFLAGS = -module -avoid-version
++client_la_LDFLAGS = -module -avoid-version -shared
+ 
+ client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
+index 6a18bf0..9a0393f 100644
+--- a/xlators/protocol/server/src/Makefile.am
++++ b/xlators/protocol/server/src/Makefile.am
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+ 
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+ 
+ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff --git a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
+index 3d93f74..589185d 100644
+--- a/xlators/storage/bd/src/Makefile.am
++++ b/xlators/storage/bd/src/Makefile.am
+@@ -2,7 +2,7 @@ if ENABLE_BD_XLATOR
+ xlator_LTLIBRARIES = bd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+ 
+-bd_la_LDFLAGS = -module -avoid-version
++bd_la_LDFLAGS = -module -avoid-version -shared
+ LIBBD = -llvm2app -lrt
+ bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
+ bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
+diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
+index 88efcc7..79ca903 100644
+--- a/xlators/storage/posix/src/Makefile.am
++++ b/xlators/storage/posix/src/Makefile.am
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = posix.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+ 
+-posix_la_LDFLAGS = -module -avoid-version
++posix_la_LDFLAGS = -module -avoid-version -shared
+ 
+ posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c
+ posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
+diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
+index 11c939f..561c52d 100644
+--- a/xlators/system/posix-acl/src/Makefile.am
++++ b/xlators/system/posix-acl/src/Makefile.am
+@@ -1,6 +1,6 @@
+ xlator_LTLIBRARIES = posix-acl.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system
+-posix_acl_la_LDFLAGS = -module -avoid-version
++posix_acl_la_LDFLAGS = -module -avoid-version -shared
+ posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c
+ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
new file mode 100644
index 0000000..af5332b
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
@@ -0,0 +1,547 @@
+diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
+--- a/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 11:00:36.322686236 +0200
+@@ -3,7 +3,7 @@
+ transport_LTLIBRARIES = rdma.la
+ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+ 
+-rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
++rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared
+ 
+ rdma_la_SOURCES = rdma.c name.c
+ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej
+diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
+--- a/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -3,7 +3,7 @@
+ rpctransport_LTLIBRARIES = socket.la
+ rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+ 
+-socket_la_LDFLAGS = -module -avoid-version
++socket_la_LDFLAGS = -module -avoid-version -shared
+ 
+ socket_la_SOURCES = socket.c name.c
+ socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
+diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
+--- a/xlators/cluster/afr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/afr/src/Makefile.am	2015-08-28 11:01:31.603219323 +0200
+@@ -10,11 +10,11 @@
+ 	afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \
+ 	afr-self-heal-name.c
+ 
+-afr_la_LDFLAGS = -module -avoid-version
++afr_la_LDFLAGS = -module -avoid-version -shared
+ afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c
+ afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-pump_la_LDFLAGS = -module -avoid-version
++pump_la_LDFLAGS = -module -avoid-version -shared
+ pump_la_SOURCES =  $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c
+ pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+Only in b/xlators/cluster/afr/src: Makefile.am.orig
+Only in b/xlators/cluster/afr/src: Makefile.am.rej
+diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
+--- a/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -11,13 +11,13 @@
+ nufa_la_SOURCES = $(dht_common_source) nufa.c
+ switch_la_SOURCES = $(dht_common_source) switch.c
+ 
+-dht_la_LDFLAGS = -module -avoid-version
++dht_la_LDFLAGS = -module -avoid-version -shared
+ dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-nufa_la_LDFLAGS = -module -avoid-version
++nufa_la_LDFLAGS = -module -avoid-version -shared
+ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-switch_la_LDFLAGS = -module -avoid-version
++switch_la_LDFLAGS = -module -avoid-version -shared
+ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+ noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \
+Only in b/xlators/cluster/dht/src: Makefile.am.orig
+diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
+--- a/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = stripe.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+ 
+-stripe_la_LDFLAGS = -module -avoid-version
++stripe_la_LDFLAGS = -module -avoid-version -shared
+ 
+ stripe_la_SOURCES = stripe.c stripe-helpers.c \
+ 	$(top_builddir)/xlators/lib/src/libxlator.c
+Only in b/xlators/cluster/stripe/src: Makefile.am.orig
+diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
+--- a/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = error-gen.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-error_gen_la_LDFLAGS = -module -avoid-version
++error_gen_la_LDFLAGS = -module -avoid-version -shared
+ 
+ error_gen_la_SOURCES = error-gen.c
+ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
+--- a/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = io-stats.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-io_stats_la_LDFLAGS = -module -avoid-version
++io_stats_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_stats_la_SOURCES = io-stats.c
+ io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
+--- a/xlators/debug/trace/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/trace/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = trace.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+ 
+-trace_la_LDFLAGS = -module -avoid-version
++trace_la_LDFLAGS = -module -avoid-version -shared
+ 
+ trace_la_SOURCES = trace.c
+ trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
+--- a/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:16:28.051864039 +0200
+@@ -3,7 +3,7 @@
+ xlator_LTLIBRARIES = crypt.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-crypt_la_LDFLAGS = -module -avoid-version
++crypt_la_LDFLAGS = -module -avoid-version -shared
+ 
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
+ crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
+Only in b/xlators/encryption/crypt/src: Makefile.am.orig
+Only in b/xlators/encryption/crypt/src: Makefile.am.rej
+diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
+--- a/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = rot-13.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-rot_13_la_LDFLAGS = -module -avoid-version
++rot_13_la_LDFLAGS = -module -avoid-version -shared
+ 
+ rot_13_la_SOURCES = rot-13.c
+ rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
+--- a/xlators/features/changelog/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/changelog/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -5,7 +5,7 @@
+ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
+ 	changelog-misc.h changelog-encoders.h changelog-notifier.h
+ 
+-changelog_la_LDFLAGS = -module -avoid-version
++changelog_la_LDFLAGS = -module -avoid-version -shared
+ 
+ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
+ 	changelog-encoders.c changelog-notifier.c changelog-barrier.c
+Only in b/xlators/features/changelog/src: Makefile.am.orig
+diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
+--- a/xlators/features/compress/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/features/compress/src/Makefile.am	2015-08-28 11:17:19.492360095 +0200
+@@ -4,7 +4,7 @@
+ 
+ noinst_HEADERS = cdc.h cdc-mem-types.h
+ 
+-cdc_la_LDFLAGS = -module -avoid-version
++cdc_la_LDFLAGS = -module -avoid-version -shared
+ 
+ cdc_la_SOURCES = cdc.c cdc-helper.c
+ cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
+Only in b/xlators/features/compress/src: Makefile.am.rej
+diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
+--- a/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = gfid-access.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-gfid_access_la_LDFLAGS = -module -avoid-version
++gfid_access_la_LDFLAGS = -module -avoid-version -shared
+ 
+ gfid_access_la_SOURCES = gfid-access.c
+ gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
+--- a/xlators/features/index/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/index/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = index.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-index_la_LDFLAGS = -module -avoid-version
++index_la_LDFLAGS = -module -avoid-version -shared
+ 
+ index_la_SOURCES = index.c
+ index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
+--- a/xlators/features/locks/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/locks/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = locks.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-locks_la_LDFLAGS = -module -avoid-version
++locks_la_LDFLAGS = -module -avoid-version -shared
+ 
+ locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \
+ 		   clear.c
+diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
+--- a/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = mac-compat.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-mac_compat_la_LDFLAGS = -module -avoid-version
++mac_compat_la_LDFLAGS = -module -avoid-version -shared
+ 
+ mac_compat_la_SOURCES = mac-compat.c
+ mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
+--- a/xlators/features/marker/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/marker/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = marker.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-marker_la_LDFLAGS = -module -avoid-version
++marker_la_LDFLAGS = -module -avoid-version -shared
+ 
+ marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c
+ marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
+--- a/xlators/features/protect/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/protect/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,15 +2,15 @@
+ 
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-prot_dht_la_LDFLAGS = -module -avoid-version
++prot_dht_la_LDFLAGS = -module -avoid-version -shared
+ prot_dht_la_SOURCES = prot_dht.c
+ prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_client_la_LDFLAGS = -module -avoid-version
++prot_client_la_LDFLAGS = -module -avoid-version -shared
+ prot_client_la_SOURCES = prot_client.c
+ prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_server_la_LDFLAGS = -module -avoid-version
++prot_server_la_LDFLAGS = -module -avoid-version -shared
+ prot_server_la_SOURCES = prot_server.c
+ prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
+--- a/xlators/features/qemu-block/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/qemu-block/src/Makefile.am	2015-08-28 11:03:19.464259458 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = qemu-block.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-qemu_block_la_LDFLAGS = -module -avoid-version
++qemu_block_la_LDFLAGS = -module -avoid-version -shared
+ qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt
+ 
+ qemu_block_la_SOURCES_qemu = \
+Only in b/xlators/features/qemu-block/src: Makefile.am.orig
+Only in b/xlators/features/qemu-block/src: Makefile.am.rej
+diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
+--- a/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quiesce.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-quiesce_la_LDFLAGS = -module -avoid-version
++quiesce_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quiesce_la_SOURCES = quiesce.c
+ quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
+--- a/xlators/features/quota/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quota/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,8 +1,8 @@
+ xlator_LTLIBRARIES = quota.la quotad.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-quota_la_LDFLAGS = -module -avoid-version
+-quotad_la_LDFLAGS = -module -avoid-version
++quota_la_LDFLAGS = -module -avoid-version -shared
++quotad_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quota_la_SOURCES = quota.c quota-enforcer-client.c
+ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
+--- a/xlators/features/read-only/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/read-only/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -4,12 +4,12 @@
+ 
+ noinst_HEADERS = read-only-common.h
+ 
+-read_only_la_LDFLAGS = -module -avoid-version
++read_only_la_LDFLAGS = -module -avoid-version -shared
+ 
+ read_only_la_SOURCES = read-only.c read-only-common.c
+ read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
+ 
+-worm_la_LDFLAGS = -module -avoid-version
++worm_la_LDFLAGS = -module -avoid-version -shared
+ 
+ worm_la_SOURCES = read-only-common.c worm.c
+ worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+--- a/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = glusterd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
+ glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
+-glusterd_la_LDFLAGS = -module -avoid-version
++glusterd_la_LDFLAGS = -module -avoid-version -shared
+ if ENABLE_BD_XLATOR
+ glusterd_la_LDFLAGS += -llvm2app
+ endif
+diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
+--- a/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -26,7 +26,7 @@
+ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
+ 	$(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
+ 
+-fuse_la_LDFLAGS = -module -avoid-version
++fuse_la_LDFLAGS = -module -avoid-version -shared
+ fuse_la_LIBADD = @GF_FUSE_LDADD@
+ 
+ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+Only in b/xlators/mount/fuse/src: Makefile.am.orig
+diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
+--- a/xlators/nfs/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/nfs/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
+ nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+ server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \
+ 	nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \
+ 	nlmcbk_svc.c mount3udp_svc.c acl3.c
+diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
+--- a/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-io_cache_la_LDFLAGS = -module -avoid-version 
++io_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
+ io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
+--- a/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-threads.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-io_threads_la_LDFLAGS = -module -avoid-version 
++io_threads_la_LDFLAGS = -module -avoid-version -shared
+ 
+ io_threads_la_SOURCES = io-threads.c
+ io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
+--- a/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = md-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-md_cache_la_LDFLAGS = -module -avoid-version
++md_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ md_cache_la_SOURCES = md-cache.c
+ md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
+--- a/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = open-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-open_behind_la_LDFLAGS = -module -avoid-version
++open_behind_la_LDFLAGS = -module -avoid-version -shared
+ 
+ open_behind_la_SOURCES = open-behind.c
+ open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
+--- a/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quick-read.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-quick_read_la_LDFLAGS = -module -avoid-version 
++quick_read_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quick_read_la_SOURCES = quick-read.c
+ quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
+--- a/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = read-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-read_ahead_la_LDFLAGS = -module -avoid-version
++read_ahead_la_LDFLAGS = -module -avoid-version -shared
+ 
+ read_ahead_la_SOURCES = read-ahead.c page.c
+ read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
+--- a/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = readdir-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-readdir_ahead_la_LDFLAGS = -module -avoid-version
++readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
+ 
+ readdir_ahead_la_SOURCES = readdir-ahead.c
+ readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
+--- a/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = symlink-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance
+ 
+-symlink_cache_la_LDFLAGS = -module -avoid-version 
++symlink_cache_la_LDFLAGS = -module -avoid-version -shared
+ 
+ symlink_cache_la_SOURCES = symlink-cache.c
+ symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
+--- a/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = write-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-write_behind_la_LDFLAGS = -module -avoid-version 
++write_behind_la_LDFLAGS = -module -avoid-version -shared
+ 
+ write_behind_la_SOURCES = write-behind.c
+ write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
+--- a/xlators/playground/template/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/playground/template/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = template.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
+ 
+-template_la_LDFLAGS = -module -avoid-version
++template_la_LDFLAGS = -module -avoid-version -shared
+ 
+ template_la_SOURCES = template.c
+ template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
+--- a/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = addr.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+ 
+-addr_la_LDFLAGS = -module -avoid-version
++addr_la_LDFLAGS = -module -avoid-version -shared
+ 
+ addr_la_SOURCES = addr.c
+ addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
+--- a/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = login.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+ 
+-login_la_LDFLAGS = -module -avoid-version
++login_la_LDFLAGS = -module -avoid-version -shared
+ 
+ login_la_SOURCES = login.c
+ login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
+--- a/xlators/protocol/client/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/client/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = client.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+ 
+-client_la_LDFLAGS = -module -avoid-version
++client_la_LDFLAGS = -module -avoid-version -shared
+ 
+ client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
+--- a/xlators/protocol/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+ 
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+ 
+ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
+--- a/xlators/storage/bd/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/bd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = bd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+ 
+-bd_la_LDFLAGS = -module -avoid-version
++bd_la_LDFLAGS = -module -avoid-version -shared
+ LIBBD = -llvm2app -lrt
+ bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
+ bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
+diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
+--- a/xlators/storage/posix/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/posix/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = posix.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+ 
+-posix_la_LDFLAGS = -module -avoid-version
++posix_la_LDFLAGS = -module -avoid-version -shared
+ 
+ posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c
+ posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
+diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
+--- a/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,6 +1,6 @@
+ xlator_LTLIBRARIES = posix-acl.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system
+-posix_acl_la_LDFLAGS = -module -avoid-version
++posix_acl_la_LDFLAGS = -module -avoid-version -shared
+ posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c
+ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
diff --git a/sys-cluster/glusterfs/files/glusterfs-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-docdir.patch
new file mode 100644
index 0000000..5e26f63
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-docdir.patch
@@ -0,0 +1,51 @@
+From 6a17bb8523c4c7810bf7797371df22cfb259f7a7 Mon Sep 17 00:00:00 2001
+From: MATSUU Takuto <matsuu@gentoo.org>
+Date: Sat, 16 May 2009 07:01:53 +0900
+Subject: [PATCH] Use the standard autoconf $docdir variable.
+
+---
+ doc/examples/Makefile.am        |    1 -
+ extras/Makefile.am              |    3 +--
+ extras/benchmarking/Makefile.am |    4 +---
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
+index b4c93f4..5296d83 100644
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -1,7 +1,6 @@
+ EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol
+ EXTRA_DIST = $(EXTRA)
+ 
+-docdir = $(datadir)/doc/$(PACKAGE_NAME)
+ Examplesdir = $(docdir)/examples
+ Examples_DATA = $(EXTRA)
+ 
+diff --git a/extras/Makefile.am b/extras/Makefile.am
+index 9be3973..ea0b33d 100644
+--- a/extras/Makefile.am
++++ b/extras/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+-docdir = $(datadir)/doc/glusterfs/
+-EditorModedir = $(docdir)/
++EditorModedir = $(docdir)
+ EditorMode_DATA = glusterfs-mode.el glusterfs.vim
+ 
+ SUBDIRS = init.d benchmarking
+diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
+index 04cc061..bfcc592 100644
+--- a/extras/benchmarking/Makefile.am
++++ b/extras/benchmarking/Makefile.am
+@@ -1,7 +1,5 @@
+ 
+-docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking
+-
+-benchmarkingdir = $(docdir)
++benchmarkingdir = $(docdir)/benchmarking
+ 
+ benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh
+ 
+-- 
+1.6.3
+
diff --git a/sys-cluster/glusterfs/files/glusterfs-r1.initd b/sys-cluster/glusterfs/files/glusterfs-r1.initd
new file mode 100644
index 0000000..717ee79
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-r1.initd
@@ -0,0 +1,122 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+if [[ "${SVCNAME}" != "glusterfs" ]]
+then
+	GLUSTERFS_NAME="${SVCNAME#glusterfs.}"
+else
+	GLUSTERFS_NAME="glusterfs"
+fi
+
+GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid"
+
+eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"'
+eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"'
+eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"'
+eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"'
+eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"'
+eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"'
+eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"'
+
+depend() {
+	need net 
+	[[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse
+	use dns
+	before netmount
+	after firewall ntp-client ntpd
+}
+
+checkconfig() {
+	if [[ -z "${GLUSTERFS_NAME}" ]]
+	then
+		eerror "The service name is not properly formatted."
+		return 1
+	fi
+
+	if [[ -z "${GLUSTERFS_SERVER}" ]]
+	then
+		if [[ -z "${GLUSTERFS_VOLFILE}" ]]
+		then
+			eerror "No GlusterFS volume file source has been defined.  Edit /etc/conf.d/glusterfs"
+			eerror "and configure a volume file source for ${SVCNAME}."
+			return 1
+		else
+			if [[ ! -f "${GLUSTERFS_VOLFILE}" ]]
+			then
+				eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
+				return 1
+			fi
+		fi
+	fi
+
+	if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
+		return 1
+	fi
+}
+
+start() {
+	local status daemon
+
+	checkconfig || return 1
+
+	ebegin "Starting GlusterFS (${SVCNAME})"
+	eindent
+
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Starting in server mode ..."
+		daemon="glusterfsd"
+	else
+		einfo "Starting in client mode. Mounting filesystem ..."
+		daemon="glusterfs"
+	fi
+
+	if [[ -n "${GLUSTERFS_SERVER}" ]]
+	then
+		einfo "Using server supplied volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile-server=${GLUSTERFS_SERVER} \
+			--volfile-server-port=${GLUSTERFS_PORT} \
+			--volfile-server-transport=${GLUSTERFS_TRANSPORT} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	else
+		einfo "Using local volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile=${GLUSTERFS_VOLFILE} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	fi
+
+	eoutdent
+	eend ${status}
+}
+
+stop() {
+	local status
+
+	ebegin "Stopping GlusterFS (${SVCNAME})"
+	eindent
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Stopping server process ..."
+		start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
+		status="$?"
+	else
+		einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..."
+		umount "${GLUSTERFS_MOUNTPOINT}"
+		status="$?"
+	fi
+	eoutdent
+	eend ${status}
+}
diff --git a/sys-cluster/glusterfs/files/glusterfs.confd b/sys-cluster/glusterfs/files/glusterfs.confd
new file mode 100644
index 0000000..257d0a8
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.confd
@@ -0,0 +1,6 @@
+#glusterfsd_mountpoint=""
+#glusterfsd_log=""
+#glusterfsd_vol=""
+#glusterfsd_port=""
+#glusterfsd_transport=""
+#glusterfsd_opts=""
diff --git a/sys-cluster/glusterfs/files/glusterfs.logrotate b/sys-cluster/glusterfs/files/glusterfs.logrotate
new file mode 100644
index 0000000..07ae7b9
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.logrotate
@@ -0,0 +1,34 @@
+# Rotate client logs
+/var/log/glusterfs/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfs > /dev/null 2>&1 || true
+  /usr/bin/killall -HUP glusterd > /dev/null 2>&1 || true
+  endscript
+}
+
+# Rotate server logs
+/var/log/glusterfs/bricks/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfsd > /dev/null 2>&1 || true
+  endscript
+}
diff --git a/sys-cluster/glusterfs/files/glusterfs.vim b/sys-cluster/glusterfs/files/glusterfs.vim
new file mode 100644
index 0000000..bbb9cb1
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.vim
@@ -0,0 +1,8 @@
+if &compatible || v:version < 603
+    finish
+endif
+
+
+" GlusterFS Volume files
+au BufNewFile,BufRead *.vol
+    \     set filetype=glusterfs
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
new file mode 100644
index 0000000..4189f8d
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+inherit autotools elisp-common eutils multilib python versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
+
+RDEPEND="emacs? ( virtual/emacs )
+		fuse? ( >=sys-fs/fuse-2.7.0 )
+		infiniband? ( sys-infiniband/libibverbs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
+		"${FILESDIR}/${PN}-docdir.patch" \
+		"${FILESDIR}/glusterd-3.2.0-workdir.patch"
+	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fuse fuse-client) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		--enable-georeplication \
+		--disable-bdb \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake
+	if use emacs ; then
+		elisp-compile extras/glusterfs-mode.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el* || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
+	fi
+
+	if use extras ; then
+		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
+		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
+		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
+		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+
+	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	python_convert_shebangs -r 2 "${ED}"
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	elog
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	elog
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	elog
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers.  Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+
+	if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
+		elog
+		elog "You are upgrading from a previous version of ${PN}, please read:"
+		elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

From 9c5f3cad13e22236c75deb5c4ffab1640f6c0474 Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 27 Feb 2017 14:02:36 -0800
Subject: [PATCH 255/261] update

---
 sys-cluster/glusterfs/Manifest              |   1 +
 sys-cluster/glusterfs/files/glusterfs.initd | 120 ++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 sys-cluster/glusterfs/files/glusterfs.initd

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 67cc444..8ba84f2 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -9,6 +9,7 @@ AUX glusterfs-3.6.5-build-shared-only.patch 27261 SHA256 b2d73ffb27f07bf762e8f67
 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
 AUX glusterfs-r1.initd 3072 SHA256 ee75831e6c81f5944adf15e7bf3b929972581031ae4d782e50bb69c4edf2845b SHA512 79594885b78ba9f2aa3bceea2df4abff0d0249fbdab1b4054051060463e4c630daeccb75b69ba96138614b93fa585ce5967534d3cb72e986fd160f951c2e19da WHIRLPOOL 4d4bc5f987879b2ef63bda994be846871eed96cf6e7a506e3b37389dead717a44a01459c36280de59f3ba8742f97c3ddcfc995c3e1df18f75fd950beaa48f7ec
 AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d
+AUX glusterfs.initd 3024 SHA256 e8ae1c94f9a90d3e3f2aec9cc7ed24698d375309b816a9cbafcf95e31af56e05 SHA512 0803a535c61e9714ae35cbc5e5e8a7d0a4706c88e191d23e6db980735e45a2ac0d7531c2c4b94e156b3f292641e3f13fcd73d49dbdce0bff3e5dc40a7ed75e0a WHIRLPOOL 390f0e00acc11967c3ac79285e01f7cbb75474181804284c71c982a9a71d424617eb467ca90fe1fd402a584a124742f58d43d1a4e99188078ca5172d5e3d1cb8
 AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a736ccb76fd05f9a9f60a2 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 WHIRLPOOL 10ced84d8035e3e7e5aaa013cd7c0c9761999e8ddca41ff2df3ed2be7a78add579d5c2b17a27b86d9a6fafdb607b9d175725208af72585d9fdc66b3bdb5fed3d
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
diff --git a/sys-cluster/glusterfs/files/glusterfs.initd b/sys-cluster/glusterfs/files/glusterfs.initd
new file mode 100644
index 0000000..1f5bde6
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.initd
@@ -0,0 +1,120 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+if [[ "${SVCNAME}" != "glusterfs" ]]
+then
+	GLUSTERFS_NAME="${SVCNAME#glusterfs.}"
+else
+	GLUSTERFS_NAME="glusterfs"
+fi
+
+GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid"
+
+eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"'
+eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"'
+eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"'
+eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"'
+eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"'
+eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"'
+eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"'
+
+depend() {
+	need net 
+	[[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse
+	use dns
+	before netmount
+	after firewall ntp-client ntpd
+}
+
+checkconfig() {
+	if [[ -z "${GLUSTERFS_NAME}" ]]
+	then
+		eerror "The service name is not properly formatted."
+		return 1
+	fi
+
+	if [[ -z "${GLUSTERFS_SERVER}" ]]
+	then
+		if [[ -z "${GLUSTERFS_VOLFILE}" ]]
+		then
+			eerror "No GlusterFS volume file source has been defined.  Edit /etc/conf.d/glusterfs"
+			eerror "and configure a volume file source for ${SVCNAME}."
+			return 1
+		else
+			if [[ ! -f "${GLUSTERFS_VOLFILE}" ]]
+			then
+				eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
+				return 1
+			fi
+		fi
+	fi
+
+	if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
+		return 1
+	fi
+}
+
+start() {
+	local status
+
+	checkconfig || return 1
+
+	ebegin "Starting GlusterFS (${SVCNAME})"
+	eindent
+
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Starting in server mode ..."
+	else
+		einfo "Starting in client mode. Mounting filesystem ..."
+	fi
+
+	if [[ -n "${GLUSTERFS_SERVER}" ]]
+	then
+		einfo "Using server supplied volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/glusterfsd -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile-server=${GLUSTERFS_SERVER} \
+			--volfile-server-port=${GLUSTERFS_PORT} \
+			--volfile-server-transport=${GLUSTERFS_TRANSPORT} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	else
+		einfo "Using local volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/glusterfsd -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile=${GLUSTERFS_VOLFILE} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	fi
+
+	eoutdent
+	eend ${status}
+}
+
+stop() {
+	local status
+
+	ebegin "Stopping GlusterFS (${SVCNAME})"
+	eindent
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Stopping server process ..."
+		start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
+		status="$?"
+	else
+		einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..."
+		umount "${GLUSTERFS_MOUNTPOINT}"
+		status="$?"
+	fi
+	eoutdent
+	eend ${status}
+}

From df7a26ade647536b5c9508844e83db5ac6f65afa Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 27 Feb 2017 14:08:09 -0800
Subject: [PATCH 256/261] update

---
 sys-cluster/glusterfs/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 8ba84f2..d30a480 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,6 +1,7 @@
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
 AUX glusterd-r2.initd 756 SHA256 5fee2ab663249573f1f37d8b32ba8d609028446d12bdcfd925d763803cd88d47 SHA512 ad0f69cde665515b8cd2ce0ceeb2d6abdbf84dd2a2cde4f883a76b44fe61c18261ef4120f6e11eb6ef4a61b9361fd2eb6e5a3a62e98c78c086b4d177e3115b57 WHIRLPOOL 731dbd0bcf7f30b16c83ed08751b5768e5185c2231f55bc051ff0c2396856a7ed1a0db271f6bc18c9533c427aaa103503113806bf9a857c76e703cbc64f965ec
+AUX glusterd.initd 720 SHA256 e88c1e0fb7418b0ca3a58584afb3895f6494b29a492ed192f7c4bb1c1dea063d SHA512 daedb4c0e7f6cc6f80a595d687d9aed59f67b525e1b07db27d53be5e064999986b0c8d0f5ea18b0b2fe41fe5990a18796b82e814f5755094572368c8448f0d30 WHIRLPOOL b7911e79d921902fd12ff89a647fd3a8c2a808ce9903f868a7d021d5ffcb3419bdf6c53084224366f204887057a222d93274facc9ee6a8c38a58e4e4c76e0880
 AUX glusterfs-3.1.0-parallel-build.patch 659 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c SHA512 9bfa0572beda5d132a47d9a52c2f6c3149abec36054a5d20203acf01e624721a7e9f9dd603b43a724f0eb5e01ecf45696de8b5a3b6204ff9871cefaae85c5bf8 WHIRLPOOL 8d7037a6ec21d4e099d696628428747182a1c416bc6a158dd7c55633a009cbaa81aed919a3108ba35f30d1593b4027bfcd2662ee457b43c28122ade91a1688cc
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
 AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 SHA256 10b0ad92f61996f7ca0e0bf12b383813c4cd2013d95d8b6e1ab53a18853a9e05 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00 WHIRLPOOL e8e5572a5861478c718cd0b89c74159e3b13f6ef204eb3e3b2d8af8ddd296bc71469648ae957f0dd4e18de187e6fcd3e1910ea9ec5a707b78f61af8c88c9bb9b

From 7a672c583d3adee3298ad4e030dabadfea7cab1f Mon Sep 17 00:00:00 2001
From: lisa <lisa@safesoft.us>
Date: Mon, 27 Feb 2017 14:14:06 -0800
Subject: [PATCH 257/261] update

---
 sys-cluster/glusterfs/files/glusterd.initd | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 sys-cluster/glusterfs/files/glusterd.initd

diff --git a/sys-cluster/glusterfs/files/glusterd.initd b/sys-cluster/glusterfs/files/glusterd.initd
new file mode 100644
index 0000000..5e8efb5
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd.initd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+PIDFILE=/var/run/glusterd.pid
+
+depend() {
+	need net
+	before netmount
+}
+
+start() {
+	ebegin "Starting glusterd"
+	start-stop-daemon --start -q --exec /usr/sbin/glusterd \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		-- -N
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping glusterd"
+	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+	eindent
+
+	einfo "Unmounting GlusterFS filesystems"
+	umount -t fuse.glusterfs -a
+
+	einfo "Killing remaining GlusterFS processes"
+	for PID in $(find /var/lib/glusterd/ -type f -name "*.pid" -exec cat {} \;); do
+		kill "${PID}"
+	done
+
+	eoutdent
+	eend $?
+}

From 16d5f7877cd16ca5b256add3ce12ea4b37f0be8f Mon Sep 17 00:00:00 2001
From: Safesoft KMS user <neteng@safesoftsolutions.com>
Date: Fri, 3 Mar 2017 03:53:40 -0800
Subject: [PATCH 258/261] use ssl

---
 net-misc/janus/Manifest           | 2 +-
 net-misc/janus/janus-0.2.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index d0f3f62..8640fda 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -5,4 +5,4 @@ AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbc
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
 DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
-EBUILD janus-0.2.2.ebuild 1925 SHA256 001e3cae6b4d9652e5cfc1f58ede1719c50a9fd3f581046f4efe0ca0ead6d130 SHA512 f5d6d16609660648192b95c9b36f6b4c2fc4170f036545dc0572aebdc095541ac1f890311ace8fac3fb0e328a179b3f9a33e1cee6e64f18377497fff94367282 WHIRLPOOL a23e798c82d2058685763ed5a3fe6f325f6bc7e8fae8b9d676efc830254bce9e8ea046feb7bc2660318b8a3278704ef972ccf6521eaf5813f5054824acd956a7
+EBUILD janus-0.2.2.ebuild 1934 SHA256 ea1d78743fc844c5a3bdbacd94ccfcb5180780489aa3170c325242f6ba0e8e59 SHA512 73329e647614799171182f91a2120727835aed15ab9b861c1a53b6501ca2e11b11054163eef24d84f7df97f2c40e36dcc25433cd4e0f32fe0b1846f4e26a3338 WHIRLPOOL 54296beeccc52570c1cf1bb37a8d85aacf6ca29e40000e49afe16e2a62b94049bc278d52cd066c5295b07ce0853adc7de14cd6d9bdd883e20df983c70a8ec265
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
index 11b918f..417edce 100644
--- a/net-misc/janus/janus-0.2.2.ebuild
+++ b/net-misc/janus/janus-0.2.2.ebuild
@@ -31,7 +31,7 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	dev-libs/jansson
 	net-libs/libnice[-upnp]
 	dev-libs/openssl
-	>=net-libs/libsrtp-2.0.0
+	>=net-libs/libsrtp-2.0.0[openssl]
 	net-libs/sofia-sip
 	dev-libs/glib
 	app-misc/screen

From cf5bbed6bf750a7d0eeea366bae79f733b555336 Mon Sep 17 00:00:00 2001
From: root <root@hyp09.safesoftsolutions.com>
Date: Mon, 6 Mar 2017 11:11:02 -0800
Subject: [PATCH 259/261] update

---
 net-misc/janus/Manifest           | 2 +-
 net-misc/janus/janus-0.2.2.ebuild | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-misc/janus/Manifest b/net-misc/janus/Manifest
index 8640fda..2f1e181 100644
--- a/net-misc/janus/Manifest
+++ b/net-misc/janus/Manifest
@@ -5,4 +5,4 @@ AUX janus-initd.safe 6063 SHA256 d504da9f1b7958aa630d6a11acbe9fa0155314cda645fbc
 DIST janus-0.0.5.tar.gz 20812153 SHA256 53107271609a2145c48fcc5ef9a1bf8154da55d4ba2e8c0700a783261f0657a0 SHA512 5459f845ac099e549978694ea8c805f86dce54adebee8442202b30e490eb0985b5683f6d34ec63506bfa2bf5b470bff2f16569d713e46b7ce92018585a06e125 WHIRLPOOL 2d40c3753bbd954be61ad1856707cc2615c55e9b17d47be175c6676c8cac32cb380e11b593abc5d00c0ad3455a6f628579afc83409b514f9f1383d196be80b54
 DIST janus-0.2.2.tar.gz 27781204 SHA256 2a3a30276d4fd2d07cfb323a8e25cc9182da9cdeab4bcfa3da9c273ea4ff39d4 SHA512 1b153b4497549873f67968d870a54994fe3f1559be8cf94b650082ba92eeb49c21e14068723c1c671acfc7f899040ea74143f1d5105230c456927b639ce0ac1e WHIRLPOOL 2b9ad74a5f7492ce0652fbd95ee51bdf7b0b12878c460449349c64938131cac09b543acad4381b451f161aa3d6d5c95c75577bae1f4c5102aa330391288b6f9d
 EBUILD janus-0.0.5.ebuild 1928 SHA256 70620478397030b6669b89a305dbcd88edc802331f970ee9c3574fb7a46120cc SHA512 4f16324187f8d8e90c1f514ca6276c32a1b8b72186c219d810e3bfed49d48ec967a636cf496d452a1200105c6ea45903a4d743accfec8be8b683cb42e22ead0d WHIRLPOOL 2a179441d15d54acb5a78547316fe6854d820402149174cff9f13879f59d62653c0f081324237384d36086692bdf931d3d174a3261092d9759920012896d3a71
-EBUILD janus-0.2.2.ebuild 1934 SHA256 ea1d78743fc844c5a3bdbacd94ccfcb5180780489aa3170c325242f6ba0e8e59 SHA512 73329e647614799171182f91a2120727835aed15ab9b861c1a53b6501ca2e11b11054163eef24d84f7df97f2c40e36dcc25433cd4e0f32fe0b1846f4e26a3338 WHIRLPOOL 54296beeccc52570c1cf1bb37a8d85aacf6ca29e40000e49afe16e2a62b94049bc278d52cd066c5295b07ce0853adc7de14cd6d9bdd883e20df983c70a8ec265
+EBUILD janus-0.2.2.ebuild 1963 SHA256 093ab9cc7369fb05cc39da50022ebcf29b457156edeebffa55e7e158243a34f6 SHA512 cc426e93f9b8c58d274a23dcd5c150b4e2bb05f6b6a0ff7aafb9453544bc07536a600846505b7554b5b49ed76e0f876fb18e5e56c1861ef6c3352a9abbe67090 WHIRLPOOL a44ea0be6d9b2884b4678dcde3c23a127b71c3a1cdb9e76da9dc4a976e6d19052efb50f71a5d81a1d6bd6e3014189860e362b76542126c74f9d06f135690df63
diff --git a/net-misc/janus/janus-0.2.2.ebuild b/net-misc/janus/janus-0.2.2.ebuild
index 417edce..f82f382 100644
--- a/net-misc/janus/janus-0.2.2.ebuild
+++ b/net-misc/janus/janus-0.2.2.ebuild
@@ -31,13 +31,16 @@ DEPEND="docs? ( app-doc/doxygen media-gfx/graphviz )
 	dev-libs/jansson
 	net-libs/libnice[-upnp]
 	dev-libs/openssl
-	>=net-libs/libsrtp-2.0.0[openssl]
+	>=net-libs/libsrtp-2.0.0
 	net-libs/sofia-sip
 	dev-libs/glib
 	app-misc/screen
 	dev-util/gengetopt
 	dev-libs/ding-libs"
 
+#	>=net-libs/libsrtp-2.0.0[openssl]
+
+
 S="${WORKDIR}/janus-gateway"
 
 src_prepare() {

From d595031a9d324a926c9dd271029be6ae8efee579 Mon Sep 17 00:00:00 2001
From: root <vcall@safesoft.io>
Date: Mon, 6 Mar 2017 12:55:03 -0800
Subject: [PATCH 260/261] update

---
 net-misc/asterisk/Manifest             | 6 +++---
 net-misc/asterisk/asterisk-11.6.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a56d791..3498955 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -97,9 +97,9 @@ DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa152
 DIST asterisk-11.22.0-rc1.tar.gz 35096909 SHA256 53492ad14864360465a8f42345c8d85ee5835427c3c76fdc78c3e4e6de349f16 SHA512 2989dae4454784153cfbc1d5cb55a7d33599a85ca2fbd2c8094c781f2a615d163a71e408cd8ac340e8c2c0b994616c4f1594bdf2d981cae07b806963d92fc1b1 WHIRLPOOL 0adbc546b156446e10ceaec02066ff31b9699af03629355266f5ccfd53cd92504d8f6e645c290ea2eeb11ba244e2f23d8ad75da897c89387b22084b68fcb3995
 DIST asterisk-11.22.0.tar.gz 35101090 SHA256 590c361f8926e08eeaf320a35985cd39a2ea651ec3e94fb62484a7179c32f527 SHA512 98085053fc8d2aaf1c3305ef1900287bc1ee9d1e421a073cb0e1b56d379fd7803fdbfaab16143be24bdd41a7b28305dce7b91763564e750697ac2b2d9e8ad719 WHIRLPOOL f531ae8be5db9071c1809149523883cf0b7e65d2e8cecbc70d585d1881cd36a206de8cbc0edd2c4805d326427bb67a87cf2e079bed464fcc0cce376cb1098d59
 DIST asterisk-11.25.0.tar.gz 35125167 SHA256 12bc6d6b254e232417c656e86bec99e08828335e135d923f87498c133641f1c1 SHA512 a545352180612b9008ab92c7c24e416835cbf12ba3fd93c8a6ceee9b7a930b197b5ee3eb0de949605a800f0f57257393bee7deab2a1d933beed3d81ce28ec0c2 WHIRLPOOL 047654c4defe3446f3930192e3228e5df2d882ba2e7c307c15d575e1a226f401c59ca2e6d2e6a63d7fd8a2b8273961d5f900482c5a6b02fc6e45662665c9a79c
-DIST asterisk-certified-11.6-current.tar.gz 28887227 SHA256 592e3084e86c64b4c22848290124481e3f14d7cc1bfe01a8223c064a1ba0916c SHA512 32ea8fbaf159a364577d229c1cd1fda19c5f757c317268284c24cd9917c969b58a830604311ae9afcd20c7881233767bcde3f2ba2e42be5e2863d184a7e69907 WHIRLPOOL 9102f8c1c810f2e41bdec62e691f7d54449ff91afc7b90e94586cf9cee472dcd7f1b76e11d394f0d3fac8ba1b05a0003926088a3bebe5a8c7f3f846d6ac95603
+DIST asterisk-certified-11.6-current.tar.gz 28890792 SHA256 1e0fd6683b5c2ae0a7138e69c1edca2c025a57bac921913204ac3ae2185c515f SHA512 b0d9323d462c8c746aa0058df506ba4042131817bf57ea34c23fc965ad6f7c278457c7022c0a5a0cc2aa38b922012a6091e52c9bf349864fda304d419790a72d WHIRLPOOL 7a8899d8dec9e422cafa1eb9d856ce8f1c0d581273dbdca7d56ab881b018c1bb8a6cde53c8cad7c6c833989a1e396ca1b68eb6d33742fa2f4983c6f7fa3855ef
 DIST asterisk-patchset-3.0.tar.gz 24717 SHA256 cec240bf284dcd4a978b445902f7c529eac8b1f7efb57cdc097dd303bbdf6eef SHA512 a9973af87368188169c3183b7ff42f681cb6c4d650b161090b09af0eb52a952d855a71d4531ab9f7ed3718dac95e7849df8852959f0cde1673478132f677b334 WHIRLPOOL 816837bfdbb59d4c7cbd2d626214ee5df2742948376a915b3221427fb30fef38484b74d77a863cef84bffcb00e5ab54848e3821ee3e0e9294ef7f665f597d652
-DIST asterisk-patchset.tar.gz 26416 SHA256 aefa91483c4ca5f1d601d356ed6e8aca77ac3fc8b5f14dacdf75508c9e01e952 SHA512 1cafd370b43c7be7c888af52c16f2f0c6a2ea73b9eb810e21f649ab81a4ab88f9deb33067c0185354ee5f9322ede6c68f3599183f75cf0e3ec3cacfd2f0b417b WHIRLPOOL 7d6f02b789731f9751fcea3aecbc5127170f0fa33a04a34fd2593bfc3ba7426ff2d1ba14ce63bc76f1dff1eeb19983353d861aa27cc1940bda32c534ec93360f
+DIST asterisk-patchset.tar.gz 26467 SHA256 03681dd38e938d3f0e9bd4b412f0260d84b065c872e0f35c117e64276ddcb243 SHA512 c5252b2e273d88b000661256e73fcbab7537a6bc6a93b2863ebf76acd4ec13945c33e9946dc823a33bdec07e1cbdb43409c422a234bfaeab902af8a2a91156d0 WHIRLPOOL 1f6f3e91f3a89e536bd1a68d60392b44f24eacf67e47edf8cd67f60356fabe32716ce4ed64b88706fff166177253f80e2e8cdfb377ec1f6ee8f863338de7f473
 EBUILD asterisk-1.4.39.1.ebuild 10878 SHA256 4c26895d27cc015c47acda47c8fe2fcf29d2394581ddb622a1678cc79f3cdb19 SHA512 4b4e2aa3fa67fbfc17e6f04299f4eb1a584880b574fbc191284b956aa47b7e84105edda4a10aa620a7391a7d2c073431f9a539d04da8a66b6fcbce1e7d48735f WHIRLPOOL 457b89530f0de5ab79c466888ab930c0fee06d8e29eda1a670c59e8b80cb241bf1433233a8efd2358e2d3a68147cbb5425c0a5126dd281b4e6b22dc9e540ae1f
 EBUILD asterisk-1.8.23.0.ebuild 9454 SHA256 8a03f6d596fd0f7635836b5583b994bcb06aa207440d69ea8e350f2bb0b7c51d SHA512 800d4774847de6606528f23eafbdd894069a29efa83cae0b75dcf1b427b29133af696201156cf18bfebd501dbdff58903461a7cb139eef3b131dd27f625930b4 WHIRLPOOL bb63fb7b7f82295d6ee3d724faa67210969cc812d136eff6f45ad640ff3f061419143a4d2d342c55ee1c5ea48bed14693edfb9b52b7cac4e836df5c3f9214e85
 EBUILD asterisk-11.15.0-r1.ebuild 9730 SHA256 02ec357db897f1c8d1de5ceb0fc7c61e113ad2dd6df0ab5b26e19e41a96958f9 SHA512 ed3c38039806089d4cadd327ab7e8f415b67ff5b8b0627faac8a86f164fbe080c4a6a0cc17e3a5ae777945d4db6b6eacfd7158393921cebc2d448b1c95a45c4e WHIRLPOOL 7a7cf55a437e0ae0e82ec792417d80693fbd6d0c49cdcd60bad2921d54556e0b449375ac4dc6d7a29d97cdd6519fbab3b342fae3e0f2863b80b72b99d44b8807
@@ -110,4 +110,4 @@ EBUILD asterisk-11.21.2.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259
 EBUILD asterisk-11.22.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.22.0_rc1.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
 EBUILD asterisk-11.25.0.ebuild 9631 SHA256 a5e17320755fb5b777c5c428761fed5858259c9acd6e3261fa696da201968e75 SHA512 5f227f3cb3314720c5146c2eb880511b56d2d23c923ae6277790ef02c62bacf85dec8dadbe05c969a952967f762ed1f8cbf794067708d097c3b6356943bfcf80 WHIRLPOOL 898131e6f8aaf4a276bee0882a1eecc1b98fbe515c0a93bef0e26ff1a7e95f50355b2773d762f7a203757be13e000da8da8e914490d60fa37f151137b46d89ed
-EBUILD asterisk-11.6.ebuild 9656 SHA256 5eaf9d59d2a902db8b49f98ccef973943453497a5e6044cf5512e7df1aebbcaf SHA512 2c39db59c6a1bd2f6092e24a403d352d8560ad464cd9bbad854bf1a1ebadfbd1664f3b12b79e825f85791f5bab3073123721499d8dace84228663f39fdf2996c WHIRLPOOL 228a4e2bda2188b0f424e3007eef5909e6fe2b44add37eed714b59df9a82a100e2d4a49083ec9c61ddbc41d2f14fb2dc4110eddd259d5de5c7f17b3789cd4a35
+EBUILD asterisk-11.6.ebuild 9679 SHA256 0c7b191533e5904b64bfdd1a9c39841722e1ec960a2c38d4aeddb65d012b61d0 SHA512 d461a8f4f29a4cede2a6ba9872c5503a5360875caf61c8be78d4f29d4a90efaf827ac17301ce7a220edcfb49419429dfbb4053a09f9ee96124e02fece06755f4 WHIRLPOOL 5094f56e65418b150c4a7c89d7e537a6203f28763eac5df92b31491f83844cc8f894a930a19934d4260c586218bbbffbc261bff2d4a87f7eb8b2b00d0791c158
diff --git a/net-misc/asterisk/asterisk-11.6.ebuild b/net-misc/asterisk/asterisk-11.6.ebuild
index 206a97f..a4c2ea7 100644
--- a/net-misc/asterisk/asterisk-11.6.ebuild
+++ b/net-misc/asterisk/asterisk-11.6.ebuild
@@ -83,7 +83,7 @@ PDEPEND="net-misc/asterisk-core-sounds
 	net-misc/asterisk-extra-sounds
 	net-misc/asterisk-moh-opsound"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/asterisk-certified-11.6-cert16"
 
 pkg_setup() {
 	CONFIG_CHECK="~!NF_CONNTRACK_SIP"

From 38011e500ce578b3a8e4d731601d3fce0eee1f43 Mon Sep 17 00:00:00 2001
From: Phi Le <phitung@gmail.com>
Date: Wed, 8 Mar 2017 23:40:11 -0800
Subject: [PATCH 261/261] test

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5a43ddf..8d1c463 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,4 @@ overlay
 custom packages build for gentoo
 
 use at your own risk, cheese
+